Update to the 20050130 snapshot of GCC 4.0.0. Adjust pkg-plist wrt. to

libjava which I hope to re-enable with the next update.

30 files changed, 170 insertions, 190 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index d443023a8ff1..57003f58630d 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050116
+PORTREVISION=	20050130
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 19d7b9529ef6..2d298e2bc4a6 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050116.tar.bz2) = 347eb7fd30bbe463f2a58a7f37adc21f
-SIZE (gcc-core-4.0-20050116.tar.bz2) = 13000298
-MD5 (gcc-g++-4.0-20050116.tar.bz2) = 477121bd93c32430122fa6671f624702
-SIZE (gcc-g++-4.0-20050116.tar.bz2) = 2587710
-MD5 (gcc-java-4.0-20050116.tar.bz2) = b713470b666fe575b588acc50fef167d
-SIZE (gcc-java-4.0-20050116.tar.bz2) = 5470014
-MD5 (gcc-objc-4.0-20050116.tar.bz2) = 8f60fdfa7f088a5cf2236e4307dd2579
-SIZE (gcc-objc-4.0-20050116.tar.bz2) = 176670
-MD5 (gcc-testsuite-4.0-20050116.tar.bz2) = 369fe46ea18d8b744d7ae67eb60a69c2
-SIZE (gcc-testsuite-4.0-20050116.tar.bz2) = 2965401
-MD5 (gcc-fortran-4.0-20050116.tar.bz2) = a5ba6f0fb2b23057011115aaca157a6e
-SIZE (gcc-fortran-4.0-20050116.tar.bz2) = 558101
+MD5 (gcc-core-4.0-20050130.tar.bz2) = 0505cc96da2c36c5b2ecb66fcf385236
+SIZE (gcc-core-4.0-20050130.tar.bz2) = 12973241
+MD5 (gcc-g++-4.0-20050130.tar.bz2) = 7facf0a289341e2363d4a0a65adbea0a
+SIZE (gcc-g++-4.0-20050130.tar.bz2) = 2614550
+MD5 (gcc-java-4.0-20050130.tar.bz2) = 02904b405adfae89d7519db5da1bfaec
+SIZE (gcc-java-4.0-20050130.tar.bz2) = 5468632
+MD5 (gcc-objc-4.0-20050130.tar.bz2) = 031b9b2b3ca7b980fc60da6222a51eaf
+SIZE (gcc-objc-4.0-20050130.tar.bz2) = 176971
+MD5 (gcc-testsuite-4.0-20050130.tar.bz2) = 50318abc5b757a1088d02cb595332ddd
+SIZE (gcc-testsuite-4.0-20050130.tar.bz2) = 2975263
+MD5 (gcc-fortran-4.0-20050130.tar.bz2) = aa094d71927df45f63b0f4c612786c6b
+SIZE (gcc-fortran-4.0-20050130.tar.bz2) = 559306
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index ffbc17b1165d..2d9022c47cc1 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -23,13 +23,12 @@ bin/grepjar40
 %%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
-%%LIBJAVA%%bin/jv-convert40
-%%LIBJAVA%%bin/rmic40
-%%LIBJAVA%%bin/rmiregistry40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/grmic40
+%%LIBJAVA%%bin/grmiregistry40
+%%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/jni.h
-%%LIBJAVA%%include/jvmpi.h
+%%LIBJAVA%%include/mf-runtime.h
 %%LIBJAVA%%lib/lib-org-xml-sax.a
 %%LIBJAVA%%lib/lib-org-w3c-dom.a
 %%LIBJAVA%%lib/libffi.la
@@ -38,7 +37,6 @@ bin/jcf-dump40
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 include/mf-runtime.h
 @comment Insert PLIST.lib here