Upgrade to 1998-02-05 SNAP. Fixes problems several have had with 1.0.1.

Including linking with the STL vector class.

4 files changed, 48 insertions, 26 deletions

diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 45c2a777e549..b8860aa17b12 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -1,16 +1,16 @@
 # New ports collection makefile for:	egcs
-# Version required:	1.0.1
+# Version required:	1998-02-05
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.4 1998/01/23 17:49:35 jdp Exp $
+# $Id: Makefile,v 1.5 1998/02/03 07:48:35 asami Exp $
 #
 
-DISTNAME=	egcs-1.0.1
+DISTNAME=	egcs-980205
 CATEGORIES=	lang
-MASTER_SITES=	ftp://ftp.cygnus.com/pub/egcs/releases/egcs-1.0.1/ \
-		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.0.1/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.0.1/
+MASTER_SITES=	ftp://ftp.cygnus.com/pub/egcs/snapshots/1998-02-05/ \
+		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-02-05/ \
+		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-02-05/
 
 MAINTAINER=	jdp@polstra.com
 
@@ -21,16 +21,22 @@ USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
-FME=${PREFIX}
+post-patch:
+	@(cd ${WRKSRC}/gcc/config/i386/ ; \
+	MAJ=`sysctl -n kern.osreldate | sed -e '/.....$$/s///'` ; \
+	mv freebsd.h freebsd.h.in ; \
+	sed -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd.h.in >freebsd.h ; \
+	mv freebsd-elf.h freebsd-elf.h.in ; \
+	sed -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd-elf.h.in >freebsd-elf.h)
 
 post-install:
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ ${PREFIX}/bin/c++ \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cc1 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cc1obj \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cc1plus \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/cpp \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/f771 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.23/ld ; \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cc1 \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cc1obj \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cc1plus \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/cpp \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/f771 \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.07/ld ; \
 		do strip $$prog ; \
 		done)
 	if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 0546423e3f80..0d54ed3fc425 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1 +1 @@
-MD5 (egcs-1.0.1.tar.gz) = 3bdeb3a5835753aa53725002d8939606
+MD5 (egcs-980205.tar.gz) = 2dff4b0ab51a94721828f9e20d101e0b
diff --git a/lang/gcc42/files/patch-ad b/lang/gcc42/files/patch-ad
index aae7be9bfd4c..cb56621ece0e 100644
--- a/lang/gcc42/files/patch-ad
+++ b/lang/gcc42/files/patch-ad
@@ -1,17 +1,12 @@
---- gcc/config/i386/freebsd.h.orig	Fri Oct 17 23:52:58 1997
-+++ gcc/config/i386/freebsd.h	Thu Jan 22 21:50:29 1998
-@@ -35,10 +35,13 @@
- #include "i386/perform.h"
- 
- #undef CPP_PREDEFINES
--#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
-+#define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__=2 -D__386BSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
- 
+--- gcc/config/i386/freebsd.h.orig	Fri Feb 13 10:52:24 1998
++++ gcc/config/i386/freebsd.h	Fri Feb 13 11:03:27 1998
+@@ -40,6 +40,9 @@
  /* Like the default, except no -lg.  */
- #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
-+
+ #define LIB_SPEC "%{!shared:%{!pg:-lc}%{pg:-lc_p}}"
+ 
 +#undef CC1PLUS_SPEC
 +#define CC1PLUS_SPEC "-fsjlj-exceptions"
- 
++
  #undef SIZE_TYPE
  #define SIZE_TYPE "unsigned int"
+ 
diff --git a/lang/gcc42/files/patch-af b/lang/gcc42/files/patch-af
new file mode 100644
index 000000000000..d838cff75b3a
--- /dev/null
+++ b/lang/gcc42/files/patch-af
@@ -0,0 +1,21 @@
+--- gcc/config/i386/freebsd-elf.h.orig	Sat Dec  6 09:25:14 1997
++++ gcc/config/i386/freebsd-elf.h	Fri Feb 13 11:43:46 1998
+@@ -127,6 +127,9 @@
+     }									\
+ }
+ 
++#undef CC1PLUS_SPEC
++#define CC1PLUS_SPEC "-fsjlj-exceptions"
++
+ #undef SIZE_TYPE
+ #define SIZE_TYPE "unsigned int"
+  
+@@ -140,7 +143,7 @@
+ #define WCHAR_TYPE_SIZE BITS_PER_WORD
+     
+ #undef CPP_PREDEFINES
+-#define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__=2 -Asystem(FreeBSD)"
++#define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__ -Asystem(FreeBSD)"
+ 
+ #undef CPP_SPEC
+ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"