diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 038b401d4bc4..5a8407c2094f 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050709
+PORTREVISION=	20050716
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -99,7 +99,8 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar
+INFO=		cpp cppinternals gcc gccinstall gccint gcj fastjar \
+		hacking vmintegration
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
@@ -160,7 +161,7 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index b8e06812ef9b..4dad20cdaa49 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050709.tar.bz2) = d814fbaf7cb4d68688d38181d229d655
-SIZE (gcc-core-4.1-20050709.tar.bz2) = 13941455
-MD5 (gcc-g++-4.1-20050709.tar.bz2) = 59b88825e52ffd06577d418bdf353dcf
-SIZE (gcc-g++-4.1-20050709.tar.bz2) = 3676609
-MD5 (gcc-java-4.1-20050709.tar.bz2) = bd8a4fed15a3c2f00d3d5d25c25ba46c
-SIZE (gcc-java-4.1-20050709.tar.bz2) = 6052058
-MD5 (gcc-objc-4.1-20050709.tar.bz2) = 10229ba71593bf7e29beea9f7b8aac1f
-SIZE (gcc-objc-4.1-20050709.tar.bz2) = 187712
-MD5 (gcc-testsuite-4.1-20050709.tar.bz2) = 68e05ba7bc7eb8792e72cf38f429aaee
-SIZE (gcc-testsuite-4.1-20050709.tar.bz2) = 3195198
-MD5 (gcc-fortran-4.1-20050709.tar.bz2) = 7cb318a781487a09e24fc4dfbe314021
-SIZE (gcc-fortran-4.1-20050709.tar.bz2) = 597312
+MD5 (gcc-core-4.1-20050716.tar.bz2) = e8a08642eb8983e8e1146ce65569311c
+SIZE (gcc-core-4.1-20050716.tar.bz2) = 13991294
+MD5 (gcc-g++-4.1-20050716.tar.bz2) = c5ee876801e4c5b7e02fe379d95f4fed
+SIZE (gcc-g++-4.1-20050716.tar.bz2) = 3680138
+MD5 (gcc-java-4.1-20050716.tar.bz2) = cac5c6d5632050075bfeec56b1bddd54
+SIZE (gcc-java-4.1-20050716.tar.bz2) = 8452795
+MD5 (gcc-objc-4.1-20050716.tar.bz2) = 68a8d6091329229b81ccba27d09f5505
+SIZE (gcc-objc-4.1-20050716.tar.bz2) = 187686
+MD5 (gcc-testsuite-4.1-20050716.tar.bz2) = 2eba7faccecfe27439f0a5f210280504
+SIZE (gcc-testsuite-4.1-20050716.tar.bz2) = 3196822
+MD5 (gcc-fortran-4.1-20050716.tar.bz2) = 01347f8f3ac36f9b04c648215fd23bb4
+SIZE (gcc-fortran-4.1-20050716.tar.bz2) = 598296