Upgrade to the 19990517 snapshot. EGCS is not in a feature freeze for the

upcoming 1.2 release.  Which, BTW, will be called GCC-2.95.

72 files changed, 450 insertions, 522 deletions

diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc-devel/distinfo b/lang/gcc-devel/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc-devel/distinfo
+++ b/lang/gcc-devel/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc-devel/files/patch-ak b/lang/gcc-devel/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc-devel/files/patch-ak
+++ b/lang/gcc-devel/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc-devel/files/patch-al b/lang/gcc-devel/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc-devel/files/patch-al
+++ b/lang/gcc-devel/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc-ooo/distinfo
+++ b/lang/gcc-ooo/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc-ooo/files/patch-ak b/lang/gcc-ooo/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc-ooo/files/patch-ak
+++ b/lang/gcc-ooo/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc-ooo/files/patch-al b/lang/gcc-ooo/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc-ooo/files/patch-al
+++ b/lang/gcc-ooo/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc/files/patch-ak b/lang/gcc/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc/files/patch-ak
+++ b/lang/gcc/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc/files/patch-al b/lang/gcc/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc/files/patch-al
+++ b/lang/gcc/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc30/distinfo b/lang/gcc30/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc30/distinfo
+++ b/lang/gcc30/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc30/files/patch-ak b/lang/gcc30/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc30/files/patch-ak
+++ b/lang/gcc30/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc30/files/patch-al b/lang/gcc30/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc30/files/patch-al
+++ b/lang/gcc30/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc31/files/patch-ak b/lang/gcc31/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc31/files/patch-ak
+++ b/lang/gcc31/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc31/files/patch-al b/lang/gcc31/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc31/files/patch-al
+++ b/lang/gcc31/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc32/distinfo b/lang/gcc32/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc32/distinfo
+++ b/lang/gcc32/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc32/files/patch-ak b/lang/gcc32/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc32/files/patch-ak
+++ b/lang/gcc32/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc32/files/patch-al b/lang/gcc32/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc32/files/patch-al
+++ b/lang/gcc32/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc33/distinfo
+++ b/lang/gcc33/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc33/files/patch-ak b/lang/gcc33/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc33/files/patch-ak
+++ b/lang/gcc33/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc33/files/patch-al b/lang/gcc33/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc33/files/patch-al
+++ b/lang/gcc33/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc34/files/patch-ak b/lang/gcc34/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc34/files/patch-ak
+++ b/lang/gcc34/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc34/files/patch-al b/lang/gcc34/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc34/files/patch-al
+++ b/lang/gcc34/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc35/distinfo
+++ b/lang/gcc35/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc35/files/patch-ak b/lang/gcc35/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc35/files/patch-ak
+++ b/lang/gcc35/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc35/files/patch-al b/lang/gcc35/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc35/files/patch-al
+++ b/lang/gcc35/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc40/files/patch-ak b/lang/gcc40/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc40/files/patch-ak
+++ b/lang/gcc40/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc40/files/patch-al b/lang/gcc40/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc40/files/patch-al
+++ b/lang/gcc40/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc41/files/patch-ak b/lang/gcc41/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc41/files/patch-ak
+++ b/lang/gcc41/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc41/files/patch-al b/lang/gcc41/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc41/files/patch-al
+++ b/lang/gcc41/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc42/files/patch-ak b/lang/gcc42/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc42/files/patch-ak
+++ b/lang/gcc42/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc42/files/patch-al b/lang/gcc42/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc42/files/patch-al
+++ b/lang/gcc42/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc43/files/patch-ak b/lang/gcc43/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc43/files/patch-ak
+++ b/lang/gcc43/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc43/files/patch-al b/lang/gcc43/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc43/files/patch-al
+++ b/lang/gcc43/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc44/files/patch-ak b/lang/gcc44/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc44/files/patch-ak
+++ b/lang/gcc44/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc44/files/patch-al b/lang/gcc44/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc44/files/patch-al
+++ b/lang/gcc44/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc45/files/patch-ak b/lang/gcc45/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc45/files/patch-ak
+++ b/lang/gcc45/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc45/files/patch-al b/lang/gcc45/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc45/files/patch-al
+++ b/lang/gcc45/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc46/files/patch-ak b/lang/gcc46/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc46/files/patch-ak
+++ b/lang/gcc46/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc46/files/patch-al b/lang/gcc46/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc46/files/patch-al
+++ b/lang/gcc46/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc47/files/patch-ak b/lang/gcc47/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc47/files/patch-ak
+++ b/lang/gcc47/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc47/files/patch-al b/lang/gcc47/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc47/files/patch-al
+++ b/lang/gcc47/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index f7263905d14b..bb91c63459bd 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -4,10 +4,10 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.56 1999/04/21 07:48:57 obrien Exp $
+# $Id: Makefile,v 1.57 1999/04/22 00:17:01 scrappy Exp $
 #
 
-SNAPDATE=	1999-04-18
+SNAPDATE=	1999-05-17
 SNAPVER=	${SNAPDATE:S/-//g}
 
 DISTNAME=	egcs-${SNAPVER}
@@ -32,7 +32,7 @@ NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
-EGCS_REV=	egcs-2.93.19
+EGCS_REV=	2.93.22
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index 8dfe86dd8d9e..cc22d0983b57 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,6 +1,6 @@
-MD5 (egcs-chill-19990418.tar.gz) = 618bced7973ebb4cac38b720188ff6dd
-MD5 (egcs-core-19990418.tar.gz) = 5d3e9993c0afbd9dbb0cf769bf6a3ef2
-MD5 (egcs-g++-19990418.tar.gz) = ac03cfacb1394bcb864dcac471a176e5
-MD5 (egcs-g77-19990418.tar.gz) = 53009da04ff99de463a21883a892a5c4
-MD5 (egcs-java-19990418.tar.gz) = 43c7206a22a27bd831756132081d2c01
-MD5 (egcs-objc-19990418.tar.gz) = a9d05ce441dd7499b05a9ec8a7ebcf2f
+MD5 (egcs-chill-19990517.tar.gz) = fb04950bde491596c418d21773e916dc
+MD5 (egcs-core-19990517.tar.gz) = d1fd994e635335e5a7edc2fe9b6e2940
+MD5 (egcs-g++-19990517.tar.gz) = f3d7366ac9ee833eefb937c426895155
+MD5 (egcs-g77-19990517.tar.gz) = a3db87e4be16e7b49e35353c6b9e75a7
+MD5 (egcs-java-19990517.tar.gz) = 3c9b7548dd69c7ab84d5d6cb44860953
+MD5 (egcs-objc-19990517.tar.gz) = 4917d5fb53808d72c3002d01ec443f64
diff --git a/lang/gcc48/files/patch-ak b/lang/gcc48/files/patch-ak
index 37a029c5bb20..b2c7ce166ba5 100644
--- a/lang/gcc48/files/patch-ak
+++ b/lang/gcc48/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Sun Apr 18 02:33:12 1999
-+++ gcc/configure	Wed Apr 21 17:32:59 1999
-@@ -3022,6 +3022,15 @@
+--- gcc/configure.orig	Mon May 17 04:57:01 1999
++++ gcc/configure	Tue May 18 03:55:08 1999
+@@ -3058,6 +3058,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,22 +16,20 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3500,19 +3509,19 @@
+@@ -3535,17 +3544,17 @@
  # 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"
+-		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
 +		tm_file=i386/freebsd-aout.h
-+		tmake_file=t-freebsd
+ 		tmake_file=i386/t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+		tm_file="i386/i386.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
++ 		tm_file="i386/i386.h i386/freebsd.h i386/perform.h"
++		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
 +		tmake_file=t-freebsd
  		gas=yes
  		gnu_ld=yes
diff --git a/lang/gcc48/files/patch-al b/lang/gcc48/files/patch-al
index f2ddb69b6ad0..a8163b10efd6 100644
--- a/lang/gcc48/files/patch-al
+++ b/lang/gcc48/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Wed Apr 14 18:50:50 1999
-+++ gcc/configure.in	Wed Apr 21 17:34:09 1999
-@@ -606,6 +606,15 @@
+--- gcc/configure.in.orig	Wed May 12 10:38:26 1999
++++ gcc/configure.in	Tue May 18 03:57:11 1999
+@@ -625,6 +625,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,23 +16,21 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1117,22 +1126,22 @@
+@@ -1135,20 +1144,20 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
 +	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
- changequote([,])dnl
--		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
-+		tm_file=i386/freebsd-aout.h
++changequote([,])dnl
++		tm_file=i386/freebsd.h
 +		tmake_file=t-freebsd
 +		;;
 +changequote(,)dnl
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
-+changequote([,])dnl
+ changequote([,])dnl
+-		tm_file="i386/i386.h i386/att.h linux.h i386/freebsd-elf.h i386/perform.h"
 +		tm_file="i386/i386.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
 +		tmake_file=t-freebsd