Upgrade to the 1999-09-20 development snapshot.

108 files changed, 1764 insertions, 1368 deletions

diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc-devel/distinfo b/lang/gcc-devel/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc-devel/distinfo
+++ b/lang/gcc-devel/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc-devel/files/alpha-freebsd.h b/lang/gcc-devel/files/alpha-freebsd.h
index f10b264..12c5d6d 100644
--- a/lang/gcc-devel/files/alpha-freebsd.h
+++ b/lang/gcc-devel/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc-devel/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc-devel/files/patch-ak b/lang/gcc-devel/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc-devel/files/patch-ak
+++ b/lang/gcc-devel/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc-devel/files/patch-al b/lang/gcc-devel/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc-devel/files/patch-al
+++ b/lang/gcc-devel/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc-devel/pkg-plist b/lang/gcc-devel/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc-devel/pkg-plist
+++ b/lang/gcc-devel/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc-ooo/distinfo b/lang/gcc-ooo/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc-ooo/distinfo
+++ b/lang/gcc-ooo/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc-ooo/files/alpha-freebsd.h b/lang/gcc-ooo/files/alpha-freebsd.h
index f10b264..d3116bd 100644
--- a/lang/gcc-ooo/files/alpha-freebsd.h
+++ b/lang/gcc-ooo/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc-ooo/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc-ooo/files/patch-ak b/lang/gcc-ooo/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc-ooo/files/patch-ak
+++ b/lang/gcc-ooo/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc-ooo/files/patch-al b/lang/gcc-ooo/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc-ooo/files/patch-al
+++ b/lang/gcc-ooo/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc/files/alpha-freebsd.h b/lang/gcc/files/alpha-freebsd.h
index f10b264..feedc64 100644
--- a/lang/gcc/files/alpha-freebsd.h
+++ b/lang/gcc/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc/files/patch-ak b/lang/gcc/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc/files/patch-ak
+++ b/lang/gcc/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc/files/patch-al b/lang/gcc/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc/files/patch-al
+++ b/lang/gcc/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc30/distinfo b/lang/gcc30/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc30/distinfo
+++ b/lang/gcc30/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc30/files/alpha-freebsd.h b/lang/gcc30/files/alpha-freebsd.h
index f10b264..9d69b49 100644
--- a/lang/gcc30/files/alpha-freebsd.h
+++ b/lang/gcc30/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc30/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc30/files/patch-ak b/lang/gcc30/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc30/files/patch-ak
+++ b/lang/gcc30/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc30/files/patch-al b/lang/gcc30/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc30/files/patch-al
+++ b/lang/gcc30/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc30/pkg-plist b/lang/gcc30/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc30/pkg-plist
+++ b/lang/gcc30/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc31/distinfo b/lang/gcc31/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc31/distinfo
+++ b/lang/gcc31/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc31/files/alpha-freebsd.h b/lang/gcc31/files/alpha-freebsd.h
index f10b264..c96edd1 100644
--- a/lang/gcc31/files/alpha-freebsd.h
+++ b/lang/gcc31/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc31/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc31/files/patch-ak b/lang/gcc31/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc31/files/patch-ak
+++ b/lang/gcc31/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc31/files/patch-al b/lang/gcc31/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc31/files/patch-al
+++ b/lang/gcc31/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc32/distinfo b/lang/gcc32/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc32/distinfo
+++ b/lang/gcc32/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc32/files/alpha-freebsd.h b/lang/gcc32/files/alpha-freebsd.h
index f10b264..9af10ac 100644
--- a/lang/gcc32/files/alpha-freebsd.h
+++ b/lang/gcc32/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc32/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc32/files/patch-ak b/lang/gcc32/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc32/files/patch-ak
+++ b/lang/gcc32/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc32/files/patch-al b/lang/gcc32/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc32/files/patch-al
+++ b/lang/gcc32/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc32/pkg-plist
+++ b/lang/gcc32/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc33/distinfo b/lang/gcc33/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc33/distinfo
+++ b/lang/gcc33/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc33/files/alpha-freebsd.h b/lang/gcc33/files/alpha-freebsd.h
index f10b264..0ca4765 100644
--- a/lang/gcc33/files/alpha-freebsd.h
+++ b/lang/gcc33/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc33/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc33/files/patch-ak b/lang/gcc33/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc33/files/patch-ak
+++ b/lang/gcc33/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc33/files/patch-al b/lang/gcc33/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc33/files/patch-al
+++ b/lang/gcc33/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc34/files/alpha-freebsd.h b/lang/gcc34/files/alpha-freebsd.h
index f10b264..e34f682 100644
--- a/lang/gcc34/files/alpha-freebsd.h
+++ b/lang/gcc34/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc34/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc34/files/patch-ak b/lang/gcc34/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc34/files/patch-ak
+++ b/lang/gcc34/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc34/files/patch-al b/lang/gcc34/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc34/files/patch-al
+++ b/lang/gcc34/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc35/distinfo b/lang/gcc35/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc35/distinfo
+++ b/lang/gcc35/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc35/files/alpha-freebsd.h b/lang/gcc35/files/alpha-freebsd.h
index f10b264..04804b3 100644
--- a/lang/gcc35/files/alpha-freebsd.h
+++ b/lang/gcc35/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc35/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc35/files/patch-ak b/lang/gcc35/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc35/files/patch-ak
+++ b/lang/gcc35/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc35/files/patch-al b/lang/gcc35/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc35/files/patch-al
+++ b/lang/gcc35/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc35/pkg-plist
+++ b/lang/gcc35/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc40/distinfo b/lang/gcc40/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc40/distinfo
+++ b/lang/gcc40/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc40/files/alpha-freebsd.h b/lang/gcc40/files/alpha-freebsd.h
index f10b264..4e8d28b 100644
--- a/lang/gcc40/files/alpha-freebsd.h
+++ b/lang/gcc40/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc40/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc40/files/patch-ak b/lang/gcc40/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc40/files/patch-ak
+++ b/lang/gcc40/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc40/files/patch-al b/lang/gcc40/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc40/files/patch-al
+++ b/lang/gcc40/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc41/distinfo b/lang/gcc41/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc41/distinfo
+++ b/lang/gcc41/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc41/files/alpha-freebsd.h b/lang/gcc41/files/alpha-freebsd.h
index f10b264..0923ced 100644
--- a/lang/gcc41/files/alpha-freebsd.h
+++ b/lang/gcc41/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc41/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc41/files/patch-ak b/lang/gcc41/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc41/files/patch-ak
+++ b/lang/gcc41/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc41/files/patch-al b/lang/gcc41/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc41/files/patch-al
+++ b/lang/gcc41/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc42/distinfo b/lang/gcc42/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc42/distinfo
+++ b/lang/gcc42/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc42/files/alpha-freebsd.h b/lang/gcc42/files/alpha-freebsd.h
index f10b264..436207f 100644
--- a/lang/gcc42/files/alpha-freebsd.h
+++ b/lang/gcc42/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc42/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc42/files/patch-ak b/lang/gcc42/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc42/files/patch-ak
+++ b/lang/gcc42/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc42/files/patch-al b/lang/gcc42/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc42/files/patch-al
+++ b/lang/gcc42/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc43/distinfo b/lang/gcc43/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc43/distinfo
+++ b/lang/gcc43/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc43/files/alpha-freebsd.h b/lang/gcc43/files/alpha-freebsd.h
index f10b264..9e775b6 100644
--- a/lang/gcc43/files/alpha-freebsd.h
+++ b/lang/gcc43/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc43/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc43/files/patch-ak b/lang/gcc43/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc43/files/patch-ak
+++ b/lang/gcc43/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc43/files/patch-al b/lang/gcc43/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc43/files/patch-al
+++ b/lang/gcc43/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc44/distinfo b/lang/gcc44/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc44/distinfo
+++ b/lang/gcc44/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc44/files/alpha-freebsd.h b/lang/gcc44/files/alpha-freebsd.h
index f10b264..18598f9 100644
--- a/lang/gcc44/files/alpha-freebsd.h
+++ b/lang/gcc44/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc44/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc44/files/patch-ak b/lang/gcc44/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc44/files/patch-ak
+++ b/lang/gcc44/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc44/files/patch-al b/lang/gcc44/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc44/files/patch-al
+++ b/lang/gcc44/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc45/distinfo
+++ b/lang/gcc45/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc45/files/alpha-freebsd.h b/lang/gcc45/files/alpha-freebsd.h
index f10b264..44e1c5d 100644
--- a/lang/gcc45/files/alpha-freebsd.h
+++ b/lang/gcc45/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc45/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc45/files/patch-ak b/lang/gcc45/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc45/files/patch-ak
+++ b/lang/gcc45/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc45/files/patch-al b/lang/gcc45/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc45/files/patch-al
+++ b/lang/gcc45/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc46/distinfo
+++ b/lang/gcc46/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc46/files/alpha-freebsd.h b/lang/gcc46/files/alpha-freebsd.h
index f10b264..1c6a20e 100644
--- a/lang/gcc46/files/alpha-freebsd.h
+++ b/lang/gcc46/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc46/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc46/files/patch-ak b/lang/gcc46/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc46/files/patch-ak
+++ b/lang/gcc46/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc46/files/patch-al b/lang/gcc46/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc46/files/patch-al
+++ b/lang/gcc46/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc47/distinfo b/lang/gcc47/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc47/distinfo
+++ b/lang/gcc47/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc47/files/alpha-freebsd.h b/lang/gcc47/files/alpha-freebsd.h
index f10b264..1c1c015 100644
--- a/lang/gcc47/files/alpha-freebsd.h
+++ b/lang/gcc47/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc47/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc47/files/patch-ak b/lang/gcc47/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc47/files/patch-ak
+++ b/lang/gcc47/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc47/files/patch-al b/lang/gcc47/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc47/files/patch-al
+++ b/lang/gcc47/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index b7b98ca..4b6b8bd6 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -7,10 +7,10 @@
 # $FreeBSD$
 #
 
-SNAPDATE=	1999-07-18
+SNAPDATE=	1999-09-20
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	gcc-${SNAPVER}
+DISTNAME=	gcc-2.96
 PKGNAME=	gcc-devel-${SNAPVER}
 CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
@@ -19,22 +19,21 @@ MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/$
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
  		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	gcc-chill-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-core-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g++-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-g77-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-java-${SNAPVER}${EXTRACT_SUFX} \
-		gcc-objc-${SNAPVER}${EXTRACT_SUFX}
+DISTFILES=	egcs-core-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g++-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-g77-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-java-${SNAPVER}${EXTRACT_SUFX} \
+		egcs-objc-${SNAPVER}${EXTRACT_SUFX}
 
 MAINTAINER=	obrien@FreeBSD.org
 
-BROKEN='Cygnus has yet to release a "HEAD" snapshot, post 2.95 release'
 NO_CDROM=	'dated material'
 
 .include <bsd.port.pre.mk>
 
 EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
+WRKSRC=		${WRKDIR}/egcs-${SNAPVER}
 
 .if ${PORTOBJFORMAT} == "elf"
 .if ${MACHINE_ARCH} == "i386"
@@ -63,6 +62,7 @@ MAN1=		cccp.1 eg++.1 eg77.1 egcc.1
 pre-patch:
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd.h ${WRKSRC}/gcc/config/i386/freebsd-aout.h
 	@${MV} ${WRKSRC}/gcc/config/i386/freebsd-elf.h ${WRKSRC}/gcc/config/i386/freebsd.h
+	@${CP} ${WRKSRC}/gcc/config/t-openbsd-thread ${WRKSRC}/gcc/config/t-freebsd-thread
 
 pre-configure:
 	@(MAJ=`sysctl -n kern.osreldate | ${SED} -e '/.....$$/s///'` ; \
diff --git a/lang/gcc48/distinfo b/lang/gcc48/distinfo
index ab795f9..8ded6dc 100644
--- a/lang/gcc48/distinfo
+++ b/lang/gcc48/distinfo
@@ -1,6 +1,5 @@
-MD5 (egcs-chill-19990718.tar.gz) = 6ec3e656307bacd46c1466ef4e14deaa
-MD5 (egcs-core-19990718.tar.gz) = 50a9667af9e8efd4b7871d21d313b7e9
-MD5 (egcs-g++-19990718.tar.gz) = cae082dd99abfb4e52a85e5b996e5e7c
-MD5 (egcs-g77-19990718.tar.gz) = db751a4062cc90ace9d4c5d8f612ebb5
-MD5 (egcs-java-19990718.tar.gz) = 655e46f0a521a0489fa41912dfbd536a
-MD5 (egcs-objc-19990718.tar.gz) = b338d9c5c96e4ad9dfb35a7772d17a9b
+MD5 (egcs-core-19990920.tar.gz) = 5e792fd9c93f54aa538e54457e947a87
+MD5 (egcs-g++-19990920.tar.gz) = 5cb7eccdd093e8281e9563fb210c2817
+MD5 (egcs-g77-19990920.tar.gz) = 4a3678196a61407ccc53b00ac5007472
+MD5 (egcs-java-19990920.tar.gz) = f1854ca21f9eddfd402b3a3d5e34c92f
+MD5 (egcs-objc-19990920.tar.gz) = a953b1d97bf4e11b2e27498f8f49d337
diff --git a/lang/gcc48/files/alpha-freebsd.h b/lang/gcc48/files/alpha-freebsd.h
index f10b264..ffb0d7c 100644
--- a/lang/gcc48/files/alpha-freebsd.h
+++ b/lang/gcc48/files/alpha-freebsd.h
@@ -22,6 +22,8 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This was taken from the NetBSD configuration, and modified
    for FreeBSD/alpha by Hidetoshi Shimokawa <simokawa@FreeBSD.ORG> */
 
+/* $FreeBSD: /tmp/pcvs/ports/lang/gcc48/files/Attic/alpha-freebsd.h,v 1.5 1999-10-10 20:28:32 obrien Exp $ */
+
 
 /* Get generic FreeBSD definitions.  */
 #include <freebsd.h>
diff --git a/lang/gcc48/files/patch-ak b/lang/gcc48/files/patch-ak
index b8eaba9..81bf097 100644
--- a/lang/gcc48/files/patch-ak
+++ b/lang/gcc48/files/patch-ak
@@ -1,6 +1,6 @@
---- gcc/configure.orig	Tue Jun  8 02:19:23 1999
-+++ gcc/configure	Mon Jun 14 23:54:18 1999
-@@ -3058,6 +3058,15 @@
+--- gcc/configure.orig	Mon Sep 20 02:59:34 1999
++++ gcc/configure	Sat Sep 25 10:51:55 1999
+@@ -3167,6 +3167,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,14 +16,14 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -3536,17 +3545,17 @@
+@@ -3772,8 +3781,12 @@
  # 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 svr4.h i386/freebsd-elf.h i386/perform.h"
-+	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
-+		tm_file=i386/freebsd.h
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout)
++		tm_file=i386/freebsd-aout.h
 +		tmake_file=t-freebsd
 +		;;
 +	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf*)
@@ -31,8 +31,14 @@
  		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
  		tmake_file=t-freebsd
  		gas=yes
- 		gnu_ld=yes
- 		stabs=yes
+@@ -3782,13 +3795,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
 -		;;
 -	i[34567]86-*-freebsd*)
 -		tm_file=i386/freebsd.h
diff --git a/lang/gcc48/files/patch-al b/lang/gcc48/files/patch-al
index de95c44..1c81b9a 100644
--- a/lang/gcc48/files/patch-al
+++ b/lang/gcc48/files/patch-al
@@ -1,6 +1,6 @@
---- gcc/configure.in.orig	Mon Jun  7 14:37:24 1999
-+++ gcc/configure.in	Mon Jun 14 19:25:53 1999
-@@ -625,6 +625,15 @@
+--- gcc/configure.in.orig	Mon Sep 20 02:59:33 1999
++++ gcc/configure.in	Sat Sep 25 10:56:01 1999
+@@ -634,6 +634,15 @@
   			thread_file='posix'
   		fi
  		;;
@@ -16,32 +16,38 @@
  	alpha*-*-netbsd*)
  		tm_file="${tm_file} alpha/elf.h alpha/netbsd.h alpha/netbsd-elf.h"
  		target_cpu_default="MASK_GAS"
-@@ -1136,20 +1145,20 @@
+@@ -1274,9 +1283,15 @@
  #		use_collect2=yes
  		;;
  changequote(,)dnl
 -	i[34567]86-*-freebsdelf*)
-++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout*)
++	i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12] | i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd-aout*)
++changequote([,])dnl
++		tm_file=i386/freebsd-aout.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* | i[34567]86-*-freebsd*)
  changequote([,])dnl
 -		tm_file="i386/i386.h i386/att.h svr4.h i386/freebsd-elf.h i386/perform.h"
--		extra_parts="crtbegin.o crtbeginS.o crtend.o crtendS.o"
-+		tm_file=i386/freebsd.h
++		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
--		stabs=yes
- 		;;
- changequote(,)dnl
+ 		gas=yes
+@@ -1285,15 +1300,9 @@
+ 		case x${enable_threads} in
+ 		xyes | xpthreads | xposix)
+ 			thread_file='posix'
+-			tmake_file="${tmake_file} t-openbsd-thread"
++			tmake_file="${tmake_file} t-freebsd-thread"
+ 			;;
+ 		esac
+-		;;
+-changequote(,)dnl
 -	i[34567]86-*-freebsd*)
-+	i[34567]86-*-freebsd[3-9].* | i[34567]86-*-freebsd[3-9] | i[34567]86-*-freebsd* | i[34567]86-*-freebsdelf* | i[34567]86-*-freebsd*)
- changequote([,])dnl
+-changequote([,])dnl
 -		tm_file=i386/freebsd.h
-+		tm_file="i386/i386.h i386/att.h svr4.h freebsd.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
-+		stabs=yes
+-		tmake_file=t-freebsd
  		;;
  changequote(,)dnl
  	i[34567]86-*-netbsd*)
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index 6448838..3b4f934 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/chill
 bin/eg++filt
 bin/eg++
 bin/eg77
@@ -80,6 +79,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/map.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/memory
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multimap.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/multiset.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/new.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/numeric
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/ostream.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/pair.h
@@ -166,8 +166,6 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/vector.h
 @unexec install-info --delete %D/info/gcc.info %D/info/dir
 @unexec install-info --delete %D/info/g77.info %D/info/dir
 @unexec install-info --delete %D/info/cpp.info %D/info/dir
-@unexec install-info --delete %D/info/chill.info %D/info/dir
-info/chill.info
 info/cpp.info
 info/cpp.info-1
 info/cpp.info-2
@@ -218,6 +216,7 @@ info/gcc.info-27
 info/gcc.info-28
 info/gcc.info-29
 info/gcc.info-30
+info/gcc.info-31
 info/gcc.info-3
 info/gcc.info-4
 info/gcc.info-5
@@ -225,16 +224,13 @@ info/gcc.info-6
 info/gcc.info-7
 info/gcc.info-8
 info/gcc.info-9
-@exec install-info %D/info/chill.info %D/info/dir
 @exec install-info %D/info/cpp.info %D/info/dir
 @exec install-info %D/info/g77.info %D/info/dir
 @exec install-info %D/info/gcc.info %D/info/dir
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/SYSCALLS.c.X
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1chill
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1obj
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cc1plus
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/chillrt0.o
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/cpp
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 @comment ELF-only:lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/crtbegin.o
@@ -244,6 +240,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/collect2
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/f771
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/README
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/assert.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/curses.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/exception
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/float.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g2c.h
@@ -252,6 +249,37 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/limits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/math.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/new.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdio.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/values.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/zconf.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/netisr.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net/zlib.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_if.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_ioctl.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/atm_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/kern_include.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm/port.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_fil.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet/ip_nat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx/ipx.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/ns.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns/spp_var.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/auth.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/svc.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security/_pam_compat.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/file.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/types.h
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys/vnioctl.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/NXConstStr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Object.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/Protocol.h
@@ -263,35 +291,8 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/objc.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/sarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/thr.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc/typedstream.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/proto.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdarg.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stdbool.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/stddef.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/syslimits.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/typeinfo
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-alpha.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-arc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-c4x.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-clipper.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-h8300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i860.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-i960.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m32r.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-m88k.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mips.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10200.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-mn10300.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pa.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-ppc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-pyr.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sh.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-sparc.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-spur.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/va-v850.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/varargs.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jc1
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/jvgenmain
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libchill.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libgcc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libobjc.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/specs
@@ -302,6 +303,14 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libiberty.a
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/libstdc++.a
 @dirrm %%GNU_HOST%%/include
 @dirrm %%GNU_HOST%%
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/net
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netatm
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netinet
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netipx
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/netns
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/rpc
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/security
+@dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/sys
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/objc
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std
 @dirrm lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++