Update lang/gcc42 to the 20061014 snapshot of GCC 4.2.0, which appends a

version number to libdata/pkgconfig/libgcj.pc.  Fix packaging on amd64
on the way (enabling Java actually was a noop, except for pkg-plist).

Update lang/gcc41 to the 20061013 snapshot of GCC 4.1.2.

These changes allow us to remove the CONFLICT between lang/gcc41 and
lang/gcc42 when building with Java support (the default on i386).

Approved by:	portmgr (erwin)

4 files changed, 26 insertions, 27 deletions

diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 1dd2abd5e9d3..3e0007c818a5 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060923
+PORTREVISION=	20061014
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -51,7 +51,7 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 CONFIGURE_ARGS+=	--disable-libgomp
 .endif
 
-.if ${ARCH} != i386 && ${ARCH} != amd64
+.if ${ARCH} != i386
 WITHOUT_JAVA=	yes
 .endif
 
@@ -102,7 +102,6 @@ PLIST_SUB+=	FORTRAN="@comment "
 .endif
 
 .if ! defined(WITHOUT_JAVA)
-CONFLICTS+=	gcc-4.1.*
 DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index c61f2a58ee02..5d506fa441db 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060923.tar.bz2) = 133b5901ccc73afb59b7f4609294544d
-SHA256 (gcc-core-4.2-20060923.tar.bz2) = 9185f0fd0403ef0f11fbecc82b3acd445b5f4841a91709367917dfd7d94ff798
-SIZE (gcc-core-4.2-20060923.tar.bz2) = 15779768
-MD5 (gcc-g++-4.2-20060923.tar.bz2) = 6d4dfc8e1e4fef9cc7252a79129cc31d
-SHA256 (gcc-g++-4.2-20060923.tar.bz2) = c945180e09f539929dbef9d60deaf57dcfd6e48f99b1c3388e711b5faa443151
-SIZE (gcc-g++-4.2-20060923.tar.bz2) = 4736312
-MD5 (gcc-objc-4.2-20060923.tar.bz2) = 2463f37f1aab5fe9d26bc79b28cabe8d
-SHA256 (gcc-objc-4.2-20060923.tar.bz2) = 234ac91daf9ff5dc2e9ea5c7b8d06124b7b080e13b4106c7998960eebe788c1e
-SIZE (gcc-objc-4.2-20060923.tar.bz2) = 192007
-MD5 (gcc-testsuite-4.2-20060923.tar.bz2) = 3b5d165f46038ab091e69a65fac6b034
-SHA256 (gcc-testsuite-4.2-20060923.tar.bz2) = 488a63d6dbeabaea4bcca6b57545b3944ec2f6571d36796472d0628712a5382a
-SIZE (gcc-testsuite-4.2-20060923.tar.bz2) = 3763282
-MD5 (gcc-fortran-4.2-20060923.tar.bz2) = 29e0307aa0f3a300be8c00699b21e166
-SHA256 (gcc-fortran-4.2-20060923.tar.bz2) = f4d21b544ead77367096856218985b1b9cf380c4d8935f2e41f16d1a02ecec5b
-SIZE (gcc-fortran-4.2-20060923.tar.bz2) = 837319
-MD5 (gcc-java-4.2-20060923.tar.bz2) = dfa61b09fc81fcffcee3424ed966780a
-SHA256 (gcc-java-4.2-20060923.tar.bz2) = 7dab910d6a99be09099de7a209afb8eb5ce105e7dd7e769c9aaac1e356ffa5b0
-SIZE (gcc-java-4.2-20060923.tar.bz2) = 10455140
+MD5 (gcc-core-4.2-20061014.tar.bz2) = e00af69c69325d557bcf04e6cd71e874
+SHA256 (gcc-core-4.2-20061014.tar.bz2) = 2774fad3dc802df34115f74c1d7ed3555d49163545bee8a9ea737aab8b5552c0
+SIZE (gcc-core-4.2-20061014.tar.bz2) = 15803090
+MD5 (gcc-g++-4.2-20061014.tar.bz2) = faa59d594459e2cfdf71f1d324420971
+SHA256 (gcc-g++-4.2-20061014.tar.bz2) = 077c373f14d423e97a6bfa792563855936e213e40ca289d4bcdf91d44f579874
+SIZE (gcc-g++-4.2-20061014.tar.bz2) = 4761518
+MD5 (gcc-objc-4.2-20061014.tar.bz2) = ec00182885194ce26ce017e4ed4420eb
+SHA256 (gcc-objc-4.2-20061014.tar.bz2) = 7e3de9b080a68ba57fe7b6d64c4c77684fd510219427a8acec71893add74f769
+SIZE (gcc-objc-4.2-20061014.tar.bz2) = 191828
+MD5 (gcc-testsuite-4.2-20061014.tar.bz2) = 8751f3a5e1cdd316eddb71e289a3db01
+SHA256 (gcc-testsuite-4.2-20061014.tar.bz2) = 79ffbdec74cdf12652688264a395b80ebb9b9916e307c4ff3e0037881c79d6ed
+SIZE (gcc-testsuite-4.2-20061014.tar.bz2) = 3772298
+MD5 (gcc-fortran-4.2-20061014.tar.bz2) = f63b41707748278a5fe951d6a498bb08
+SHA256 (gcc-fortran-4.2-20061014.tar.bz2) = fdd49268ac9e54f274595ad1743665d1d8534ef2bb5419f1d75f7fb7c9a39789
+SIZE (gcc-fortran-4.2-20061014.tar.bz2) = 858940
+MD5 (gcc-java-4.2-20061014.tar.bz2) = 78d61b3cdb47422a50713b6721ab59e0
+SHA256 (gcc-java-4.2-20061014.tar.bz2) = 56095a0efaf61a50264fb8172f34d8ce3b2bdc28f1d10414d486697545cc4196
+SIZE (gcc-java-4.2-20061014.tar.bz2) = 10468012
diff --git a/lang/gcc46/files/java-patch-hier b/lang/gcc46/files/java-patch-hier
index 43a39deb09a5..edb122b087b8 100644
--- a/lang/gcc46/files/java-patch-hier
+++ b/lang/gcc46/files/java-patch-hier
@@ -1,13 +1,13 @@
 Index: libjava/Makefile.in
 ===================================================================
---- libjava/Makefile.in	(revision 114994)
+--- libjava/Makefile.in	(revision 117734)
 +++ libjava/Makefile.in	(working copy)
-@@ -667,7 +667,7 @@
- toolexeclib_LTLIBRARIES = libgcj.la libgij.la $(am__append_2)
+@@ -712,7 +712,7 @@
+ 	$(am__append_2) $(am__append_3)
  toolexecmainlib_DATA = libgcj.spec
  dbexec_LTLIBRARIES = libjvm.la
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
- pkgconfig_DATA = libgcj.pc
  jardir = $(datadir)/java
- jar_DATA = libgcj-$(gcc_version).jar
+ jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
+ @JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 505428d8b648..f4209b2a688a 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -29,7 +29,7 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
-%%JAVA%%libdata/pkgconfig/libgcj.pc
+%%JAVA%%libdata/pkgconfig/libgcj-4.2.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here