7 files changed, 122 insertions, 73 deletions

diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 57df0d93ea3d..f9347a47d87e 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -7,46 +7,50 @@
 # $Id: Makefile,v 1.48 1999/03/08 07:28:27 asami Exp $
 #
 
-DISTNAME=	egcs-1.1.2-pre2
-PKGNAME=	egcs-1.1.2b2
+DISTNAME=	egcs-1.1.2
 CATEGORIES=	lang
-MASTER_SITES=	ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://egcs.cygnus.com/pub/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://cambridge.cygnus.com/pub/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/egcs-1.1.2-prerelease/ \
-		ftp://go.cygnus.com/pub/ftp.cygnus.com/egcs/releases/egcs-1.1.2/ \
+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}
+.if ${MACHINE_ARCH} == "alpha"
+DISTFILES+=	egcs-freebsd-alpha-supplement${EXTRACT_SUFX}
+.endif
 
 MAINTAINER=	obrien@FreeBSD.org
 
 WWW_SITE=	http://egcs.cygnus.com
 
-#USE_BZIP2=	yes
+USE_BZIP2=	yes
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.91.62
+EGCS_REV=	egcs-2.91.66
 LIBSTDCPP_REV=	2.9.0
 
 .if ${PORTOBJFORMAT} == "elf"
+.if ${MACHINE_ARCH} == "i386"
 PLIST=		${WRKDIR}/PLIST
-GNUHOST=	${ARCH}-unknown-freebsd${OSREL}
+.endif
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsd${OSREL}
 .else
-GNUHOST=	${ARCH}-unknown-freebsdaout${OSREL}
+CONFIGURE_TARGET=	${ARCH}-portbld-freebsdaout${OSREL}
 .endif
 
-PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${GNUHOST}
+PLIST_SUB=	EGCS_REV=${EGCS_REV} GNU_HOST=${CONFIGURE_TARGET}
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld ${GNUHOST} \
-		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/include/g++
+CONFIGURE_ARGS=	--with-gnu-as --with-gnu-ld \
+		--with-gxx-include-dir=${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/include/g++
 .if defined(WANT_SHAREDLIBS)
 CONFIGURE_ARGS+= --enable-shared
 .endif
-CONFIGURE_TARGET=	# empty
 ALL_TARGET=	bootstrap
 MAN1=		cccp.1 g++.1 g77.1 gcc.1
 
@@ -66,7 +70,7 @@ pre-configure:
 		>freebsd-aout.h ; \
 	${MV} freebsd.h freebsd.h.in ; \
 	${SED} -e "s:__FreeBSD__:__FreeBSD__=$${MAJ}:" freebsd.h.in >freebsd.h )
-.if ${PORTOBJFORMAT} == "elf"
+.if ${PORTOBJFORMAT} == "elf" && ${MACHINE_ARCH} == "i386"
 	@${SED} -e 's/^@comment ELF-only://' ${PKGDIR}/PLIST >${PLIST}
 .endif
 
@@ -80,24 +84,24 @@ post-install:
 	@(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/${GNUHOST}-gcc \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/f771 ; \
+	${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++
 	${MV} ${PREFIX}/lib/libiberty.a  \
-		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a  \
-		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}/libstdc++.a
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/libstdc++.a
 .if defined(WANT_SHAREDLIBS)
 	${MV} -f ${PREFIX}/lib/libstdc++.so*  \
-		${PREFIX}/lib/gcc-lib/${GNUHOST}/${EGCS_REV}
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 .endif
 	if [ ! -f ${PREFIX}/info/dir ]; then \
 	    ${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index 59ba34cc9bd3..55665654d3f3 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -1 +1,4 @@
-MD5 (egcs-1.1.2-pre2.tar.gz) = 9b56d81f9fd921d973ff58600496b201
+MD5 (egcs-core-1.1.2.tar.bz2) = ad12b8eb6014a3f4fd3fe7f9bd6df01d
+MD5 (egcs-g++-1.1.2.tar.bz2) = defecf8027a98c18b0ecbff0ab970243
+MD5 (egcs-g77-1.1.2.tar.bz2) = d5e7e645896a549bdbdfebbb01bc3235
+MD5 (egcs-objc-1.1.2.tar.bz2) = 91e12ee2e12fa866aeec41174bcf1dfe
diff --git a/lang/gcc31/files/patch-ad b/lang/gcc31/files/patch-ad
index 3fa37c95418b..f8fb5803acf0 100644
--- a/lang/gcc31/files/patch-ad
+++ b/lang/gcc31/files/patch-ad
@@ -1,17 +1,6 @@
---- gcc/config/i386/freebsd-aout.h.orig	Tue Jun 30 15:52:18 1998
-+++ gcc/config/i386/freebsd-aout.h	Fri Jan 22 04:08:44 1999
-@@ -89,6 +89,10 @@
- /* Don't default to pcc-struct-return, because gcc is the only compiler, and
-    we want to retain compatibility with older gcc versions.  */
- #define DEFAULT_PCC_STRUCT_RETURN 0
-+
-+/* Ensure we the configuration knows our system correctly so we can link with
-+   libraries compiled with the native cc. */
-+#undef NO_DOLLAR_IN_LABEL
- 
- /* i386 freebsd still uses old binutils that don't insert nops by default
-    when the .align directive demands to insert extra space in the text
-@@ -99,19 +103,18 @@
+--- gcc/config/i386/freebsd-aout.h.orig	Mon Mar  1 14:47:33 1999
++++ gcc/config/i386/freebsd-aout.h	Sat Mar 13 19:24:50 1999
+@@ -103,19 +103,18 @@
  
  /* Profiling routines, partially copied from i386/osfrose.h.  */
  
@@ -34,7 +23,7 @@
        fprintf (FILE, "\tcall mcount\n");				\
      }									\
  }
-@@ -129,6 +132,7 @@
+@@ -133,6 +132,7 @@
  
  #define TYPE_ASM_OP	".type"
  #define SIZE_ASM_OP	".size"
@@ -42,7 +31,7 @@
  
  /* The following macro defines the format used to output the second
     operand of the .type assembler directive.  Different svr4 assemblers
-@@ -138,6 +142,12 @@
+@@ -142,6 +142,12 @@
  
  #define TYPE_OPERAND_FMT	"@%s"
  
@@ -55,7 +44,7 @@
  /* Write the extra assembler code needed to declare a function's result.
     Most svr4 assemblers don't require any special declaration of the
     result value, but there are exceptions.  */
-@@ -239,6 +249,8 @@
+@@ -243,6 +249,8 @@
  #define STARTFILE_SPEC  \
    "%{shared:c++rt0.o%s} \
     %{!shared:%{pg:gcrt0.o%s}%{!pg:%{static:scrt0.o%s}%{!static:crt0.o%s}}}"
diff --git a/lang/gcc31/files/patch-af b/lang/gcc31/files/patch-af
index e9d23249070c..c50ce06c8375 100644
--- a/lang/gcc31/files/patch-af
+++ b/lang/gcc31/files/patch-af
@@ -1,21 +1,6 @@
---- gcc/config/i386/freebsd.h.orig	Mon Jul 13 15:38:36 1998
-+++ gcc/config/i386/freebsd.h	Fri Jan 22 04:11:03 1999
-@@ -26,8 +26,13 @@
- 
- /* The svr4 ABI for the i386 says that records and unions are returned
-    in memory.  */
-+/* On FreeBSD, we do not. */
- #undef DEFAULT_PCC_STRUCT_RETURN
--#define DEFAULT_PCC_STRUCT_RETURN 1
-+#define DEFAULT_PCC_STRUCT_RETURN 0
-+
-+/* This gets defined in tm.h->linux.h->svr4.h, and keeps us from using
-+   libraries compiled with the native cc, so undef it. */
-+#undef NO_DOLLAR_IN_LABEL
- 
- /* This is how to output an element of a case-vector that is relative.
-    This is only used for PIC code.  See comments by the `casesi' insn in
-@@ -108,22 +113,19 @@
+--- gcc/config/i386/freebsd.h.orig	Mon Mar  1 14:47:32 1999
++++ gcc/config/i386/freebsd.h	Sat Mar 13 19:25:53 1999
+@@ -113,22 +113,19 @@
   : ((n) >= FIRST_STACK_REG && (n) <= LAST_STACK_REG) ? (n)+3 \
   : (-1))
  
@@ -42,7 +27,7 @@
      }									\
  }
  
-@@ -146,20 +148,8 @@
+@@ -151,20 +148,8 @@
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
  
  #undef	LIB_SPEC
@@ -51,11 +36,11 @@
 - * want to profile or debug the C library, please add
 - * -lc_p or -ggdb to LDFLAGS at the link time, respectively.
 - */
--#define LIB_SPEC \
+ #define LIB_SPEC \
 -  "%{!shared: %{mieee-fp:-lieee} %{p:-lgmon} %{pg:-lgmon} \
 -     %{!ggdb:-lc} %{ggdb:-lg}}"
 -#else
- #define LIB_SPEC \
+-#define LIB_SPEC \
 -  "%{!shared: \
 -     %{mieee-fp:-lieee} %{p:-lgmon -lc_p} %{pg:-lgmon -lc_p} \
 -       %{!p:%{!pg:%{!g*:-lc} %{g*:-lg}}}}"
diff --git a/lang/gcc31/files/patch-ak b/lang/gcc31/files/patch-ak
index 817e789e8f53..19a2994f3f05 100644
--- a/lang/gcc31/files/patch-ak
+++ b/lang/gcc31/files/patch-ak
@@ -1,15 +1,32 @@
---- gcc/configure.orig	Wed Dec  2 11:22:52 1998
-+++ gcc/configure	Tue Feb  9 02:21:19 1999
-@@ -2748,20 +2748,21 @@
+--- gcc/configure.orig	Mon Mar  8 10:06:10 1999
++++ gcc/configure	Sat Mar 13 19:08:06 1999
+@@ -2395,6 +2395,15 @@
+  			thread_file='posix'
+  		fi
+ 		;;
++	alpha*-*-freebsd*)
++		tm_file="${tm_file} freebsd.h alpha/freebsd.h alpha/freebsd-elf.h"
++		xm_file="${xm_file} xm-freebsd.h"
++		target_cpu_default="MASK_GAS"
++		tmake_file="t-freebsd alpha/t-crtbe"
++		xmake_file=none
++		fixincludes=fixinc.wrap
++		gas=yes gnu_ld=yes
++		;;
+ 	alpha*-*-netbsd*)
+ 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsdl-elf.h"
+ 		xm_file="xm-netbsd.h ${xm_file}"
+@@ -2851,21 +2860,21 @@
  # Next line turned off because both 386BSD and BSD/386 use GNU ld.
  #		use_collect2=yes
  		;;
 -	i[34567]86-*-freebsdelf*)
 -		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +	i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++		tm_file=i386/freebsd-aout.h
  		# On FreeBSD, the headers are already ok, except for math.h.
  		fixincludes=fixinc.wrap
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=i386/t-freebsd
 -		gas=yes
 -		gnu_ld=yes
diff --git a/lang/gcc31/files/patch-al b/lang/gcc31/files/patch-al
index 5630ff63f6d5..51e1b8cdee1c 100644
--- a/lang/gcc31/files/patch-al
+++ b/lang/gcc31/files/patch-al
@@ -1,15 +1,32 @@
---- gcc/configure.in.orig	Thu Aug 27 17:19:04 1998
-+++ gcc/configure.in	Tue Feb  9 02:22:10 1999
-@@ -846,20 +846,20 @@
+--- gcc/configure.in.orig	Sun Mar  7 16:22:22 1999
++++ gcc/configure.in	Sat Mar 13 19:23:23 1999
+@@ -416,6 +416,15 @@
+  			thread_file='posix'
+  		fi
+ 		;;
++	alpha*-*-freebsd*)
++		tm_file="${tm_file} freebsd.h alpha/freebsd.h alpha/freebsd-elf.h"
++		xm_file="${xm_file} xm-freebsd.h"
++		target_cpu_default="MASK_GAS"
++		tmake_file="t-freebsd alpha/t-crtbe"
++		xmake_file=none
++		fixincludes=fixinc.wrap
++		gas=yes gnu_ld=yes
++		;;
+ 	alpha*-*-netbsd*)
+ 		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsdl-elf.h"
+ 		xm_file="xm-netbsd.h ${xm_file}"
+@@ -872,21 +881,21 @@
  # Next line turned off because both 386BSD and BSD/386 use GNU ld.
  #		use_collect2=yes
  		;;
 -	i[[34567]]86-*-freebsdelf*)
 -		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +	i[[34567]]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++		tm_file=i386/freebsd-aout.h
  		# On FreeBSD, the headers are already ok, except for math.h.
  		fixincludes=fixinc.wrap
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=i386/t-freebsd
 -		gas=yes
 -		gnu_ld=yes
@@ -20,6 +37,7 @@
 +		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd.h i386/perform.h"
  		# On FreeBSD, the headers are already ok, except for math.h.
  		fixincludes=fixinc.wrap
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=i386/t-freebsd
 +		gas=yes
 +		gnu_ld=yes
diff --git a/lang/gcc31/files/patch-bc b/lang/gcc31/files/patch-bc
new file mode 100644
index 000000000000..c6faefae79d6
--- /dev/null
+++ b/lang/gcc31/files/patch-bc
@@ -0,0 +1,33 @@
+--- libstdc++/Makefile.in.orig	Sat Jul 11 19:20:49 1998
++++ libstdc++/Makefile.in	Sun Mar 14 21:48:39 1999
+@@ -14,7 +14,7 @@
+ # along with this library; see the file COPYING.  If not, write to the Free
+ # Software Foundation, 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ 
+-VERSION = 2.9.0
++VERSION = 3
+ 
+ OBJS  = cstringi.o stdexcepti.o cstdlibi.o cmathi.o stlinst.o
+ SUBLIBS = $(STAMP)-string $(STAMP)-complx
+@@ -98,7 +98,8 @@
+ 	ln -f -s $(SHLIB) $(SHLINK)
+ 
+ mshlink:
+-	@$(MAKE) $(MSHLINK) "SHLINK=$(MSHLINK)"
++	#@$(MAKE) $(MSHLINK) "SHLINK=$(MSHLINK)"
++	@true
+ 
+ $(IO_DIR)/iostream.list: force
+ 	cd $(IO_DIR) ; $(MAKE) $(FLAGS_TO_PASS) iostream.list
+@@ -281,10 +282,7 @@
+ 	  if [ $$FILE = $(SHLINK) ] ; then \
+ 	    ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+ 	  elif [ $$FILE = mshlink ]; then \
+-	    for FILE in $(MSHLINK) ; do \
+-	      rm -f $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+-	      ln -f -s $(SHLIB) $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+-	    done; \
++	    true; \
+ 	  elif [ $$FILE = $(SHLIB) ]; then \
+ 	    $(INSTALL_PROGRAM) $$FILE $${INSTALLDIR}$(MULTISUBDIR)/$$FILE ; \
+ 	    : On the HP, shared libraries must be mode 555. ;\