Upgrade to version 2.95.1.

1 files changed, 47 insertions, 33 deletions

diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 26e007319bb6..4e6a46c6a353 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -7,39 +7,41 @@
 # $FreeBSD$
 #
 
-DISTNAME=	egcs-1.1.2
-PKGNAME=	pgcc-1.1.3
+DISTNAME=	gcc-2.95.1
+PKGNAME=	pgcc-2.95.1
 CATEGORIES=	lang
-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}
+MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/releases/${DISTNAME}/ \
+		ftp://egcs.cygnus.com/pub/egcs/releases/${DISTNAME}/ \
+		${MASTER_SITE_GNU} \
+		ftp://ftp.nluug.nl/pub/languages/egcs/releases/${DISTNAME}/ \
+		ftp://ftp.iij.ad.jp/pub/egcs/releases/${DISTNAME}/ \
+		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/${DISTNAME}/
+MASTER_SITE_SUBDIR=	gcc
+DISTFILES=	gcc-core-${DISTNAME:S/gcc-//g}${EXTRACT_SUFX} \
+		gcc-g++-${DISTNAME:S/gcc-//g}${EXTRACT_SUFX} \
+		gcc-g77-${DISTNAME:S/gcc-//g}${EXTRACT_SUFX} \
+		gcc-java-${DISTNAME:S/gcc-//g}${EXTRACT_SUFX} \
+		gcc-objc-${DISTNAME:S/gcc-//g}${EXTRACT_SUFX}
 
 PATCH_SITES=	http://www.gcc.ml.org/data/source/  \
 		ftp://ftp.goof.com/pub/pcg/source/  \
 		ftp://ftp.hitachi-sk.co.jp/pub/pentium-gcc/source/  \
 		ftp://ftp.fu-berlin.de/unix/languages/pgcc/source/
-PATCHFILES=	egcs-1.1.2-pgcc-1.1.3.diff.gz
+PATCHFILES=	gcc-2.95.1-pgcc-2.95.1.diff.gz
 PATCH_DIST_STRIP=	-p1
 
 MAINTAINER=	obrien@FreeBSD.org
 
 BUILD_DEPENDS=  autoconf:${PORTSDIR}/devel/autoconf
 
-BROKEN='waiting for new patches against gcc-2.95.1'
-
-.include <bsd.port.pre.mk>
+ONLY_FOR_ARCHS=	i386
 
 USE_BZIP2=	yes
 
-EGCS_REV=	pgcc-2.91.66
-LIBSTDCPP_REV=	2.9.0
+.include <bsd.port.pre.mk>
+
+GCC_REV=	p${DISTNAME}
+LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
 PLIST=		${WRKDIR}/PLIST
@@ -48,25 +50,28 @@ CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
+PLIST_SUB=	EGCS_REV=${GCC_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
-		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
+		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/include/g++
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
+.if defined(WANT_THREADS)
+#	?is this an ObjC only thing?
+CONFIGURE_ARGS+= --enable-threads=posix
+.endif
 ALL_TARGET=	bootstrap
-MAN1=		cccp.1 g++.1 g77.1 gcc.1
+MAN1=		cccp.1 pg++.1 pg77.1 pgcc.1
 
 pre-patch:
-	@${MV} ${WRKSRC}/gcc/config/i386/t-freebsd ${WRKSRC}/gcc/config/
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
-	${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \
+	${SED} -e "s:__FreeBSD__[0-9=]*:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \
 		>${WRKSRC}/gcc/config/freebsd.h )
 .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
 	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
@@ -82,27 +87,36 @@ post-install:
 		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
 		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
 		${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 ; \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/f771 ; \
 	do \
 		strip $$prog ; \
 	done)
+	${MV} ${PREFIX}/bin/i386-portbld-freebsd4.0-gcc ${PREFIX}/bin/i386-portbld-freebsd4.0-pgcc
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/pgcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/pg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/pg77
 	${MV} ${PREFIX}/bin/gcov ${PREFIX}/bin/pgcov
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/pg++filt
+	${MV} ${PREFIX}/bin/gcj ${PREFIX}/bin/pgcj
+	${MV} ${PREFIX}/bin/gcjh ${PREFIX}/bin/pgcjh
+	${MV} ${PREFIX}/bin/jv-scan ${PREFIX}/bin/pjv-scan
+	${MV} ${PREFIX}/bin/jcf-dump ${PREFIX}/bin/pjcf-dump
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
-		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
-	${MV} -f ${PREFIX}/lib/libstdc++.a  \
-		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/libstdc++.a
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
+	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}/libstdc++.a
+	${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/pgcc.1
+	${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/pg++.1
+	${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/pg77.1
 .if defined(WANT_SHAREDLIBS)
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
-		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${GCC_REV}
 .endif
 .for info in cpp g77 gcc
 	install-info ${PREFIX}/info/${info}.info ${PREFIX}/info/dir