Update to the 20060707 snapshot of GCC 4.1.2.

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/gcc41/Makefile b/lang/gcc41/Makefile
index eae94d7eac90..435602836a00 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.1.2
-PORTREVISION=	20060630
+PORTREVISION=	20060707
 CATEGORIES=	lang java
 VERSIONSTRING=	4.1-${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
@@ -162,15 +161,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/gcc41/distinfo b/lang/gcc41/distinfo
index ea3bf15a3931..0b4abafec404 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,18 +1,18 @@
-MD5 (gcc-core-4.1-20060630.tar.bz2) = a5aa82bbb305c156b2c8355869dbd197
-SHA256 (gcc-core-4.1-20060630.tar.bz2) = 5a798b1436f8607a1286bdf1acbe66bca8dbb451cb0bfd07cc2b8a53a4958588
-SIZE (gcc-core-4.1-20060630.tar.bz2) = 14946596
-MD5 (gcc-g++-4.1-20060630.tar.bz2) = 8f885a50a8d0baa9ed2a7d3f064328b3
-SHA256 (gcc-g++-4.1-20060630.tar.bz2) = e1a28359ac3896b1d9fb1e083e7026d7dc7f3ff4029d7a8175e455e6df2830a7
-SIZE (gcc-g++-4.1-20060630.tar.bz2) = 3829608
-MD5 (gcc-objc-4.1-20060630.tar.bz2) = 1f43e60c82083d2e4859c27e63354250
-SHA256 (gcc-objc-4.1-20060630.tar.bz2) = b2dca19ef3409b7328d4d0a34269c2ca0f334fc8a2d861250d2ea47ef4cec5fe
-SIZE (gcc-objc-4.1-20060630.tar.bz2) = 191014
-MD5 (gcc-testsuite-4.1-20060630.tar.bz2) = d0ae5bc6c6f7ee2b5476721a93490658
-SHA256 (gcc-testsuite-4.1-20060630.tar.bz2) = cb0942d61c2f863ee5c7063bee25bf75d692181111d84fb64d0e7cf61faf8773
-SIZE (gcc-testsuite-4.1-20060630.tar.bz2) = 3566718
-MD5 (gcc-fortran-4.1-20060630.tar.bz2) = 28c32037d4b83ee3f474a16cb9361732
-SHA256 (gcc-fortran-4.1-20060630.tar.bz2) = 6b15481d9c83ed4a0bbf5a5293a0dc1ddede535b0957b5ac19b84d611f1de237
-SIZE (gcc-fortran-4.1-20060630.tar.bz2) = 774308
-MD5 (gcc-java-4.1-20060630.tar.bz2) = bdda2baa3dbe45f31a9d0d13708b6840
-SHA256 (gcc-java-4.1-20060630.tar.bz2) = 68d9545d4fd71eb9740a4ed4a15d8157d7aefb969be6c236d785198c020f7206
-SIZE (gcc-java-4.1-20060630.tar.bz2) = 9085919
+MD5 (gcc-core-4.1-20060707.tar.bz2) = fb5ccd3e0c2acfc6d8a59527d9a8b8c2
+SHA256 (gcc-core-4.1-20060707.tar.bz2) = a3704d03ccfff7020ffcc0e7c0b68ef3e5817f56a953a7b8990cb054328d7b1b
+SIZE (gcc-core-4.1-20060707.tar.bz2) = 14949779
+MD5 (gcc-g++-4.1-20060707.tar.bz2) = e4cd677ddcef7e5b4e97612564a4108c
+SHA256 (gcc-g++-4.1-20060707.tar.bz2) = 5c6c583cac023828c376dd80982f20c8704c96275a8c3acb4a8183b7c4cabf21
+SIZE (gcc-g++-4.1-20060707.tar.bz2) = 3829624
+MD5 (gcc-objc-4.1-20060707.tar.bz2) = 0ca5b80a7cbcf8388b488337c86cd42e
+SHA256 (gcc-objc-4.1-20060707.tar.bz2) = 60603354d1d736e803725052196de537a8a998e3b245904ea4d5a9ca322905d7
+SIZE (gcc-objc-4.1-20060707.tar.bz2) = 190940
+MD5 (gcc-testsuite-4.1-20060707.tar.bz2) = 9b68f40293ead5728e4d9ebf9f230823
+SHA256 (gcc-testsuite-4.1-20060707.tar.bz2) = 0c1bab78918c5bac4052b8a4b5fa497f2e9717c65c038cc85b748e5c1b1bf9f4
+SIZE (gcc-testsuite-4.1-20060707.tar.bz2) = 3565144
+MD5 (gcc-fortran-4.1-20060707.tar.bz2) = 5741405c33172590cdc6e4f3858c8327
+SHA256 (gcc-fortran-4.1-20060707.tar.bz2) = a76d8374478c37a53187aba40f4a666debb7f86297c365515217e098b1648393
+SIZE (gcc-fortran-4.1-20060707.tar.bz2) = 780113
+MD5 (gcc-java-4.1-20060707.tar.bz2) = 9e81a75f53b88fde1a88fc15d531e950
+SHA256 (gcc-java-4.1-20060707.tar.bz2) = 54bfd31de85ddc79ebe886a8005cbe89b64604728e841d3ab6523d93ec4f7a3b
+SIZE (gcc-java-4.1-20060707.tar.bz2) = 9085706