Update to the 20090528 snapshot of GCC 4.5.0.

Move the snapshot date from PORTREVISION to being a part of PORTVERSION
to allow for PORTREVISION bumps.

Simplify pre-everything and adjust PLIST_SUB accordingly.

Move VERSIONSTRING down to pacify portlint after all those years and
extract it from PORTVERSION, too.

3 files changed, 30 insertions, 23 deletions

diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index c3ceaf7d4b96..49c9dac3431d 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -7,10 +7,8 @@
 #
 
 PORTNAME=	gcc
-PORTVERSION=	4.5.0
-PORTREVISION=	20090521
+PORTVERSION=	4.5.0.20090528
 CATEGORIES=	lang java
-VERSIONSTRING=	4.5-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -29,6 +27,7 @@ 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}
 NOT_FOR_ARCHS=	alpha ia64 powerpc
@@ -71,7 +70,8 @@ CONFIGURE_ARGS+=	--disable-nls \
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
 USE_LDCONFIG=	${TARGLIB}
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET} \
+PLIST_SUB=	GCC_VER=${PORTVERSION:C/(.+)\.[0-9]+/\1/} \
+		GNU_HOST=${CONFIGURE_TARGET} \
 		SUFFIX=${SUFFIX}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
@@ -132,7 +132,7 @@ PLIST_SUB+=	JAVA="@comment "
 .endif
 
 pre-everything::
-	@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
+	@${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL}  target=${CONFIGURE_TARGET}"
 .if ! defined(WITHOUT_JAVA)
 	@DSIZ=700000; DSIZBYTE=734003200; \
 	if [ `ulimit -d` -lt $$DSIZ ]; then \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index dcef831d4877..f25b818398cf 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.5-20090521.tar.bz2) = bca3b6994be7e43461658469bc47a9e0
-SHA256 (gcc-core-4.5-20090521.tar.bz2) = c4f0a898129a674e7159a214511798226c095bc70ebac462299a3b41b836a37e
-SIZE (gcc-core-4.5-20090521.tar.bz2) = 22442242
-MD5 (gcc-fortran-4.5-20090521.tar.bz2) = ac646182067a4e02ec5ef5dfeda98359
-SHA256 (gcc-fortran-4.5-20090521.tar.bz2) = 58c5e52ef5062cc60368c500e29b495747171daabd713483ceb47391ab5d3007
-SIZE (gcc-fortran-4.5-20090521.tar.bz2) = 1338486
-MD5 (gcc-g++-4.5-20090521.tar.bz2) = c872bc3894534eb28fc5cbb59a149c41
-SHA256 (gcc-g++-4.5-20090521.tar.bz2) = e1a9e4faa41acbd08b6e65df4707bc4ca04790d975c3ea4ef687ba5216d153da
-SIZE (gcc-g++-4.5-20090521.tar.bz2) = 5984943
-MD5 (gcc-objc-4.5-20090521.tar.bz2) = 5b539855d2778e9cc8ddc648e8c64162
-SHA256 (gcc-objc-4.5-20090521.tar.bz2) = eacddddef726821b09b73b9db92f87b700da9568377231b0377cb29fcdaac9d2
-SIZE (gcc-objc-4.5-20090521.tar.bz2) = 240575
-MD5 (gcc-testsuite-4.5-20090521.tar.bz2) = e1d02dc8ac0b826b143eec9e58c8ffa0
-SHA256 (gcc-testsuite-4.5-20090521.tar.bz2) = eccf1e157863924b3616e362316328114019769168b28cd282258c0b98c2d56e
-SIZE (gcc-testsuite-4.5-20090521.tar.bz2) = 5141989
-MD5 (gcc-java-4.5-20090521.tar.bz2) = ae15eea84c913af16554b6709e6a7277
-SHA256 (gcc-java-4.5-20090521.tar.bz2) = 51b6a9587c76f77fb2b34a9d34d739700cf2e2dd335a2ab557397ea37fa6c36a
-SIZE (gcc-java-4.5-20090521.tar.bz2) = 19019645
+MD5 (gcc-core-4.5-20090528.tar.bz2) = 995d4ccd428f4a538039c09a69bb1e07
+SHA256 (gcc-core-4.5-20090528.tar.bz2) = e224db3bbd1c6ca0b9a9b61b67641a6af15a7ce1450ae2a33444feffd8b96b7b
+SIZE (gcc-core-4.5-20090528.tar.bz2) = 22459422
+MD5 (gcc-fortran-4.5-20090528.tar.bz2) = 54ab1fd94cf8c225668eaee6ad7ab2ed
+SHA256 (gcc-fortran-4.5-20090528.tar.bz2) = 4885baafb96b3b24b24bcdcc9a8259b22bf95c92156efa84615f526e0b089165
+SIZE (gcc-fortran-4.5-20090528.tar.bz2) = 1340476
+MD5 (gcc-g++-4.5-20090528.tar.bz2) = d5e95033785297a202b56378107fb3eb
+SHA256 (gcc-g++-4.5-20090528.tar.bz2) = eccd3dd26ab007174236bd3e3589e1c8232920dbd8ffbfe0fb80ec389d37231b
+SIZE (gcc-g++-4.5-20090528.tar.bz2) = 5996337
+MD5 (gcc-objc-4.5-20090528.tar.bz2) = 50d4db3e2329e026ca8e1563e36393a5
+SHA256 (gcc-objc-4.5-20090528.tar.bz2) = 3f2d36262b3371870c88616bdaad3ded7de71a9546ae47a597ba5ae82c3132a4
+SIZE (gcc-objc-4.5-20090528.tar.bz2) = 240712
+MD5 (gcc-testsuite-4.5-20090528.tar.bz2) = 6ff1d33ee564b01a995d20f84df991c8
+SHA256 (gcc-testsuite-4.5-20090528.tar.bz2) = ac8684130e2a5784dc1fbae199d33abd83521540e4d3d718208333a8c5f0bcfd
+SIZE (gcc-testsuite-4.5-20090528.tar.bz2) = 5137086
+MD5 (gcc-java-4.5-20090528.tar.bz2) = b47dc129ca77bdecbe4e882489c045fc
+SHA256 (gcc-java-4.5-20090528.tar.bz2) = 8783222ad9d6a0791a2f6e4347f7a92b82601166a3d7e60f8ba837422dbfd177
+SIZE (gcc-java-4.5-20090528.tar.bz2) = 19018452
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 34769d657489..d902b6ab2d2b 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -12,6 +12,13 @@ bin/%%GNU_HOST%%-gcc-%%GCC_VER%%
 bin/%%GNU_HOST%%-gcc%%SUFFIX%%
 bin/%%GNU_HOST%%-gfortran%%SUFFIX%%
 info/gcc%%SUFFIX%%/dir
+share/libstdc++/python/libstdcxx/__init__.py
+share/libstdc++/python/libstdcxx/v6/__init__.py
+share/libstdc++/python/libstdcxx/v6/printers.py
+@dirrm share/libstdc++/python/libstdcxx/v6
+@dirrm share/libstdc++/python/libstdcxx
+@dirrm share/libstdc++/python
+@dirrm share/libstdc++
 %%JAVA%%bin/aot-compile%%SUFFIX%%
 %%JAVA%%bin/gappletviewer%%SUFFIX%%
 %%JAVA%%bin/gc-analyze%%SUFFIX%%