Update to the 20050514 snapshot of GCC 4.0.1.

Add a conflict with the gcc34 port and address portlint warnings.
Simplify the handling of libraries which are not installed in all
configurations and put all 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, 29 insertions, 37 deletions

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 5d3b0d64d78f..62f77cf5bb44 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	4.0.1
-PORTREVISION=	20050507
+PORTREVISION=	20050514
 CATEGORIES=	lang java
 VERSIONSTRING=	4.0-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -23,14 +23,14 @@ DISTFILES=	\
 DISTFILES+=	gcc-fortran-${VERSIONSTRING}${EXTRACT_SUFX}
 .endif
 
-MAINTAINER?=	gerald@FreeBSD.org
-COMMENT?=	GNU Compiler Collection 4.0
+MAINTAINER=	gerald@FreeBSD.org
+COMMENT=	GNU Compiler Collection 4.0
 
 .if defined(WITH_FORTRAN)
 LIB_DEPENDS=	gmp.6:${PORTSDIR}/math/libgmp4
 .endif
 
-CONFLICTS=	gcc-3.3.* gcc-4.1.*
+CONFLICTS=	gcc-3.3.* gcc-3.4.* gcc-4.1.*
 LATEST_LINK?=	gcc40${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -74,7 +74,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
 .endif
@@ -97,13 +97,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 gcc gccinstall gccint gcj fastjar
 
 .if defined(WITHOUT_LIBJAVA)
 CONFIGURE_ARGS+=	--disable-libgcj
 PLIST_SUB+=	LIBJAVA="@comment "
 .else
+EXTRA_LIBS+=	libffi libgcj libgij
 PLIST_SUB+=	LIBJAVA=""
 .endif
 
@@ -151,14 +151,13 @@ post-install: fake-manpages
 .endfor
 	# These libraries are moved from PREFIX/lib to avoid conflicts with
 	# the stock compiler.
-.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_SHLIB}
+.for f in libstdc++ libsupc++ libobjc libmudflap libmudflapth ${EXTRA_LIBS}
 	${MV} -f ${PREFIX}/lib/${f}.* ${TARGLIB}
 .endfor
-	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
-	${RM} -f ${PREFIX}/lib/libiberty.a
-	${RM} -f ${TARGLIB}/*.la
-	${RM} -f ${PREFIX}/lib/lib-org-*.la
-	# Handle target libraries, libexec binaries, 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}\///} ${TARGLIB:S/lib/libexec/g:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ; if [ -d $d ]; then \
@@ -167,15 +166,11 @@ 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} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/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}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/libexec/gcc 2>&1 || true" >> ${TMPPLIST}
 
 cklatest:
 .for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index bafbc791a406..8957028bb73a 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,12 +1,12 @@
-MD5 (gcc-core-4.0-20050507.tar.bz2) = d7f71ba06b60860dd0fa5d92176df8eb
-SIZE (gcc-core-4.0-20050507.tar.bz2) = 13384136
-MD5 (gcc-g++-4.0-20050507.tar.bz2) = 39aae8f0ef2008fcac482d87a18e97f4
-SIZE (gcc-g++-4.0-20050507.tar.bz2) = 2661654
-MD5 (gcc-java-4.0-20050507.tar.bz2) = ab11934ce38b169d7be57488c9941e71
-SIZE (gcc-java-4.0-20050507.tar.bz2) = 5935227
-MD5 (gcc-objc-4.0-20050507.tar.bz2) = 147c743d7a248d17f3dcd1ba32b0864e
-SIZE (gcc-objc-4.0-20050507.tar.bz2) = 177811
-MD5 (gcc-testsuite-4.0-20050507.tar.bz2) = 98f974520b46f39f81cbd3842a52a14c
-SIZE (gcc-testsuite-4.0-20050507.tar.bz2) = 3049856
-MD5 (gcc-fortran-4.0-20050507.tar.bz2) = e0349e0cf44d87895b239aad075bda60
-SIZE (gcc-fortran-4.0-20050507.tar.bz2) = 570367
+MD5 (gcc-core-4.0-20050514.tar.bz2) = d37afa168591baad614bffb4b847246c
+SIZE (gcc-core-4.0-20050514.tar.bz2) = 13388829
+MD5 (gcc-g++-4.0-20050514.tar.bz2) = 6d77385bc9af0a60eb14f24e388a1190
+SIZE (gcc-g++-4.0-20050514.tar.bz2) = 2660580
+MD5 (gcc-java-4.0-20050514.tar.bz2) = 44bdb6b6ad72bf460e57fb036154b82c
+SIZE (gcc-java-4.0-20050514.tar.bz2) = 5936555
+MD5 (gcc-objc-4.0-20050514.tar.bz2) = 40128e001be0330c342ef43ba8528fa2
+SIZE (gcc-objc-4.0-20050514.tar.bz2) = 177819
+MD5 (gcc-testsuite-4.0-20050514.tar.bz2) = d6bff288e5e8d15e1a8fd078d5d1c2cc
+SIZE (gcc-testsuite-4.0-20050514.tar.bz2) = 3052248
+MD5 (gcc-fortran-4.0-20050514.tar.bz2) = 1df83bb3510c2db13ffdea6298db13a8
+SIZE (gcc-fortran-4.0-20050514.tar.bz2) = 571051
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 2a362859e5f6..225b033ca724 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -32,16 +32,13 @@ include/mf-runtime.h
 %%LIBJAVA%%bin/jv-convert40
 %%LIBJAVA%%include/ffi.h
 %%LIBJAVA%%lib/libffi.a
-%%LIBJAVA%%lib/libffi.la
 %%LIBJAVA%%lib/libgij.a
-%%LIBJAVA%%lib/libgij.la
 %%LIBJAVA%%lib/logging.properties
-%%LIBJAVA%%lib/pkgconfig/libgcj.pc
-%%LIBJAVA%%@dirrm lib/pkgconfig
 %%LIBJAVA%%lib/security/classpath.security
 %%LIBJAVA%%lib/security/libgcj.security
 %%LIBJAVA%%@dirrm lib/security
 %%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
+%%LIBJAVA%%libdata/pkgconfig/libgcj.pc
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-