24 files changed, 352 insertions, 208 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 3089fa3b8020..6d7f9f0f31ab 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060527
+PORTREVISION=	20060603
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -44,14 +44,10 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} == amd64  ||  ${ARCH} == ia64  ||  ${ARCH} == sparc64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
-# FIXME: As of 20060416, installing libgcj requires jar/fastjar which has
-# not been packaged for FreeBSD yet.
-WITHOUT_JAVA=	yes
-
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
@@ -109,8 +105,7 @@ EXTRA_PATCHES=	${FILESDIR}/java-patch-hier
 # FIXME: we are currently getting weird build failures with libjava on
 # some 4.x and 5.x systems, which the following works around. PR 81788.
 CONFIGURE_ARGS+=--disable-rpath
-MAN1+=		fastjar${SUFFIX}.1 \
-		gcj${SUFFIX}.1 \
+MAN1+=		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
@@ -122,7 +117,7 @@ MAN1+=		fastjar${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-INFO+=		gcc${SUFFIX}/gcj gcc${SUFFIX}/fastjar
+INFO+=		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 2586a5c7eb2f..5d4335e34e2a 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,15 +1,18 @@
-MD5 (gcc-core-4.2-20060527.tar.bz2) = be51d4055a1e1d56a1c703b4caa3eef9
-SHA256 (gcc-core-4.2-20060527.tar.bz2) = bf0c13859e5642caf8b61f16e1c9793152dda41b976ee60d12de818f3c667042
-SIZE (gcc-core-4.2-20060527.tar.bz2) = 15638064
-MD5 (gcc-g++-4.2-20060527.tar.bz2) = 0f020f66aed91802e37a610c72a4ba75
-SHA256 (gcc-g++-4.2-20060527.tar.bz2) = cc374d8edbb90f6faf6915e9d1ec36998beacd95f52bfbce5634d74e087d80fe
-SIZE (gcc-g++-4.2-20060527.tar.bz2) = 3921725
-MD5 (gcc-objc-4.2-20060527.tar.bz2) = f6d39ed8506f5d8698a232f47b402bf3
-SHA256 (gcc-objc-4.2-20060527.tar.bz2) = 88460da11d0f5fae255571256d30643f002879175a89bdf3a9c0c2efdb839c95
-SIZE (gcc-objc-4.2-20060527.tar.bz2) = 191550
-MD5 (gcc-testsuite-4.2-20060527.tar.bz2) = bc954f8fe3b5b94f0fece4a858434fc6
-SHA256 (gcc-testsuite-4.2-20060527.tar.bz2) = 764117b8e8ffae70f2d5e3aed0589edb02846d13a4fd798fd5a625e44c0c26f1
-SIZE (gcc-testsuite-4.2-20060527.tar.bz2) = 3672514
-MD5 (gcc-fortran-4.2-20060527.tar.bz2) = bd98fa0f62b412bf42aa44fa5578ea9c
-SHA256 (gcc-fortran-4.2-20060527.tar.bz2) = 01e34082463adf5f1284f8630fc328b3f6e951d10e8743f7fb4c4c29229e496a
-SIZE (gcc-fortran-4.2-20060527.tar.bz2) = 811690
+MD5 (gcc-core-4.2-20060603.tar.bz2) = 492c0d6eee49bb07f54322fcddfcefb4
+SHA256 (gcc-core-4.2-20060603.tar.bz2) = eab75297cbcce7c13b4135b2aaaf99c6621e60930908aa3ecb1f3ab3244d09bb
+SIZE (gcc-core-4.2-20060603.tar.bz2) = 15641576
+MD5 (gcc-g++-4.2-20060603.tar.bz2) = 25c08e6e3b4fd6a6116727431a2b09a7
+SHA256 (gcc-g++-4.2-20060603.tar.bz2) = 0e6b4af15f869d1ab9f72b39dc8abcd2b58bac293f2a6a868fdd8cbf45534894
+SIZE (gcc-g++-4.2-20060603.tar.bz2) = 3921860
+MD5 (gcc-objc-4.2-20060603.tar.bz2) = 6433064e814f2726a1c3e61aae807d08
+SHA256 (gcc-objc-4.2-20060603.tar.bz2) = 17c7322cb67e0b2e089b417b2cfde4fd1948b7ee7657086549b359761eea3825
+SIZE (gcc-objc-4.2-20060603.tar.bz2) = 191857
+MD5 (gcc-testsuite-4.2-20060603.tar.bz2) = 764369c2216f102fcf64b1734299e44c
+SHA256 (gcc-testsuite-4.2-20060603.tar.bz2) = b7b1c9fb220137669dd78903310c501c7259e24844cdae546fb9b346c4c40f6b
+SIZE (gcc-testsuite-4.2-20060603.tar.bz2) = 3676689
+MD5 (gcc-fortran-4.2-20060603.tar.bz2) = 3108d2d4d109d2328f984f020eafaabf
+SHA256 (gcc-fortran-4.2-20060603.tar.bz2) = 653c8d2e78aef3909726ccfb94a99d4b7c5a8d008a152fccc26c7c6ed51f2e70
+SIZE (gcc-fortran-4.2-20060603.tar.bz2) = 813412
+MD5 (gcc-java-4.2-20060603.tar.bz2) = 71d73e77d100985e65f24552d2d2c181
+SHA256 (gcc-java-4.2-20060603.tar.bz2) = 8e84978373d7c4869597fed95380035e1dc8abc7a18b0e8b3076479c0c18e7b2
+SIZE (gcc-java-4.2-20060603.tar.bz2) = 9912351
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index f79172c39695..f165897550f1 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -15,21 +15,41 @@ info/gcc%%SUFFIX%%/dir
 %%FORTRAN%%bin/gfortran%%SUFFIX%%
 %%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 %%JAVA%%bin/addr2name.awk%%SUFFIX%%
-%%JAVA%%bin/fastjar%%SUFFIX%%
 %%JAVA%%bin/gcj%%SUFFIX%%
 %%JAVA%%bin/gcj-dbtool%%SUFFIX%%
 %%JAVA%%bin/gcjh%%SUFFIX%%
 %%JAVA%%bin/gij%%SUFFIX%%
 %%JAVA%%bin/gjnih%%SUFFIX%%
-%%JAVA%%bin/grepjar%%SUFFIX%%
 %%JAVA%%bin/grmic%%SUFFIX%%
 %%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jar%%SUFFIX%%
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/jv-scan%%SUFFIX%%
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
 %%JAVA%%include/ffi.h
+%%JAVA%%lib/logging.properties
+%%JAVA%%lib/security/classpath.security
+%%JAVA%%@dirrm lib/security
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%JAVA%%share/libtool/libltdl/COPYING.LIB
+%%JAVA%%share/libtool/libltdl/Makefile.am
+%%JAVA%%share/libtool/libltdl/Makefile.in
+%%JAVA%%share/libtool/libltdl/README
+%%JAVA%%share/libtool/libltdl/acinclude.m4
+%%JAVA%%share/libtool/libltdl/aclocal.m4
+%%JAVA%%share/libtool/libltdl/config-h.in
+%%JAVA%%share/libtool/libltdl/config.guess
+%%JAVA%%share/libtool/libltdl/config.sub
+%%JAVA%%share/libtool/libltdl/configure
+%%JAVA%%share/libtool/libltdl/configure.ac
+%%JAVA%%share/libtool/libltdl/install-sh
+%%JAVA%%share/libtool/libltdl/ltdl.c
+%%JAVA%%share/libtool/libltdl/ltdl.h
+%%JAVA%%share/libtool/libltdl/ltmain.sh
+%%JAVA%%share/libtool/libltdl/missing
+%%JAVA%%@dirrmtry share/libtool/libltdl
+%%JAVA%%@dirrmtry share/libtool
 @comment Insert PLIST.lib here