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

9 files changed, 25 insertions, 85 deletions

diff --git a/x11-toolkits/gnustep-gui/Makefile b/x11-toolkits/gnustep-gui/Makefile
index 8b11e37..13cf564 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 8b11e37..13cf564 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 3ac7459..f433e4d 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 3ac7459..f433e4d 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 3ac7459..f433e4d 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 3ac7459..f433e4d 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 3ac7459..f433e4d 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 3ac7459..f433e4d 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 4e61bcd..1aaf20a 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>