Change all ports that need a new gcc on 3.x to use USE_NEWGCC.

26 files changed, 71 insertions, 229 deletions

diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 8b11e372d6a3..13cf56492127 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.3 1999/07/18 06:28:44 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:55 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -21,10 +21,6 @@ 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=	gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
@@ -43,6 +39,7 @@ USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+USE_NEWGCC=	yes
 
 GNUSTEPLIBDIR=	${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
 
diff --git a/devel/gnustep/Makefile b/devel/gnustep/Makefile
index 8b11e372d6a3..13cf56492127 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.3 1999/07/18 06:28:44 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:55 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -21,10 +21,6 @@ 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=	gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
@@ -43,6 +39,7 @@ USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+USE_NEWGCC=	yes
 
 GNUSTEPLIBDIR=	${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
 
diff --git a/devel/mico/Makefile b/devel/mico/Makefile
index f4139c302334..14a9388aaca7 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.34 1999/08/04 18:51:56 scrappy Exp $
+# $Id: Makefile,v 1.35 1999/08/17 19:37:09 cpiazza Exp $
 #
 
 DISTNAME=	mico-2.2.7
@@ -12,19 +12,12 @@ MASTER_SITES=	http://diamant-atm.vsb.cs.uni-frankfurt.de/~mico/
 
 MAINTAINER=	scrappy@freebsd.org
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-CC=		gcc295
-CXX=		g++295
-BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-.endif
-
 LIB_DEPENDS=	gtk12.2:${PORTSDIR}/x11-toolkits/gtk12 \
 		tcl80.1:${PORTSDIR}/lang/tcl80
 
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
+USE_NEWGCC=	yes
 USE_QT=		yes
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
@@ -41,4 +34,4 @@ MAN8=		ird.8 micod.8 nsd.8
 post-install:
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/fgfs-base/Makefile b/games/fgfs-base/Makefile
index e6de19a7f211..eebc5ba29dd3 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.3 1999/07/09 06:17:21 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:54 cpiazza Exp $
 #
 
 DISTNAME=		FlightGear-${FLIGHTGEAR_VERSION}
@@ -21,14 +21,6 @@ RUN_DEPENDS=		mpg123:${PORTSDIR}/audio/mpg123
 EXTRACT_ONLY=		${DISTNAME}.tar.gz
 
 FLIGHTGEAR_VERSION=	0.6.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400003
-BUILD_DEPENDS+=		g++295:${PORTSDIR}/lang/egcs
-CXX=			g++295
-.endif
-
 .if defined(BUILD_SCENERY_TOOLS)
 MASTER_SITES+=		ftp://ftp.cs.man.ac.uk/pub/amurta/
 DISTFILES+=		gfc-0.8.8.1b.tar.gz gpc231.tar.Z
@@ -51,6 +43,7 @@ ADDPATCHES=	${MASTERDIR}/patches.tools/disable-tools
 USE_AUTOCONF=	yes
 .endif
 
+USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--bindir=${PREFIX}/FlightGear/bin
 USE_GMAKE=	yes
@@ -73,4 +66,4 @@ pre-install:
 post-install:
 	${MV} ${PREFIX}/FlightGear/bin/runfgfs ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/flightgear-data/Makefile b/games/flightgear-data/Makefile
index e6de19a7f211..eebc5ba29dd3 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.3 1999/07/09 06:17:21 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:54 cpiazza Exp $
 #
 
 DISTNAME=		FlightGear-${FLIGHTGEAR_VERSION}
@@ -21,14 +21,6 @@ RUN_DEPENDS=		mpg123:${PORTSDIR}/audio/mpg123
 EXTRACT_ONLY=		${DISTNAME}.tar.gz
 
 FLIGHTGEAR_VERSION=	0.6.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400003
-BUILD_DEPENDS+=		g++295:${PORTSDIR}/lang/egcs
-CXX=			g++295
-.endif
-
 .if defined(BUILD_SCENERY_TOOLS)
 MASTER_SITES+=		ftp://ftp.cs.man.ac.uk/pub/amurta/
 DISTFILES+=		gfc-0.8.8.1b.tar.gz gpc231.tar.Z
@@ -51,6 +43,7 @@ ADDPATCHES=	${MASTERDIR}/patches.tools/disable-tools
 USE_AUTOCONF=	yes
 .endif
 
+USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--bindir=${PREFIX}/FlightGear/bin
 USE_GMAKE=	yes
@@ -73,4 +66,4 @@ pre-install:
 post-install:
 	${MV} ${PREFIX}/FlightGear/bin/runfgfs ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/games/flightgear/Makefile b/games/flightgear/Makefile
index e6de19a7f211..eebc5ba29dd3 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.3 1999/07/09 06:17:21 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:54 cpiazza Exp $
 #
 
 DISTNAME=		FlightGear-${FLIGHTGEAR_VERSION}
@@ -21,14 +21,6 @@ RUN_DEPENDS=		mpg123:${PORTSDIR}/audio/mpg123
 EXTRACT_ONLY=		${DISTNAME}.tar.gz
 
 FLIGHTGEAR_VERSION=	0.6.1
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400003
-BUILD_DEPENDS+=		g++295:${PORTSDIR}/lang/egcs
-CXX=			g++295
-.endif
-
 .if defined(BUILD_SCENERY_TOOLS)
 MASTER_SITES+=		ftp://ftp.cs.man.ac.uk/pub/amurta/
 DISTFILES+=		gfc-0.8.8.1b.tar.gz gpc231.tar.Z
@@ -51,6 +43,7 @@ ADDPATCHES=	${MASTERDIR}/patches.tools/disable-tools
 USE_AUTOCONF=	yes
 .endif
 
+USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--bindir=${PREFIX}/FlightGear/bin
 USE_GMAKE=	yes
@@ -73,4 +66,4 @@ pre-install:
 post-install:
 	${MV} ${PREFIX}/FlightGear/bin/runfgfs ${PREFIX}/bin
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/java/guavac/Makefile b/java/guavac/Makefile
index df32ed50c693..70690067910b 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.15 1999/08/17 19:36:56 cpiazza Exp $
+# $Id: Makefile,v 1.16 1999/08/22 18:58:39 mharo Exp $
 #
 
 DISTNAME=	guavac-1.2
@@ -12,14 +12,7 @@ MASTER_SITES=	ftp://ftp.yggdrasil.com/pub/dist/devel/compilers/guavac/
 
 MAINTAINER=	nacai@iname.com
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-CC=		gcc295
-CXX=		g++295
-BUILD_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-.endif
-
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		guavac.1
@@ -31,4 +24,4 @@ pre-install:
 post-install:
 	@strip ${PREFIX}/bin/guavac ${PREFIX}/bin/guavad
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/lang/gnustep-base/Makefile b/lang/gnustep-base/Makefile
index 8b11e372d6a3..13cf56492127 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.3 1999/07/18 06:28:44 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:55 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -21,10 +21,6 @@ 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=	gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
@@ -43,6 +39,7 @@ USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+USE_NEWGCC=	yes
 
 GNUSTEPLIBDIR=	${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
 
diff --git a/lang/gnustep-guile/Makefile b/lang/gnustep-guile/Makefile
index 8b11e372d6a3..13cf56492127 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.3 1999/07/18 06:28:44 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:55 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -21,10 +21,6 @@ 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=	gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
@@ -43,6 +39,7 @@ USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+USE_NEWGCC=	yes
 
 GNUSTEPLIBDIR=	${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
 
diff --git a/lang/gnustep-objc/Makefile b/lang/gnustep-objc/Makefile
index 8b11e372d6a3..13cf56492127 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.3 1999/07/18 06:28:44 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:55 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -21,10 +21,6 @@ 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=	gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
@@ -43,6 +39,7 @@ USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+USE_NEWGCC=	yes
 
 GNUSTEPLIBDIR=	${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
 
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index d0c96643af9f..6d61a84cf91d 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -3,7 +3,7 @@
 # Date created:		7 December 1998
 # Whom:			Josh Gilliam <josh@quick.net>
 #
-# $Id: Makefile,v 1.6 1999/08/17 19:36:53 cpiazza Exp $
+# $Id: Makefile,v 1.7 1999/08/19 12:35:41 sheldonh Exp $
 #
 
 DISTNAME=	aspell-.27.2
@@ -15,13 +15,7 @@ MASTER_SITES=	http://metalab.unc.edu/kevina/aspell/ \
 
 MAINTAINER=	ade@lovett.com
 
-.include <bsd.port.pre.mk>
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS=	g++295:${PORTSDIR}/lang/egcs
-CC=	gcc295
-CXX=	g++295
-.endif
-
+USE_NEWGCC=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CXXFLAGS="${CXXFLAGS} -I${WRKSRC}"
 USE_GMAKE=	yes
@@ -47,4 +41,4 @@ pre-install:
 	          ${WRKSRC}/manual/man-text/D_Glossary.txt \
 	          ${WRKSRC}/manual/man-text/E_Copyright.txt
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mozilla+ipv6/Makefile b/www/mozilla+ipv6/Makefile
index 2b1a2ef3ee0f..78edd485b108 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.31 1999/08/17 19:37:10 cpiazza Exp $
+# $Id: Makefile,v 1.32 1999/08/22 19:00:43 mharo Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -17,14 +17,6 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 		IDL.2:${PORTSDIR}/devel/ORBit \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -33,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NEWGCC=	yes
 CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--disable-md			\
@@ -63,4 +56,4 @@ do-install:
 	${TOUCH} ${PREFIX}/lib/mozilla/component.reg
 	${CHMOD} 666 ${PREFIX}/lib/mozilla/component.reg
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mozilla-devel/Makefile b/www/mozilla-devel/Makefile
index 2b1a2ef3ee0f..78edd485b108 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.31 1999/08/17 19:37:10 cpiazza Exp $
+# $Id: Makefile,v 1.32 1999/08/22 19:00:43 mharo Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -17,14 +17,6 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 		IDL.2:${PORTSDIR}/devel/ORBit \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -33,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NEWGCC=	yes
 CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--disable-md			\
@@ -63,4 +56,4 @@ do-install:
 	${TOUCH} ${PREFIX}/lib/mozilla/component.reg
 	${CHMOD} 666 ${PREFIX}/lib/mozilla/component.reg
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mozilla-vendor/Makefile b/www/mozilla-vendor/Makefile
index 2b1a2ef3ee0f..78edd485b108 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.31 1999/08/17 19:37:10 cpiazza Exp $
+# $Id: Makefile,v 1.32 1999/08/22 19:00:43 mharo Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -17,14 +17,6 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 		IDL.2:${PORTSDIR}/devel/ORBit \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -33,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NEWGCC=	yes
 CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--disable-md			\
@@ -63,4 +56,4 @@ do-install:
 	${TOUCH} ${PREFIX}/lib/mozilla/component.reg
 	${CHMOD} 666 ${PREFIX}/lib/mozilla/component.reg
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/mozilla/Makefile b/www/mozilla/Makefile
index 2b1a2ef3ee0f..78edd485b108 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.31 1999/08/17 19:37:10 cpiazza Exp $
+# $Id: Makefile,v 1.32 1999/08/22 19:00:43 mharo Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -17,14 +17,6 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 		IDL.2:${PORTSDIR}/devel/ORBit \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -33,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NEWGCC=	yes
 CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--disable-md			\
@@ -63,4 +56,4 @@ do-install:
 	${TOUCH} ${PREFIX}/lib/mozilla/component.reg
 	${CHMOD} 666 ${PREFIX}/lib/mozilla/component.reg
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/seamonkey/Makefile b/www/seamonkey/Makefile
index 2b1a2ef3ee0f..78edd485b108 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.31 1999/08/17 19:37:10 cpiazza Exp $
+# $Id: Makefile,v 1.32 1999/08/22 19:00:43 mharo Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -17,14 +17,6 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 		IDL.2:${PORTSDIR}/devel/ORBit \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -33,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NEWGCC=	yes
 CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--disable-md			\
@@ -63,4 +56,4 @@ do-install:
 	${TOUCH} ${PREFIX}/lib/mozilla/component.reg
 	${CHMOD} 666 ${PREFIX}/lib/mozilla/component.reg
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/www/seamonkey2/Makefile b/www/seamonkey2/Makefile
index 2b1a2ef3ee0f..78edd485b108 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.31 1999/08/17 19:37:10 cpiazza Exp $
+# $Id: Makefile,v 1.32 1999/08/22 19:00:43 mharo Exp $
 #
 
 DISTNAME=	mozilla-source-M8
@@ -17,14 +17,6 @@ LIB_DEPENDS=	glib12.2:${PORTSDIR}/devel/glib12 \
 		IDL.2:${PORTSDIR}/devel/ORBit \
 		gtk12.2:${PORTSDIR}/x11-toolkits/gtk12
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS+=	g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
 GLIB_CONFIG?=	${LOCALBASE}/bin/glib12-config
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
@@ -33,6 +25,7 @@ USE_X_PREFIX=	yes
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_NEWGCC=	yes
 CONFIGURE_ARGS=					\
 		--disable-cpp-rtti		\
 		--disable-md			\
@@ -63,4 +56,4 @@ do-install:
 	${TOUCH} ${PREFIX}/lib/mozilla/component.reg
 	${CHMOD} 666 ${PREFIX}/lib/mozilla/component.reg
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 8b11e372d6a3..13cf56492127 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.3 1999/07/18 06:28:44 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:55 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -21,10 +21,6 @@ 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=	gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
@@ -43,6 +39,7 @@ USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+USE_NEWGCC=	yes
 
 GNUSTEPLIBDIR=	${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
 
diff --git a/x11-toolkits/gnustep-xgps/Makefile b/x11-toolkits/gnustep-xgps/Makefile
index 8b11e372d6a3..13cf56492127 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.3 1999/07/18 06:28:44 cpiazza Exp $
+# $Id: Makefile,v 1.4 1999/08/17 19:36:55 cpiazza Exp $
 #
 
 DISTNAME=       gstep-core-0.5.5
@@ -21,10 +21,6 @@ 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=	gcc295:${PORTSDIR}/lang/egcs
-RUN_DEPENDS=	gcc295:${PORTSDIR}/lang/egcs
-CC=		gcc295
 .endif
 
 BROKEN=		"Hardcoded freebsd release numbers in PLIST"
@@ -43,6 +39,7 @@ USE_XLIB=	yes
 MAKEFILE=
 MAKE_FLAGS=	OPTFLAG="${CFLAGS}"
 NO_MTREE=	yes
+USE_NEWGCC=	yes
 
 GNUSTEPLIBDIR=	${PREFIX}/Libraries/ix86/freebsd3.1/gnu-gnu-gnu-xraw
 
diff --git a/x11-toolkits/gtk--/Makefile b/x11-toolkits/gtk--/Makefile
index 3ac745984f9c..f433e4d0f694 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.12 1999/08/15 06:50:01 cpiazza Exp $
+# $Id: Makefile,v 1.13 1999/08/17 19:36:56 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -19,15 +19,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
@@ -72,4 +64,4 @@ MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtk--2/Makefile b/x11-toolkits/gtk--2/Makefile
index 3ac745984f9c..f433e4d0f694 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.12 1999/08/15 06:50:01 cpiazza Exp $
+# $Id: Makefile,v 1.13 1999/08/17 19:36:56 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -19,15 +19,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
@@ -72,4 +64,4 @@ MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm12/Makefile b/x11-toolkits/gtkmm12/Makefile
index 3ac745984f9c..f433e4d0f694 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.12 1999/08/15 06:50:01 cpiazza Exp $
+# $Id: Makefile,v 1.13 1999/08/17 19:36:56 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -19,15 +19,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
@@ -72,4 +64,4 @@ MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm20/Makefile b/x11-toolkits/gtkmm20/Makefile
index 3ac745984f9c..f433e4d0f694 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.12 1999/08/15 06:50:01 cpiazza Exp $
+# $Id: Makefile,v 1.13 1999/08/17 19:36:56 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -19,15 +19,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
@@ -72,4 +64,4 @@ MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm24/Makefile b/x11-toolkits/gtkmm24/Makefile
index 3ac745984f9c..f433e4d0f694 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.12 1999/08/15 06:50:01 cpiazza Exp $
+# $Id: Makefile,v 1.13 1999/08/17 19:36:56 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -19,15 +19,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
@@ -72,4 +64,4 @@ MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 3ac745984f9c..f433e4d0f694 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.12 1999/08/15 06:50:01 cpiazza Exp $
+# $Id: Makefile,v 1.13 1999/08/17 19:36:56 cpiazza Exp $
 #
 
 DISTNAME=	Gtk---1.0.0
@@ -19,15 +19,7 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 GTK_CONFIG?=	${X11BASE}/bin/gtk12-config
 
 USE_X_PREFIX=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400004
-BUILD_DEPENDS=  g++295:${PORTSDIR}/lang/egcs
-CC=		gcc295
-CXX=		g++295
-.endif
-
+USE_NEWGCC=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-static=yes \
@@ -72,4 +64,4 @@ MAN3=	G_IntList.3 G_IntList_Iterator.3 G_List.3 G_List_Cpp_Iterator.3 \
 post-install:
 	@${CAT} ${PKGDIR}/MESSAGE
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile
index 4e61bcd6d70c..1aaf20a95525 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.2 1999/07/08 06:11:24 cpiazza Exp $
+# $Id: Makefile,v 1.3 1999/08/17 19:37:11 cpiazza Exp $
 #
 
 DISTNAME=		plib-1.0.12a
@@ -20,17 +20,11 @@ LIB_DEPENDS=		GL.14:${PORTSDIR}/graphics/Mesa3 		\
 
 USE_X_PREFIX=		yes
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 400003
-BUILD_DEPENDS=		g++295:${PORTSDIR}/lang/egcs
-CXX=			g++295
-.endif
-
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		CPPFLAGS=-I${X11BASE}/include
 CONFIGURE_ARGS+=	--includedir=$(PREFIX)/include/plib
 USE_GMAKE=		yes
+USE_NEWGCC=		yes
 MANCOMPRESSED=		yes
 
 MAN1=			calibrate.1
@@ -42,4 +36,4 @@ pre-build:
 pre-install:
 	@(cd ${WRKDIR}/calibrate-0.0.1; ${MAKE} PREFIX=${PREFIX} install)
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>