30 files changed, 200 insertions, 180 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 57003f58630d..b9bedf56565c 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.0
-PORTREVISION=	20050130
+PORTREVISION=	20050220
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 2d298e2bc4a6..9f19f5866ce0 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,12 +1,12 @@
-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
+MD5 (gcc-core-4.0-20050220.tar.bz2) = 2642c3b380b6c025d1c6ddd37dc17ff3
+SIZE (gcc-core-4.0-20050220.tar.bz2) = 13002062
+MD5 (gcc-g++-4.0-20050220.tar.bz2) = 529fcec9f5a599dee9176962b11ce9c0
+SIZE (gcc-g++-4.0-20050220.tar.bz2) = 2628176
+MD5 (gcc-java-4.0-20050220.tar.bz2) = 1a936285edf286cbbcedad02e5e8f59d
+SIZE (gcc-java-4.0-20050220.tar.bz2) = 5918592
+MD5 (gcc-objc-4.0-20050220.tar.bz2) = 2d2cdff6e491af868291ba3c8cbde0c8
+SIZE (gcc-objc-4.0-20050220.tar.bz2) = 176967
+MD5 (gcc-testsuite-4.0-20050220.tar.bz2) = 8a3fc08b16bf2e9d15fe368b13a99f74
+SIZE (gcc-testsuite-4.0-20050220.tar.bz2) = 2989580
+MD5 (gcc-fortran-4.0-20050220.tar.bz2) = e9b73eaeab1f4b0005216143a5d71598
+SIZE (gcc-fortran-4.0-20050220.tar.bz2) = 560198
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 2d9022c47cc1..1db52eccfa72 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -20,20 +20,22 @@ bin/gccbug40
 bin/gcj40
 bin/gcjh40
 bin/grepjar40
-%%LIBJAVA%%bin/gij40
 bin/jv-scan40
 bin/jcf-dump40
 %%LIBJAVA%%bin/addr2name.awk40
+%%LIBJAVA%%bin/gcj-dbtool40
+%%LIBJAVA%%bin/gij40
 %%LIBJAVA%%bin/grmic40
 %%LIBJAVA%%bin/grmiregistry40
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
-%%LIBJAVA%%include/mf-runtime.h
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libffi.a
+%%LIBJAVA%%lib/libffi.la
+%%LIBJAVA%%lib/libgij.a
+%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/pkgconfig/libgcj.pc
+%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security