Update MinGW and change MAINTAINER.

- mingw            -> 20010726
- mingw-bin-msvcrt -> 1.0
- mingw-binutils   -> 2.11.90
- mingw-gcc        -> 2.95.3

PR:		ports/29344 (+ several minor fixes)
Submitted by:	Michal P. <doc@lublin.t1.pl> (new MAINTAINER)
Approved by:	Toshihiro Inoue <tino@pa2.so-net.ne.jp> (ex. MAINTAINER)

22 files changed, 257 insertions, 257 deletions

diff --git a/devel/mingw-bin-msvcrt/Makefile b/devel/mingw-bin-msvcrt/Makefile
index 5529ba1..80cb48e 100644
--- a/devel/mingw-bin-msvcrt/Makefile
+++ b/devel/mingw-bin-msvcrt/Makefile
@@ -6,16 +6,20 @@
 #
 
 PORTNAME=	bin-msvcrt
-PORTVERSION=	2000.03.27
+PORTVERSION=	1.0
+PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.xraylith.wisc.edu/pub/khan/gnu-win32/mingw32/runtime/
-PKGNAMEPREFIX=	mingw-
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/./-/g}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mingw
+PKGNAMEPREFIX= 	mingw-
+DIST_SUBDIR=	mingw
 
-MAINTAINER=	tino@pa2.so-net.ne.jp
+MAINTAINER=	doc@hisio.safenet.pl
+
+DISTFILES = mingw-runtime-1.0-20010604${EXTRACT_SUFX} \
+		w32api-1.0-20010606${EXTRACT_SUFX}
 
 NO_MTREE=	yes
-USE_ZIP=	yes
 NO_WRKSUBDIR=	yes
 
 post-extract:
diff --git a/devel/mingw-bin-msvcrt/distinfo b/devel/mingw-bin-msvcrt/distinfo
index 00288e6..2d8890a 100644
--- a/devel/mingw-bin-msvcrt/distinfo
+++ b/devel/mingw-bin-msvcrt/distinfo
@@ -1 +1,2 @@
-MD5 (bin-msvcrt-2000-03-27.zip) = 4b1fa39fe36e11269b5955237eb76a71
+MD5 (mingw/mingw-runtime-1.0-20010604.tar.gz) = 473f8dfeb7c418417a8254fca9137a2b
+MD5 (mingw/w32api-1.0-20010606.tar.gz) = 391d284f09cf7d13adccbd4ba50b4638
diff --git a/devel/mingw-bin-msvcrt/files/Makefile b/devel/mingw-bin-msvcrt/files/Makefile
index 4b9e65f..31fbebf 100644
--- a/devel/mingw-bin-msvcrt/files/Makefile
+++ b/devel/mingw-bin-msvcrt/files/Makefile
@@ -5,4 +5,5 @@ all:
 install:
 	mkdir -p ${PREFIX}/bin
 	install -c -g wheel -o root -m 0755 bin/mingwm10.dll ${PREFIX}/bin
-	cp -r i386-mingw32msvc ${PREFIX}
+	mkdir -p /usr/local/i386-mingw32msvc
+	cp -R lib include ${PREFIX}/i386-mingw32msvc
diff --git a/devel/mingw-bin-msvcrt/pkg-plist b/devel/mingw-bin-msvcrt/pkg-plist
index 0828943..2e56edb 100644
--- a/devel/mingw-bin-msvcrt/pkg-plist
+++ b/devel/mingw-bin-msvcrt/pkg-plist
@@ -1,6 +1,7 @@
 bin/mingwm10.dll
 i386-mingw32msvc/include/_mingw.h
 i386-mingw32msvc/include/assert.h
+i386-mingw32msvc/include/basetsd.h
 i386-mingw32msvc/include/basetyps.h
 i386-mingw32msvc/include/cderr.h
 i386-mingw32msvc/include/cguid.h
@@ -30,6 +31,11 @@ i386-mingw32msvc/include/imm.h
 i386-mingw32msvc/include/initguid.h
 i386-mingw32msvc/include/intshcut.h
 i386-mingw32msvc/include/io.h
+i386-mingw32msvc/include/ipexport.h
+i386-mingw32msvc/include/iphlpapi.h
+i386-mingw32msvc/include/ipifcons.h
+i386-mingw32msvc/include/iprtrmib.h
+i386-mingw32msvc/include/iptypes.h
 i386-mingw32msvc/include/isguids.h
 i386-mingw32msvc/include/largeint.h
 i386-mingw32msvc/include/limits.h
@@ -65,14 +71,18 @@ i386-mingw32msvc/include/mcx.h
 i386-mingw32msvc/include/mem.h
 i386-mingw32msvc/include/memory.h
 i386-mingw32msvc/include/mmsystem.h
+i386-mingw32msvc/include/mswsock.h
 i386-mingw32msvc/include/nb30.h
 i386-mingw32msvc/include/nddeapi.h
 i386-mingw32msvc/include/nspapi.h
+i386-mingw32msvc/include/ntdef.h
+i386-mingw32msvc/include/ntsecapi.h
 i386-mingw32msvc/include/oaidl.h
 i386-mingw32msvc/include/objbase.h
 i386-mingw32msvc/include/objfwd.h
 i386-mingw32msvc/include/objidl.h
 i386-mingw32msvc/include/ocidl.h
+i386-mingw32msvc/include/odbcinst.h
 i386-mingw32msvc/include/ole.h
 i386-mingw32msvc/include/ole2.h
 i386-mingw32msvc/include/ole2ver.h
@@ -93,6 +103,9 @@ i386-mingw32msvc/include/pshpack2.h
 i386-mingw32msvc/include/pshpack4.h
 i386-mingw32msvc/include/pshpack8.h
 i386-mingw32msvc/include/rapi.h
+i386-mingw32msvc/include/ras.h
+i386-mingw32msvc/include/raserror.h
+i386-mingw32msvc/include/rassapi.h
 i386-mingw32msvc/include/regstr.h
 i386-mingw32msvc/include/richedit.h
 i386-mingw32msvc/include/richole.h
@@ -115,11 +128,14 @@ i386-mingw32msvc/include/signal.h
 i386-mingw32msvc/include/sql.h
 i386-mingw32msvc/include/sqlext.h
 i386-mingw32msvc/include/sqltypes.h
+i386-mingw32msvc/include/sqlucode.h
 i386-mingw32msvc/include/stdarg.h
 i386-mingw32msvc/include/stddef.h
+i386-mingw32msvc/include/stdint.h
 i386-mingw32msvc/include/stdio.h
 i386-mingw32msvc/include/stdlib.h
 i386-mingw32msvc/include/string.h
+i386-mingw32msvc/include/subauth.h
 i386-mingw32msvc/include/sys/fcntl.h
 i386-mingw32msvc/include/sys/file.h
 i386-mingw32msvc/include/sys/locking.h
@@ -129,14 +145,15 @@ i386-mingw32msvc/include/sys/timeb.h
 i386-mingw32msvc/include/sys/types.h
 i386-mingw32msvc/include/sys/unistd.h
 i386-mingw32msvc/include/sys/utime.h
-@dirrm i386-mingw32msvc/include/sys
 i386-mingw32msvc/include/tchar.h
 i386-mingw32msvc/include/time.h
 i386-mingw32msvc/include/tlhelp32.h
 i386-mingw32msvc/include/unistd.h
 i386-mingw32msvc/include/unknwn.h
+i386-mingw32msvc/include/userenv.h
 i386-mingw32msvc/include/values.h
 i386-mingw32msvc/include/varargs.h
+i386-mingw32msvc/include/w32api.h
 i386-mingw32msvc/include/wchar.h
 i386-mingw32msvc/include/wctype.h
 i386-mingw32msvc/include/winbase.h
@@ -161,17 +178,20 @@ i386-mingw32msvc/include/winspool.h
 i386-mingw32msvc/include/winsvc.h
 i386-mingw32msvc/include/winuser.h
 i386-mingw32msvc/include/winver.h
+i386-mingw32msvc/include/ws2tcpip.h
 i386-mingw32msvc/include/wtypes.h
 i386-mingw32msvc/include/zmouse.h
-@dirrm i386-mingw32msvc/include
 i386-mingw32msvc/lib/CRT_noglob.o
+i386-mingw32msvc/lib/crt1.o
 i386-mingw32msvc/lib/crt2.o
 i386-mingw32msvc/lib/crtmt.o
 i386-mingw32msvc/lib/crtst.o
+i386-mingw32msvc/lib/dllcrt1.o
 i386-mingw32msvc/lib/dllcrt2.o
-i386-mingw32msvc/lib/gcrt2.o
+i386-mingw32msvc/lib/gcrt1.o
 i386-mingw32msvc/lib/libadvapi32.a
 i386-mingw32msvc/lib/libcap.a
+i386-mingw32msvc/lib/libcoldname.a
 i386-mingw32msvc/lib/libcomctl32.a
 i386-mingw32msvc/lib/libcomdlg32.a
 i386-mingw32msvc/lib/libcrtdll.a
@@ -194,6 +214,7 @@ i386-mingw32msvc/lib/libglut32.a
 i386-mingw32msvc/lib/libgmon.a
 i386-mingw32msvc/lib/libimagehlp.a
 i386-mingw32msvc/lib/libimm32.a
+i386-mingw32msvc/lib/libiphlpapi.a
 i386-mingw32msvc/lib/libkernel32.a
 i386-mingw32msvc/lib/liblargeint.a
 i386-mingw32msvc/lib/liblz32.a
@@ -206,6 +227,7 @@ i386-mingw32msvc/lib/libmingwthrd.a
 i386-mingw32msvc/lib/libmoldname.a
 i386-mingw32msvc/lib/libmpr.a
 i386-mingw32msvc/lib/libmsacm32.a
+i386-mingw32msvc/lib/libmsvcp60.a
 i386-mingw32msvc/lib/libmsvcrt.a
 i386-mingw32msvc/lib/libmsvcrt20.a
 i386-mingw32msvc/lib/libmsvcrt40.a
@@ -213,6 +235,7 @@ i386-mingw32msvc/lib/libmswsock.a
 i386-mingw32msvc/lib/libnddeapi.a
 i386-mingw32msvc/lib/libnetapi32.a
 i386-mingw32msvc/lib/libodbc32.a
+i386-mingw32msvc/lib/libodbccp32.a
 i386-mingw32msvc/lib/libole32.a
 i386-mingw32msvc/lib/liboleaut32.a
 i386-mingw32msvc/lib/libolecli32.a
@@ -222,6 +245,7 @@ i386-mingw32msvc/lib/libolesvr32.a
 i386-mingw32msvc/lib/libopengl32.a
 i386-mingw32msvc/lib/libpenwin32.a
 i386-mingw32msvc/lib/libpkpd32.a
+i386-mingw32msvc/lib/libpsapi.a
 i386-mingw32msvc/lib/librapi.a
 i386-mingw32msvc/lib/librasapi32.a
 i386-mingw32msvc/lib/librpcdce4.a
@@ -229,6 +253,7 @@ i386-mingw32msvc/lib/librpcns4.a
 i386-mingw32msvc/lib/librpcrt4.a
 i386-mingw32msvc/lib/libscrnsave.a
 i386-mingw32msvc/lib/libscrnsavw.a
+i386-mingw32msvc/lib/libsecur32.a
 i386-mingw32msvc/lib/libshell32.a
 i386-mingw32msvc/lib/libsvrapi.a
 i386-mingw32msvc/lib/libtapi32.a
@@ -236,6 +261,7 @@ i386-mingw32msvc/lib/libth32.a
 i386-mingw32msvc/lib/libthunk32.a
 i386-mingw32msvc/lib/liburl.a
 i386-mingw32msvc/lib/libuser32.a
+i386-mingw32msvc/lib/libuserenv.a
 i386-mingw32msvc/lib/libuuid.a
 i386-mingw32msvc/lib/libvdmdbg.a
 i386-mingw32msvc/lib/libversion.a
@@ -249,4 +275,6 @@ i386-mingw32msvc/lib/libwow32.a
 i386-mingw32msvc/lib/libws2_32.a
 i386-mingw32msvc/lib/libwsock32.a
 i386-mingw32msvc/lib/libwst.a
+@dirrm i386-mingw32msvc/include/sys
+@dirrm i386-mingw32msvc/include
 @unexec rmdir -p %D/i386-mingw32msvc/lib 2>/dev/null || true
diff --git a/devel/mingw-binutils/Makefile b/devel/mingw-binutils/Makefile
index 91aa945..fa3a79b 100644
--- a/devel/mingw-binutils/Makefile
+++ b/devel/mingw-binutils/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	2.9.1
+PORTVERSION=	2.11.90
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/old-releases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mingw
 PKGNAMEPREFIX=	mingw-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-20010705-src${EXTRACT_SUFFIX}
+DIST_SUBDIR=	mingw
 
-MAINTAINER=	tino@pa2.so-net.ne.jp
+MAINTAINER=	doc@hisio.safenet.pl
+
+NO_WRKSUBDIR=	yes
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--target=i386-mingw32msvc
diff --git a/devel/mingw-binutils/distinfo b/devel/mingw-binutils/distinfo
index 799d350..65a0eeea 100644
--- a/devel/mingw-binutils/distinfo
+++ b/devel/mingw-binutils/distinfo
@@ -1 +1 @@
-MD5 (binutils-2.9.1.tar.bz2) = 1ce1b93ff0d6b2f252c7987ad7725755
+MD5 (mingw/binutils-2.11.90-20010705-src.tar.gz) = 02261ce6456ca212c3f115d7b0e2ac1b        
diff --git a/devel/mingw-binutils/pkg-comment b/devel/mingw-binutils/pkg-comment
index 3b7a356..accdf7d 100644
--- a/devel/mingw-binutils/pkg-comment
+++ b/devel/mingw-binutils/pkg-comment
@@ -1 +1 @@
-FSF binutils-2.9.1 for Windows cross-development
+FSF binutils-2.11.90 for Windows cross-development
diff --git a/devel/mingw-binutils/pkg-descr b/devel/mingw-binutils/pkg-descr
index a967371..aeff2a3 100644
--- a/devel/mingw-binutils/pkg-descr
+++ b/devel/mingw-binutils/pkg-descr
@@ -1,3 +1,3 @@
-FSF binutils-2.9.1 for Windows cross-development.
+FSF binutils-2.11.90 for Windows cross-development.
 
 This port is needed by mingw-gcc/devel.
diff --git a/devel/mingw-binutils/pkg-plist b/devel/mingw-binutils/pkg-plist
index 0265ac8..dcfb17e 100644
--- a/devel/mingw-binutils/pkg-plist
+++ b/devel/mingw-binutils/pkg-plist
@@ -1,18 +1,3 @@
-bin/i386-mingw32msvc-addr2line
-bin/i386-mingw32msvc-ar
-bin/i386-mingw32msvc-as
-bin/i386-mingw32msvc-c++filt
-bin/i386-mingw32msvc-dlltool
-bin/i386-mingw32msvc-gasp
-bin/i386-mingw32msvc-ld
-bin/i386-mingw32msvc-nm
-bin/i386-mingw32msvc-objcopy
-bin/i386-mingw32msvc-objdump
-bin/i386-mingw32msvc-ranlib
-bin/i386-mingw32msvc-size
-bin/i386-mingw32msvc-strings
-bin/i386-mingw32msvc-strip
-bin/i386-mingw32msvc-windres
 i386-mingw32msvc/bin/ar
 i386-mingw32msvc/bin/as
 i386-mingw32msvc/bin/dlltool
diff --git a/devel/mingw-gcc/Makefile b/devel/mingw-gcc/Makefile
index ef179cb..5a9e37e 100644
--- a/devel/mingw-gcc/Makefile
+++ b/devel/mingw-gcc/Makefile
@@ -6,24 +6,15 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	2.95.2
+PORTVERSION=	2.95.3
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= gcc/releases/${DISTNAME}
-DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-chill-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-java-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
-
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= mingw
 PKGNAMEPREFIX=	mingw-
+DISTNAME=	gcc-${PORTVERSION}-20010723-src
+DIST_SUBDIR=	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
+MAINTAINER=	doc@hisio.safenet.pl
 
 BUILD_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt \
@@ -31,7 +22,8 @@ BUILD_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 RUN_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt
 
-USE_BZIP2=	yes
+NO_WRKSUBDIR=	yes
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=i386-mingw32msvc \
@@ -44,20 +36,21 @@ MAN1=	cccp.1                 \
 	i386-mingw32msvc-g77.1 \
 	i386-mingw32msvc-gcc.1
 
+post-patch:
+	${PERL} -i.orig -pe 's/install-libiberty//' ${WRKSRC}/Makefile.in
+
 post-install:
 	@for file in \
-	  cpp gcjh gcov jcf-dump jv-scan \
+	  cpp gcov  \
 	  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 \
 	  strip ${PREFIX}/bin/$${file}; \
 	done
-	@rm ${PREFIX}/info/chill.info
 
 .include <bsd.port.mk>
diff --git a/devel/mingw-gcc/distinfo b/devel/mingw-gcc/distinfo
index 7124599..7a3a8d9 100644
--- a/devel/mingw-gcc/distinfo
+++ b/devel/mingw-gcc/distinfo
@@ -1,7 +1 @@
-MD5 (gcc-core-2.95.2.tar.bz2) = ec486554bc3491f1ebbb3b850c12650a
-MD5 (gcc-chill-2.95.2.tar.bz2) = 0f342e35875c80026cc986f20c856467
-MD5 (gcc-g++-2.95.2.tar.bz2) = eaabfb6b09d5f0ada4d7ce45db8b7e52
-MD5 (gcc-g77-2.95.2.tar.bz2) = 7e7b81a6ded50121b12fb78384b63a6e
-MD5 (gcc-java-2.95.2.tar.bz2) = cd19878014d3c60808af8fc8e976c6e5
-MD5 (gcc-objc-2.95.2.tar.bz2) = 44e0ba43e4c9b68e2ecaa7a50c1cddab
-MD5 (mingw-gcc-2.95.2-1.diff.gz) = 62e7de18ec1dde80f4ac2a0ddbe18da1
+MD5 (mingw/gcc-2.95.3-20010723-src.tar.gz) = 532a97c526b6d142cb4e2e4647499e11
diff --git a/devel/mingw-gcc/pkg-plist b/devel/mingw-gcc/pkg-plist
index 9aa7a2a..8b6b033 100644
--- a/devel/mingw-gcc/pkg-plist
+++ b/devel/mingw-gcc/pkg-plist
@@ -1,17 +1,26 @@
-bin/cpp
-bin/gcjh
-bin/gcov
+bin/i386-mingw32msvc-addr2line
+bin/i386-mingw32msvc-ar
+bin/i386-mingw32msvc-as
 bin/i386-mingw32msvc-c++
 bin/i386-mingw32msvc-c++filt
-bin/i386-mingw32msvc-chill
+bin/i386-mingw32msvc-dlltool
+bin/i386-mingw32msvc-dllwrap
 bin/i386-mingw32msvc-g++
 bin/i386-mingw32msvc-g77
+bin/i386-mingw32msvc-gasp
 bin/i386-mingw32msvc-gcc
-bin/i386-mingw32msvc-gcj
+bin/i386-mingw32msvc-ld
+bin/i386-mingw32msvc-nm
+bin/i386-mingw32msvc-objcopy
+bin/i386-mingw32msvc-objdump
 bin/i386-mingw32msvc-protoize
+bin/i386-mingw32msvc-ranlib
+bin/i386-mingw32msvc-readelf
+bin/i386-mingw32msvc-size
+bin/i386-mingw32msvc-strings
+bin/i386-mingw32msvc-strip
 bin/i386-mingw32msvc-unprotoize
-bin/jcf-dump
-bin/jv-scan
+bin/i386-mingw32msvc-windres
 i386-mingw32msvc/bin/gcc
 i386-mingw32msvc/include/_G_config.h
 i386-mingw32msvc/lib/libiberty.a
@@ -79,18 +88,61 @@ info/gcc.info-9
 @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%%-5/SYSCALLS.c.X
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cc1
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cc1obj
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cc1plus
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cpp0
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/f771
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/README
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/exception
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/fixed
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/float.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/iso646.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/limits.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/new
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/new.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/NXConstStr.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/Object.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/Protocol.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/encoding.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/hash.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/objc-api.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/objc-list.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/objc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/sarray.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/thr.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/typedstream.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/proto.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/stdarg.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/stdbool.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/stddef.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/syslimits.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/typeinfo
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-alpha.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-arc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-c4x.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-clipper.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-h8300.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-i860.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-i960.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-m32r.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-m88k.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-mips.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-mn10200.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-mn10300.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-pa.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-ppc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-pyr.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-sh.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-sparc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-spur.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-v850.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/varargs.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/libgcc.a
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/libobjc.a
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/libstdc++.a
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/specs
 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
@@ -173,6 +225,7 @@ 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++/sstream
 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
@@ -193,7 +246,6 @@ 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
@@ -241,56 +293,12 @@ 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++/std
 @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
-@unexec rmdir -p %D/lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%% 2>/dev/null || true
-lib/libiberty.a
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%
+@dirrm lib/gcc-lib/i386-mingw32msvc
+@unexec rmdir %D/lib/gcc-lib 2>/dev/null || true
diff --git a/devel/mingw/Makefile b/devel/mingw/Makefile
index a1102e7..0f1606c 100644
--- a/devel/mingw/Makefile
+++ b/devel/mingw/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	mingw
-PORTVERSION=	2000.03.27
+PORTVERSION=	20010726
 CATEGORIES=	devel
 MASTER_SITES=	# empty
 DISTFILES=	# empty
 
-MAINTAINER=	tino@pa2.so-net.ne.jp
+MAINTAINER=	doc@hisio.safenet.pl
 
-BUILD_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
-		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt
-RUN_DEPENDS=	i386-mingw32msvc-gcc:${PORTSDIR}/devel/mingw-gcc
+RUN_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
+		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt \
+		i386-mingw32msvc-gcc:${PORTSDIR}/devel/mingw-gcc
 
 NO_BUILD=	yes
 
diff --git a/devel/mingw/pkg-descr b/devel/mingw/pkg-descr
index cfa414d..3d588e3 100644
--- a/devel/mingw/pkg-descr
+++ b/devel/mingw/pkg-descr
@@ -7,4 +7,4 @@ It provides C, C++ and Fortran compilers plus other related tools.
 This package is a meta port that depends on other packages:
   mingw-binutils, mingw-bin-msvcrt, mingw-gcc
 
-WWW: http://www.geocities.com/Tokyo/Towers/6162/gcc.html
+WWW: http://www.mingw.org/
diff --git a/devel/mingw32-binutils/Makefile b/devel/mingw32-binutils/Makefile
index 91aa945..fa3a79b 100644
--- a/devel/mingw32-binutils/Makefile
+++ b/devel/mingw32-binutils/Makefile
@@ -6,15 +6,18 @@
 #
 
 PORTNAME=	binutils
-PORTVERSION=	2.9.1
+PORTVERSION=	2.11.90
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= binutils/old-releases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	mingw
 PKGNAMEPREFIX=	mingw-
+DISTNAME=	${PORTNAME}-${PORTVERSION}-20010705-src${EXTRACT_SUFFIX}
+DIST_SUBDIR=	mingw
 
-MAINTAINER=	tino@pa2.so-net.ne.jp
+MAINTAINER=	doc@hisio.safenet.pl
+
+NO_WRKSUBDIR=	yes
 
-USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--target=i386-mingw32msvc
diff --git a/devel/mingw32-binutils/distinfo b/devel/mingw32-binutils/distinfo
index 799d350..65a0eeea 100644
--- a/devel/mingw32-binutils/distinfo
+++ b/devel/mingw32-binutils/distinfo
@@ -1 +1 @@
-MD5 (binutils-2.9.1.tar.bz2) = 1ce1b93ff0d6b2f252c7987ad7725755
+MD5 (mingw/binutils-2.11.90-20010705-src.tar.gz) = 02261ce6456ca212c3f115d7b0e2ac1b        
diff --git a/devel/mingw32-binutils/pkg-comment b/devel/mingw32-binutils/pkg-comment
index 3b7a356..accdf7d 100644
--- a/devel/mingw32-binutils/pkg-comment
+++ b/devel/mingw32-binutils/pkg-comment
@@ -1 +1 @@
-FSF binutils-2.9.1 for Windows cross-development
+FSF binutils-2.11.90 for Windows cross-development
diff --git a/devel/mingw32-binutils/pkg-descr b/devel/mingw32-binutils/pkg-descr
index a967371..aeff2a3 100644
--- a/devel/mingw32-binutils/pkg-descr
+++ b/devel/mingw32-binutils/pkg-descr
@@ -1,3 +1,3 @@
-FSF binutils-2.9.1 for Windows cross-development.
+FSF binutils-2.11.90 for Windows cross-development.
 
 This port is needed by mingw-gcc/devel.
diff --git a/devel/mingw32-binutils/pkg-plist b/devel/mingw32-binutils/pkg-plist
index 0265ac8..dcfb17e 100644
--- a/devel/mingw32-binutils/pkg-plist
+++ b/devel/mingw32-binutils/pkg-plist
@@ -1,18 +1,3 @@
-bin/i386-mingw32msvc-addr2line
-bin/i386-mingw32msvc-ar
-bin/i386-mingw32msvc-as
-bin/i386-mingw32msvc-c++filt
-bin/i386-mingw32msvc-dlltool
-bin/i386-mingw32msvc-gasp
-bin/i386-mingw32msvc-ld
-bin/i386-mingw32msvc-nm
-bin/i386-mingw32msvc-objcopy
-bin/i386-mingw32msvc-objdump
-bin/i386-mingw32msvc-ranlib
-bin/i386-mingw32msvc-size
-bin/i386-mingw32msvc-strings
-bin/i386-mingw32msvc-strip
-bin/i386-mingw32msvc-windres
 i386-mingw32msvc/bin/ar
 i386-mingw32msvc/bin/as
 i386-mingw32msvc/bin/dlltool
diff --git a/devel/mingw32-gcc/Makefile b/devel/mingw32-gcc/Makefile
index ef179cb..5a9e37e 100644
--- a/devel/mingw32-gcc/Makefile
+++ b/devel/mingw32-gcc/Makefile
@@ -6,24 +6,15 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	2.95.2
+PORTVERSION=	2.95.3
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_SOURCEWARE}
-MASTER_SITE_SUBDIR= gcc/releases/${DISTNAME}
-DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-chill-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-java-${PORTVERSION}${EXTRACT_SUFX} \
-		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
-
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= mingw
 PKGNAMEPREFIX=	mingw-
+DISTNAME=	gcc-${PORTVERSION}-20010723-src
+DIST_SUBDIR=	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
+MAINTAINER=	doc@hisio.safenet.pl
 
 BUILD_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt \
@@ -31,7 +22,8 @@ BUILD_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 RUN_DEPENDS=	i386-mingw32msvc-as:${PORTSDIR}/devel/mingw-binutils \
 		mingwm10.dll:${PORTSDIR}/devel/mingw-bin-msvcrt
 
-USE_BZIP2=	yes
+NO_WRKSUBDIR=	yes
+
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--target=i386-mingw32msvc \
@@ -44,20 +36,21 @@ MAN1=	cccp.1                 \
 	i386-mingw32msvc-g77.1 \
 	i386-mingw32msvc-gcc.1
 
+post-patch:
+	${PERL} -i.orig -pe 's/install-libiberty//' ${WRKSRC}/Makefile.in
+
 post-install:
 	@for file in \
-	  cpp gcjh gcov jcf-dump jv-scan \
+	  cpp gcov  \
 	  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 \
 	  strip ${PREFIX}/bin/$${file}; \
 	done
-	@rm ${PREFIX}/info/chill.info
 
 .include <bsd.port.mk>
diff --git a/devel/mingw32-gcc/distinfo b/devel/mingw32-gcc/distinfo
index 7124599..7a3a8d9 100644
--- a/devel/mingw32-gcc/distinfo
+++ b/devel/mingw32-gcc/distinfo
@@ -1,7 +1 @@
-MD5 (gcc-core-2.95.2.tar.bz2) = ec486554bc3491f1ebbb3b850c12650a
-MD5 (gcc-chill-2.95.2.tar.bz2) = 0f342e35875c80026cc986f20c856467
-MD5 (gcc-g++-2.95.2.tar.bz2) = eaabfb6b09d5f0ada4d7ce45db8b7e52
-MD5 (gcc-g77-2.95.2.tar.bz2) = 7e7b81a6ded50121b12fb78384b63a6e
-MD5 (gcc-java-2.95.2.tar.bz2) = cd19878014d3c60808af8fc8e976c6e5
-MD5 (gcc-objc-2.95.2.tar.bz2) = 44e0ba43e4c9b68e2ecaa7a50c1cddab
-MD5 (mingw-gcc-2.95.2-1.diff.gz) = 62e7de18ec1dde80f4ac2a0ddbe18da1
+MD5 (mingw/gcc-2.95.3-20010723-src.tar.gz) = 532a97c526b6d142cb4e2e4647499e11
diff --git a/devel/mingw32-gcc/pkg-plist b/devel/mingw32-gcc/pkg-plist
index 9aa7a2a..8b6b033 100644
--- a/devel/mingw32-gcc/pkg-plist
+++ b/devel/mingw32-gcc/pkg-plist
@@ -1,17 +1,26 @@
-bin/cpp
-bin/gcjh
-bin/gcov
+bin/i386-mingw32msvc-addr2line
+bin/i386-mingw32msvc-ar
+bin/i386-mingw32msvc-as
 bin/i386-mingw32msvc-c++
 bin/i386-mingw32msvc-c++filt
-bin/i386-mingw32msvc-chill
+bin/i386-mingw32msvc-dlltool
+bin/i386-mingw32msvc-dllwrap
 bin/i386-mingw32msvc-g++
 bin/i386-mingw32msvc-g77
+bin/i386-mingw32msvc-gasp
 bin/i386-mingw32msvc-gcc
-bin/i386-mingw32msvc-gcj
+bin/i386-mingw32msvc-ld
+bin/i386-mingw32msvc-nm
+bin/i386-mingw32msvc-objcopy
+bin/i386-mingw32msvc-objdump
 bin/i386-mingw32msvc-protoize
+bin/i386-mingw32msvc-ranlib
+bin/i386-mingw32msvc-readelf
+bin/i386-mingw32msvc-size
+bin/i386-mingw32msvc-strings
+bin/i386-mingw32msvc-strip
 bin/i386-mingw32msvc-unprotoize
-bin/jcf-dump
-bin/jv-scan
+bin/i386-mingw32msvc-windres
 i386-mingw32msvc/bin/gcc
 i386-mingw32msvc/include/_G_config.h
 i386-mingw32msvc/lib/libiberty.a
@@ -79,18 +88,61 @@ info/gcc.info-9
 @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%%-5/SYSCALLS.c.X
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cc1
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cc1obj
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cc1plus
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/cpp0
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/f771
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/README
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/exception
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/fixed
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/float.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/iso646.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/limits.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/new
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/new.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/NXConstStr.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/Object.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/Protocol.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/encoding.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/hash.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/objc-api.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/objc-list.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/objc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/sarray.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/thr.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc/typedstream.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/proto.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/stdarg.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/stdbool.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/stddef.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/syslimits.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/typeinfo
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-alpha.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-arc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-c4x.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-clipper.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-h8300.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-i860.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-i960.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-m32r.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-m88k.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-mips.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-mn10200.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-mn10300.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-pa.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-ppc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-pyr.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-sh.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-sparc.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-spur.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/va-v850.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/varargs.h
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/libgcc.a
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/libobjc.a
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/libstdc++.a
+lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/specs
 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
@@ -173,6 +225,7 @@ 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++/sstream
 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
@@ -193,7 +246,6 @@ 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
@@ -241,56 +293,12 @@ 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++/std
 @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
-@unexec rmdir -p %D/lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%% 2>/dev/null || true
-lib/libiberty.a
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include/objc
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5/include
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%-5
+@dirrm lib/gcc-lib/i386-mingw32msvc/%%PORTVERSION%%
+@dirrm lib/gcc-lib/i386-mingw32msvc
+@unexec rmdir %D/lib/gcc-lib 2>/dev/null || true