Update to the 20110604 snapshot of GCC 4.7.0. Upstream now only provides

a single tarball and this update brings a number of changes around that.

Enable c, c++, and fortran (and only these) explicitly by default, and
Java when/where available. [1]

Reported by:	Scott Allendorf <scott-allendorf@uiowa.edu> [1]

4 files changed, 12 insertions, 32 deletions

diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 04010156441..07420427b0c 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -7,13 +7,11 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.0.20110521
+PORTVERSION=	4.7.0.20110604
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX}
+DISTNAME=	gcc-${VERSIONSTRING}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
@@ -24,7 +22,6 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 
 .if defined(MAINTAINER_MODE)
-DISTFILES+=	gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
@@ -64,6 +61,7 @@ LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--disable-nls \
+		--enable-languages=c,c++,fortran \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
@@ -97,9 +95,9 @@ INFO+=		gcc${SUFFIX}/libquadmath
 .endif
 
 .if ! defined(WITHOUT_JAVA)
-DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
+CONFIGURE_ARGS+=--enable-languages=c,c++,fortran,java
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index b2baa70b085..2832b60b3f2 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,10 +1,2 @@
-SHA256 (gcc-core-4.7-20110521.tar.bz2) = 2d5001e90823fc864ecd026e12d680af6c8dfa5dd1781bdf42929c9083c70fbc
-SIZE (gcc-core-4.7-20110521.tar.bz2) = 26360184
-SHA256 (gcc-fortran-4.7-20110521.tar.bz2) = 2fa5cea8ce37b6d5c8110f3f4c5020d16139dc2ab561f97131be2381d41cd801
-SIZE (gcc-fortran-4.7-20110521.tar.bz2) = 1568093
-SHA256 (gcc-g++-4.7-20110521.tar.bz2) = 8aa6fa0f3106eb100c930fc06772c49fdf8433ad0a6fdb91c09c27b75f9ac5d3
-SIZE (gcc-g++-4.7-20110521.tar.bz2) = 6985509
-SHA256 (gcc-testsuite-4.7-20110521.tar.bz2) = b611e9d30e898b3bdf5aadc043cb9bee8f8c775b9309607416d6f8165562ba28
-SIZE (gcc-testsuite-4.7-20110521.tar.bz2) = 6332069
-SHA256 (gcc-java-4.7-20110521.tar.bz2) = 404ef578c804fcdbfaa3026ba9117e955b392b085a546b21a8271683035a1828
-SIZE (gcc-java-4.7-20110521.tar.bz2) = 18538742
+SHA256 (gcc-4.7-20110604.tar.bz2) = e62b67f9c7ed6aec0b60897c3150cd2ffdacf565eff3826b07af6f00b97c2a59
+SIZE (gcc-4.7-20110604.tar.bz2) = 69515350
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 04010156441..07420427b0c 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -7,13 +7,11 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.0.20110521
+PORTVERSION=	4.7.0.20110604
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX} \
-		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX}
+DISTNAME=	gcc-${VERSIONSTRING}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
@@ -24,7 +22,6 @@ LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 
 .if defined(MAINTAINER_MODE)
-DISTFILES+=	gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
@@ -64,6 +61,7 @@ LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--disable-nls \
+		--enable-languages=c,c++,fortran \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
@@ -97,9 +95,9 @@ INFO+=		gcc${SUFFIX}/libquadmath
 .endif
 
 .if ! defined(WITHOUT_JAVA)
-DISTFILES+=	gcc-java-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
+CONFIGURE_ARGS+=--enable-languages=c,c++,fortran,java
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index b2baa70b085..2832b60b3f2 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,10 +1,2 @@
-SHA256 (gcc-core-4.7-20110521.tar.bz2) = 2d5001e90823fc864ecd026e12d680af6c8dfa5dd1781bdf42929c9083c70fbc
-SIZE (gcc-core-4.7-20110521.tar.bz2) = 26360184
-SHA256 (gcc-fortran-4.7-20110521.tar.bz2) = 2fa5cea8ce37b6d5c8110f3f4c5020d16139dc2ab561f97131be2381d41cd801
-SIZE (gcc-fortran-4.7-20110521.tar.bz2) = 1568093
-SHA256 (gcc-g++-4.7-20110521.tar.bz2) = 8aa6fa0f3106eb100c930fc06772c49fdf8433ad0a6fdb91c09c27b75f9ac5d3
-SIZE (gcc-g++-4.7-20110521.tar.bz2) = 6985509
-SHA256 (gcc-testsuite-4.7-20110521.tar.bz2) = b611e9d30e898b3bdf5aadc043cb9bee8f8c775b9309607416d6f8165562ba28
-SIZE (gcc-testsuite-4.7-20110521.tar.bz2) = 6332069
-SHA256 (gcc-java-4.7-20110521.tar.bz2) = 404ef578c804fcdbfaa3026ba9117e955b392b085a546b21a8271683035a1828
-SIZE (gcc-java-4.7-20110521.tar.bz2) = 18538742
+SHA256 (gcc-4.7-20110604.tar.bz2) = e62b67f9c7ed6aec0b60897c3150cd2ffdacf565eff3826b07af6f00b97c2a59
+SIZE (gcc-4.7-20110604.tar.bz2) = 69515350