From 07ebde802e907bdb939068483c54b54a4b3c46a1 Mon Sep 17 00:00:00 2001
From: Gerald Pfeifer <gerald@FreeBSD.org>
Date: Fri, 28 Sep 2012 14:15:51 +0000
Subject: [PATCH] Update to the 20120922 snapshot of GCC 4.7.3, which is pretty
 close to the GCC 4.7.2 release.  It also fixes an ABI problem introduced with
 earlier GCC 4.7 releases.

Cut down the comments at the top of Makefile per recent guidance.

Revamp the handling of different languages (frontends, run-times)
by GCC to allow for orthogonal setting them in the future. [1]

Print the list of languages being built as part of pre-everything
and shorten the output of operating system and version there.

Inspired by:	jkim [1]
---
 lang/gcc47/Makefile | 16 ++++++----------
 lang/gcc47/distinfo |  4 ++--
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index dd0f5c21c6aa..64a842e8d060 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -1,13 +1,8 @@
-# ex:ts=8
-# Ports collection makefile for:	gcc47
-# Date created:				2011-03-20
-# Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
-#
+# Created by: Gerald Pfeifer <gerald@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.2.20120908
+PORTVERSION=	4.7.3.20120922
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -57,6 +52,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV+=	UNAME_m="powerpc64"
 .endif
 
+LANGUAGES:=	c,c++,objc,fortran
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
@@ -64,7 +60,6 @@ LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--disable-nls \
-		--enable-languages=c,c++,objc,fortran \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
@@ -101,7 +96,7 @@ INFO+=		gcc${SUFFIX}/libquadmath	\
 .if ${PORT_OPTIONS:MJAVA}
 BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
-CONFIGURE_ARGS+=--enable-languages=c,c++,objc,fortran,java
+LANGUAGES:=	${LANGUAGES},java
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
@@ -134,9 +129,10 @@ PLIST_SUB+=	JAVA=""
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
+CONFIGURE_ARGS+=--enable-languages=${LANGUAGES}
 
 pre-everything::
-	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
+	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]"
 
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 6b75ffd2b1cb..f1972e845bbf 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gcc-4.7-20120908.tar.bz2) = 7973e8e281c8b93345a887a6d33bb89aebc9a2696dc07e63bfa2f705a643766e
-SIZE (gcc-4.7-20120908.tar.bz2) = 78878370
+SHA256 (gcc-4.7-20120922.tar.bz2) = fa2ab0924f10642a5ae4d9626d229fdf8830d2aa0ef91fb4584985aa34da1294
+SIZE (gcc-4.7-20120922.tar.bz2) = 78875317