Update to the 20050924 snapshot of GCC 4.1.0. This brings a huge libjava/

Classpath merger.

27 files changed, 171 insertions, 135 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index e034a7a2334f..069f281d9705 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050917
+PORTREVISION=	20050924
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -147,8 +147,8 @@ check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
 post-install:
-	# FIXME: As of July 2005 libjava installs these bogus directories.
-	-${RMDIR} -p ${PREFIX}/share/classpath/api
+	# FIXME: As of September 2005 libjava installs this extra directory.
+	-${RMDIR} -p ${PREFIX}/share/classpath/
 	# man pages can only be generated if Perl >= 5.6 is installed;
 	# fake them otherwise.
 	for mp in ${_MANPAGES}; do \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 3b7fef454d10..00f7847ec4c7 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050917.tar.bz2) = cb573cdafaa1e0834081162a781de018
-SIZE (gcc-core-4.1-20050917.tar.bz2) = 14047310
-MD5 (gcc-g++-4.1-20050917.tar.bz2) = 597bed067cf69cca5bc1fa337f5313d0
-SIZE (gcc-g++-4.1-20050917.tar.bz2) = 3699135
-MD5 (gcc-objc-4.1-20050917.tar.bz2) = 7897df8a7c501b1559c39cd1aeca49c7
-SIZE (gcc-objc-4.1-20050917.tar.bz2) = 188206
-MD5 (gcc-testsuite-4.1-20050917.tar.bz2) = e9c9f2153e0281557f99bf64be4bd9fd
-SIZE (gcc-testsuite-4.1-20050917.tar.bz2) = 3249445
-MD5 (gcc-fortran-4.1-20050917.tar.bz2) = 93141182a61c2b71f2cc460f61ba9709
-SIZE (gcc-fortran-4.1-20050917.tar.bz2) = 620294
-MD5 (gcc-java-4.1-20050917.tar.bz2) = 3d92d8bc7e2a2b2645cc2972b5bc0774
-SIZE (gcc-java-4.1-20050917.tar.bz2) = 8225678
+MD5 (gcc-core-4.1-20050924.tar.bz2) = c2f1086fd7d18cceae8d09ee655baec8
+SIZE (gcc-core-4.1-20050924.tar.bz2) = 14067148
+MD5 (gcc-g++-4.1-20050924.tar.bz2) = 0fb42875160a936dedd9eb40dbaab524
+SIZE (gcc-g++-4.1-20050924.tar.bz2) = 3698129
+MD5 (gcc-objc-4.1-20050924.tar.bz2) = 04a351c4c8a95d9da1c195981322b4e9
+SIZE (gcc-objc-4.1-20050924.tar.bz2) = 188139
+MD5 (gcc-testsuite-4.1-20050924.tar.bz2) = 2540cd6a0e27f10f63834292f3376977
+SIZE (gcc-testsuite-4.1-20050924.tar.bz2) = 3252948
+MD5 (gcc-fortran-4.1-20050924.tar.bz2) = e07829d3cf828f6d2e96edadd6dbff78
+SIZE (gcc-fortran-4.1-20050924.tar.bz2) = 622689
+MD5 (gcc-java-4.1-20050924.tar.bz2) = 4db13d5766ea3bf7c483f45ea3fa11ea
+SIZE (gcc-java-4.1-20050924.tar.bz2) = 8540957
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 6dfb78cdcba7..566feb391d71 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -32,6 +32,10 @@ include/ssp/unistd.h
 %%JAVA%%bin/%%GNU_HOST%%-gcj41
 %%JAVA%%bin/%%GNU_HOST%%-gcjh41
 %%JAVA%%include/ffi.h
+%%JAVA%%include/jawt.h
+%%JAVA%%include/jawt_md.h
+%%JAVA%%include/jni.h
+%%JAVA%%include/jni_md.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here