31 files changed, 122 insertions, 122 deletions

diff --git a/devel/ORBacus/Makefile b/devel/ORBacus/Makefile
index 414cd76b5afb..918411ced22a 100644
--- a/devel/ORBacus/Makefile
+++ b/devel/ORBacus/Makefile
@@ -3,7 +3,7 @@
 # Whom:			ejc@bazzle.com
 # Version required:	3.0
 #
-# $Id: Makefile,v 1.21 1999/06/04 13:29:21 ejc Exp $
+# $Id: Makefile,v 1.22 1999/07/12 07:18:36 asami Exp $
 #
 
 DISTNAME=	OB-3.1.3
@@ -20,13 +20,13 @@ LIBSTDC=	/usr/lib/libstdc++.a
 CONFIGURE_ENV=	CXX=c++ CXXFLAGS="-O -pipe"
 .else
 .if ${PORTOBJFORMAT} == "elf"
-LIBSTDC=	${PREFIX}/lib/gcc-lib/i386-unknown-freebsdelf${OSREL}/egcs-2.91.62/libstdc++.a
+LIBSTDC=	${PREFIX}/lib/gcc-lib/${ARCH}-portbld-freebsd${OSREL}/2.95/libstdc++.a
 .else
-LIBSTDC=	${PREFIX}/lib/gcc-lib/i386-unknown-freebsd${OSREL}/egcs-2.91.62/libstdc++.a
+LIBSTDC=	${PREFIX}/lib/gcc-lib/${ARCH}-portbld-freebsdaout${OSREL}/2.95/libstdc++.a
 .endif
 
-BUILD_DEPENDS=  eg++:${PORTSDIR}/lang/egcs
-CONFIGURE_ENV=	CXX=eg++ CXXFLAGS="-O -pipe"
+BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
+CONFIGURE_ENV=	CXX=g++295 CXXFLAGS="-O -pipe"
 .endif
 
 USE_XLIB=	yes
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 1d2f4383a9ba..8b11e372d6a3 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 October 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/07/18 06:27:18 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/18 06:28:44 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 .if ${OSVERSION} < 300000
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .elif ${OSVERSION} < 400000
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-CC=		egcc
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 1d2f4383a9ba..8b11e372d6a3 100644
--- a/devel/gnustep/Makefile
+++ b/devel/gnustep/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 October 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/07/18 06:27:18 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/18 06:28:44 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 .if ${OSVERSION} < 300000
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .elif ${OSVERSION} < 400000
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-CC=		egcc
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index 389a3b1484f9..f4139c302334 100644
--- a/devel/mico/Makefile
+++ b/devel/mico/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 July 1998
 # Whom:                Marc G. Fournier <scrappy@freebsd.org>
 #
-# $Id: Makefile,v 1.33 1999/05/29 03:55:55 steve Exp $
+# $Id: Makefile,v 1.34 1999/08/04 18:51:56 scrappy Exp $
 #
 
 DISTNAME=	mico-2.2.7
@@ -15,9 +15,9 @@ MAINTAINER=	scrappy@freebsd.org
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-CC=		egcc
-CXX=		eg++
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
 .endif
 
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile
index df3b104911fa..e6de19a7f211 100644
--- a/games/fgfs-base/Makefile
+++ b/games/fgfs-base/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 June 1999
 # Whom:			Brian Buchanan <brian@CSUA.Berkeley.EDU>
 #
-# $Id: Makefile,v 1.2 1999/07/08 06:11:20 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/09 06:17:21 cpiazza Exp $
 #
 
 DISTNAME=		FlightGear-${FLIGHTGEAR_VERSION}
@@ -25,8 +25,8 @@ FLIGHTGEAR_VERSION=	0.6.1
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400003
-BUILD_DEPENDS+=		eg++:${PORTSDIR}/lang/egcs
-CXX=			eg++
+BUILD_DEPENDS+=		g++295:${PORTSDIR}/lang/egcs
+CXX=			g++295
 .endif
 
 .if defined(BUILD_SCENERY_TOOLS)
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index df3b104911fa..e6de19a7f211 100644
--- a/games/flightgear-data/Makefile
+++ b/games/flightgear-data/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 June 1999
 # Whom:			Brian Buchanan <brian@CSUA.Berkeley.EDU>
 #
-# $Id: Makefile,v 1.2 1999/07/08 06:11:20 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/09 06:17:21 cpiazza Exp $
 #
 
 DISTNAME=		FlightGear-${FLIGHTGEAR_VERSION}
@@ -25,8 +25,8 @@ FLIGHTGEAR_VERSION=	0.6.1
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400003
-BUILD_DEPENDS+=		eg++:${PORTSDIR}/lang/egcs
-CXX=			eg++
+BUILD_DEPENDS+=		g++295:${PORTSDIR}/lang/egcs
+CXX=			g++295
 .endif
 
 .if defined(BUILD_SCENERY_TOOLS)
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index df3b104911fa..e6de19a7f211 100644
--- a/games/flightgear/Makefile
+++ b/games/flightgear/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 June 1999
 # Whom:			Brian Buchanan <brian@CSUA.Berkeley.EDU>
 #
-# $Id: Makefile,v 1.2 1999/07/08 06:11:20 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/09 06:17:21 cpiazza Exp $
 #
 
 DISTNAME=		FlightGear-${FLIGHTGEAR_VERSION}
@@ -25,8 +25,8 @@ FLIGHTGEAR_VERSION=	0.6.1
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400003
-BUILD_DEPENDS+=		eg++:${PORTSDIR}/lang/egcs
-CXX=			eg++
+BUILD_DEPENDS+=		g++295:${PORTSDIR}/lang/egcs
+CXX=			g++295
 .endif
 
 .if defined(BUILD_SCENERY_TOOLS)
diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index 8bae814ae20c..96abd6c2f6db 100644
--- a/java/guavac/Makefile
+++ b/java/guavac/Makefile
@@ -3,7 +3,7 @@
 # Date created:        10 October 1996
 # Whom:                Yukihiro Nakai <Nakai@Mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.13 1999/05/12 22:45:03 asami Exp $
+# $Id: Makefile,v 1.14 1999/06/28 02:21:39 billf Exp $
 #
 
 DISTNAME=	guavac-1.2
@@ -15,9 +15,9 @@ MAINTAINER=	nacai@iname.com
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-CC=		egcc
-CXX=		eg++
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
 .endif
 
 USE_GMAKE=	yes
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 1d2f4383a9ba..8b11e372d6a3 100644
--- a/lang/gnustep-base/Makefile
+++ b/lang/gnustep-base/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 October 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/07/18 06:27:18 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/18 06:28:44 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 .if ${OSVERSION} < 300000
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .elif ${OSVERSION} < 400000
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-CC=		egcc
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 1d2f4383a9ba..8b11e372d6a3 100644
--- a/lang/gnustep-guile/Makefile
+++ b/lang/gnustep-guile/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 October 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/07/18 06:27:18 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/18 06:28:44 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 .if ${OSVERSION} < 300000
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .elif ${OSVERSION} < 400000
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-CC=		egcc
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index 1d2f4383a9ba..8b11e372d6a3 100644
--- a/lang/gnustep-objc/Makefile
+++ b/lang/gnustep-objc/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 October 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/07/18 06:27:18 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/18 06:28:44 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 .if ${OSVERSION} < 300000
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .elif ${OSVERSION} < 400000
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-CC=		egcc
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 251c08f8b375..173565861fd8 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -13,13 +13,13 @@ MASTER_SITES=	http://metalab.unc.edu/kevina/aspell/ \
 		ftp://ftp.kddlabs.co.jp/pub/Tools/aspell/ \
 		ftp://maroon.webmaster.com/pub/aspell/
 
-MAINTAINER=	ports@freebsd.org
+MAINTAINER=	josh@quick.net
 
 .include <bsd.port.pre.mk>
-.if ${OSREL} < 4
-BUILD_DEPENDS=	eg++:${PORTSDIR}/lang/egcs
-CC=	egcc
-CXX=	eg++
+.if ${OSVERSION} < 400004
+BUILD_DEPENDS=	g++295:${PORTSDIR}/lang/egcs
+CC=	gcc295
+CXX=	g++295
 .endif
 
 GNU_CONFIGURE=	yes
diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index b6c48df523f0..420124ab9847 100644
--- a/www/mozilla+ipv6/Makefile
+++ b/www/mozilla+ipv6/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.29 1999/07/24 02:26:21 cpiazza Exp $
+# $Id: Makefile,v 1.30 1999/07/24 15:33:04 steve Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -20,9 +20,9 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index b6c48df523f0..420124ab9847 100644
--- a/www/mozilla-devel/Makefile
+++ b/www/mozilla-devel/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.29 1999/07/24 02:26:21 cpiazza Exp $
+# $Id: Makefile,v 1.30 1999/07/24 15:33:04 steve Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -20,9 +20,9 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index b6c48df523f0..420124ab9847 100644
--- a/www/mozilla-vendor/Makefile
+++ b/www/mozilla-vendor/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.29 1999/07/24 02:26:21 cpiazza Exp $
+# $Id: Makefile,v 1.30 1999/07/24 15:33:04 steve Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -20,9 +20,9 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index b6c48df523f0..420124ab9847 100644
--- a/www/mozilla/Makefile
+++ b/www/mozilla/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.29 1999/07/24 02:26:21 cpiazza Exp $
+# $Id: Makefile,v 1.30 1999/07/24 15:33:04 steve Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -20,9 +20,9 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index b6c48df523f0..420124ab9847 100644
--- a/www/seamonkey/Makefile
+++ b/www/seamonkey/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.29 1999/07/24 02:26:21 cpiazza Exp $
+# $Id: Makefile,v 1.30 1999/07/24 15:33:04 steve Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -20,9 +20,9 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index b6c48df523f0..420124ab9847 100644
--- a/www/seamonkey2/Makefile
+++ b/www/seamonkey2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		31 Mar 1998
 # Whom:			eivind/dima/jseger
 #
-# $Id: Makefile,v 1.29 1999/07/24 02:26:21 cpiazza Exp $
+# $Id: Makefile,v 1.30 1999/07/24 15:33:04 steve Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -20,9 +20,9 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
diff --git a/x11-clocks/kdetoys11/Makefile b/x11-clocks/kdetoys11/Makefile
index 24e0052efe7b..c5976bbf59bc 100644
--- a/x11-clocks/kdetoys11/Makefile
+++ b/x11-clocks/kdetoys11/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/22 23:48:10 sada Exp $
+# $Id: Makefile,v 1.2 1999/08/12 00:47:33 taoka Exp $
 #
 
 DISTNAME=	kdetoys-1.1.1
@@ -34,9 +34,9 @@ CXXFLAGS?=	${CFLAGS}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-CC=	egcc
-CXX=	eg++
-BUILD_DEPENDS= egcc:${PORTSDIR}/lang/egcs
+CC=	gcc295
+CXX=	g++295
+BUILD_DEPENDS= gcc295:${PORTSDIR}/lang/egcs
 .endif
 
 .if defined(QT_GIF_AVAILABLE)
diff --git a/x11-clocks/kdetoys2/Makefile b/x11-clocks/kdetoys2/Makefile
index 24e0052efe7b..c5976bbf59bc 100644
--- a/x11-clocks/kdetoys2/Makefile
+++ b/x11-clocks/kdetoys2/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/22 23:48:10 sada Exp $
+# $Id: Makefile,v 1.2 1999/08/12 00:47:33 taoka Exp $
 #
 
 DISTNAME=	kdetoys-1.1.1
@@ -34,9 +34,9 @@ CXXFLAGS?=	${CFLAGS}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-CC=	egcc
-CXX=	eg++
-BUILD_DEPENDS= egcc:${PORTSDIR}/lang/egcs
+CC=	gcc295
+CXX=	g++295
+BUILD_DEPENDS= gcc295:${PORTSDIR}/lang/egcs
 .endif
 
 .if defined(QT_GIF_AVAILABLE)
diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index 24e0052efe7b..c5976bbf59bc 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/22 23:48:10 sada Exp $
+# $Id: Makefile,v 1.2 1999/08/12 00:47:33 taoka Exp $
 #
 
 DISTNAME=	kdetoys-1.1.1
@@ -34,9 +34,9 @@ CXXFLAGS?=	${CFLAGS}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-CC=	egcc
-CXX=	eg++
-BUILD_DEPENDS= egcc:${PORTSDIR}/lang/egcs
+CC=	gcc295
+CXX=	g++295
+BUILD_DEPENDS= gcc295:${PORTSDIR}/lang/egcs
 .endif
 
 .if defined(QT_GIF_AVAILABLE)
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index 24e0052efe7b..c5976bbf59bc 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -3,7 +3,7 @@
 # Date created:		18 may 1999
 # Whom:			imura@cs.titech.ac.jp
 #
-# $Id: Makefile,v 1.1.1.1 1999/06/22 23:48:10 sada Exp $
+# $Id: Makefile,v 1.2 1999/08/12 00:47:33 taoka Exp $
 #
 
 DISTNAME=	kdetoys-1.1.1
@@ -34,9 +34,9 @@ CXXFLAGS?=	${CFLAGS}
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-CC=	egcc
-CXX=	eg++
-BUILD_DEPENDS= egcc:${PORTSDIR}/lang/egcs
+CC=	gcc295
+CXX=	g++295
+BUILD_DEPENDS= gcc295:${PORTSDIR}/lang/egcs
 .endif
 
 .if defined(QT_GIF_AVAILABLE)
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 1d2f4383a9ba..8b11e372d6a3 100644
--- a/x11-toolkits/gnustep-gui/Makefile
+++ b/x11-toolkits/gnustep-gui/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 October 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/07/18 06:27:18 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/18 06:28:44 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 .if ${OSVERSION} < 300000
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .elif ${OSVERSION} < 400000
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-CC=		egcc
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
diff --git a/x11-toolkits/gnustep-xgps/Makefile b/x11-toolkits/gnustep-xgps/Makefile
index 1d2f4383a9ba..8b11e372d6a3 100644
--- a/x11-toolkits/gnustep-xgps/Makefile
+++ b/x11-toolkits/gnustep-xgps/Makefile
@@ -3,7 +3,7 @@
 # Date created:         03 October 1998
 # Whom:                 Thomas Gellekum <tg@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.2 1999/07/18 06:27:18 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/07/18 06:28:44 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -22,9 +22,9 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 .if ${OSVERSION} < 300000
 BROKEN=		"Sorry, this port does not work on FreeBSD-2.2.x"
 .elif ${OSVERSION} < 400000
-BUILD_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	egcc:${PORTSDIR}/lang/egcs
-CC=		egcc
+BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
+CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 0d327a125976..3ac745984f9c 100644
--- a/x11-toolkits/gtk--/Makefile
+++ b/x11-toolkits/gtk--/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.11 1999/06/09 11:35:31 steve Exp $
+# $Id: Makefile,v 1.12 1999/08/15 06:50:01 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -23,9 +23,9 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS=  eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 0d327a125976..3ac745984f9c 100644
--- a/x11-toolkits/gtk--2/Makefile
+++ b/x11-toolkits/gtk--2/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.11 1999/06/09 11:35:31 steve Exp $
+# $Id: Makefile,v 1.12 1999/08/15 06:50:01 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -23,9 +23,9 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS=  eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 0d327a125976..3ac745984f9c 100644
--- a/x11-toolkits/gtkmm12/Makefile
+++ b/x11-toolkits/gtkmm12/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.11 1999/06/09 11:35:31 steve Exp $
+# $Id: Makefile,v 1.12 1999/08/15 06:50:01 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -23,9 +23,9 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS=  eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 0d327a125976..3ac745984f9c 100644
--- a/x11-toolkits/gtkmm20/Makefile
+++ b/x11-toolkits/gtkmm20/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.11 1999/06/09 11:35:31 steve Exp $
+# $Id: Makefile,v 1.12 1999/08/15 06:50:01 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -23,9 +23,9 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS=  eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 0d327a125976..3ac745984f9c 100644
--- a/x11-toolkits/gtkmm24/Makefile
+++ b/x11-toolkits/gtkmm24/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.11 1999/06/09 11:35:31 steve Exp $
+# $Id: Makefile,v 1.12 1999/08/15 06:50:01 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -23,9 +23,9 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS=  eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 0d327a125976..3ac745984f9c 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -3,7 +3,7 @@
 # Date created:        11 May 1998
 # Whom:                Yukihiro Nakai <Nakai@technologist.com>
 #
-# $Id: Makefile,v 1.11 1999/06/09 11:35:31 steve Exp $
+# $Id: Makefile,v 1.12 1999/08/15 06:50:01 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -23,9 +23,9 @@ USE_X_PREFIX=	yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400004
-BUILD_DEPENDS=  eg++:${PORTSDIR}/lang/egcs
-CC=		egcc
-CXX=		eg++
+BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
+CC=		gcc295
+CXX=		g++295
 .endif
 
 USE_GMAKE=	yes
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index af9089a25375..4e61bcd6d70c 100644
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@@ -3,7 +3,7 @@
 # Date created:		26 June 1999
 # Whom:			Brian Buchanan <brian@CSUA.Berkeley.EDU>
 #
-# $Id: Makefile,v 1.1.1.1 1999/07/03 06:38:36 cpiazza Exp $
+# $Id: Makefile,v 1.2 1999/07/08 06:11:24 cpiazza Exp $
 #
 
 DISTNAME=		plib-1.0.12a
@@ -23,8 +23,8 @@ USE_X_PREFIX=		yes
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400003
-BUILD_DEPENDS=		eg++:${PORTSDIR}/lang/egcs
-CXX=			eg++
+BUILD_DEPENDS=		g++295:${PORTSDIR}/lang/egcs
+CXX=			g++295
 .endif
 
 GNU_CONFIGURE=		yes