1 files changed, 50 insertions, 38 deletions

diff --git a/lang/gcc295/Makefile b/lang/gcc295/Makefile
index 2788cbf79dff..df7a74ec2443 100644
--- a/lang/gcc295/Makefile
+++ b/lang/gcc295/Makefile
@@ -1,24 +1,26 @@
-# ex:ts=8
-# Ports collection makefile for:	egcs
+# ex:ts=8 
+# Ports collection makefile for:	egcs 
 # Version required: 			1998-09-14
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.55 1999/04/22 00:17:00 scrappy Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
-DISTNAME=	egcs-1.1.2
+DISTNAME=	gcc-2.95
 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/gcc-2.95/ \
+		ftp://egcs.cygnus.com/pub/egcs/releases/gcc-2.95/ \
+		ftp://ftp.nluug.nl/pub/languages/egcs/releases/gcc-2.95/ \
+		ftp://ftp.iij.ad.jp/pub/egcs/releases/gcc-2.95/ \
+		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+		ftp://cambridge.cygnus.com/pub/egcs/releases/gcc-2.95/
+DISTFILES=	gcc-chill-2.95${EXTRACT_SUFX} \
+		gcc-core-2.95${EXTRACT_SUFX} \
+		gcc-g++-2.95${EXTRACT_SUFX} \
+		gcc-g77-2.95${EXTRACT_SUFX} \
+		gcc-java-2.95${EXTRACT_SUFX} \
+		gcc-objc-2.95${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
@@ -26,8 +28,9 @@ USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.91.66
-LIBSTDCPP_REV=	2.9.0
+EGCS_REV=	2.95
+#EGCS_REV=	${DISTNAME:S/gcc-//g}
+LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -46,27 +49,29 @@ CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
 .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 eg++.1 eg77.1 egcc.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
-	@${CP} ${FILESDIR}/alpha-freebsd-elf.h ${WRKSRC}/gcc/config/alpha/freebsd-elf.h
-	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
 
 pre-configure:
-	@# Keep from running `autoconf' and `autoheader' since we modified
-	@# configure.in by patching it.
-	@touch ${WRKSRC}/gcc/configure
-	@touch ${WRKSRC}/gcc/cstamp-h.in
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
 	${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" ${FILESDIR}/freebsd.h \
 		>${WRKSRC}/gcc/config/freebsd.h )
+	@${CP} ${FILESDIR}/alpha-freebsd.h ${WRKSRC}/gcc/config/alpha/freebsd.h
 .if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
 	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
 .endif
+	@# Keep from running `autoconf' and `autoheader' since we modified
+	@# configure.in by patching it.
+	@touch ${WRKSRC}/gcc/configure
+	@touch ${WRKSRC}/gcc/cstamp-h.in
 
 pre-install:
 	${MKDIR} ${PREFIX}/info
@@ -75,23 +80,30 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(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/${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++
+		${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 ; \
+	do \
+		strip $$prog ; \
+	done)
+	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
+	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
+	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
+	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
-	${MV} -f ${PREFIX}/lib/libstdc++.a  \
+	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/libstdc++.a
+	${MV} ${PREFIX}/man/man1/gcc.1 ${PREFIX}/man/man1/egcc.1
+	${MV} ${PREFIX}/man/man1/g++.1 ${PREFIX}/man/man1/eg++.1
+	${MV} ${PREFIX}/man/man1/g77.1 ${PREFIX}/man/man1/eg77.1
 .if defined(WANT_SHAREDLIBS)
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}