Update to the 2003-11-26 snapshot and fix several packaging issues.

Import significant simplifications of the post-install handling of
GCJ include files from the gcc33 port.  Use the new INFO= facility.

The port is still (marked) broken, but should essentially work out
of the box once the remaining upstream bugs have been fixed.

3 files changed, 17 insertions, 67 deletions

diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 2dd6f40715ba..9ebfa30a7f13 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2003-11-12
+SNAPDATE=	2003-11-26
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
 PORTNAME=	gcc
@@ -41,7 +41,7 @@ NOMANCOMPRESS=	yes	# too hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-BROKEN=		"Building libjava causes an Internal Compiler Error iff built within the ports tree"
+#BROKEN=		"Building libjava causes an Internal Compiler Error iff built within the ports tree"
 
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 
@@ -49,10 +49,6 @@ GCC_VER=	${PORTVERSION:C/\.0$//}
 SRCDIR=		${WRKDIR}/gcc-${VERSIONSTRING}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_VER}
-GCJINC=		${PREFIX}/include/gcj
-GNUINC=		${PREFIX}/include/gnu
-JAVAINC=	${PREFIX}/include/java
-JAVAINC2=	${PREFIX}/include/javax
 PLIST_SUB=	GCC_VER=${GCC_VER} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -82,6 +78,7 @@ MAN1=		cpp34.1 g++34.1 g77-34.1 gcc34.1 gcov34.1 \
 		jcf-dump34.1 jv-scan34.1 jv-convert34.1 \
 		rmic34.1 rmiregistry34.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
+INFO=		cpp cppinternals g77 gcc gccint gcj
 
 .if defined(CVS_DATE)
 NO_CHECKSUM=	yes
@@ -128,17 +125,8 @@ post-build:
 check: build
 	cd ${WRKSRC}; export RUNTESTFLAGS='--target_board ''unix{-pthread}'''; ${GMAKE} -sk check
 
-pre-install:
-	${MKDIR} ${PREFIX}/info
-
 post-install:
 	@${RM} -f ${PREFIX}/bin/c++ ${PREFIX}/bin/${CONFIGURE_TARGET}-c++
-	@(for prog in \
-		${TARGLIB}/cc1 ${TARGLIB}/cc1obj ${TARGLIB}/cc1plus \
-		${TARGLIB}/collect2 ${TARGLIB}/f771 ; \
-	do \
-		${STRIP_CMD} $$prog ; \
-	done )
 .for f in gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	${STRIP_CMD} ${PREFIX}/bin/${f}
 	${MV} -f ${PREFIX}/bin/${f} ${PREFIX}/bin/${f}34
@@ -163,7 +151,7 @@ post-install:
 	-${MV} -f ${PREFIX}/lib/libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
-.for info in cpp cppinternals g77 gcc gccint gcj fastjar
+.for info in cpp cppinternals g77 gcc gccint gcj
 	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
@@ -178,30 +166,15 @@ post-install:
 	    ${FIND} ${TARGLIB:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcc-lib
 	(${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.gcc-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
 	cd ${PREFIX} ;\
-	    ${FIND} ${GCJINC:S/^${PREFIX}\///} -type f -o -type l	\
-	    	>${WRKDIR}/PLIST.gcj-inc
-	cd ${PREFIX} ;\
-	    ${FIND} ${GNUINC:S/^${PREFIX}\///} -type f -o -type l	\
-	    	>>${WRKDIR}/PLIST.gcj-inc
-	cd ${PREFIX} ;\
-	    ${FIND} ${JAVAINC:S/^${PREFIX}\///} -type f -o -type l	\
-	    	>>${WRKDIR}/PLIST.gcj-inc
-	cd ${PREFIX} ;\
-	    ${FIND} ${JAVAINC2:S/^${PREFIX}\///} -type f -o -type l	\
-	    	>>${WRKDIR}/PLIST.gcj-inc
-	cd ${PREFIX} ;\
-	    ${FIND} ${GCJINC:S/^${PREFIX}\///} -type d \
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc
-	cd ${PREFIX} ;\
-	    ${FIND} ${GNUINC:S/^${PREFIX}\///} -type d \
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc
-	cd ${PREFIX} ;\
-	    ${FIND} ${JAVAINC:S/^${PREFIX}\///} -type d \
-	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc
-	cd ${PREFIX} ;\
-	    ${FIND} ${JAVAINC2:S/^${PREFIX}\///} -type d \
+	    ${FIND} ${inc:S/^${PREFIX}\///} -type f -o -type l	\
+	    	>>${WRKDIR}/PLIST.gcj-inc ;\
+	    ${FIND} ${inc:S/^${PREFIX}\///} -type d \
 	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc
+.endfor
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 46072eb180db..bd13e0869173 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-3.4-20031112.tar.bz2) = ddd2582e1e36ae595141359da14a7e01
-MD5 (gcc-g++-3.4-20031112.tar.bz2) = 033b1c1ba2999734f8d958470ad5ae2a
-MD5 (gcc-g77-3.4-20031112.tar.bz2) = 90800cc1f0906a3a21c6fb9592f76c9e
-MD5 (gcc-java-3.4-20031112.tar.bz2) = 21ef7cb3c30c01c38f126d4876c9b21f
-MD5 (gcc-objc-3.4-20031112.tar.bz2) = fa16e047ddd27f31ecd1cd207da0b912
-MD5 (gcc-testsuite-3.4-20031112.tar.bz2) = 35ac46dfff547e03c4bbe8c9091fcc6e
+MD5 (gcc-core-3.4-20031126.tar.bz2) = 1e7312be9f96a68234d734a49a5356f5
+MD5 (gcc-g++-3.4-20031126.tar.bz2) = e942f2fafcdd26fcf57e888dcc0287b2
+MD5 (gcc-g77-3.4-20031126.tar.bz2) = 407374ee87713d547d684d72cb8e0ed9
+MD5 (gcc-java-3.4-20031126.tar.bz2) = 1c2a018d4577fffdf74350d5520166a6
+MD5 (gcc-objc-3.4-20031126.tar.bz2) = 9ba8f817c30bf92d3f22c46eba19c329
+MD5 (gcc-testsuite-3.4-20031126.tar.bz2) = d615c0729e1f166aa1a0c858ada3d8f7
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index fcf222a09837..7544216cd144 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -20,9 +20,7 @@ bin/grepjar34
 bin/rmic34
 bin/rmiregistry34
 bin/addr2name.awk
-include/fficonfig.h
 include/ffi.h
-include/ffi_mips.h
 include/jni.h
 include/jvmpi.h
 lib/libffi.la
@@ -41,24 +39,3 @@ share/java/libgcj-%%GCC_VER%%.jar
 @comment Insert PLIST.gcj-inc here
 @comment -=[ begin PLIST.gcj-inc ]=-
 @comment -=[ end PLIST.gcj-inc ]=-
-@unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/cppinternals.info %D/info/dir
-@unexec install-info --delete %D/info/g77.info %D/info/dir
-@unexec install-info --delete %D/info/gcc.info %D/info/dir
-@unexec install-info --delete %D/info/gccint.info %D/info/dir
-@unexec install-info --delete %D/info/gcj.info %D/info/dir
-@unexec install-info --delete %D/info/fastjar.info %D/info/dir
-info/cpp.info
-info/cppinternals.info
-info/g77.info
-info/gcc.info
-info/gccint.info
-info/gcj.info
-info/fastjar.info
-@exec install-info %D/info/cpp.info %D/info/dir
-@exec install-info %D/info/cppinternals.info %D/info/dir
-@exec install-info %D/info/g77.info %D/info/dir
-@exec install-info %D/info/gcc.info %D/info/dir
-@exec install-info %D/info/gccint.info %D/info/dir
-@exec install-info %D/info/gcj.info %D/info/dir
-@exec install-info %D/info/fastjar.info %D/info/dir