diff --git a/devel/mingw-gcc/Makefile b/devel/mingw-gcc/Makefile
index 2bdb1d6cc23c..b4659ce6d904 100644
--- a/devel/mingw-gcc/Makefile
+++ b/devel/mingw-gcc/Makefile
@@ -1,59 +1,55 @@
 # New ports collection makefile for: mingw-gcc
 # Date created:		6 June 2000
 # Whom:			Toshihiro Inoue <tino@pa2.so-net.ne.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	2.95.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= gcc
 PKGNAMEPREFIX=	mingw-
 
 PATCH_SITES=	http://www.ab.wakwak.com/~tino/windows/
 PATCHFILES=	${PKGNAME}-1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tino@pa2.so-net.ne.jp
 
 BUILD_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt \
 		autoheader:${PORTSDIR}/devel/autoconf
 RUN_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=i386-mingw32msvc \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/i386-mingw32msvc/${PORTVERSION}/include/g++
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 MAN1=	cccp.1                 \
 	i386-mingw32msvc-g++.1 \
 	i386-mingw32msvc-g77.1 \
 	i386-mingw32msvc-gcc.1
 
-post-configure:
-	cd ${WRKSRC}/gcc; ${GMAKE} installdirs
-
 post-install:
 	@for file in \
-	  c++ cpp g++ g77 gcc gcj gcjh gcov \
-	  jcf-dump jv-scan protoize unprotoize; \
+	  cpp gcjh gcov jcf-dump jv-scan \
+	  i386-mingw32msvc-c++ \
+	  i386-mingw32msvc-c++filt \
+	  i386-mingw32msvc-g++ \
+	  i386-mingw32msvc-g77 \
+	  i386-mingw32msvc-gcc \
+	  i386-mingw32msvc-gcj \
+	  i386-mingw32msvc-protoize \
+	  i386-mingw32msvc-unprotoize; \
 	do \
-	  file1=${PREFIX}/bin/$${file}; \
-	  file2=${PREFIX}/bin/i386-mingw32msvc-$${file}; \
-	  if [ -f $${file1} ] && [ ! -f $${file2} ]; \
-	  then \
-	    ${CP} $${file1} $${file2}; \
-	  fi; \
-	  strip $${file2}; \
+	  strip ${PREFIX}/bin/$${file}; \
 	done
-.for f in chill.info cpp.info g77.info gcc.info
-	@install-info ${PREFIX}/info/${f} ${PREFIX}/info/dir
-.endfor
+	@rm ${PREFIX}/info/chill.info
 
 .include <bsd.port.mk>
diff --git a/devel/mingw-gcc/files/patch-aa b/devel/mingw-gcc/files/patch-aa
new file mode 100644
index 000000000000..29cdf81e1bb9
--- /dev/null
+++ b/devel/mingw-gcc/files/patch-aa
@@ -0,0 +1,29 @@
+--- gcc/configure.orig	Thu Aug 24 19:33:08 2000
++++ gcc/configure	Thu Aug 24 19:52:57 2000
+@@ -763,7 +763,7 @@
+     gcc_gxx_include_dir='${libsubdir}/include/g++'
+   else
+     topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
+-    gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
++    gcc_gxx_include_dir="\$(local_prefix)\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
+   fi
+ fi
+ 
+@@ -8530,7 +8530,7 @@
+ # make and thus we'd get different behavior depending on where we built the
+ # sources.
+ if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
+-    gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
++    gcc_tooldir='$(local_prefix)/$(target_alias)'
+ else
+ # An explanation of the sed strings:
+ #  -e 's|^\$(prefix)||'   matches and eliminates 'prefix' from 'exec_prefix'
+@@ -8554,7 +8554,7 @@
+ #   /foo        /foo/bar/ugg      ../../
+ #
+     dollar='$$'
+-    gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
++    gcc_tooldir="\$(libdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
+ fi
+ 
+ 
diff --git a/devel/mingw-gcc/files/patch-ab b/devel/mingw-gcc/files/patch-ab
new file mode 100644
index 000000000000..55c611144673
--- /dev/null
+++ b/devel/mingw-gcc/files/patch-ab
@@ -0,0 +1,53 @@
+--- gcc/Makefile.in.orig	Thu Aug 24 19:46:43 2000
++++ gcc/Makefile.in	Thu Aug 24 19:50:43 2000
+@@ -1407,12 +1407,12 @@
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
+-  -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
++  -DSTANDARD_STARTFILE_PREFIX=\"$(libdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
+   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+   -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
+   -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
+-  -DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\"
++  -DTOOLDIR_BASE_PREFIX=\"$(local_prefix)/\"
+ gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
+     Makefile $(lang_specs_files) prefix.h
+ 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+@@ -1972,7 +1972,7 @@
+ 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ 	  -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+ 	  -c `echo $(srcdir)/cccp.c | sed 's,^\./,,'`
+@@ -2006,7 +2006,7 @@
+ 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ 	  -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+ 	  -c `echo $(srcdir)/cppinit.c | sed 's,^\./,,'`
+@@ -2031,7 +2031,7 @@
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
+ 	  $(srcdir)/protoize.c
+ 
+@@ -2042,7 +2042,7 @@
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
+ 	  $(srcdir)/unprotoize.c
+ 
diff --git a/devel/mingw-gcc/pkg-plist b/devel/mingw-gcc/pkg-plist
index d673d6382e56..9aa7a2ac5749 100644
--- a/devel/mingw-gcc/pkg-plist
+++ b/devel/mingw-gcc/pkg-plist
@@ -1,298 +1,296 @@
+bin/cpp
+bin/gcjh
+bin/gcov
 bin/i386-mingw32msvc-c++
+bin/i386-mingw32msvc-c++filt
 bin/i386-mingw32msvc-chill
-bin/i386-mingw32msvc-cpp
 bin/i386-mingw32msvc-g++
 bin/i386-mingw32msvc-g77
 bin/i386-mingw32msvc-gcc
 bin/i386-mingw32msvc-gcj
-bin/i386-mingw32msvc-gcjh
-bin/i386-mingw32msvc-gcov
-bin/i386-mingw32msvc-jcf-dump
-bin/i386-mingw32msvc-jv-scan
 bin/i386-mingw32msvc-protoize
 bin/i386-mingw32msvc-unprotoize
+bin/jcf-dump
+bin/jv-scan
 i386-mingw32msvc/bin/gcc
 i386-mingw32msvc/include/_G_config.h
 i386-mingw32msvc/lib/libiberty.a
 i386-mingw32msvc/lib/libstdc++.a.2.10.0
-@unexec install-info --delete %D/info/chill.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
 info/cpp.info-3
 info/g77.info
 info/g77.info-1
 info/g77.info-10
 info/g77.info-11
 info/g77.info-12
 info/g77.info-13
 info/g77.info-14
 info/g77.info-15
 info/g77.info-16
 info/g77.info-17
 info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
 info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
 info/g77.info-6
 info/g77.info-7
 info/g77.info-8
 info/g77.info-9
 info/gcc.info
 info/gcc.info-1
 info/gcc.info-10
 info/gcc.info-11
 info/gcc.info-12
 info/gcc.info-13
 info/gcc.info-14
 info/gcc.info-15
 info/gcc.info-16
 info/gcc.info-17
 info/gcc.info-18
 info/gcc.info-19
 info/gcc.info-2
 info/gcc.info-20
 info/gcc.info-21
 info/gcc.info-22
 info/gcc.info-23
 info/gcc.info-24
 info/gcc.info-25
 info/gcc.info-26
 info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-3
 info/gcc.info-30
 info/gcc.info-4
 info/gcc.info-5
 info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/SYSCALLS.c.X
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1chill
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1obj
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1plus
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/chillrt0.o
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cpp
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/f771
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/README
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/exception
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/fixed
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/float.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/PlotFile.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/SFile.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/algo.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/algobase.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/algorithm
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/alloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/bitset
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/builtinbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/bvector.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cassert
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cctype
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cerrno
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cfloat
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ciso646
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/climits
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/clocale
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cmath
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/complex
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/complex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/csetjmp
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/csignal
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstdarg
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstddef
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstdio
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstdlib
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstring
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ctime
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cwchar
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cwctype
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/defalloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/deque
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/deque.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/dummy.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/editbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/floatio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/fstream
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/fstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/function.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/functional
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_map
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_set
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hashtable.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/heap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/indstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iolibio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iomanip
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iomanip.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iosfwd
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostdio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostream
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostreamP.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/istream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iterator
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iterator.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/libio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/libioP.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/list
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/list.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/map
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/memory
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/multimap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/multiset.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/numeric
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ostream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pair.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/parsestream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pfstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/procbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pthread_alloc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pthread_alloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/queue
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/rope
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/rope.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ropeimpl.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/set
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/slist
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/slist.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stack
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stack.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/bastring.cc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/bastring.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/complext.cc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/complext.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/dcomplex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/fcomplex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/gslice.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/gslice_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/indirect_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/ldcomplex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/mask_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/slice.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/slice_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/std_valarray.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/straits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/valarray_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/valarray_meta.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stdexcept
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stdiostream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_algo.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_algobase.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_alloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_bvector.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_config.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_construct.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_deque.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_function.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hash_fun.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hash_map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hash_set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hashtable.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_heap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_iterator.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_list.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_multimap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_multiset.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_numeric.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_pair.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_queue.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_raw_storage_iter.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_relops.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_rope.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_slist.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_stack.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_tempbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_tree.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_uninitialized.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_vector.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/streambuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/strfile.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/string
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/strstream
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/strstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/tempbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/tree.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/type_traits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/utility
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/valarray
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/vector
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/vector.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/iso646.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/limits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/new
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/new.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/NXConstStr.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/Object.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/Protocol.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/encoding.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/hash.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/objc-api.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/objc-list.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/objc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/sarray.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/thr.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/typedstream.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/proto.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/stdarg.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/stdbool.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/stddef.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/syslimits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/typeinfo
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-alpha.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-arc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-c4x.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-clipper.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-h8300.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-i860.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-i960.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-m32r.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-m88k.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-mips.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-mn10200.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-mn10300.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-pa.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-ppc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-pyr.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-sh.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-sparc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-spur.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-v850.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/varargs.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/jc1
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/jvgenmain
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libchill.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libgcc.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libobjc.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libstdc++.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/specs
-@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%
-@dirrm lib/gcc-lib/i386-mingw32msvc
+@unexec rmdir -p %D/lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%% 2>/dev/null || true
+lib/libiberty.a
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index 2bdb1d6cc23c..b4659ce6d904 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -1,59 +1,55 @@
 # New ports collection makefile for: mingw-gcc
 # Date created:		6 June 2000
 # Whom:			Toshihiro Inoue <tino@pa2.so-net.ne.jp>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	2.95.2
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNU}
 MASTER_SITE_SUBDIR= gcc
 PKGNAMEPREFIX=	mingw-
 
 PATCH_SITES=	http://www.ab.wakwak.com/~tino/windows/
 PATCHFILES=	${PKGNAME}-1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	tino@pa2.so-net.ne.jp
 
 BUILD_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt \
 		autoheader:${PORTSDIR}/devel/autoconf
 RUN_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=i386-mingw32msvc \
 		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/i386-mingw32msvc/${PORTVERSION}/include/g++
 
 PLIST_SUB=	PORTVERSION="${PORTVERSION}"
 
 MAN1=	cccp.1                 \
 	i386-mingw32msvc-g++.1 \
 	i386-mingw32msvc-g77.1 \
 	i386-mingw32msvc-gcc.1
 
-post-configure:
-	cd ${WRKSRC}/gcc; ${GMAKE} installdirs
-
 post-install:
 	@for file in \
-	  c++ cpp g++ g77 gcc gcj gcjh gcov \
-	  jcf-dump jv-scan protoize unprotoize; \
+	  cpp gcjh gcov jcf-dump jv-scan \
+	  i386-mingw32msvc-c++ \
+	  i386-mingw32msvc-c++filt \
+	  i386-mingw32msvc-g++ \
+	  i386-mingw32msvc-g77 \
+	  i386-mingw32msvc-gcc \
+	  i386-mingw32msvc-gcj \
+	  i386-mingw32msvc-protoize \
+	  i386-mingw32msvc-unprotoize; \
 	do \
-	  file1=${PREFIX}/bin/$${file}; \
-	  file2=${PREFIX}/bin/i386-mingw32msvc-$${file}; \
-	  if [ -f $${file1} ] && [ ! -f $${file2} ]; \
-	  then \
-	    ${CP} $${file1} $${file2}; \
-	  fi; \
-	  strip $${file2}; \
+	  strip ${PREFIX}/bin/$${file}; \
 	done
-.for f in chill.info cpp.info g77.info gcc.info
-	@install-info ${PREFIX}/info/${f} ${PREFIX}/info/dir
-.endfor
+	@rm ${PREFIX}/info/chill.info
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-gcc/files/patch-aa b/devel/mingw32-gcc/files/patch-aa
new file mode 100644
index 000000000000..29cdf81e1bb9
--- /dev/null
+++ b/devel/mingw32-gcc/files/patch-aa
@@ -0,0 +1,29 @@
+--- gcc/configure.orig	Thu Aug 24 19:33:08 2000
++++ gcc/configure	Thu Aug 24 19:52:57 2000
+@@ -763,7 +763,7 @@
+     gcc_gxx_include_dir='${libsubdir}/include/g++'
+   else
+     topsrcdir=${srcdir}/.. . ${srcdir}/../config.if
+-    gcc_gxx_include_dir="\$(libsubdir)/\$(unlibsubdir)/..\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
++    gcc_gxx_include_dir="\$(local_prefix)\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/[^/]*|/..|g'\`/include/g++"-${libstdcxx_interface}
+   fi
+ fi
+ 
+@@ -8530,7 +8530,7 @@
+ # make and thus we'd get different behavior depending on where we built the
+ # sources.
+ if test x$exec_prefix = xNONE -o x$exec_prefix = x$prefix; then
+-    gcc_tooldir='$(libsubdir)/$(unlibsubdir)/../$(target_alias)'
++    gcc_tooldir='$(local_prefix)/$(target_alias)'
+ else
+ # An explanation of the sed strings:
+ #  -e 's|^\$(prefix)||'   matches and eliminates 'prefix' from 'exec_prefix'
+@@ -8554,7 +8554,7 @@
+ #   /foo        /foo/bar/ugg      ../../
+ #
+     dollar='$$'
+-    gcc_tooldir="\$(libsubdir)/\$(unlibsubdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
++    gcc_tooldir="\$(libdir)/\`echo \$(exec_prefix) | sed -e 's|^\$(prefix)||' -e 's|/\$(dollar)||' -e 's|^[^/]|/|' -e 's|/[^/]*|../|g'\`\$(target_alias)"
+ fi
+ 
+ 
diff --git a/devel/mingw32-gcc/files/patch-ab b/devel/mingw32-gcc/files/patch-ab
new file mode 100644
index 000000000000..55c611144673
--- /dev/null
+++ b/devel/mingw32-gcc/files/patch-ab
@@ -0,0 +1,53 @@
+--- gcc/Makefile.in.orig	Thu Aug 24 19:46:43 2000
++++ gcc/Makefile.in	Thu Aug 24 19:50:43 2000
+@@ -1407,12 +1407,12 @@
+ # Language-independent files.
+ 
+ DRIVER_DEFINES = \
+-  -DSTANDARD_STARTFILE_PREFIX=\"$(unlibsubdir)/\" \
++  -DSTANDARD_STARTFILE_PREFIX=\"$(libdir)/\" \
+   -DSTANDARD_EXEC_PREFIX=\"$(libdir)/gcc-lib/\" \
+   -DDEFAULT_TARGET_VERSION=\"$(version)\" \
+   -DDEFAULT_TARGET_MACHINE=\"$(target_alias)\" \
+   -DSTANDARD_BINDIR_PREFIX=\"$(bindir)/\" \
+-  -DTOOLDIR_BASE_PREFIX=\"$(unlibsubdir)/../\"
++  -DTOOLDIR_BASE_PREFIX=\"$(local_prefix)/\"
+ gcc.o: gcc.c $(CONFIG_H) system.h intl.h multilib.h \
+     Makefile $(lang_specs_files) prefix.h
+ 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+@@ -1972,7 +1972,7 @@
+ 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ 	  -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+ 	  -c `echo $(srcdir)/cccp.c | sed 's,^\./,,'`
+@@ -2006,7 +2006,7 @@
+ 	$(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ 	  -DGCC_INCLUDE_DIR=\"$(libsubdir)/include\" \
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+ 	  -c `echo $(srcdir)/cppinit.c | sed 's,^\./,,'`
+@@ -2031,7 +2031,7 @@
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
+ 	  $(srcdir)/protoize.c
+ 
+@@ -2042,7 +2042,7 @@
+ 	  -DGPLUSPLUS_INCLUDE_DIR=\"$(gcc_gxx_include_dir)\" \
+ 	  -DCROSS_INCLUDE_DIR=\"$(gcc_tooldir)/sys-include\" \
+ 	  -DTOOL_INCLUDE_DIR=\"$(gcc_tooldir)/include\" \
+- 	  -DLOCAL_INCLUDE_DIR=\"$(libsubdir)/$(unlibsubdir)/..`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
++ 	  -DLOCAL_INCLUDE_DIR=\"$(local_prefix)`echo $(exec_prefix) | sed -e 's|^$(prefix)||' -e 's|/[^/]*|/..|g'`/include\" \
+ 	  -DSTD_PROTO_DIR=\"$(libsubdir)\" \
+ 	  $(srcdir)/unprotoize.c
+ 
diff --git a/devel/mingw32-gcc/pkg-plist b/devel/mingw32-gcc/pkg-plist
index d673d6382e56..9aa7a2ac5749 100644
--- a/devel/mingw32-gcc/pkg-plist
+++ b/devel/mingw32-gcc/pkg-plist
@@ -1,298 +1,296 @@
+bin/cpp
+bin/gcjh
+bin/gcov
 bin/i386-mingw32msvc-c++
+bin/i386-mingw32msvc-c++filt
 bin/i386-mingw32msvc-chill
-bin/i386-mingw32msvc-cpp
 bin/i386-mingw32msvc-g++
 bin/i386-mingw32msvc-g77
 bin/i386-mingw32msvc-gcc
 bin/i386-mingw32msvc-gcj
-bin/i386-mingw32msvc-gcjh
-bin/i386-mingw32msvc-gcov
-bin/i386-mingw32msvc-jcf-dump
-bin/i386-mingw32msvc-jv-scan
 bin/i386-mingw32msvc-protoize
 bin/i386-mingw32msvc-unprotoize
+bin/jcf-dump
+bin/jv-scan
 i386-mingw32msvc/bin/gcc
 i386-mingw32msvc/include/_G_config.h
 i386-mingw32msvc/lib/libiberty.a
 i386-mingw32msvc/lib/libstdc++.a.2.10.0
-@unexec install-info --delete %D/info/chill.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
 info/cpp.info-3
 info/g77.info
 info/g77.info-1
 info/g77.info-10
 info/g77.info-11
 info/g77.info-12
 info/g77.info-13
 info/g77.info-14
 info/g77.info-15
 info/g77.info-16
 info/g77.info-17
 info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
 info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
 info/g77.info-6
 info/g77.info-7
 info/g77.info-8
 info/g77.info-9
 info/gcc.info
 info/gcc.info-1
 info/gcc.info-10
 info/gcc.info-11
 info/gcc.info-12
 info/gcc.info-13
 info/gcc.info-14
 info/gcc.info-15
 info/gcc.info-16
 info/gcc.info-17
 info/gcc.info-18
 info/gcc.info-19
 info/gcc.info-2
 info/gcc.info-20
 info/gcc.info-21
 info/gcc.info-22
 info/gcc.info-23
 info/gcc.info-24
 info/gcc.info-25
 info/gcc.info-26
 info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-3
 info/gcc.info-30
 info/gcc.info-4
 info/gcc.info-5
 info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/SYSCALLS.c.X
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1chill
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1obj
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cc1plus
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/chillrt0.o
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/cpp
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/f771
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/README
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/exception
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/fixed
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/float.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/PlotFile.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/SFile.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/algo.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/algobase.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/algorithm
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/alloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/bitset
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/builtinbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/bvector.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cassert
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cctype
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cerrno
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cfloat
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ciso646
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/climits
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/clocale
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cmath
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/complex
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/complex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/csetjmp
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/csignal
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstdarg
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstddef
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstdio
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstdlib
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cstring
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ctime
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cwchar
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/cwctype
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/defalloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/deque
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/deque.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/dummy.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/editbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/floatio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/fstream
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/fstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/function.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/functional
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_map
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_set
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hash_set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/hashtable.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/heap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/indstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iolibio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iomanip
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iomanip.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iosfwd
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostdio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostream
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iostreamP.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/istream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iterator
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/iterator.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/libio.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/libioP.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/list
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/list.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/map
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/memory
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/multimap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/multiset.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/numeric
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ostream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pair.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/parsestream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pfstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/procbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pthread_alloc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/pthread_alloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/queue
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/rope
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/rope.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/ropeimpl.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/set
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/slist
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/slist.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stack
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stack.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/bastring.cc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/bastring.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/complext.cc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/complext.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/dcomplex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/fcomplex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/gslice.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/gslice_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/indirect_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/ldcomplex.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/mask_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/slice.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/slice_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/std_valarray.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/straits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/valarray_array.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std/valarray_meta.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/std
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stdexcept
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stdiostream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_algo.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_algobase.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_alloc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_bvector.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_config.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_construct.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_deque.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_function.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hash_fun.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hash_map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hash_set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_hashtable.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_heap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_iterator.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_list.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_map.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_multimap.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_multiset.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_numeric.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_pair.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_queue.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_raw_storage_iter.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_relops.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_rope.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_set.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_slist.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_stack.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_tempbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_tree.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_uninitialized.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stl_vector.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/stream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/streambuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/strfile.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/string
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/strstream
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/strstream.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/tempbuf.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/tree.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/type_traits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/utility
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/valarray
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/vector
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++/vector.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/g++
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/iso646.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/limits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/new
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/new.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/NXConstStr.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/Object.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/Protocol.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/encoding.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/hash.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/objc-api.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/objc-list.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/objc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/sarray.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/thr.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc/typedstream.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/objc
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/proto.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/stdarg.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/stdbool.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/stddef.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/syslimits.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/typeinfo
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-alpha.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-arc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-c4x.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-clipper.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-h8300.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-i860.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-i960.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-m32r.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-m88k.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-mips.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-mn10200.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-mn10300.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-pa.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-ppc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-pyr.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-sh.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-sparc.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-spur.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/va-v850.h
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include/varargs.h
 @dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/include
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/jc1
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/jvgenmain
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libchill.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libgcc.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libobjc.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/libstdc++.a
 lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%/specs
-@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%
-@dirrm lib/gcc-lib/i386-mingw32msvc
+@unexec rmdir -p %D/lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%% 2>/dev/null || true
+lib/libiberty.a