Update to the 20060915 of GCC 4.1.2. This fixes the namespace pollution

caused by include/ffi.h.

Enable libgcj on amd64 in addition to i386.

Remove the hack we had used to rename man pages to match the actual
names of binaries (back when GCCs configure mechanism failed to do so).

3 files changed, 21 insertions, 29 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 7d7f789acf22..34c4bd92afa5 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060909
+PORTREVISION=	20060916
 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
+.if ${ARCH} != i386 && ${ARCH} != amd64
 WITHOUT_JAVA=	yes
 .endif
 
@@ -155,16 +155,9 @@ post-install:
 	for mp in ${_MANPAGES}; do \
 	  ${TEST} -e $${mp} || ${TOUCH} ${TOUCH_FLAGS} $${mp}; \
 	done
-.for f in c++ gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
-	# gij and jv-convert, for example, are not built on all platforms.
-	if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
-	  ${MV} -f ${PREFIX}/man/man1/${f}.1 \
-	           ${PREFIX}/man/man1/${f}${SUFFIX}.1; \
-	fi
-.endfor
-	${RM} -f ${TARGLIB}/*.la
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
+	${RM} -f ${TARGLIB}/*.la
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} libexec/gcc/${CONFIGURE_TARGET}/${PORTVERSION} include/gcj include/gnu include/java include/javax
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index e86bd223a53d..5b2338be1905 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060909.tar.bz2) = 51b6371b12e8d9af832101569163fd57
-SHA256 (gcc-core-4.2-20060909.tar.bz2) = 6925254d7db83ea27054bd8d92318c444f5d37cb4f0f7a061310c84601be6a80
-SIZE (gcc-core-4.2-20060909.tar.bz2) = 15774683
-MD5 (gcc-g++-4.2-20060909.tar.bz2) = 7bc2a3d949615283c590c62af7ac056d
-SHA256 (gcc-g++-4.2-20060909.tar.bz2) = 3e03e89eb247b6fb3886e88d495031a0f68791e64a19a6f13fde9c62f09fc6a9
-SIZE (gcc-g++-4.2-20060909.tar.bz2) = 4737733
-MD5 (gcc-objc-4.2-20060909.tar.bz2) = 53303a2e05ec49211bd0c8c4506956f8
-SHA256 (gcc-objc-4.2-20060909.tar.bz2) = d5b7e813aadd7ebdba6ac592a429fbaf0258522a1c2385c2b39658673803556f
-SIZE (gcc-objc-4.2-20060909.tar.bz2) = 191799
-MD5 (gcc-testsuite-4.2-20060909.tar.bz2) = 4f28531d16e1af981b15a01f09d50ee3
-SHA256 (gcc-testsuite-4.2-20060909.tar.bz2) = 6c91fcc0ba4a43d845ef9b89a5d91b1bf9928ace00502a6f0fab5115d7efbce1
-SIZE (gcc-testsuite-4.2-20060909.tar.bz2) = 3752950
-MD5 (gcc-fortran-4.2-20060909.tar.bz2) = 5c3f87da05b0bb183dfb12c2dd017d5c
-SHA256 (gcc-fortran-4.2-20060909.tar.bz2) = d916d2fae128bf7f5c33e5dfee126c3b81935e1473f6a62d514bea4d93c83ed2
-SIZE (gcc-fortran-4.2-20060909.tar.bz2) = 835085
-MD5 (gcc-java-4.2-20060909.tar.bz2) = 3f518f48b7c086fc492b177232a6b69e
-SHA256 (gcc-java-4.2-20060909.tar.bz2) = 6134bc817d32934d69264dae19bc79e93a57b8d30f222d46a99816d0fb286522
-SIZE (gcc-java-4.2-20060909.tar.bz2) = 10396900
+MD5 (gcc-core-4.2-20060916.tar.bz2) = 0b624f3657b6d69548001570ff17f0bb
+SHA256 (gcc-core-4.2-20060916.tar.bz2) = eb431c069cd019f5da9e30d66157f18888dcf8c395a18eb0205ad64883cd665c
+SIZE (gcc-core-4.2-20060916.tar.bz2) = 15775559
+MD5 (gcc-g++-4.2-20060916.tar.bz2) = 6c874d22c6136ad743bf31c1c3de0b88
+SHA256 (gcc-g++-4.2-20060916.tar.bz2) = 0b506d5e14c025cfee5c7b04cf5d8881f924c1b37b63d5357c0939a02615ffec
+SIZE (gcc-g++-4.2-20060916.tar.bz2) = 4736790
+MD5 (gcc-objc-4.2-20060916.tar.bz2) = f1d4583da59d3de4aed86e4bb2c58483
+SHA256 (gcc-objc-4.2-20060916.tar.bz2) = 38552d7d7c1888abc035f2ab2fb634e1944cc90905b5d6a36a7412d6e279425f
+SIZE (gcc-objc-4.2-20060916.tar.bz2) = 191720
+MD5 (gcc-testsuite-4.2-20060916.tar.bz2) = cd20adbd59a8121a2684ee275accd1f9
+SHA256 (gcc-testsuite-4.2-20060916.tar.bz2) = c3b3a6c4d4255b4f22c4431c2591a09afdd8369e6a91f78e1619f62475b09f08
+SIZE (gcc-testsuite-4.2-20060916.tar.bz2) = 3760983
+MD5 (gcc-fortran-4.2-20060916.tar.bz2) = a89a190d31b9bfe70fe2513d7498f026
+SHA256 (gcc-fortran-4.2-20060916.tar.bz2) = bb4cc654d09314de067a502a34522bb712e8d2c3c5806650c83a541dbb323f89
+SIZE (gcc-fortran-4.2-20060916.tar.bz2) = 835456
+MD5 (gcc-java-4.2-20060916.tar.bz2) = 2d510946c7d39387302323e6371a5efb
+SHA256 (gcc-java-4.2-20060916.tar.bz2) = 8fd5a7b0bb06db76e3150a4b6eefdf24d56a72ef80dccdd599790a0b0d41a1d8
+SIZE (gcc-java-4.2-20060916.tar.bz2) = 10435176
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index fe2ba33ce2cd..505428d8b648 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -29,7 +29,6 @@ info/gcc%%SUFFIX%%/dir
 %%JAVA%%bin/jcf-dump%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%%
 %%JAVA%%bin/%%GNU_HOST%%-gcjh%%SUFFIX%%
-%%JAVA%%include/ffi.h
 %%JAVA%%libdata/pkgconfig/libgcj.pc
 %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar