Update to the 20110422 snapshot of GCC 4.6.1.

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/gcc/Makefile b/lang/gcc/Makefile
index 76a59742827c..d6f073f89e70 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.6.1.20110415
+PORTVERSION=	4.6.1.20110422
 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/gcc/distinfo b/lang/gcc/distinfo
index 2a7ff91d0e5d..bb89f3f04033 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.6-20110415.tar.bz2) = 551a5cb88dbafb83fd7e84477330271fc8736ccf6163aaf7e3a9cc7fa32a02ce
-SIZE (gcc-core-4.6-20110415.tar.bz2) = 26303270
-SHA256 (gcc-fortran-4.6-20110415.tar.bz2) = 346d4934ae526eb77d010b01e44cba3701c02c53107af545f058ca4cb67fdb0c
-SIZE (gcc-fortran-4.6-20110415.tar.bz2) = 1544379
-SHA256 (gcc-g++-4.6-20110415.tar.bz2) = 58c28d285ddea2be65e376db2afd01099ac5856d716598ab7fc7314f4c9e402e
-SIZE (gcc-g++-4.6-20110415.tar.bz2) = 6937258
-SHA256 (gcc-testsuite-4.6-20110415.tar.bz2) = 5dae95ef805e5919f9913e9a64aee857f00e191ed0997d40e4785fc6a0788364
-SIZE (gcc-testsuite-4.6-20110415.tar.bz2) = 6229282
-SHA256 (gcc-java-4.6-20110415.tar.bz2) = 1f0dc7713a0a328c4ffe909c2e46ee63b430190728c9006599ef092a975390de
-SIZE (gcc-java-4.6-20110415.tar.bz2) = 18535912
+SHA256 (gcc-core-4.6-20110422.tar.bz2) = fdacf74de8e7b135e3ec45f23ec020f09d39a355c3452afefd83d1f7e2391582
+SIZE (gcc-core-4.6-20110422.tar.bz2) = 26307922
+SHA256 (gcc-fortran-4.6-20110422.tar.bz2) = 82dffb6c4249e5c23c0bb9ba2b0c958ad26cb4f2a954529119f09c5ecac16ae9
+SIZE (gcc-fortran-4.6-20110422.tar.bz2) = 1544483
+SHA256 (gcc-g++-4.6-20110422.tar.bz2) = ca59b9ec15da693ad799b965c38258cdfb00a88f01dbbe52e8150fe6f9b6b8bc
+SIZE (gcc-g++-4.6-20110422.tar.bz2) = 6937687
+SHA256 (gcc-testsuite-4.6-20110422.tar.bz2) = a0255bf4a1b778600f672c14d8c52da56a4ea63994056f3c3dec409d5867b703
+SIZE (gcc-testsuite-4.6-20110422.tar.bz2) = 6233071
+SHA256 (gcc-java-4.6-20110422.tar.bz2) = 9f4244fa038ca48c5ab879def583ce8d83dbcef8d6e6cd95926e079ba7851422
+SIZE (gcc-java-4.6-20110422.tar.bz2) = 18538871
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 76a59742827c..d6f073f89e70 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.6.1.20110415
+PORTVERSION=	4.6.1.20110422
 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/gcc46/distinfo b/lang/gcc46/distinfo
index 2a7ff91d0e5d..bb89f3f04033 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,10 +1,10 @@
-SHA256 (gcc-core-4.6-20110415.tar.bz2) = 551a5cb88dbafb83fd7e84477330271fc8736ccf6163aaf7e3a9cc7fa32a02ce
-SIZE (gcc-core-4.6-20110415.tar.bz2) = 26303270
-SHA256 (gcc-fortran-4.6-20110415.tar.bz2) = 346d4934ae526eb77d010b01e44cba3701c02c53107af545f058ca4cb67fdb0c
-SIZE (gcc-fortran-4.6-20110415.tar.bz2) = 1544379
-SHA256 (gcc-g++-4.6-20110415.tar.bz2) = 58c28d285ddea2be65e376db2afd01099ac5856d716598ab7fc7314f4c9e402e
-SIZE (gcc-g++-4.6-20110415.tar.bz2) = 6937258
-SHA256 (gcc-testsuite-4.6-20110415.tar.bz2) = 5dae95ef805e5919f9913e9a64aee857f00e191ed0997d40e4785fc6a0788364
-SIZE (gcc-testsuite-4.6-20110415.tar.bz2) = 6229282
-SHA256 (gcc-java-4.6-20110415.tar.bz2) = 1f0dc7713a0a328c4ffe909c2e46ee63b430190728c9006599ef092a975390de
-SIZE (gcc-java-4.6-20110415.tar.bz2) = 18535912
+SHA256 (gcc-core-4.6-20110422.tar.bz2) = fdacf74de8e7b135e3ec45f23ec020f09d39a355c3452afefd83d1f7e2391582
+SIZE (gcc-core-4.6-20110422.tar.bz2) = 26307922
+SHA256 (gcc-fortran-4.6-20110422.tar.bz2) = 82dffb6c4249e5c23c0bb9ba2b0c958ad26cb4f2a954529119f09c5ecac16ae9
+SIZE (gcc-fortran-4.6-20110422.tar.bz2) = 1544483
+SHA256 (gcc-g++-4.6-20110422.tar.bz2) = ca59b9ec15da693ad799b965c38258cdfb00a88f01dbbe52e8150fe6f9b6b8bc
+SIZE (gcc-g++-4.6-20110422.tar.bz2) = 6937687
+SHA256 (gcc-testsuite-4.6-20110422.tar.bz2) = a0255bf4a1b778600f672c14d8c52da56a4ea63994056f3c3dec409d5867b703
+SIZE (gcc-testsuite-4.6-20110422.tar.bz2) = 6233071
+SHA256 (gcc-java-4.6-20110422.tar.bz2) = 9f4244fa038ca48c5ab879def583ce8d83dbcef8d6e6cd95926e079ba7851422
+SIZE (gcc-java-4.6-20110422.tar.bz2) = 18538871