Update to the 2004-01-07 snapshot of GCC 3.4. Merge in my 2004-01-05

changes which combine and simplify the post-install handling of target
libraries and GCJ include files and my 2003-12-14 change which simplifies
handling of .info files from the lang/gcc33 port.

3 files changed, 13 insertions, 28 deletions

diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 364ac5ba9453..92e7aa4917fd 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2003-12-31
+SNAPDATE=	2004-01-07
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
@@ -153,37 +153,25 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-.for info in ${INFO}
-	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir
-.endfor
 # I am sick and tired of the anonyance that man pages can only be generated if
 # perl 5.6 is installed.  This is becoming a royal PITA on non-5-CURRENT systems
 .for mp in ${_MANPAGES}
 	( ${TEST} -e ${mp} || ${TOUCH} ${TOUCH_FLAGS} ${mp} )
 .endfor
-	cd ${PREFIX} ;\
-	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type f -o -type l	\
-	    	>${WRKDIR}/PLIST.lib
-	cd ${PREFIX} ;\
-	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib
-	(${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
-	# Handle GCJ include files.
-	${RM} -f ${WRKDIR}/PLIST.gcj-inc
-.for inc in ${PREFIX}/include/gcj ${PREFIX}/include/gnu ${PREFIX}/include/java ${PREFIX}/include/javax
+	# Handle target libraries and GCJ include files.
+	${RM} -f ${WRKDIR}/PLIST.lib
+.for inc in ${TARGLIB} include/gcj include/gnu include/java include/javax
 	cd ${PREFIX} ;\
 	    ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l	\
-	    	>>${WRKDIR}/PLIST.gcj-inc ;\
+	    	>>${WRKDIR}/PLIST.lib ;\
 	    ${FIND} ${inc:S/^${PREFIX}\///} -type d \
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib
 .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} "/Insert PLIST.gcj-inc"	>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
-	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcj-inc"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "x!"			>> ${WRKDIR}/ex.script
 	${CP} -p ${TMPPLIST} ${TMPPLIST}.pre
 	cd ${WRKDIR} ; ex < ex.script
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 745c2ba4f8c5..35f240627d81 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-3.4-20031231.tar.bz2) = 615f3a8df9fbe35a9fa171e16fca3f07
-MD5 (gcc-g++-3.4-20031231.tar.bz2) = f3efb6c41e0f792d5b1fa3af4a33214b
-MD5 (gcc-g77-3.4-20031231.tar.bz2) = 242a7b36b70b9a759cf5ed276ce3a3be
-MD5 (gcc-java-3.4-20031231.tar.bz2) = 6e5def364fc52b57e39d4a73c32659e3
-MD5 (gcc-objc-3.4-20031231.tar.bz2) = 1b8977b0e7074118bf715285a313d594
-MD5 (gcc-testsuite-3.4-20031231.tar.bz2) = 4f5819e3787418fd0550b4b16ceb9f3e
+MD5 (gcc-core-3.4-20040107.tar.bz2) = 2de4606dde0d9dfafb96ab271e028081
+MD5 (gcc-g++-3.4-20040107.tar.bz2) = 5210c6e084b0e1bd9f02d4b012d936f8
+MD5 (gcc-g77-3.4-20040107.tar.bz2) = c30706a558bc88ca16f2c45b1b3eb244
+MD5 (gcc-java-3.4-20040107.tar.bz2) = ece8ad9079c75347516cfb9159543833
+MD5 (gcc-objc-3.4-20040107.tar.bz2) = c9d9d241639a883cf214756f08198452
+MD5 (gcc-testsuite-3.4-20040107.tar.bz2) = cff08732e9a7833c4461990eb68034f7
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 63ed478b829e..0119d6a05859 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -52,6 +52,3 @@ share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.lib here
 @comment -=[ begin PLIST.lib ]=-
 @comment -=[ end PLIST.lib ]=-
-@comment Insert PLIST.gcj-inc here
-@comment -=[ begin PLIST.gcj-inc ]=-
-@comment -=[ end PLIST.gcj-inc ]=-