Update to the 20060708 snapshot of GCC 4.2.0.

Simplify the subdirectory we use for GCC-specific libraries and include
files from gcc/${CONFIGURE_TARGET}/${PORTVERSION} to gcc-${PORTVERSION}.

Remove the hack to set RANLIB=: now that this has been addressed upstream.

2 files changed, 21 insertions, 24 deletions

diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 71913421c596..578cc082b42c 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.2.0
-PORTREVISION=	20060701
+PORTREVISION=	20060708
 CATEGORIES=	lang java
 VERSIONSTRING=	4.2-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -56,7 +56,7 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
-TARGLIB=	${PREFIX}/lib/gcc/${CONFIGURE_TARGET}/${PORTVERSION}
+TARGLIB=	${PREFIX}/lib/gcc-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--disable-nls \
 		--with-system-zlib \
@@ -65,7 +65,6 @@ CONFIGURE_ARGS+=	--disable-nls \
 		--libdir=${TARGLIB} \
 		--with-gxx-include-dir=${TARGLIB}/include/c++/ \
 		--infodir=${PREFIX}/${INFO_PATH}/gcc${SUFFIX}
-CONFIGURE_ENV=	RANLIB=:
 .if defined(WITH_JAVA_AWT)
 CONFIGURE_ARGS+=	--enable-java-awt=xlib,gtk
 .endif
@@ -160,15 +159,13 @@ post-install:
 	         ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7
 	# Add target libraries and include files to packaging list.
 	${RM} -f ${WRKDIR}/PLIST.lib
-.for d in ${TARGLIB:S/^${PREFIX}\///} ${TARGLIB:S/^${PREFIX}\///:S/lib/libexec/} include/gcj include/gnu include/java include/javax
+.for d in ${TARGLIB:S/^${PREFIX}\///} libexec/gcc/${CONFIGURE_TARGET}/${PORTVERSION} 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/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${WRKDIR}/PLIST.lib
-	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${WRKDIR}/PLIST.lib
 	${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}
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index b9c2624a6d28..e8a12f4ba792 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.2-20060701.tar.bz2) = 6fc6a69b3225b89dba0de2c75bd6ea61
-SHA256 (gcc-core-4.2-20060701.tar.bz2) = ef18f96a8613b3567cc9bbc3f5ffe6c742f6ba7941681daa80c359646d3b15bd
-SIZE (gcc-core-4.2-20060701.tar.bz2) = 15658701
-MD5 (gcc-g++-4.2-20060701.tar.bz2) = 9d865893db9f299d3464554e568f4058
-SHA256 (gcc-g++-4.2-20060701.tar.bz2) = 49e7d95666d6d9ee4ca0c0c361a5b250c5100f5b84358bc80d5e350bbccab102
-SIZE (gcc-g++-4.2-20060701.tar.bz2) = 4720846
-MD5 (gcc-objc-4.2-20060701.tar.bz2) = 284a064e3b8f0aff5ec125675703fd13
-SHA256 (gcc-objc-4.2-20060701.tar.bz2) = cb8a88938c73fee62e2ef94b49f09ff674bdd945618df5c69ddce342d19b9976
-SIZE (gcc-objc-4.2-20060701.tar.bz2) = 191844
-MD5 (gcc-testsuite-4.2-20060701.tar.bz2) = 3c1738797c38faff79d84b0c8f5f9920
-SHA256 (gcc-testsuite-4.2-20060701.tar.bz2) = bcc3c6d873ed49339fda3ae5f023f4f3e47fb6c0a75ca3bfea9ae9e63a46405e
-SIZE (gcc-testsuite-4.2-20060701.tar.bz2) = 3707137
-MD5 (gcc-fortran-4.2-20060701.tar.bz2) = c042e3e6b0a5733a6c62caf5ac77d1bc
-SHA256 (gcc-fortran-4.2-20060701.tar.bz2) = d7e22da8485e901eb93972a41d65a28e58be9f927e9d949bef49ebbccf8ea0ec
-SIZE (gcc-fortran-4.2-20060701.tar.bz2) = 820307
-MD5 (gcc-java-4.2-20060701.tar.bz2) = 0bd3fae27a03377f28940d4c6fda359d
-SHA256 (gcc-java-4.2-20060701.tar.bz2) = f8ee9e79e437a141b1a3b7bdea4efa6402e4d0ab908eefa888d44fbf566564f3
-SIZE (gcc-java-4.2-20060701.tar.bz2) = 10042684
+MD5 (gcc-core-4.2-20060708.tar.bz2) = 057a52dd45cdee9373b2f16089f2389e
+SHA256 (gcc-core-4.2-20060708.tar.bz2) = 2c1c515b46901d8530b1c1dfc36fa9251550365f355419f879f47fa5138e603a
+SIZE (gcc-core-4.2-20060708.tar.bz2) = 15668856
+MD5 (gcc-g++-4.2-20060708.tar.bz2) = 100deff5c9a9f076341b4c0fdfad1124
+SHA256 (gcc-g++-4.2-20060708.tar.bz2) = d97e7ffbb488c0c8e2ed7d82bdd83a9c1c70eb8b380c61ad3e00bc65c3366aa3
+SIZE (gcc-g++-4.2-20060708.tar.bz2) = 4724949
+MD5 (gcc-objc-4.2-20060708.tar.bz2) = 3ab052bf14c8fa43a027b68fd6d863e0
+SHA256 (gcc-objc-4.2-20060708.tar.bz2) = 408035afb3ef0cbd2d7654e91f18c3fc5f1904a6ccb8543a9e3d8b190a137de3
+SIZE (gcc-objc-4.2-20060708.tar.bz2) = 191854
+MD5 (gcc-testsuite-4.2-20060708.tar.bz2) = d06c99bab37357dabe2ee1653cc013fe
+SHA256 (gcc-testsuite-4.2-20060708.tar.bz2) = d9f0df1fbe69800841f5f684240ac0384ed7e22f02bf86755197cb165d1b971a
+SIZE (gcc-testsuite-4.2-20060708.tar.bz2) = 3707677
+MD5 (gcc-fortran-4.2-20060708.tar.bz2) = 9ef7883522a37f48dab634f89f49ca6e
+SHA256 (gcc-fortran-4.2-20060708.tar.bz2) = 71fa245e904759ee925d566f2089153ab4b9143fdadbf929b6b66ce53b02173e
+SIZE (gcc-fortran-4.2-20060708.tar.bz2) = 822086
+MD5 (gcc-java-4.2-20060708.tar.bz2) = 5738ad2c137c52b5f285eef7112f5f4f
+SHA256 (gcc-java-4.2-20060708.tar.bz2) = 122d59462df54470e31d73ad4bd47394dceda36a6f6d4c4056c51aaeb39356cc
+SIZE (gcc-java-4.2-20060708.tar.bz2) = 10045751