Update to the 20090514 snapshot of GCC 4.5.0.

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.

Tinder-tested by:	itetcu@

2 files changed, 24 insertions, 24 deletions

diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index c5a868ea3378..d1cb6af845f4 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.5.0
-PORTREVISION=	20090507
+PORTREVISION=	20090514
 CATEGORIES=	lang java
 VERSIONSTRING=	4.5-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -29,7 +29,7 @@ DISTFILES+=	gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-SUFFIX=		45
+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
@@ -167,15 +169,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/gcc46/distinfo b/lang/gcc46/distinfo
index faf03ca7ca69..9ef2334aa23b 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.5-20090507.tar.bz2) = e77c8782eebf508f572983dd68a650c1
-SHA256 (gcc-core-4.5-20090507.tar.bz2) = 0fef211bb90e20f83db93af9a30ae7d5675d0b854d098ce7412a6bdd71a505b3
-SIZE (gcc-core-4.5-20090507.tar.bz2) = 22428771
-MD5 (gcc-fortran-4.5-20090507.tar.bz2) = e0882b8bbc5212ecaf1601a98f339cb2
-SHA256 (gcc-fortran-4.5-20090507.tar.bz2) = f450526f2f65673268a50a184d5c497826e88676e7f084c639bd02a321de81a2
-SIZE (gcc-fortran-4.5-20090507.tar.bz2) = 1327679
-MD5 (gcc-g++-4.5-20090507.tar.bz2) = 3c0849469940d64610382f5c3f1c20f2
-SHA256 (gcc-g++-4.5-20090507.tar.bz2) = 374538dbf860240ab28f4e030ce8a2fd9f3f238584f4b1fe872a5b959aea5b1c
-SIZE (gcc-g++-4.5-20090507.tar.bz2) = 5971249
-MD5 (gcc-objc-4.5-20090507.tar.bz2) = 67c3a9d73c7331e2d50891f65da44d7a
-SHA256 (gcc-objc-4.5-20090507.tar.bz2) = 16fad88e0a04286b55bc32ce735dd7303547b35133905d7494839477f06fd532
-SIZE (gcc-objc-4.5-20090507.tar.bz2) = 239822
-MD5 (gcc-testsuite-4.5-20090507.tar.bz2) = 94fca461269bac59acbe33f297f714cb
-SHA256 (gcc-testsuite-4.5-20090507.tar.bz2) = 8555e87f9df1a94755d2eab2a0b52694c7ee66c4c901bf11162c5919e42a2605
-SIZE (gcc-testsuite-4.5-20090507.tar.bz2) = 5116068
-MD5 (gcc-java-4.5-20090507.tar.bz2) = 97a4c87053c9d1410a3dbc15835fa9e1
-SHA256 (gcc-java-4.5-20090507.tar.bz2) = 9c6167a89b0f406c45e1a9718763f94215e1d604106cbe69fbf2e92640934378
-SIZE (gcc-java-4.5-20090507.tar.bz2) = 19016293
+MD5 (gcc-core-4.5-20090514.tar.bz2) = 64be4aa197f6e704d092d20e293388ed
+SHA256 (gcc-core-4.5-20090514.tar.bz2) = d1dc606c716dcbae8c534fc29f765bef86dada32fcff8b5be7c9ebbe025562ad
+SIZE (gcc-core-4.5-20090514.tar.bz2) = 22435870
+MD5 (gcc-fortran-4.5-20090514.tar.bz2) = e4340ab2551bae00f7042577cace8fd0
+SHA256 (gcc-fortran-4.5-20090514.tar.bz2) = 75d87bd85fe17567c485f9123015ab760c726a8d7b5e1e8e58abc6fd0448e5aa
+SIZE (gcc-fortran-4.5-20090514.tar.bz2) = 1331419
+MD5 (gcc-g++-4.5-20090514.tar.bz2) = c6024a50db57dc68b28fa980f814348f
+SHA256 (gcc-g++-4.5-20090514.tar.bz2) = ce37b9449bf22198b7f2166b15587f6c5ef43acdfb56c84d20a984dc83b038e4
+SIZE (gcc-g++-4.5-20090514.tar.bz2) = 5970174
+MD5 (gcc-objc-4.5-20090514.tar.bz2) = c4f0607c781b636d001b9798364a1028
+SHA256 (gcc-objc-4.5-20090514.tar.bz2) = e98b54e255a455680416da256b1f4182ecee3b3eb46aa58fe16deda3adfb444d
+SIZE (gcc-objc-4.5-20090514.tar.bz2) = 240172
+MD5 (gcc-testsuite-4.5-20090514.tar.bz2) = 177caf7dcbeed6f880132498f0a42b4d
+SHA256 (gcc-testsuite-4.5-20090514.tar.bz2) = 9a523da815c9509c632a2839316dd4980ab1ec81ae3009e82176c9f7a8f52056
+SIZE (gcc-testsuite-4.5-20090514.tar.bz2) = 5133587
+MD5 (gcc-java-4.5-20090514.tar.bz2) = 7bedaa8b521000d26df4581bb635509a
+SHA256 (gcc-java-4.5-20090514.tar.bz2) = 83e28c85bfbe3215ef43e40022a7f4becb39e3cccf6803422fe8f677eeaad547
+SIZE (gcc-java-4.5-20090514.tar.bz2) = 19020112