Upgrade to 1.1.2 release.

1 files changed, 30 insertions, 26 deletions

diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 57df0d93ea3d..f9347a47d87e 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -7,46 +7,50 @@
 # $Id: Makefile,v 1.48 1999/03/08 07:28:27 asami Exp $
 #
 
-DISTNAME=	egcs-1.1.2-pre2
-PKGNAME=	egcs-1.1.2b2
+DISTNAME=	egcs-1.1.2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://cambridge.cygnus.com/pub/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.2/ \
+MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.2/ \
+		ftp://ftp.crc.ca/pub/packages/egcs/egcs-1.1.2/ \
 		ftp://ftp.funet.fi/mirrors/ftp.cygnus.com/pub/egcs/releases/egcs-1.1.2/ \
 		ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.1.2/ \
+		ftp://ftp.nluug.nl/pub/languages/egcs/releases/egcs-1.1.2/ \
+		ftp://ftp.iij.ad.jp/pub/egcs/releases/egcs-1.1.2/ \
 		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.1.2/ \
 		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.1.2/
+DISTFILES=	egcs-core-1.1.2${EXTRACT_SUFX} egcs-g++-1.1.2${EXTRACT_SUFX} \
+		egcs-g77-1.1.2${EXTRACT_SUFX} egcs-objc-1.1.2${EXTRACT_SUFX}
+.if ${MACHINE_ARCH} == "alpha"
+DISTFILES+=	egcs-freebsd-alpha-supplement${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	obrien@FreeBSD.org
 
 WWW_SITE=	http://egcs.cygnus.com
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.91.62
+EGCS_REV=	egcs-2.91.66
 LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
+.if ${MACHINE_ARCH} == "i386"
 PLIST=		${WRKDIR}/PLIST
-GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
+.endif
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .else
-GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
+PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
-		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
+		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
-CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -66,7 +70,7 @@ pre-configure:
 		>freebsd-aout.h ; \
 	${MV} freebsd.h freebsd.h.in ; \
 	${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd.h.in >freebsd.h )
-.if ${PORTOBJFORMAT} == "elf"
+.if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
 	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
 .endif
 
@@ -80,24 +84,24 @@ post-install:
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
 	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
 	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${GNUHOST}-gcc \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/f771 ; \
+	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
 		do strip $$prog ; \
 		done)
 	ln -f ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	ln -f ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/lib/libiberty.a  \
-		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
-		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/libstdc++.a
 .if defined(WANT_SHAREDLIBS)
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
-		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \