Merge parts of the GCC-2.95 update, in preperation for the 1st post 2.95

snapshot.
Mark BROKEN until the next Cygnus snapshot.

36 files changed, 522 insertions, 450 deletions

diff --git a/lang/gcc-devel/Makefile b/lang/gcc-devel/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc-devel/Makefile
+++ b/lang/gcc-devel/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc-devel/pkg-plist b/lang/gcc-devel/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc-devel/pkg-plist
+++ b/lang/gcc-devel/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc-ooo/Makefile b/lang/gcc-ooo/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc-ooo/Makefile
+++ b/lang/gcc-ooo/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc-ooo/pkg-plist b/lang/gcc-ooo/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc-ooo/pkg-plist
+++ b/lang/gcc-ooo/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc/pkg-plist
+++ b/lang/gcc/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc30/Makefile b/lang/gcc30/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc30/Makefile
+++ b/lang/gcc30/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc30/pkg-plist b/lang/gcc30/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc30/pkg-plist
+++ b/lang/gcc30/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc31/Makefile b/lang/gcc31/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc31/Makefile
+++ b/lang/gcc31/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc31/pkg-plist b/lang/gcc31/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc31/pkg-plist
+++ b/lang/gcc31/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc32/Makefile b/lang/gcc32/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc32/Makefile
+++ b/lang/gcc32/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc32/pkg-plist b/lang/gcc32/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc32/pkg-plist
+++ b/lang/gcc32/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc33/Makefile b/lang/gcc33/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc33/Makefile
+++ b/lang/gcc33/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc33/pkg-plist b/lang/gcc33/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc33/pkg-plist
+++ b/lang/gcc33/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc34/pkg-plist b/lang/gcc34/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc34/pkg-plist
+++ b/lang/gcc34/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc35/Makefile b/lang/gcc35/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc35/Makefile
+++ b/lang/gcc35/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc35/pkg-plist b/lang/gcc35/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc35/pkg-plist
+++ b/lang/gcc35/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc40/Makefile b/lang/gcc40/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc40/Makefile
+++ b/lang/gcc40/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc40/pkg-plist b/lang/gcc40/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc40/pkg-plist
+++ b/lang/gcc40/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc41/Makefile b/lang/gcc41/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc41/Makefile
+++ b/lang/gcc41/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc41/pkg-plist b/lang/gcc41/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc41/pkg-plist
+++ b/lang/gcc41/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc42/Makefile b/lang/gcc42/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc42/Makefile
+++ b/lang/gcc42/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc42/pkg-plist b/lang/gcc42/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc42/pkg-plist
+++ b/lang/gcc42/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc43/Makefile b/lang/gcc43/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc43/Makefile
+++ b/lang/gcc43/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc43/pkg-plist b/lang/gcc43/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc43/pkg-plist
+++ b/lang/gcc43/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc44/Makefile b/lang/gcc44/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc44/Makefile
+++ b/lang/gcc44/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc44/pkg-plist b/lang/gcc44/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc44/pkg-plist
+++ b/lang/gcc44/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc45/Makefile
+++ b/lang/gcc45/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc45/pkg-plist
+++ b/lang/gcc45/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc46/Makefile
+++ b/lang/gcc46/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc46/pkg-plist
+++ b/lang/gcc46/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc47/Makefile b/lang/gcc47/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc47/Makefile
+++ b/lang/gcc47/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc47/pkg-plist b/lang/gcc47/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc47/pkg-plist
+++ b/lang/gcc47/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile
index 70c09a1..54c99a9 100644
--- a/lang/gcc48/Makefile
+++ b/lang/gcc48/Makefile
@@ -4,35 +4,36 @@
 # Date created:				9 Jan 1998
 # Whom:					John Polstra <jdp@polstra.com>
 #
-# $Id: Makefile,v 1.69 1999/07/15 11:08:13 obrien Exp $
+# $Id: Makefile,v 1.70 1999/07/20 15:30:50 obrien Exp $
 #
 
 SNAPDATE=	1999-07-18
 SNAPVER=	${SNAPDATE:S/-//g}
 
-DISTNAME=	egcs-${SNAPVER}
-PKGNAME=	egcs-devel-${SNAPVER}
-CATEGORIES=	lang
+DISTNAME=	gcc-${SNAPVER}
+PKGNAME=	gcc-devel-${SNAPVER}
+CATEGORIES=	lang java
 MASTER_SITES=	ftp://go.cygnus.com/pub/sourceware.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://egcs.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.nluug.nl/pub/languages/egcs/snapshots/${SNAPDATE}/ \
 		ftp://ftp.iij.ad.jp/pub/egcs/snapshots/${SNAPDATE}/ \
-		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
+ 		ftp://ftp.fu-berlin.de/unix/languages/egcs/snapshots/ \
 		ftp://cambridge.cygnus.com/pub/egcs/snapshots/${SNAPDATE}/
-DISTFILES=	egcs-chill-${SNAPVER}${EXTRACT_SUFX} \
-		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}
+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}
 
 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=	gcc-2.95
+EGCS_REV=	${DISTNAME:S/gcc-//g}
 LIBSTDCPP_REV=	4
 
 .if ${PORTOBJFORMAT} == "elf"
@@ -83,21 +84,23 @@ post-install:
 	@${RM} -f ${PREFIX}/bin/c++
 	@${MV} -f ${PREFIX}/bin/c++filt ${PREFIX}/bin/g++filt
 	@(for prog in ${PREFIX}/bin/gcc ${PREFIX}/bin/g++ \
-	${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
-	${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
-	${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
-	${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
-		do strip $$prog ; \
-		done)
+		${PREFIX}/bin/g++filt ${PREFIX}/bin/g77 ${PREFIX}/bin/gcov \
+		${PREFIX}/bin/protoize ${PREFIX}/bin/unprotoize \
+		${PREFIX}/bin/${CONFIGURE_TARGET}-gcc \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1obj \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cc1plus \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/cpp \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/collect2 \
+		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}/f771 ; \
+	do \
+		strip $$prog ; \
+	done)
 	${MV} ${PREFIX}/bin/gcc ${PREFIX}/bin/egcc
 	${MV} ${PREFIX}/bin/g++ ${PREFIX}/bin/eg++
 	${MV} ${PREFIX}/bin/g77 ${PREFIX}/bin/eg77
 	${MV} ${PREFIX}/bin/g++filt ${PREFIX}/bin/eg++filt
+	${RM} -f ${PREFIX}/bin/cpp
 	${MV} ${PREFIX}/lib/libiberty.a  \
 		${PREFIX}/lib/gcc-lib/${CONFIGURE_TARGET}/${EGCS_REV}
 	${MV} -f ${PREFIX}/lib/libstdc++.a.${LIBSTDCPP_REV}  \
diff --git a/lang/gcc48/pkg-plist b/lang/gcc48/pkg-plist
index d3beef5..37ab948 100644
--- a/lang/gcc48/pkg-plist
+++ b/lang/gcc48/pkg-plist
@@ -1,4 +1,4 @@
-@comment $Id: PLIST,v 1.23 1999/06/05 22:25:55 mharo Exp $
+@comment $Id: PLIST,v 1.24 1999/07/04 20:58:11 obrien Exp $
 bin/chill
 bin/eg++filt
 bin/eg++
@@ -114,7 +114,7 @@ lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/slice_array.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/std_valarray.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/straits.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.h
-lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.toc
+lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_array.tcc
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/std/valarray_meta.h
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdexcept
 lib/gcc-lib/%%GNU_HOST%%/%%EGCS_REV%%/include/g++/stdiostream.h
@@ -186,6 +186,7 @@ info/g77.info-18
 info/g77.info-19
 info/g77.info-2
 info/g77.info-20
+info/g77.info-21
 info/g77.info-3
 info/g77.info-4
 info/g77.info-5