5 files changed, 57 insertions, 51 deletions

diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 33d9635c27f2..88f9b156064f 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -1,17 +1,17 @@
+# ex:ts=8
 # New ports collection makefile for:	egcs
 # Version required:	1998-02-21
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.11 1998/03/10 06:23:50 obrien Exp $
+# $Id: Makefile,v 1.12 1998/03/17 21:10:40 jdp Exp $
 #
 
-#	1998-03-08
-DISTNAME=	egcs-980221
+DISTNAME=	egcs-1.0.2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-02-21/ \
-		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-02-21/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-02-21/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/releases/egcs-1.0.2/  \
+		ftp://cambridge.cygnus.com/pub/egcs/releases/egcs-1.0.2/ \
+		ftp://ftp.fu-berlin.de/unix/languages/egcs/releases/egcs-1.0.2/
 
 MAINTAINER=	obrien@FreeBSD.org
 
@@ -20,6 +20,7 @@ MANUAL_PACKAGE_BUILD=	installs libstdc++.a which conflicts with system version
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld i386-unknown-freebsd
+ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
 post-patch:
@@ -32,12 +33,12 @@ post-patch:
 
 post-install:
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ ${PREFIX}/bin/c++ \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cc1 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cc1obj \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cc1plus \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cpp \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/f771 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/ld ; \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cc1 \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cc1obj \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cc1plus \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cpp \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/f771 \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/ld ; \
 		do strip $$prog ; \
 		done)
 	if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index f37ea6f73709..d573507af465 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1 +1 @@
-MD5 (egcs-980221.tar.gz) = 5b949e4acdc1c7cc363b9e9b1960108d
+MD5 (egcs-1.0.2.tar.gz) = 5b4538fa17d393db1d2501148ad31f21
diff --git a/lang/gcc46/files/patch-ad b/lang/gcc46/files/patch-ad
index cb56621ece0e..0939a778b9a2 100644
--- a/lang/gcc46/files/patch-ad
+++ b/lang/gcc46/files/patch-ad
@@ -1,12 +1,17 @@
 --- 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 "%{!shared:%{!pg:-lc}%{pg:-lc_p}}"
+@@ -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 "-Di386 -Dunix -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
  
+ /* Like the default, except no -lg.  */
+ #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
++
 +#undef CC1PLUS_SPEC
 +#define CC1PLUS_SPEC "-fsjlj-exceptions"
-+
+ 
  #undef SIZE_TYPE
  #define SIZE_TYPE "unsigned int"
- 
diff --git a/lang/gcc46/files/patch-af b/lang/gcc46/files/patch-af
index d838cff75b3a..b34303d22d33 100644
--- a/lang/gcc46/files/patch-af
+++ b/lang/gcc46/files/patch-af
@@ -1,5 +1,5 @@
---- 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
+--- gcc/config/i386/freebsd-elf.h.orig	Fri Mar  6 16:11:54 1998
++++ gcc/config/i386/freebsd-elf.h	Sun Mar 22 18:01:59 1998
 @@ -127,6 +127,9 @@
      }									\
  }
@@ -14,8 +14,8 @@
  #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)"
+-#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__=2 -Asystem(FreeBSD)"
++#define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 0a61c32d6e0f..ec6b52c9c8ff 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -208,35 +208,35 @@ info/gcc.info-9
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/SYSCALLS.c.X
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cc1
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cc1obj
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cc1plus
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/cpp
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/f771
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/README
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/exception
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/limits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/math.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/new
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/new.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/NXConstStr.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/Object.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/Protocol.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/encoding.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/hash.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/objc-api.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/objc-list.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/objc.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/sarray.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/thr.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/objc/typedstream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/syslimits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/include/typeinfo
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/ld
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/libgcc.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/libobjc.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.09/specs
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/SYSCALLS.c.X
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cc1
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cc1obj
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cc1plus
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/cpp
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/f771
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/README
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/exception
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/limits.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/math.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/new
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/new.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/NXConstStr.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/Object.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/Protocol.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/encoding.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/hash.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/objc-api.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/objc-list.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/objc.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/sarray.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/thr.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/objc/typedstream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/syslimits.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/include/typeinfo
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/ld
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/libgcc.a
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/libobjc.a
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.90.27/specs
 lib/libf2c.a
 lib/libiberty.a
 lib/libstdc++.a