Update to the 20050511 snapshot of GCC 3.3.6.

Add conflicts with the gcc40 and gcc41 ports, due to the .info files.
Simplify the handling of libraries which are not installed in all
configurations.
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, 26 insertions, 33 deletions

diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 606f13a..158beec 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	gcc
 PORTVERSION=	3.3.6
-PORTREVISION=	20050427
+PORTREVISION=	20050511
 CATEGORIES=	lang
 VERSIONSTRING=	3.3-${PORTREVISION}
 MASTER_SITES=	${MASTER_SITE_GCC}
@@ -23,6 +23,7 @@ DISTFILES=	\
 MAINTAINER?=	gerald@FreeBSD.org
 COMMENT?=	GNU Compiler Collection 3.3
 
+CONFLICTS=	gcc-4.0.* gcc-4.1.*
 LATEST_LINK?=	gcc33${PKGNAMESUFFIX}
 USE_BISON=	yes
 USE_BZIP2=	yes
@@ -47,7 +48,6 @@ SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 SUFFIX=		33
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${PORTVERSION}
-PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-nls \
 		--with-system-zlib \
@@ -59,17 +59,17 @@ 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
 ALL_TARGET=	bootstrap-lean
+PLIST_SUB=	GCC_VER=${PORTVERSION} GNU_HOST=${CONFIGURE_TARGET}
 MAN1=		cpp${SUFFIX}.1 \
 		g++${SUFFIX}.1 \
 		g77-${SUFFIX}.1 \
 		gcc${SUFFIX}.1 \
 		gcov${SUFFIX}.1
-MAN7=		fsf-funding.7 gfdl.7 gpl.7
 INFO=		cpp cppinternals g77 gcc gccint
 
 pre-everything::
@@ -86,7 +86,7 @@ pre-configure:
 	@${MKDIR} ${CONFIGURE_WRKSRC}
 
 post-build:
-	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially
+	@${ECHO_MSG} "Consider running 'make check' before 'make install', especially"
 	@${ECHO_MSG} "if you have not performed this build on -STABLE or -CURRENT."
 	@${ECHO_MSG} "This assumes that you have the dejagnu port installed."
 
@@ -111,16 +111,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}
-	${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/gnu
 	cd ${PREFIX} ; if [ -d $d ]; then \
@@ -129,18 +129,13 @@ post-install: fake-manpages
 	        | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\
 	fi
 .endfor
-	(${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib/${CONFIGURE_TARGET} 2>&1 || true" ; ${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib 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-lib/${CONFIGURE_TARGET} 2>&1 || true" >> ${TMPPLIST}
+	${ECHO_CMD} "@unexec ${RMDIR} %D/lib/gcc-lib 2>&1 || true" >> ${TMPPLIST}
 
 cklatest:
-.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/                                   ftp://mirrors.rcn.net/mirrors/sources.redhat.com/gcc/snapshots/
-	@-ncftpls ${SITE} | ${GREP} 'LATEST.*3\.3'
+.for SITE in ftp://gcc.gnu.org/pub/gcc/snapshots/
+	@-ncftpls -l ${SITE} | ${GREP} 'LATEST.*3\.3'
 .endfor
 
 .include <bsd.port.post.mk>
diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo
index 5e31122..cf8e062 100644
--- a/lang/gcc33/distinfo
+++ b/lang/gcc33/distinfo
@@ -1,10 +1,10 @@
-MD5 (gcc-core-3.3-20050427.tar.bz2) = 595e9569314ab1907b31f34530db1fa5
-SIZE (gcc-core-3.3-20050427.tar.bz2) = 10125972
-MD5 (gcc-g++-3.3-20050427.tar.bz2) = 3830aff11dabf751beed52148f15141f
-SIZE (gcc-g++-3.3-20050427.tar.bz2) = 2011830
-MD5 (gcc-g77-3.3-20050427.tar.bz2) = 5e91f01e7fe0bfd19d7e205b8b4233d1
-SIZE (gcc-g77-3.3-20050427.tar.bz2) = 904938
-MD5 (gcc-objc-3.3-20050427.tar.bz2) = 36f0c7a031d4f028ed43af588cd85bd5
-SIZE (gcc-objc-3.3-20050427.tar.bz2) = 141220
-MD5 (gcc-testsuite-3.3-20050427.tar.bz2) = 6421517d6855448f1fa9f26e8dd7bed0
-SIZE (gcc-testsuite-3.3-20050427.tar.bz2) = 1085831
+MD5 (gcc-core-3.3-20050511.tar.bz2) = fb6c886b0191cdc154a7d980dbbd0bed
+SIZE (gcc-core-3.3-20050511.tar.bz2) = 10222834
+MD5 (gcc-g++-3.3-20050511.tar.bz2) = 10d06bca0d5c1391c74a009e9155f89d
+SIZE (gcc-g++-3.3-20050511.tar.bz2) = 2013200
+MD5 (gcc-g77-3.3-20050511.tar.bz2) = c11fbeca81e65eedffa881567d86eb84
+SIZE (gcc-g77-3.3-20050511.tar.bz2) = 905414
+MD5 (gcc-objc-3.3-20050511.tar.bz2) = d4f96ab4e26e803882466f78e98f0a6c
+SIZE (gcc-objc-3.3-20050511.tar.bz2) = 141211
+MD5 (gcc-testsuite-3.3-20050511.tar.bz2) = 7c6214960ed9c046c00245f0e0459c58
+SIZE (gcc-testsuite-3.3-20050511.tar.bz2) = 1085924
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index 6b29af5..a7d457f 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -11,5 +11,3 @@ bin/%%GNU_HOST%%-gcc33
 bin/%%GNU_HOST%%-g++33
 bin/gccbug33
 @comment Insert PLIST.lib here
-@comment -=[ begin PLIST.lib ]=-
-@comment -=[ end PLIST.lib ]=-