Update to the 20110423 snapshot of GCC 4.7.0.

Replace the, now dysfunctional, post-patch target with a configure
option that marks this build of GCC as "FreeBSD Ports Collection". [1]

Reported by:	Bjoern Koenig <bkoenig@alpha-tierchen.de> [1]

4 files changed, 24 insertions, 30 deletions

diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 0f6a8bcbbe93..9d9d7c3bb30c 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.0.20110416
+PORTVERSION=	4.7.0.20110423
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -72,6 +72,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
 		--with-libiconv-prefix=${LOCALBASE} \
+		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
@@ -135,10 +136,6 @@ PLIST_SUB+=	JAVA="@comment "
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
-	    ${SRCDIR}/gcc/version.c
-
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 7349bd2ef8d8..42e5d938039d 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.7-20110416.tar.bz2) = 3fb28f1fb2d9dda8c2093d2d01dbcbe7ea9de640780fa8947e90660bf4395802
-SIZE (gcc-core-4.7-20110416.tar.bz2) = 26239754
-SHA256 (gcc-fortran-4.7-20110416.tar.bz2) = f7eded0eac882da3db1a3df3c402e7c80a1b0d6fa7dc2de2f590ba0bf57bc737
-SIZE (gcc-fortran-4.7-20110416.tar.bz2) = 1556191
-SHA256 (gcc-g++-4.7-20110416.tar.bz2) = c6eeb0ce195a4c133113afc70687063bf01f01540a60cbbe69dec52be826bd80
-SIZE (gcc-g++-4.7-20110416.tar.bz2) = 6968892
-SHA256 (gcc-testsuite-4.7-20110416.tar.bz2) = 7869ee36a7d7cea354d2def469ea5685796ac19b29578fac0302be744091153e
-SIZE (gcc-testsuite-4.7-20110416.tar.bz2) = 6284126
-SHA256 (gcc-java-4.7-20110416.tar.bz2) = c083af5c24954bc4d7d85d2c69dc4390bb76ddfbcd20385fb029f5a238a2ba75
-SIZE (gcc-java-4.7-20110416.tar.bz2) = 18541135
+SHA256 (gcc-core-4.7-20110423.tar.bz2) = b73242ad65187fb97305eab69c2a3c0d8ce6fcf7e68ba7d11eb1b4a9848f0cdb
+SIZE (gcc-core-4.7-20110423.tar.bz2) = 26267923
+SHA256 (gcc-fortran-4.7-20110423.tar.bz2) = 2fcc50729795e503cd13634cf9f0973a5606c569fe0316a36b785b1fdbb82533
+SIZE (gcc-fortran-4.7-20110423.tar.bz2) = 1558447
+SHA256 (gcc-g++-4.7-20110423.tar.bz2) = ad1ae3151994d8c71a680195b8b69eaae69eece8081560d110aa54caceaeb903
+SIZE (gcc-g++-4.7-20110423.tar.bz2) = 6972869
+SHA256 (gcc-testsuite-4.7-20110423.tar.bz2) = 106edd70feadde6ee9921ff88ee8d3b51edb1a64af10642e6d9da8ab0a0906fa
+SIZE (gcc-testsuite-4.7-20110423.tar.bz2) = 6287051
+SHA256 (gcc-java-4.7-20110423.tar.bz2) = 906f5ba829e9ce2ebdc4782cf78385093fab93aae6667ca2718389e2a5f2e6fe
+SIZE (gcc-java-4.7-20110423.tar.bz2) = 18541080
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 0f6a8bcbbe93..9d9d7c3bb30c 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.0.20110416
+PORTVERSION=	4.7.0.20110423
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
@@ -72,6 +72,7 @@ CONFIGURE_ARGS+=--disable-nls \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--with-ld=${LOCALBASE}/bin/ld \
 		--with-libiconv-prefix=${LOCALBASE} \
+		--with-pkgversion="FreeBSD Ports Collection" \
 		--with-system-zlib
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
@@ -135,10 +136,6 @@ PLIST_SUB+=	JAVA="@comment "
 pre-everything::
 	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \
-	    ${SRCDIR}/gcc/version.c
-
 pre-configure:
 	cd ${SRCDIR} ; contrib/gcc_update --touch
 	@${RM} -f ${SRCDIR}/gcc/*/*.info*
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 7349bd2ef8d8..42e5d938039d 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.7-20110416.tar.bz2) = 3fb28f1fb2d9dda8c2093d2d01dbcbe7ea9de640780fa8947e90660bf4395802
-SIZE (gcc-core-4.7-20110416.tar.bz2) = 26239754
-SHA256 (gcc-fortran-4.7-20110416.tar.bz2) = f7eded0eac882da3db1a3df3c402e7c80a1b0d6fa7dc2de2f590ba0bf57bc737
-SIZE (gcc-fortran-4.7-20110416.tar.bz2) = 1556191
-SHA256 (gcc-g++-4.7-20110416.tar.bz2) = c6eeb0ce195a4c133113afc70687063bf01f01540a60cbbe69dec52be826bd80
-SIZE (gcc-g++-4.7-20110416.tar.bz2) = 6968892
-SHA256 (gcc-testsuite-4.7-20110416.tar.bz2) = 7869ee36a7d7cea354d2def469ea5685796ac19b29578fac0302be744091153e
-SIZE (gcc-testsuite-4.7-20110416.tar.bz2) = 6284126
-SHA256 (gcc-java-4.7-20110416.tar.bz2) = c083af5c24954bc4d7d85d2c69dc4390bb76ddfbcd20385fb029f5a238a2ba75
-SIZE (gcc-java-4.7-20110416.tar.bz2) = 18541135
+SHA256 (gcc-core-4.7-20110423.tar.bz2) = b73242ad65187fb97305eab69c2a3c0d8ce6fcf7e68ba7d11eb1b4a9848f0cdb
+SIZE (gcc-core-4.7-20110423.tar.bz2) = 26267923
+SHA256 (gcc-fortran-4.7-20110423.tar.bz2) = 2fcc50729795e503cd13634cf9f0973a5606c569fe0316a36b785b1fdbb82533
+SIZE (gcc-fortran-4.7-20110423.tar.bz2) = 1558447
+SHA256 (gcc-g++-4.7-20110423.tar.bz2) = ad1ae3151994d8c71a680195b8b69eaae69eece8081560d110aa54caceaeb903
+SIZE (gcc-g++-4.7-20110423.tar.bz2) = 6972869
+SHA256 (gcc-testsuite-4.7-20110423.tar.bz2) = 106edd70feadde6ee9921ff88ee8d3b51edb1a64af10642e6d9da8ab0a0906fa
+SIZE (gcc-testsuite-4.7-20110423.tar.bz2) = 6287051
+SHA256 (gcc-java-4.7-20110423.tar.bz2) = 906f5ba829e9ce2ebdc4782cf78385093fab93aae6667ca2718389e2a5f2e6fe
+SIZE (gcc-java-4.7-20110423.tar.bz2) = 18541080