Update to the 20090519 snapshot of GCC 4.4.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.

Make the determination of CONFIGURE_SCRIPT more robust.

Adjust Makefile header; nothing really left from the original.

2 files changed, 28 insertions, 28 deletions

diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 97d7c6761baf..548e2b3732fd 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/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:	gcc44
+# Date created:				2008-03-01
+# Whom:					Gerald Pfeifer <gerald@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	gcc
 PORTVERSION=	4.4.1
-PORTREVISION=	20090512
+PORTREVISION=	20090519
 CATEGORIES=	lang java
 VERSIONSTRING=	4.4-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -29,7 +29,7 @@ DISTFILES+=	gcc-testsuite-${VERSIONSTRING}${EXTRACT_SUFX}
 BUILD_DEPENDS+=	runtest:${PORTSDIR}/misc/dejagnu
 .endif
 
-SUFFIX=		44
+SUFFIX=		${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/}
 LATEST_LINK=	gcc${SUFFIX}${PKGNAMESUFFIX}
 NOT_FOR_ARCHS=	alpha ia64 powerpc
 USE_BISON=	build
@@ -41,7 +41,7 @@ MAKE_JOBS_SAFE=	yes
 WANT_GNOME=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
-CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
+CONFIGURE_SCRIPT=	../${SRCDIR:S/${WRKDIR}\///}/configure
 
 .include <bsd.port.pre.mk>
 
@@ -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/gcc44/distinfo b/lang/gcc44/distinfo
index c47236e9ddea..ad17ae9402f6 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.4-20090512.tar.bz2) = 2f98a92155b1204bed010d63f48bce3a
-SHA256 (gcc-core-4.4-20090512.tar.bz2) = 7db84c54f1d9f581a204352b4ee2cb768cc349c7aa6a2b96385b45fd18c068c8
-SIZE (gcc-core-4.4-20090512.tar.bz2) = 22414751
-MD5 (gcc-fortran-4.4-20090512.tar.bz2) = 162d71e18fb80cb60db75cb32e2d38e1
-SHA256 (gcc-fortran-4.4-20090512.tar.bz2) = 1154e0e468530656ce20a7541fc9213271a72825f5138c21b91d200ab4c785b4
-SIZE (gcc-fortran-4.4-20090512.tar.bz2) = 1298359
-MD5 (gcc-g++-4.4-20090512.tar.bz2) = 3702dad2d7604abc3dc4a3f1176f4491
-SHA256 (gcc-g++-4.4-20090512.tar.bz2) = 470a167b488c38fb159bceb444cc1734929404911eac2891a054f32ee0aa3cfa
-SIZE (gcc-g++-4.4-20090512.tar.bz2) = 5910678
-MD5 (gcc-objc-4.4-20090512.tar.bz2) = ae041e5c9848be6258f0e91dc3181355
-SHA256 (gcc-objc-4.4-20090512.tar.bz2) = f6231f9f05956a658107d850ededf91004a8dcd467412de343844f02e4a5a6f2
-SIZE (gcc-objc-4.4-20090512.tar.bz2) = 239653
-MD5 (gcc-testsuite-4.4-20090512.tar.bz2) = c79ef43b4fd6ff2c99fc5d628f79dfe8
-SHA256 (gcc-testsuite-4.4-20090512.tar.bz2) = 992144c560b47b2b059b311d67f92c8cd0ea3709b0dd96ddf0c08b6318eb4abe
-SIZE (gcc-testsuite-4.4-20090512.tar.bz2) = 5051723
-MD5 (gcc-java-4.4-20090512.tar.bz2) = ae4a3baf7a5dec1dd068c51691901508
-SHA256 (gcc-java-4.4-20090512.tar.bz2) = 1091a1cad5a9717a51ec4850b1fd16aa97db9afcfe061ec482da737795f8d6d6
-SIZE (gcc-java-4.4-20090512.tar.bz2) = 19019530
+MD5 (gcc-core-4.4-20090519.tar.bz2) = bad7074674025035c0443e4043cfb2eb
+SHA256 (gcc-core-4.4-20090519.tar.bz2) = 7f801627ff865d0b40cd3a418641d0b0740b505ba1974047e2a20b89cfa581b8
+SIZE (gcc-core-4.4-20090519.tar.bz2) = 22414965
+MD5 (gcc-fortran-4.4-20090519.tar.bz2) = 3d597a58340850b49c796933bd8e0dc2
+SHA256 (gcc-fortran-4.4-20090519.tar.bz2) = 473779a154c5ab03749bf7e4abf07e0aa26a3712de22286221889558bf9e51ec
+SIZE (gcc-fortran-4.4-20090519.tar.bz2) = 1299203
+MD5 (gcc-g++-4.4-20090519.tar.bz2) = f2aacc2e6545e9ab25def6fe38eea6c8
+SHA256 (gcc-g++-4.4-20090519.tar.bz2) = 177652d43a3caa9a983eab5bc69f889fb878ade9a6e516d4ea76ab313d4646db
+SIZE (gcc-g++-4.4-20090519.tar.bz2) = 5913013
+MD5 (gcc-objc-4.4-20090519.tar.bz2) = 36a1547e2942f0381a57edd6c3f839b8
+SHA256 (gcc-objc-4.4-20090519.tar.bz2) = c4c6552ab573868306e5573f9796764de7f00974ae7dd9685997d87dfefff723
+SIZE (gcc-objc-4.4-20090519.tar.bz2) = 239651
+MD5 (gcc-testsuite-4.4-20090519.tar.bz2) = 8901d4d5cf45fda91412e7805a616df9
+SHA256 (gcc-testsuite-4.4-20090519.tar.bz2) = 1b129575d68dc3729a9848fc46a70bfb4f51622a24dd0ca338694144e1ad30dd
+SIZE (gcc-testsuite-4.4-20090519.tar.bz2) = 5055251
+MD5 (gcc-java-4.4-20090519.tar.bz2) = fe752db53f664fc1abf91791ed24c29c
+SHA256 (gcc-java-4.4-20090519.tar.bz2) = f9d4d992ad9e12df6eacbb5837485808706bfaf42e9346fb6c1deff28b898870
+SIZE (gcc-java-4.4-20090519.tar.bz2) = 19019641