Index: head/lang/gcc47/Makefile
===================================================================
--- head/lang/gcc47/Makefile	(revision 273250)
+++ head/lang/gcc47/Makefile	(revision 273251)
@@ -1,167 +1,164 @@
 # ex:ts=8
 # Ports collection makefile for:	gcc47
 # Date created:				2011-03-20
 # Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 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}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
 
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 		mpfr.4:${PORTSDIR}/math/mpfr \
 		mpc.2:${PORTSDIR}/math/mpc
 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
 
 VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
 USE_BINUTILS=	yes
 USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 MAKE_JOBS_SAFE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
 OPTIONS=	JAVA	"Enable the Java frontend (i386 and amd64 only)"	on
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386 && ${ARCH} != amd64
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--disable-nls \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--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
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION:C/(.+)\.[0-9]+/\1/} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp
 .if ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64"
 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
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
 		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
 		gjar${SUFFIX}.1 \
 		gjarsigner${SUFFIX}.1 \
 		gjavah${SUFFIX}.1 \
 		gjdoc${SUFFIX}.1 \
 		gkeytool${SUFFIX}.1 \
 		gnative2ascii${SUFFIX}.1 \
 		gorbd${SUFFIX}.1 \
 		grmic${SUFFIX}.1 \
 		grmid${SUFFIX}.1 \
 		grmiregistry${SUFFIX}.1 \
 		gserialver${SUFFIX}.1 \
 		gtnameserv${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-convert${SUFFIX}.1 \
 		rebuild-gcj-db${SUFFIX}.1
 MAN3=		ffi${SUFFIX}.3 \
 		ffi_call${SUFFIX}.3 \
 		ffi_prep_cif${SUFFIX}.3
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 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*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${WRKSRC}; ${GMAKE} -sk check
 .endif
 
 post-install:
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	${RM} -f ${TARGLIB}/*.la
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>

Property changes on: head/lang/gcc47/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.489
\ No newline at end of property
+1.490
\ No newline at end of property
Index: head/lang/gcc47/distinfo
===================================================================
--- head/lang/gcc47/distinfo	(revision 273250)
+++ head/lang/gcc47/distinfo	(revision 273251)
@@ -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

Property changes on: head/lang/gcc47/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.354
\ No newline at end of property
+1.355
\ No newline at end of property
Index: head/lang/gcc48/Makefile
===================================================================
--- head/lang/gcc48/Makefile	(revision 273250)
+++ head/lang/gcc48/Makefile	(revision 273251)
@@ -1,167 +1,164 @@
 # ex:ts=8
 # Ports collection makefile for:	gcc47
 # Date created:				2011-03-20
 # Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 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}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX} \
 		gcc-g++-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
 
 LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
 		mpfr.4:${PORTSDIR}/math/mpfr \
 		mpc.2:${PORTSDIR}/math/mpc
 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
 
 VERSIONSTRING=	${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/}
 SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 ONLY_FOR_ARCHS=	amd64 i386 ia64 powerpc sparc64
 USE_BINUTILS=	yes
 USE_BISON=	build
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_PERL5_BUILD=yes
 MAKE_JOBS_SAFE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
 OPTIONS=	JAVA	"Enable the Java frontend (i386 and amd64 only)"	on
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} != i386 && ${ARCH} != amd64
 WITHOUT_JAVA=	yes
 .endif
 
 .if ${ARCH} == "amd64"
 CONFIGURE_TARGET=	x86_64-portbld-freebsd${OSREL}
 .else
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
 LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 CONFIGURE_ARGS+=--disable-nls \
 		--libdir=${TARGLIB} \
 		--libexecdir=${LIBEXEC} \
 		--program-suffix=${SUFFIX} \
 		--with-as=${LOCALBASE}/bin/as \
 		--with-gmp=${LOCALBASE} \
 		--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
 USE_LDCONFIG=	${TARGLIB}
 PLIST_SUB=	GCC_VER=${PORTVERSION:C/(.+)\.[0-9]+/\1/} \
 		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1 \
 		gfortran${SUFFIX}.1
 INFO=		gcc${SUFFIX}/cpp \
 		gcc${SUFFIX}/cppinternals \
 		gcc${SUFFIX}/gcc \
 		gcc${SUFFIX}/gccinstall \
 		gcc${SUFFIX}/gccint \
 		gcc${SUFFIX}/gfortran \
 		gcc${SUFFIX}/libgomp
 .if ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64"
 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
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
 		gc-analyze${SUFFIX}.1 \
 		gcj${SUFFIX}.1 \
 		gcj-dbtool${SUFFIX}.1 \
 		gcjh${SUFFIX}.1 \
 		gij${SUFFIX}.1 \
 		gjar${SUFFIX}.1 \
 		gjarsigner${SUFFIX}.1 \
 		gjavah${SUFFIX}.1 \
 		gjdoc${SUFFIX}.1 \
 		gkeytool${SUFFIX}.1 \
 		gnative2ascii${SUFFIX}.1 \
 		gorbd${SUFFIX}.1 \
 		grmic${SUFFIX}.1 \
 		grmid${SUFFIX}.1 \
 		grmiregistry${SUFFIX}.1 \
 		gserialver${SUFFIX}.1 \
 		gtnameserv${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-convert${SUFFIX}.1 \
 		rebuild-gcj-db${SUFFIX}.1
 MAN3=		ffi${SUFFIX}.3 \
 		ffi_call${SUFFIX}.3 \
 		ffi_prep_cif${SUFFIX}.3
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "
 .endif
 
 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*
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 .if defined(MAINTAINER_MODE)
 full-regression-test: build
 	cd ${WRKSRC}; ${GMAKE} -sk check
 .endif
 
 post-install:
 	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	${RM} -f ${TARGLIB}/*.la
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
 .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
 	    ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} $d -type d | ${SORT} -r \
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>

Property changes on: head/lang/gcc48/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.489
\ No newline at end of property
+1.490
\ No newline at end of property
Index: head/lang/gcc48/distinfo
===================================================================
--- head/lang/gcc48/distinfo	(revision 273250)
+++ head/lang/gcc48/distinfo	(revision 273251)
@@ -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

Property changes on: head/lang/gcc48/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.354
\ No newline at end of property
+1.355
\ No newline at end of property