3 files changed, 60 insertions, 18 deletions

diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index d5338d9ba323..76e58eddcdff 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-10-14
+SNAPDATE=	2003-03-24
 SNAPVER=	${SNAPDATE:S/-//g}
 #CVS_DATE=	${SNAPDATE} 18:53:04 EDT
 
@@ -25,9 +25,6 @@ DISTFILES=	\
 		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
 .endif
 
-PATCH_SITES=	ftp://relay.nuxi.com/obrien/
-PATCHFILES=	port_gcc33_${SNAPDATE}.diff
-
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GNU Compiler Collection 3.3 (inprogress version)
 
@@ -35,6 +32,7 @@ NO_CDROM=	'dated material'
 LATEST_LINK=	gcc33
 
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 
 PATCH_WRKSRC=	${SRCDIR}
 CONFIGURE_SCRIPT=	../${SRCDIR:C/${WRKDIR}//}/configure
@@ -48,12 +46,15 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
-#GCC_REV=	${PORTVERSION:C/\.0$//}
-GCC_REV=	3.3
+GCC_REV=	${PORTVERSION:C/\.0$//}
 #SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
 SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
+GCJINC=		${PREFIX}/include/gcj
+GNUINC=		${PREFIX}/include/gnu
+JAVAINC=	${PREFIX}/include/java
+JAVAINC2=	${PREFIX}/include/javax
 PLIST_SUB=	GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}  \
 		SNAPVER=${SNAPVER}
 GNU_CONFIGURE=	yes
@@ -79,8 +80,8 @@ CONFIGURE_ARGS+= --enable-threads=posix
 .endif
 ALL_TARGET=	bootstrap
 MAN1=		cpp33.1 g++33.1 g77-33.1 gcc33.1 gcov33.1 \
-		gcj33.1 gcjh33.1 gij.1 grepjar33.1 jar33.1 \
-		jcf-dump33.1 jv-scan33.1 jv-convert.1
+		gcj33.1 gcjh33.1 gij33.1 grepjar33.1 jar33.1 \
+		jcf-dump33.1 jv-scan33.1 jv-convert33.1
 MAN7=		fsf-funding.7 gfdl.7 gpl.7
 
 pre-fetch:
@@ -108,15 +109,19 @@ do-fetch:
 		${ECHO_MSG} ">> Please try again later."; \
 		exit 1; \
 	fi
-	@test -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
+	@${TEST} -e ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
 	    || fetch -o ${DISTDIR}/${DIST_SUBDIR}/${PATCHFILES} \
 		${PATCH_SITES}${PATCHFILES}
 
 do-extract:
 	${MKDIR} ${SRCDIR}
-	cd ${DISTDIR}/${DIST_SUBDIR}/gcc ; pax -pe -rwt . ${SRCDIR}
+	cd ${DISTDIR}/${DIST_SUBDIR}/${DIST_SUBDIR ; pax -pe -rwt . ${SRCDIR}
 .endif	# CVS_DATE
 
+post-patch:
+	@${REINPLACE_CMD} -e 's|(experimental)|(experimental) [FreeBSD]|g' \
+	    ${SRCDIR}/gcc/version.c
+
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
@@ -141,7 +146,7 @@ post-install:
 	do \
 		strip $$prog ; \
 	done )
-.for file in gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh jv-scan jcf-dump jar grepjar
+.for file in gcc g++ cpp gcov ${CONFIGURE_TARGET}-gcc ${CONFIGURE_TARGET}-g++ gcj gcjh gij jv-scan jcf-dump jv-convert jar grepjar rmic rmiregistry
 	${MV} -f ${PREFIX}/bin/${file} ${PREFIX}/bin/${file}33
 	( ${TEST} ! -e ${PREFIX}/man/man1/${file}.1 \
 		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
@@ -179,10 +184,37 @@ 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
+	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 \
+	    	| sort -r | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.gcj-inc
 	${ECHO_CMD} "r ${TMPPLIST}"		> ${WRKDIR}/ex.script
 	${ECHO_CMD} "/Insert PLIST.gcc-lib"	>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "d"				>> ${WRKDIR}/ex.script
 	${ECHO_CMD} "r ${WRKDIR}/PLIST.gcc-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-gcc-lib
 	cd ${WRKDIR} ; ex < ex.script
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index b0cde026bb73..3dd08d43990c 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,6 +1,5 @@
-MD5 (gcc-core-20021014.tar.bz2) = 094dafa01504d0e668d8e1ddc363ed33
-MD5 (gcc-g++-20021014.tar.bz2) = 2bbe1803cba09c8829ec39d41722e843
-MD5 (gcc-g77-20021014.tar.bz2) = 898a9f22401f370b42b32978c1ba4466
-MD5 (gcc-java-20021014.tar.bz2) = dd3f2e44f7c1dac3db6adbc049f4533d
-MD5 (gcc-objc-20021014.tar.bz2) = 664a1e1d78425eff76f86ccdb97b7a2f
-MD5 (port_gcc33_2002-10-14.diff) = 95f664ca930f7f7af391efa24101242c
+MD5 (gcc-core-20030324.tar.bz2) = 2dbbb579f4fe3f31e33a9b4fd9458da6
+MD5 (gcc-g++-20030324.tar.bz2) = a377adfedc2ee8032cb99b9bfb846ad1
+MD5 (gcc-g77-20030324.tar.bz2) = bec95dc645cc974962d3f8d553033d02
+MD5 (gcc-java-20030324.tar.bz2) = f5eafce2896385e3c0cb99983971e53c
+MD5 (gcc-objc-20030324.tar.bz2) = 0bcf8c5af46557f86addb64631054e4e
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index b404eea24dec..fb06926fd713 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,21 +1,32 @@
 @comment $FreeBSD$
+bin/cpp33
 bin/g++33
 bin/g77-33
 bin/gcc33
 bin/gcov33
+bin/%%GNU_HOST%%-gcc-3.3
 bin/%%GNU_HOST%%-gcc33
 bin/%%GNU_HOST%%-g++33
-bin/gccbug-%%SNAPVER%%
+bin/%%GNU_HOST%%-gcj
+bin/gccbug-3.3
 bin/gcj33
 bin/gcjh33
+bin/gij33
 bin/jv-scan33
 bin/jcf-dump33
+bin/jv-convert33
 bin/jar33
 bin/grepjar33
+bin/rmic33
+bin/rmiregistry33
+bin/addr2name.awk
 @comment not needed post-libstdc++-v3:	%%GNU_HOST%%/include/_G_config.h
 @comment Insert PLIST.gcc-lib here
 @comment -=[ begin PLIST.gcc-lib ]=-
 @comment -=[ end PLIST.gcc-lib ]=-
+@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