5 files changed, 67 insertions, 76 deletions

diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index f3f29cc5169d..b21b3a4308ad 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,19 +4,17 @@
 # Date created:		9 Jan 1998
 # Whom:			John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.14 1998/04/07 01:18:07 obrien Exp $
+# $Id: Makefile,v 1.12 1998/03/17 21:10:40 jdp Exp $
 #
 
-DISTNAME=	egcs-980315
+DISTNAME=	egcs-980406
 CATEGORIES=	lang
-MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-03-15/ \
-		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-03-15/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-03-15/
+MASTER_SITES=	ftp://egcs.cygnus.com/pub/egcs/snapshots/1998-04-06/ \
+		ftp://cambridge.cygnus.com/pub/egcs/snapshots/1998-04-06/ \
+		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/1998-04-06/
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN=	"used to build on my system, now doesn't.  use 'cvs co -regcs_102 egcs' if you want a working version before the next upgrade"
-
 MANUAL_PACKAGE_BUILD=	installs libstdc++.a which conflicts with system version
 
 GNU_CONFIGURE=	yes
@@ -35,12 +33,14 @@ 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.14/cc1 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/cc1obj \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/cc1plus \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/cpp \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/f771 \
-	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/ld ; \
+	${PREFIX}/bin/c++filt ${PREFIX}/bin/info ${PREFIX}/bin/install-info \
+	${PREFIX}/bin/makeinfo ${PREFIX}/bin/texindex \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cc1 \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cc1obj \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cc1plus \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cpp \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/collect2 \
+	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/f771 ; \
 		do strip $$prog ; \
 		done)
 	if [ ! -f ${PREFIX}/info/dir ]; then \
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index c8b49108e6b5..ba427689a091 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1 +1 @@
-MD5 (egcs-980315.tar.gz) = 6e8d706260798b0391d4b6038f00260e
+MD5 (egcs-980406.tar.gz) = d27e5ccb21b254efdbf7ef4dc346d847
diff --git a/lang/gcc40/files/patch-ad b/lang/gcc40/files/patch-ad
deleted file mode 100644
index cb56621ece0e..000000000000
--- a/lang/gcc40/files/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- 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}}"
- 
-+#undef CC1PLUS_SPEC
-+#define CC1PLUS_SPEC "-fsjlj-exceptions"
-+
- #undef SIZE_TYPE
- #define SIZE_TYPE "unsigned int"
- 
diff --git a/lang/gcc40/files/patch-af b/lang/gcc40/files/patch-af
deleted file mode 100644
index d838cff75b3a..000000000000
--- a/lang/gcc40/files/patch-af
+++ /dev/null
@@ -1,21 +0,0 @@
---- 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}"
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index d699fb81cdae..168fb8fa5536 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,8 +1,14 @@
 bin/c++
+bin/c++filt
 bin/g++
 bin/g77
 bin/gcc
 bin/gcov
+bin/info
+bin/makeinfo
+bin/install-info
+bin/texindex
+bin/texi2dvi
 bin/i386-unknown-freebsd-gcc
 bin/protoize
 bin/unprotoize
@@ -197,6 +203,7 @@ info/gcc.info-25
 info/gcc.info-26
 info/gcc.info-27
 info/gcc.info-28
+info/gcc.info-29
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -204,39 +211,56 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
+info/info-stnd.info
+info/info.info
+info/texinfo
+info/texinfo-1
+info/texinfo-2
+info/texinfo-3
+info/texinfo-4
+info/texinfo-5
+info/texinfo-6
+info/texinfo-7
+info/texinfo-8
+info/texinfo-9
+info/texinfo-10
+info/texinfo-11
+info/texinfo-12
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
 @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.14/SYSCALLS.c.X
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/cc1
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/cc1obj
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/cc1plus
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/cpp
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/f771
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/README
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/exception
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/limits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/math.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/new
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/new.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/NXConstStr.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/Object.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/Protocol.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/encoding.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/hash.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/objc-api.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/objc-list.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/objc.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/sarray.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/thr.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/objc/typedstream.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/syslimits.h
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/include/typeinfo
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/ld
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/libgcc.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/libobjc.a
-lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.14/specs
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/SYSCALLS.c.X
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cc1
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cc1obj
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cc1plus
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/cpp
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/collect2
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/f771
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/README
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/assert.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/exception
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/float.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/limits.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/math.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/new
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/new.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/NXConstStr.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/Object.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/Protocol.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/encoding.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/hash.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/objc-api.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/objc-list.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/objc.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/sarray.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/thr.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/objc/typedstream.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/syslimits.h
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/include/typeinfo
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/libgcc.a
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/libobjc.a
+lib/gcc-lib/i386-unknown-freebsd/egcs-2.91.22/specs
 lib/libf2c.a
 lib/libiberty.a
 lib/libstdc++.a