Complete the repocopy of lang/gcc41 to lang/gcc42 and update to the 20051210

snapshot of GCC 4.2.0.

Change pkg-plist to avoid hardcoding any version number.

PR:		90253

29 files changed, 437 insertions, 427 deletions

diff --git a/CVSROOT/modules b/CVSROOT/modules
index 75dad3772680..8a80eaa1300f 100644
--- a/CVSROOT/modules
+++ b/CVSROOT/modules
@@ -2740,6 +2740,7 @@ gcc33		ports/lang/gcc33
 gcc34		ports/lang/gcc34
 gcc40		ports/lang/gcc40
 gcc41		ports/lang/gcc41
+gcc42		ports/lang/gcc42
 gccxml		ports/devel/gccxml
 gcdmaster	ports/sysutils/gcdmaster
 gcfilms		ports/multimedia/gcfilms
diff --git a/lang/Makefile b/lang/Makefile
index 1f305928631d..6433c96f5cf6 100644
--- a/lang/Makefile
+++ b/lang/Makefile
@@ -74,6 +74,7 @@
     SUBDIR += gcc34
     SUBDIR += gcc40
     SUBDIR += gcc41
+    SUBDIR += gcc42
     SUBDIR += gcl
     SUBDIR += gdc
     SUBDIR += gforth
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index fd158af88a2d..7b0c5e940f9b 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -24,7 +24,7 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
-CONFLICTS=	gcc-4.0.* gcc-4.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.* gcc-4.2.*
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 173a120b793e..d83d82b8860b 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -23,7 +23,7 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
-CONFLICTS=	gcc-4.0.* gcc-4.1.*
+CONFLICTS=	gcc-4.0.* gcc-4.1.* gcc-4.2.*
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 535c5ea6a06f..03da2aa3ce1b 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -26,7 +26,7 @@ LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.2.*
 LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 08e9dfa2924a..a64e4e4a00d3 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -7,10 +7,10 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.1.0
-PORTREVISION=	20051202
+PORTVERSION=	4.2.0
+PORTREVISION=	20051210
 CATEGORIES=	lang java
-VERSIONSTRING=	4.1-${PORTREVISION}
+VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -19,15 +19,15 @@ DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
-COMMENT=	GNU Compiler Collection 4.1
+COMMENT=	GNU Compiler Collection 4.2
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 BUILD_DEPENDS=	${LOCALBASE}/lib/libmpfr.a:${PORTSDIR}/math/mpfr
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.*
-LATEST_LINK?=	gcc41${PKGNAMESUFFIX}
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.0.* gcc-4.1.*
+LATEST_LINK?=	gcc42${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -61,7 +61,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-SUFFIX=		41
+SUFFIX=		42
 TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
@@ -84,7 +84,8 @@ LDCONFIG_DIRS=	${TARGLIB}
 CONFIGURE_ARGS+=	--disable-shared
 .endif
 ALL_TARGET=	bootstrap-lean
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
@@ -185,7 +186,7 @@ post-install:
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
-	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.1'
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*4\.2'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 0ce8a83985c7..ad95376dbee9 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20051202.tar.bz2) = 540d3478f21413893cd5929de80f6f81
-SHA256 (gcc-core-4.1-20051202.tar.bz2) = 47768eaa9b9f2cad457f95109c59f011924094ae5f4db5df67e10b7cd41b2e61
-SIZE (gcc-core-4.1-20051202.tar.bz2) = 14775222
-MD5 (gcc-g++-4.1-20051202.tar.bz2) = 90422c9305c1116e870a49196e770b20
-SHA256 (gcc-g++-4.1-20051202.tar.bz2) = 0ac173957e412e0c747454138a8e358406a7aa9c1f10d11e90c688e2ef75bbae
-SIZE (gcc-g++-4.1-20051202.tar.bz2) = 3816892
-MD5 (gcc-objc-4.1-20051202.tar.bz2) = 6b688bc5f990aab8a6eaaa18d90f632f
-SHA256 (gcc-objc-4.1-20051202.tar.bz2) = 678fca8a64610fb63f2bb89a558462828ef43233de1ff4ba85ded9282da2db8a
-SIZE (gcc-objc-4.1-20051202.tar.bz2) = 190402
-MD5 (gcc-testsuite-4.1-20051202.tar.bz2) = b06ee8f791193b5ecf6c0bc38bdf3ed7
-SHA256 (gcc-testsuite-4.1-20051202.tar.bz2) = 865a0566a2203e5a9be7f845acabea3fac39ca4a976fd80cd0646029a9f79661
-SIZE (gcc-testsuite-4.1-20051202.tar.bz2) = 3491070
-MD5 (gcc-fortran-4.1-20051202.tar.bz2) = afb1b78613fceba5a14d5df0f8d81e04
-SHA256 (gcc-fortran-4.1-20051202.tar.bz2) = c68985bf49e3053b59fd397bf6a3e715fc7e5a341d94b53646d6b7a540cf649b
-SIZE (gcc-fortran-4.1-20051202.tar.bz2) = 724265
-MD5 (gcc-java-4.1-20051202.tar.bz2) = 6df75c205de36312597cef356374bb26
-SHA256 (gcc-java-4.1-20051202.tar.bz2) = c3f21e90ecb9b5dad6a41dc9cb6e3d6afaa27dee2d3c5ebaff1ca05979df0c8a
-SIZE (gcc-java-4.1-20051202.tar.bz2) = 9067925
+MD5 (gcc-core-4.2-20051210.tar.bz2) = 41a9bc4c6ed50938c33190de327f22af
+SHA256 (gcc-core-4.2-20051210.tar.bz2) = d8c9ec8f93b16f367003c2063129f79ed6d08857d71c7e1fbb2c6a719dfedc90
+SIZE (gcc-core-4.2-20051210.tar.bz2) = 14898072
+MD5 (gcc-g++-4.2-20051210.tar.bz2) = 91a6f0683bea54f155a335937078095d
+SHA256 (gcc-g++-4.2-20051210.tar.bz2) = 35314b5687039164f015087f23d736721451db0f24df668bd7603fa635f2e0c4
+SIZE (gcc-g++-4.2-20051210.tar.bz2) = 3824577
+MD5 (gcc-objc-4.2-20051210.tar.bz2) = 26e9a35119d320158fb00413e185ca7b
+SHA256 (gcc-objc-4.2-20051210.tar.bz2) = 3efea884dd42ead0bb0da09340615a4c9fc59769596788931856f18ed3f7b46f
+SIZE (gcc-objc-4.2-20051210.tar.bz2) = 189777
+MD5 (gcc-testsuite-4.2-20051210.tar.bz2) = 34e86c35466d835af9783de5014751ff
+SHA256 (gcc-testsuite-4.2-20051210.tar.bz2) = 64b7f50368a47c694dba67dcf5de66e329628786843742f0f95c888842a4bd33
+SIZE (gcc-testsuite-4.2-20051210.tar.bz2) = 3507759
+MD5 (gcc-fortran-4.2-20051210.tar.bz2) = e19d674a4fe448da41c9debbd9e02542
+SHA256 (gcc-fortran-4.2-20051210.tar.bz2) = 41d909ec2f27f3a2da0396c746b3c3d86bcf21d51d6cfc519fef3d80181bb277
+SIZE (gcc-fortran-4.2-20051210.tar.bz2) = 724493
+MD5 (gcc-java-4.2-20051210.tar.bz2) = 90cb98d995bd656a74a3a9caae8e0491
+SHA256 (gcc-java-4.2-20051210.tar.bz2) = 8d2b120463b1e1b004919f7132f3b09ff361706b019699ecb80f52659a14287c
+SIZE (gcc-java-4.2-20051210.tar.bz2) = 9066735
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 52eb89adf358..85974006f10b 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -1,37 +1,37 @@
 @comment $FreeBSD$
-bin/c++41
-bin/cpp41
-bin/g++41
-bin/gcc41
-bin/gcov41
-bin/%%GNU_HOST%%-c++41
-bin/%%GNU_HOST%%-g++41
+bin/c++%%SUFFIX%%
+bin/cpp%%SUFFIX%%
+bin/g++%%SUFFIX%%
+bin/gcc%%SUFFIX%%
+bin/gcov%%SUFFIX%%
+bin/%%GNU_HOST%%-c++%%SUFFIX%%
+bin/%%GNU_HOST%%-g++%%SUFFIX%%
 bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
-bin/%%GNU_HOST%%-gcc41
-bin/gccbug41
+bin/%%GNU_HOST%%-gcc%%SUFFIX%%
+bin/gccbug%%SUFFIX%%
 include/mf-runtime.h
 include/ssp/ssp.h
 include/ssp/string.h
 include/ssp/stdio.h
 include/ssp/unistd.h
 @unexec rmdir %D/include/ssp 2>/dev/null || true
-%%FORTRAN%%bin/gfortran41
-%%FORTRAN%%bin/%%GNU_HOST%%-gfortran41
-%%JAVA%%bin/addr2name.awk41
-%%JAVA%%bin/fastjar41
-%%JAVA%%bin/gcj41
-%%JAVA%%bin/gcj-dbtool41
-%%JAVA%%bin/gcjh41
-%%JAVA%%bin/gij41
-%%JAVA%%bin/gjnih41
-%%JAVA%%bin/grepjar41
-%%JAVA%%bin/grmic41
-%%JAVA%%bin/grmiregistry41
-%%JAVA%%bin/jv-convert41
-%%JAVA%%bin/jv-scan41
-%%JAVA%%bin/jcf-dump41
-%%JAVA%%bin/%%GNU_HOST%%-gcj41
-%%JAVA%%bin/%%GNU_HOST%%-gcjh41
+%%FORTRAN%%bin/gfortran%%SUFFIX%%
+%%FORTRAN%%bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
+%%JAVA%%bin/addr2name.awk%%SUFFIX%%
+%%JAVA%%bin/fastjar%%SUFFIX%%
+%%JAVA%%bin/gcj%%SUFFIX%%
+%%JAVA%%bin/gcj-dbtool%%SUFFIX%%
+%%JAVA%%bin/gcjh%%SUFFIX%%
+%%JAVA%%bin/gij%%SUFFIX%%
+%%JAVA%%bin/gjnih%%SUFFIX%%
+%%JAVA%%bin/grepjar%%SUFFIX%%
+%%JAVA%%bin/grmic%%SUFFIX%%
+%%JAVA%%bin/grmiregistry%%SUFFIX%%
+%%JAVA%%bin/jv-convert%%SUFFIX%%
+%%JAVA%%bin/jv-scan%%SUFFIX%%
+%%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