4 files changed, 48 insertions, 62 deletions

diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index e9bd3b8f78d7..0b92fb1c433e 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-07-01
+SNAPDATE=	2002-07-26
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -15,13 +15,12 @@ PORTREVISION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
 		ftp://gcc.gnu.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
-DISTFILES=	\
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	gcc/releases/gcc-3.1.1
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-java-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://relay.nuxi.com/obrien/
 PATCHFILES=	port_gcc31_${SNAPDATE}.diff
@@ -41,27 +40,28 @@ NOMANCOMPRESS=	yes	# to hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "elf"
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
-.else
+.if ${PORTOBJFORMAT} == "aout"
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
+.else
+CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 #GCC_REV=	${PORTVERSION:C/\.0$//}
 GCC_REV=	3.1.1
 #SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
-SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
+SRCDIR=		${WRKDIR}/gcc-${PORTVERSION}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 PLIST_SUB=	GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}  \
-		SNAPVER=${SNAPVER}
+		SNAPVER=${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
-		--with-gxx-include-dir=${TARGLIB}/include/g++
+		--with-gxx-include-dir=${TARGLIB}/include/g++-v3
 #CONFIGURE_ARGS+=	--program-suffix=31
-CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
+#	Java
+CONFIGURE_ARGS+=	--with-system-zlib --includedir=${TARGLIB}/include/Java
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
@@ -82,15 +82,6 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(NETWINDER_SS)
-post-extract:
-.for F in ${DISTFILES}
-	cd ${WRKDIR} ; rpm2cpio ${DISTDIR}/$F |cpio -idum
-.endfor
-	cd ${WRKDIR} ; ${TAR} -xzf gcc-${SNAPVER}.tar.gz
-	cd ${WRKDIR} ; ${LN} -sf gcc gcc-${SNAPVER}
-.endif
-
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
@@ -128,13 +119,15 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
 		${PREFIX}/man/man1/${file}-31.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for file in libstdc++ libsupc++ libg2c libfrtbegin libobjc
 	${MV} -f ${PREFIX}/lib/${file}.* ${TARGLIB}
 .endfor
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
+	# Java
+	cd ${PREFIX}/lib ; ${MV} -f libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
 # I am sick and tired of this .info shit, makeinfo --no-split isn't working
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index 6353205fca66..6d94892bf204 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-20020701.tar.bz2) = 3bec43c2211b6351a8b578c9caa2bbc1
-MD5 (gcc-g++-20020701.tar.bz2) = 20f8807c3c558433b799c0581e355d4d
-MD5 (gcc-g77-20020701.tar.bz2) = 17d3c957c76b144f29188cc7fa6a05f8
-MD5 (gcc-java-20020701.tar.bz2) = 20dc919b8aeff2e89622f356058052e2
-MD5 (gcc-objc-20020701.tar.bz2) = 78ae98871a3c7ab074479f43078caf7a
-MD5 (port_gcc31_2002-07-01.diff) = f1ecb89e83fec7fa8cd0e4e277d59a48
+MD5 (gcc-core-3.1.1.tar.bz2) = b4e28adf3043a165fa06561b3a743c21
+MD5 (gcc-g++-3.1.1.tar.bz2) = 67c87ca839aadb90648abb15c4639fdd
+MD5 (gcc-g77-3.1.1.tar.bz2) = 053563936e9fc4932aaad013da103086
+MD5 (gcc-java-3.1.1.tar.bz2) = 5a5cf5088095c5c4378e63c30f832be5
+MD5 (gcc-objc-3.1.1.tar.bz2) = f59f7471ed5f544791251fa57bcce85c
+MD5 (port_gcc31_2002-07-26.diff) = 0680f6395440c81352abf9617f384d14
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index e9bd3b8f78d7..0b92fb1c433e 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -6,7 +6,7 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	2002-07-01
+SNAPDATE=	2002-07-26
 SNAPVER=	${SNAPDATE:S/-//g}
 
 PORTNAME=	gcc
@@ -15,13 +15,12 @@ PORTREVISION=	${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_SOURCEWARE} \
 		ftp://gcc.gnu.org/pub/%SUBDIR%/
-MASTER_SITE_SUBDIR=	gcc/snapshots/${SNAPDATE}
-DISTFILES=	\
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+MASTER_SITE_SUBDIR=	gcc/releases/gcc-3.1.1
+DISTFILES=	gcc-core-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g++-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-g77-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-java-${PORTVERSION}${EXTRACT_SUFX} \
+		gcc-objc-${PORTVERSION}${EXTRACT_SUFX}
 
 PATCH_SITES=	ftp://relay.nuxi.com/obrien/
 PATCHFILES=	port_gcc31_${SNAPDATE}.diff
@@ -41,27 +40,28 @@ NOMANCOMPRESS=	yes	# to hard to deal with differences on 5-cur and releng4
 
 .include <bsd.port.pre.mk>
 
-.if ${PORTOBJFORMAT} == "elf"
-CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
-.else
+.if ${PORTOBJFORMAT} == "aout"
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
+.else
+CONFIGURE_TARGET?=	${ARCH}-portbld-freebsd${OSREL}
 .endif
 
 #GCC_REV=	${PORTVERSION:C/\.0$//}
 GCC_REV=	3.1.1
 #SRCDIR=		${WRKDIR}/gcc-${GCC_REV}
-SRCDIR=		${WRKDIR}/gcc-${SNAPVER}
+SRCDIR=		${WRKDIR}/gcc-${PORTVERSION}
 WRKSRC=		${WRKDIR}/build
 TARGLIB=	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 PLIST_SUB=	GCC_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}  \
-		SNAPVER=${SNAPVER}
+		SNAPVER=${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_BISON=	yes
 CONFIGURE_ARGS=	--disable-nls --with-gnu-as --with-gnu-ld \
-		--with-gxx-include-dir=${TARGLIB}/include/g++
+		--with-gxx-include-dir=${TARGLIB}/include/g++-v3
 #CONFIGURE_ARGS+=	--program-suffix=31
-CONFIGURE_ARGS+=	--disable-libgcj	# does not bootstrap now
+#	Java
+CONFIGURE_ARGS+=	--with-system-zlib --includedir=${TARGLIB}/include/Java
 CONFIGURE_ENV=	MAKEINFO="makeinfo --no-split"
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
@@ -82,15 +82,6 @@ MAN7=		fsf-funding.7 gfdl.7 gpl.7
 pre-fetch:
 	@${ECHO} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT}	target ${CONFIGURE_TARGET}"
 
-.if defined(NETWINDER_SS)
-post-extract:
-.for F in ${DISTFILES}
-	cd ${WRKDIR} ; rpm2cpio ${DISTDIR}/$F |cpio -idum
-.endfor
-	cd ${WRKDIR} ; ${TAR} -xzf gcc-${SNAPVER}.tar.gz
-	cd ${WRKDIR} ; ${LN} -sf gcc gcc-${SNAPVER}
-.endif
-
 pre-configure:
 	@# Keep from running `autoconf' and `autoheader' since we modified
 	@# configure.in by patching it.
@@ -128,13 +119,15 @@ post-install:
 		|| ${MV} -f ${PREFIX}/man/man1/${file}.1 \
 		${PREFIX}/man/man1/${file}-31.1 )
 .endfor
-	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${SNAPVER}
+	${MV} -f ${PREFIX}/bin/gccbug ${PREFIX}/bin/gccbug-${PORTVERSION}
 	# These 3 libraries are moved from PREFIX/lib to avoid conflicts
 	# 	with the stock compiler.
 .for file in libstdc++ libsupc++ libg2c libfrtbegin libobjc
 	${MV} -f ${PREFIX}/lib/${file}.* ${TARGLIB}
 .endfor
 	-${MV} -f ${PREFIX}/lib/ieee ${TARGLIB}
+	# Java
+	cd ${PREFIX}/lib ; ${MV} -f libgcj.* ${TARGLIB}
 	${RM} -f ${PREFIX}/lib/libiberty.a
 	${RM} -f ${TARGLIB}/*.la
 # I am sick and tired of this .info shit, makeinfo --no-split isn't working
diff --git a/lang/gcc32/distinfo b/lang/gcc32/distinfo
index 6353205fca66..6d94892bf204 100644
--- a/lang/gcc32/distinfo
+++ b/lang/gcc32/distinfo
@@ -1,6 +1,6 @@
-MD5 (gcc-core-20020701.tar.bz2) = 3bec43c2211b6351a8b578c9caa2bbc1
-MD5 (gcc-g++-20020701.tar.bz2) = 20f8807c3c558433b799c0581e355d4d
-MD5 (gcc-g77-20020701.tar.bz2) = 17d3c957c76b144f29188cc7fa6a05f8
-MD5 (gcc-java-20020701.tar.bz2) = 20dc919b8aeff2e89622f356058052e2
-MD5 (gcc-objc-20020701.tar.bz2) = 78ae98871a3c7ab074479f43078caf7a
-MD5 (port_gcc31_2002-07-01.diff) = f1ecb89e83fec7fa8cd0e4e277d59a48
+MD5 (gcc-core-3.1.1.tar.bz2) = b4e28adf3043a165fa06561b3a743c21
+MD5 (gcc-g++-3.1.1.tar.bz2) = 67c87ca839aadb90648abb15c4639fdd
+MD5 (gcc-g77-3.1.1.tar.bz2) = 053563936e9fc4932aaad013da103086
+MD5 (gcc-java-3.1.1.tar.bz2) = 5a5cf5088095c5c4378e63c30f832be5
+MD5 (gcc-objc-3.1.1.tar.bz2) = f59f7471ed5f544791251fa57bcce85c
+MD5 (port_gcc31_2002-07-26.diff) = 0680f6395440c81352abf9617f384d14