Update to the 20090517 snapshot of GCC 4.3.4.

Extract SUFFIX from PORTVERSION.  Use SUFFIX for TARGLIB (and thus for
the library path used by this port).  Also use SUFFIX for the libexec
directory instead of the full port version and flatten the directory
structure and simplify the logic along the way.

Adjust Makefile header; nothing really left from the original.

2 files changed, 27 insertions, 27 deletions

diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index d88431523f2d..282f0778d7c1 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -1,14 +1,14 @@
 # ex:ts=8
-# Ports collection makefile for:	egcs
-# Date created:				9 Jan 1998
-# Whom:					John Polstra <jdp@polstra.com>
+# Ports collection makefile for:	gcc43
+# Date created:				2006-11-05
+# Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.3.4
-PORTREVISION=	20090510
+PORTREVISION=	20090517
 CATEGORIES=	lang java
 VERSIONSTRING=	4.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -29,7 +29,7 @@ DISTFILES+=	gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-SUFFIX=		43
+SUFFIX=		${PORTVERSION:C/([0-9]).([0-9]).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha ia64 powerpc
 USE_BISON=	build
@@ -57,7 +57,8 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
+TARGLIB=	${PREFIX}/lib/gcc${SUFFIX}
+LIBEXEC=	${PREFIX}/libexec/gcc${SUFFIX}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
@@ -65,6 +66,7 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--with-gmp=${LOCALBASE} \
 		--program-suffix=${SUFFIX} \
 		--libdir=${TARGLIB} \
+		--libexecdir=${LIBEXEC} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/
 MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 ALL_TARGET=	bootstrap-lean
@@ -164,15 +166,13 @@ post-install:
 	${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/gcc/${CONFIGURE_TARGET}/${PORTVERSION} include/gcj include/gnu include/java include/javax
+.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
-	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
-	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index cc98c177d1cb..a6dc2214fb12 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.3-20090510.tar.bz2) = 7c59f79edc2e8af5705fa620086043b4
-SHA256 (gcc-core-4.3-20090510.tar.bz2) = 9e925049b7a1b3f4f459ddcbebc545429c5ab14abd617136ef2aa5b89d174d2b
-SIZE (gcc-core-4.3-20090510.tar.bz2) = 21166096
-MD5 (gcc-fortran-4.3-20090510.tar.bz2) = c717330c69a3bf818527814b83525337
-SHA256 (gcc-fortran-4.3-20090510.tar.bz2) = 846037c8b55dc146e8c9fee4d1a6ea62afff0108cf68d8741f354f29dd15561a
-SIZE (gcc-fortran-4.3-20090510.tar.bz2) = 1152783
-MD5 (gcc-g++-4.3-20090510.tar.bz2) = 6f2d8aee6865bde64d623c269c6d51c0
-SHA256 (gcc-g++-4.3-20090510.tar.bz2) = 378649a981a6d9e4a4c742a0ac56fe59cec7f01827ca5217dac43cf75df09532
-SIZE (gcc-g++-4.3-20090510.tar.bz2) = 5668569
-MD5 (gcc-objc-4.3-20090510.tar.bz2) = 9495161c08465fd5b2f94450d344dc61
-SHA256 (gcc-objc-4.3-20090510.tar.bz2) = 85749464c2d99203343150c93ccdc1e0a40d11a93f209d4e33f9b498394d2439
-SIZE (gcc-objc-4.3-20090510.tar.bz2) = 233368
-MD5 (gcc-testsuite-4.3-20090510.tar.bz2) = 2cb2c8bdaa8bf4773d13bf02044decb8
-SHA256 (gcc-testsuite-4.3-20090510.tar.bz2) = 99cecd278864e0255c43a462e0158084c4c9bde60fae036bc44f0dc243bc8574
-SIZE (gcc-testsuite-4.3-20090510.tar.bz2) = 4616543
-MD5 (gcc-java-4.3-20090510.tar.bz2) = 7b6393596da34d6af240505596423697
-SHA256 (gcc-java-4.3-20090510.tar.bz2) = 23d34db9feb7d26407e2360aac4b26d4b013c8ffc1052e71189caeeb7c0f3a21
-SIZE (gcc-java-4.3-20090510.tar.bz2) = 18091806
+MD5 (gcc-core-4.3-20090517.tar.bz2) = 4abd762dcea66c41fb302aea1938391c
+SHA256 (gcc-core-4.3-20090517.tar.bz2) = d925b07bcef58489ec51e68571052068e85261cb89a1edab3ade6ddf7af0ac01
+SIZE (gcc-core-4.3-20090517.tar.bz2) = 21163943
+MD5 (gcc-fortran-4.3-20090517.tar.bz2) = dd97bcf3abdf850ebfe054b42cdba28b
+SHA256 (gcc-fortran-4.3-20090517.tar.bz2) = 986f532573847bee56537b424ceb8c06274195eab24f868bb6abb7b7d926c0e0
+SIZE (gcc-fortran-4.3-20090517.tar.bz2) = 1152683
+MD5 (gcc-g++-4.3-20090517.tar.bz2) = f5526b5ac90bf67d08902011e08b9cd0
+SHA256 (gcc-g++-4.3-20090517.tar.bz2) = 7ebdb641103e0fe02da09e18e36848a0a4b8cf1ef9f8c595dc5604406d60fb16
+SIZE (gcc-g++-4.3-20090517.tar.bz2) = 5670210
+MD5 (gcc-objc-4.3-20090517.tar.bz2) = 80d6144b2b604846876daeac5acca52d
+SHA256 (gcc-objc-4.3-20090517.tar.bz2) = 05218d75c43cd8d2d759c15396059e84f389785623caf1d8b7227f5148b8d315
+SIZE (gcc-objc-4.3-20090517.tar.bz2) = 233349
+MD5 (gcc-testsuite-4.3-20090517.tar.bz2) = b6b2a7d812aa7ee09b6f1bd42220f153
+SHA256 (gcc-testsuite-4.3-20090517.tar.bz2) = 49456df4e06a52528c6470ddb4568adfee66ee6e131a669955fc88f0e73f440b
+SIZE (gcc-testsuite-4.3-20090517.tar.bz2) = 4617708
+MD5 (gcc-java-4.3-20090517.tar.bz2) = e8226f5a29fdd148bf3060b2584217b2
+SHA256 (gcc-java-4.3-20090517.tar.bz2) = 86be32366277e7467b2a51410c97736518bba1d7c427b346624c546a23f28d40
+SIZE (gcc-java-4.3-20090517.tar.bz2) = 18091067