Update to the 20050528 snapshot of GCC 4.1.0. Adjust the libjava-related

part of the packaging list.

4 files changed, 32 insertions, 14 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 627e14b4d35e..963486b55264 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.0
-PORTREVISION=	20050522
+PORTREVISION=	20050528
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index d5590b849d38..790db80f8b4a 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.1-20050522.tar.bz2) = 3c3e0aeb92ab4eb9c92e8f84edc8bc7c
-SIZE (gcc-core-4.1-20050522.tar.bz2) = 13679890
-MD5 (gcc-g++-4.1-20050522.tar.bz2) = 968a6ac49ce6d8fd68b7ac1bf01f22ea
-SIZE (gcc-g++-4.1-20050522.tar.bz2) = 2712258
-MD5 (gcc-java-4.1-20050522.tar.bz2) = 7a330e745d97f1f21f7751c5345affff
-SIZE (gcc-java-4.1-20050522.tar.bz2) = 6006413
-MD5 (gcc-objc-4.1-20050522.tar.bz2) = 3e38998401ad56354e91128780c906dd
-SIZE (gcc-objc-4.1-20050522.tar.bz2) = 183996
-MD5 (gcc-testsuite-4.1-20050522.tar.bz2) = 7392c41c8e1e50bbed78986ac2c6c0e7
-SIZE (gcc-testsuite-4.1-20050522.tar.bz2) = 3093321
-MD5 (gcc-fortran-4.1-20050522.tar.bz2) = dba6fd407588ff974af406fe9d4a9d42
-SIZE (gcc-fortran-4.1-20050522.tar.bz2) = 581680
+MD5 (gcc-core-4.1-20050528.tar.bz2) = 2a2a22af171de62eec3b3bef41eb7d8f
+SIZE (gcc-core-4.1-20050528.tar.bz2) = 13697591
+MD5 (gcc-g++-4.1-20050528.tar.bz2) = 70105790e7e04ae885b9acb400d32d5c
+SIZE (gcc-g++-4.1-20050528.tar.bz2) = 2742705
+MD5 (gcc-java-4.1-20050528.tar.bz2) = 09d4673be1ccfcafaf84f95d5438ca10
+SIZE (gcc-java-4.1-20050528.tar.bz2) = 6011854
+MD5 (gcc-objc-4.1-20050528.tar.bz2) = 1ecca61aeb2ee04568b9a12452ef4530
+SIZE (gcc-objc-4.1-20050528.tar.bz2) = 185862
+MD5 (gcc-testsuite-4.1-20050528.tar.bz2) = de9e7b9a72778b6dfc6488b3743e2aed
+SIZE (gcc-testsuite-4.1-20050528.tar.bz2) = 3112225
+MD5 (gcc-fortran-4.1-20050528.tar.bz2) = 259cd6ec278e56765a5f3bca325e9238
+SIZE (gcc-fortran-4.1-20050528.tar.bz2) = 582204
diff --git a/lang/gcc/files/patch-hier b/lang/gcc/files/patch-hier
new file mode 100644
index 000000000000..af4e9b0ca2ce
--- /dev/null
+++ b/lang/gcc/files/patch-hier
@@ -0,0 +1,16 @@
+Index: libjava/Makefile.in
+===================================================================
+RCS file: /cvs/gcc/gcc/libjava/Makefile.in,v
+retrieving revision 1.522
+diff -u -3 -p -r1.522 Makefile.in
+--- libjava/Makefile.in	19 May 2005 21:46:39 -0000	1.522
++++ libjava/Makefile.in	29 May 2005 16:00:44 -0000
+@@ -696,7 +696,7 @@ toolexeclib_LTLIBRARIES = libgcj.la libg
+     $(cond_gtk_ltlibrary) $(cond_gtk_gcjawt_ltlibrary) $(cond_xlib_ltlibrary)
+ 
+ toolexecmainlib_DATA = libgcj.spec
+-pkgconfigdir = $(libdir)/pkgconfig
++pkgconfigdir = $(prefix)/libdata/pkgconfig
+ pkgconfig_DATA = libgcj.pc
+ jardir = $(datadir)/java
+ jar_DATA = libgcj-$(gcc_version).jar
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index aacb48a27cda..8bb953ca9cde 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -28,9 +28,11 @@ include/mf-runtime.h
 %%LIBJAVA%%bin/jv-convert41
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%lib/logging.properties
+%%LIBJAVA%%lib/gcj-%%GCC_VER%%/classmap.db
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
+%%LIBJAVA%%@dirrm lib/gcj-%%GCC_VER%%
+%%LIBJAVA%%@dirrm lib/security
 %%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
-%%LIBJAVA%%@dirrm lib/security
 @comment Insert PLIST.lib here