Update to the 20050513 snapshot of GCC 3.4.4.

Clean up MASTER_SITES.  Add conflicts with the gcc40 and gcc41 ports.
Simplify the handling of libraries which are not installed in all
configurations and put the libgcj libraries in the same directory
as all others, getting rid of the libtool .la archives on the way.
No longer install fsf-funding.7 gfdl.7 gpl.7, remove some cruft from
the post-install target, and simplify generation of the dynamic parts
of the packaging list.

3 files changed, 27 insertions, 42 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 4f96c774731..ecf31c1973c 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -8,11 +8,10 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.4.4
-PORTREVISION=	20050506
+PORTREVISION=	20050513
 CATEGORIES=	lang java
 VERSIONSTRING=	3.4-${PORTREVISION}
-MASTER_SITES=	${MASTER_SITE_GCC} \
-		http://web.inter.NL.net/hcc/Haj.Ten.Brugge/:bc
+MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
 DISTFILES=	\
 		gcc-core-${VERSIONSTRING}${EXTRACT_SUFX} \
@@ -25,8 +24,8 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.4
 
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc34${PKGNAMESUFFIX}
-
 USE_BISON=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -68,7 +67,7 @@ MAKE_ARGS+=	MAKEINFOFLAGS="--no-split"
 CONFIGURE_ARGS+=	--enable-shared
 INSTALLS_SHLIB=	yes
 LDCONFIG_DIRS=	%%PREFIX%%/lib ${TARGLIB}
-EXTRA_SHLIB=	libgcc_s
+EXTRA_LIBS=	libgcc_s
 .else
 CONFIGURE_ARGS+=	--disable-shared
 .if ${OSVERSION} < 500000 && ${ARCH} == alpha
@@ -90,13 +89,13 @@ MAN1=		cpp${SUFFIX}.1 \
 		jcf-dump${SUFFIX}.1 \
 		jv-scan${SUFFIX}.1 jv-convert${SUFFIX}.1 \
 		rmic${SUFFIX}.1 rmiregistry${SUFFIX}.1
-MAN7=		fsf-funding.7 gfdl.7 gpl.7
 INFO=		cpp cppinternals g77 gcc gccinstall gccint gcj fastjar
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
+EXTRA_LIBS+=	lib-org-xml-sax lib-org-w3c-dom libffi libgcj
 PLIST_SUB+=	LIBJAVA=""
 .endif
 
@@ -135,17 +134,16 @@ post-install: fake-manpages
 	fi
 .endfor
 	${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX}
-	-${MV} -f ${PREFIX}/man/man1/g77${SUFFIX}.1 ${PREFIX}/man/man1/g77-${SUFFIX}.1
+	${MV} -f ${PREFIX}/man/man1/g77${SUFFIX}.1 ${PREFIX}/man/man1/g77-${SUFFIX}.1
 	# These libraries are moved from PREFIX/lib to avoid conflicts with
 	# the stock compiler.
-.for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_SHLIB}
+.for f in libstdc++ libsupc++ libg2c libfrtbegin libobjc ${EXTRA_LIBS}
 	${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
 .endfor
-	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
-	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
-	${RM} -f ${PREFIX}/lib/libiberty.a
-	${RM} -f ${TARGLIB}/*.la
-	# Handle target libraries and GCJ include files.
+	${RM} -f ${PREFIX}/lib/libiberty.a ${TARGLIB}/*.la
+	${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \
+	         ${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}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
@@ -154,14 +152,9 @@ post-install: fake-manpages
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
-	(${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true") >> ${WRKDIR}/PLIST.lib
-	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
-	${ECHO_CMD} "/Insert PLIST.lib"		>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "r ${WRKDIR}/PLIST.lib"	>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
-	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre
-	cd ${WRKDIR} ; ex < ex.script
+	${CAT} ${WRKDIR}/PLIST.lib >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc 2>&1 || true" >> ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 8c437b7eb6e..2ca067c349a 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-3.4-20050506.tar.bz2) = b345d889ff26afff1567501fdfa91161
-SIZE (gcc-core-3.4-20050506.tar.bz2) = 10986449
-MD5 (gcc-g++-3.4-20050506.tar.bz2) = f52ebbd14317f36e1c0bb3298cb7115d
-SIZE (gcc-g++-3.4-20050506.tar.bz2) = 2483545
-MD5 (gcc-g77-3.4-20050506.tar.bz2) = 97cf79575e8f174740b29896a33b6f91
-SIZE (gcc-g77-3.4-20050506.tar.bz2) = 892398
-MD5 (gcc-java-3.4-20050506.tar.bz2) = d8d04d72333ff1dc1e655093cdf1ec94
-SIZE (gcc-java-3.4-20050506.tar.bz2) = 4549739
-MD5 (gcc-objc-3.4-20050506.tar.bz2) = f55c107b49afd47c2af2327f89a853bb
-SIZE (gcc-objc-3.4-20050506.tar.bz2) = 148683
-MD5 (gcc-testsuite-3.4-20050506.tar.bz2) = 50c873b07a9cdda873269e523375ff55
-SIZE (gcc-testsuite-3.4-20050506.tar.bz2) = 2638398
+MD5 (gcc-core-3.4-20050513.tar.bz2) = a2f6c2acbb4dbbb11084eb9632fabd30
+SIZE (gcc-core-3.4-20050513.tar.bz2) = 10986830
+MD5 (gcc-g++-3.4-20050513.tar.bz2) = 22690336450f6a2a2674c889ff76e4d8
+SIZE (gcc-g++-3.4-20050513.tar.bz2) = 2483765
+MD5 (gcc-g77-3.4-20050513.tar.bz2) = 2ea7ac6453223ae8903e34bff3ad0dc7
+SIZE (gcc-g77-3.4-20050513.tar.bz2) = 892613
+MD5 (gcc-java-3.4-20050513.tar.bz2) = b05780eea80a144dad9ceba46eea1eb9
+SIZE (gcc-java-3.4-20050513.tar.bz2) = 4550176
+MD5 (gcc-objc-3.4-20050513.tar.bz2) = c44fc5be1f62938be4554b826e44fa4b
+SIZE (gcc-objc-3.4-20050513.tar.bz2) = 148691
+MD5 (gcc-testsuite-3.4-20050513.tar.bz2) = d4cc86112ad3213939ee496d736ea7af
+SIZE (gcc-testsuite-3.4-20050513.tar.bz2) = 2638064
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index e88e3d3cc27..833e7021948 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -26,17 +26,11 @@ bin/grepjar34
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%include/jni.h
 %%LIBJAVA%%include/jvmpi.h
-%%LIBJAVA%%lib/libffi.la
-%%LIBJAVA%%lib/libffi.a
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
-%%LIBJAVA%%lib/lib-org-xml-sax.la
-%%LIBJAVA%%lib/lib-org-xml-sax.a
-%%LIBJAVA%%lib/lib-org-w3c-dom.la
-%%LIBJAVA%%lib/lib-org-w3c-dom.a
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/cc1plus
 libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/f771
@@ -54,5 +48,3 @@ libexec/gcc/%%GNU_HOST%%/%%GCC_VER%%/install-tools/mkheaders
 @unexec rmdir %D/libdata/pkgconfig 2>/dev/null || true
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
-@comment -=[ begin PLIST.lib ]=-
-@comment -=[ end PLIST.lib ]=-