get rid of USE_GCC2/3 in pkg Makefiles, and set GCC_REQD or

USE_PKGSRC_GCC as appropriate, as this is handled by compiler.mk now.

51 files changed, 124 insertions, 140 deletions

diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index ea700791c45..d6bb60ac584 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/09/15 08:46:25 grant Exp $
+# $NetBSD: Makefile,v 1.32 2003/09/17 19:39:58 grant Exp $
 
 DISTNAME=	nas-1.6.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -51,8 +51,4 @@ PLIST_SRC+=	${PKGDIR}/PLIST.voxware
 CONF_FILES=	${EGDIR}/nasd.conf.eg ${PKG_SYSCONFDIR}/nasd.conf
 .endif
 
-.if defined(USE_GCC3)
-.  include "../../lang/gcc3/buildlink2.mk"
-.endif
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/biology/rasmol/Makefile b/biology/rasmol/Makefile
index 36a72478ef3..b888c5bc8d7 100644
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:07 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/17 19:40:00 grant Exp $
 
 DISTNAME=	RasMol_2.7.1
 PKGNAME=	rasmol-2.7.1
@@ -19,7 +19,7 @@ MAKE_ENV+=	DEPTHDEF="${DEPTHDEF}"
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .if defined(RASMOL_DEPTH)
diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index f37a6773df6..a3d4891e2eb 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/09/12 20:07:08 grant Exp $
+# $NetBSD: Makefile,v 1.14 2003/09/17 19:40:02 grant Exp $
 #
 
 DISTNAME=	fastcap-2.0-15Jul92
@@ -25,7 +25,7 @@ CONFIGURE_SCRIPT=	./config
 CONFIGURE_ARGS=		4
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 do-install:
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 88becd3ab14..65d36b31776 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/12 20:07:09 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/17 19:40:03 grant Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
@@ -40,7 +40,7 @@ MAKE_ENV+=	LIBS="${LIBS}"
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/gabber/Makefile b/chat/gabber/Makefile
index 1dee976f183..f40de3cd8b9 100644
--- a/chat/gabber/Makefile
+++ b/chat/gabber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/09/12 20:07:09 grant Exp $
+# $NetBSD: Makefile,v 1.23 2003/09/17 19:40:04 grant Exp $
 
 DISTNAME=	gabber-0.8.8
 PKGREVISION=	1
@@ -16,7 +16,7 @@ USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-xmms --disable-sigctest
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index 49042c2f77e..5aaf5eea6d7 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/12 20:07:10 grant Exp $
+# $NetBSD: Makefile,v 1.7 2003/09/17 19:40:06 grant Exp $
 
 DISTNAME=		gcc-core-3.1
 PKGNAME=		cross-h8300-hms-gcc-3.1
@@ -32,7 +32,7 @@ CONFIGURE_SCRIPT=	${SRCDIR}/configure
 SRCDIR=			${WRKDIR}/gcc-3.1
 ALL_TARGET=		CFLAGS="-O2 -fomit-frame-pointer" all
 
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 
 post-extract:
 	${LN} -s ${WRKDIR}/newlib-1.10.0/newlib ${SRCDIR}/newlib
diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile
index 3d6e6451f7e..120287178c6 100644
--- a/databases/cdb/Makefile
+++ b/databases/cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:11 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/17 19:40:08 grant Exp $
 
 DISTNAME=	cdb-0.75
 CATEGORIES=	databases
@@ -12,7 +12,7 @@ ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 pre-build:
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 8bbadfd2bee..e60847dcaeb 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2003/09/12 21:02:10 tron Exp $
+# $NetBSD: Makefile,v 1.54 2003/09/17 19:40:11 grant Exp $
 #
 
 DISTNAME=	ddd-3.3.7
@@ -16,7 +16,7 @@ USE_GMAKE=		YES
 TEST_TARGET=		check
 INFO_FILES=		ddd-themes.info ddd.info
 
-USE_GCC3=		# defined
+GCC_REQD=		3.0
 
 CONFIGURE_ARGS+=	--with-ncurses=no
 CONFIGURE_ENV+=		COMPFACE="${FALSE}"
diff --git a/devel/glib/Makefile b/devel/glib/Makefile
index 1d0b6794485..cc542df2843 100644
--- a/devel/glib/Makefile
+++ b/devel/glib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.62 2003/09/12 20:07:12 grant Exp $
+# $NetBSD: Makefile,v 1.63 2003/09/17 19:40:13 grant Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/08/06 14:55:12 vanilla Exp
 #
 
@@ -39,7 +39,7 @@ CONFIGURE_ENV+=		glib_cv_rtldglobal_broken=no
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=		# defined
+GCC_REQD=		3.0
 .endif
 
 GLIB_VERSION=		${DISTNAME:S/glib-//}
diff --git a/devel/gnome-objc/Makefile b/devel/gnome-objc/Makefile
index e8a08e2e58e..577d5256a5b 100644
--- a/devel/gnome-objc/Makefile
+++ b/devel/gnome-objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/07/17 21:30:50 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/17 19:41:30 grant Exp $
 #
 
 DISTNAME=	gnome-objc-1.0.40
@@ -16,12 +16,14 @@ USE_X11=		YES
 PTHREAD_OPTS+=		require
 
 GNU_CONFIGURE=		YES
+USE_PKGLOCALEDIR=	YES
 CONFIGURE_ENV+=		OBJC="${CC}"
 
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
+GCC_REQD=		3.0
+
 .include "../../x11/gnome-libs/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index 6f052194fcc..018c65c6dd6 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:13 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:14 grant Exp $
 #
 
 DISTNAME=	prc-tools-2.2
@@ -37,7 +37,7 @@ AUTOCONF_REQD=	2.50
 USE_MAKEINFO=	YES
 INFO_FILES=	prc-tools.info
 
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=	# defined
 
 #CONFIGURE_ARGS+=--target=m68k-palmos
 CONFIGURE_ARGS+=--enable-targets=m68k-palmos,arm-palmos
diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile
index ee48aa0ca99..61c91b70f3d 100644
--- a/editors/xemacs-current/Makefile
+++ b/editors/xemacs-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/09/12 20:07:14 grant Exp $
+# $NetBSD: Makefile,v 1.30 2003/09/17 19:40:17 grant Exp $
 
 DISTNAME=	xemacs-21.5.15
 CATEGORIES=	editors
@@ -15,7 +15,7 @@ PLIST_SUBST+=	EMACSVER=xemacs-21.5-b15
 MESSAGE_SUBST+=	EMACSVER=xemacs-21.5-b15
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index a7b0214a8d8..7ff1569da2c 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/09/12 20:07:15 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:18 grant Exp $
 
 DISTNAME=	stella-1.1-src
 PKGNAME=	stella-1.1
@@ -16,7 +16,7 @@ MAKEFILE=	makefile
 ALL_TARGET=	unix-x
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 MAKE_ENV=	CXXFLAGS="${CXXFLAGS} -fno-rtti"
diff --git a/games/angband-tty/Makefile b/games/angband-tty/Makefile
index cb44f530d36..b79d13e128b 100644
--- a/games/angband-tty/Makefile
+++ b/games/angband-tty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/09/12 20:07:16 grant Exp $
+# $NetBSD: Makefile,v 1.18 2003/09/17 19:40:21 grant Exp $
 #
 
 DISTNAME=		angband-283
@@ -23,7 +23,7 @@ ALL_TARGET=		angband
 SPOILERFILE=		angband-spoilers.tar.gz
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 do-install:
diff --git a/games/angband-x11/Makefile b/games/angband-x11/Makefile
index ec27c9e8882..add23d2b101 100644
--- a/games/angband-x11/Makefile
+++ b/games/angband-x11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/09/15 13:58:37 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2003/09/17 19:40:23 grant Exp $
 #
 
 DISTNAME=	angband-3.0.3
@@ -25,7 +25,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-setgid=games --prefix=${PREFIX}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 # add spoiler files and clean up a bit
diff --git a/graphics/aalib/Makefile.common b/graphics/aalib/Makefile.common
index a7f705ace24..5e9cb77f43c 100644
--- a/graphics/aalib/Makefile.common
+++ b/graphics/aalib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:17 grant Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/09/17 19:40:26 grant Exp $
 
 DISTNAME=	aalib-${DIST_VERS}
 WRKSRC=		${WRKDIR}/aalib-1.4.0
@@ -19,7 +19,7 @@ USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index 35bed3eb36c..0371f865951 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/12 20:07:18 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/17 19:40:27 grant Exp $
 #
 
 DISTNAME=		aqsis-0.6.4
@@ -17,7 +17,7 @@ USE_GMAKE=		yes
 USE_X11=		yes
 
 USE_BUILDLINK2=		yes
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 
 .include "../../devel/libargparse/buildlink2.mk"
 .include "../../graphics/Mesa/buildlink2.mk"
diff --git a/graphics/mplayer-share/Makefile.depends b/graphics/mplayer-share/Makefile.depends
index 9c2d7209134..53a2a6aa1db 100644
--- a/graphics/mplayer-share/Makefile.depends
+++ b/graphics/mplayer-share/Makefile.depends
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile.depends,v 1.20 2003/09/12 21:46:46 jmmv Exp $
+# $NetBSD: Makefile.depends,v 1.21 2003/09/17 19:40:31 grant Exp $
 #
 
 DEPENDS+=	mplayer-share>=${MPLAYER_PKG_VERSION}:../../graphics/mplayer-share
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-1.5*) && !defined(USE_GCC3)
-USE_GCC2=	yes
-.endif
+GCC_REQD=	2.95.3
 
 .if ${OPSYS} == "NetBSD" || ${OPSYS} == "Linux"
 .  include "../../audio/cdparanoia/buildlink2.mk"
@@ -39,7 +37,6 @@ USE_X11=	YES
 .include "../../graphics/libungif/buildlink2.mk"
 .include "../../graphics/png/buildlink2.mk"
 .include "../../misc/libdvdread/buildlink2.mk"
-.include "../../mk/compiler.mk"
 
 .if defined(USE_OSS)
 .  include "../../mk/ossaudio.buildlink2.mk"
diff --git a/graphics/ncview/Makefile b/graphics/ncview/Makefile
index 2e983aea74c..795bded5bf1 100644
--- a/graphics/ncview/Makefile
+++ b/graphics/ncview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/09/12 20:07:18 grant Exp $
+# $NetBSD: Makefile,v 1.15 2003/09/17 19:40:33 grant Exp $
 
 DISTNAME=		ncview-1.92d
 CATEGORIES=		graphics
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=	--with-udunits_incdir=${BUILDLINK_PREFIX.udunits}/include
 CONFIGURE_ARGS+=	--with-udunits_libdir=${BUILDLINK_PREFIX.udunits}/lib
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../devel/netcdf/buildlink2.mk"
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index 0bb82d86b3d..9c690a8d688 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2003/09/12 20:07:19 grant Exp $
+# $NetBSD: Makefile,v 1.80 2003/09/17 19:40:35 grant Exp $
 
 DISTNAME=	netpbm-10.11.8
 CATEGORIES=	graphics
@@ -25,7 +25,7 @@ STAGEDIR=	${WRKDIR}/staging
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .if (${OPSYS} == SunOS)
diff --git a/graphics/ogle/Makefile b/graphics/ogle/Makefile
index c59b3c8bb89..71e622bdaab 100644
--- a/graphics/ogle/Makefile
+++ b/graphics/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/09/12 20:07:20 grant Exp $
+# $NetBSD: Makefile,v 1.26 2003/09/17 19:40:37 grant Exp $
 
 DISTNAME=	ogle-0.9.1
 PKGREVISION=	3
@@ -25,7 +25,7 @@ CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
 #CONFIGURE_ARGS+=	--enable-obsdaudio
 #CONFIGURE_ARGS+=	--disable-sunaudio
 
-USE_GCC2=		# defined
+GCC_REQD=		2.95.3
 
 .include "../../audio/liba52/buildlink2.mk"
 .include "../../audio/libmad/buildlink2.mk"
diff --git a/graphics/ogle_gui/Makefile b/graphics/ogle_gui/Makefile
index 3b51301b14c..33f9d0a4896 100644
--- a/graphics/ogle_gui/Makefile
+++ b/graphics/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/09/12 20:07:21 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/17 19:40:38 grant Exp $
 
 DISTNAME=	ogle_gui-0.9.1
 PKGREVISION=	2
@@ -17,7 +17,7 @@ USE_GMAKE=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/ogle
 
-USE_GCC2=		# defined
+GCC_REQD=		2.95.3
 
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/graphics/xv/Makefile b/graphics/xv/Makefile
index 1d3656197ad..14facc24721 100644
--- a/graphics/xv/Makefile
+++ b/graphics/xv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2003/07/17 21:43:16 grant Exp $
+# $NetBSD: Makefile,v 1.50 2003/09/17 19:40:40 grant Exp $
 
 DISTNAME=	xv-3.10a
 PKGREVISION=	5
@@ -46,10 +46,6 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/xv
 	${INSTALL_DATA} ${WRKSRC}/docs/xvdocs.ps ${PREFIX}/share/doc/xv
 
-.if defined(USE_GCC3)
-.  include "../../lang/gcc3/buildlink2.mk"
-.endif
-
 .include "../../graphics/png/buildlink2.mk"
 .include "../../graphics/tiff/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index c887cc7083b..39893116394 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.12 2003/08/09 10:59:12 seb Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:41 grant Exp $
 
 DISTNAME=		gpc-2.1
 PKGREVISION=		3
 WRKSRC=			${WRKDIR}/gcc-2.95.3
 CATEGORIES=		lang
-MASTER_SITES=		http://www.gnu-pascal.de/current/ \
+MASTER_SITES=		${MASTER_SITE_LOCAL}
+MASTER_SITES+=		http://www.gnu-pascal.de/current/ \
 			${MASTER_SITE_GNU:=gcc/}
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 DISTFILES+=		gcc-2.95.3.tar.gz
@@ -18,20 +19,21 @@ PATCHFILES=		gcc-2.95.3-diff-2002-08-29.gz
 
 BUILD_DEPENDS+=		gsed-[0-9]*:../../textproc/gsed
 
+USE_BUILDLINK2=		# defined
 USE_GMAKE=		# defined
 USE_NCURSES=		# defined
 PLIST_SRC=		PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
+GCC_REQD=		2.95.3
+
 .if ${OPSYS} == "NetBSD"
 CFLAGS+=		-DNETBSD_NATIVE
 GPC_PREFIX=		${PREFIX}
 GPC_SUBPREFIX=
 PLIST_SRC+=		PLIST.netbsd
 .else
-DEPENDS+=		gcc-2.95.3*:../../lang/gcc
-USE_PKGSRC_GCC=		# defined
 GPC_PREFIX=		${_GCC_PREFIX}
 GPC_SUBPREFIX=		${_GCC_SUBPREFIX}/
 .endif
@@ -74,7 +76,4 @@ pre-patch:
 pre-configure:
 	${MKDIR} ${BUILD_DIRS}
 
-.if ${OPSYS} != "NetBSD"
-.include "../../mk/gcc.buildlink2.mk"
-.endif
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 52444b8aade..a505ff95c58 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/09/12 20:07:21 grant Exp $
+# $NetBSD: Makefile,v 1.20 2003/09/17 19:40:43 grant Exp $
 
 PERL5_SNAPSHOT=	# empty
 PERL5_VERS=	5.8.0
@@ -220,6 +220,7 @@ post-install:
 	${INSTALL_DATA} ${WRKDIR}/bsd.perl.mk ${PREFIX}/share/mk/bsd.perl.mk
 
 .if ${MACHINE_ARCH} == "alpha"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/imap-uw/Makefile b/mail/imap-uw/Makefile
index fe73f702289..be8220172a0 100644
--- a/mail/imap-uw/Makefile
+++ b/mail/imap-uw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.69 2003/09/16 19:16:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.70 2003/09/17 19:40:45 grant Exp $
 # ATTENTION:
 # The Kerberos support in this software is known to be problematic. If you
 # upgrade this package you *must* test it on a system *without* Kerberos
@@ -162,7 +162,5 @@ do-install:
 .if !defined(IMAP_UW_NO_SSL) || ${IMAP_UW_NO_SSL} != "YES"
 .include "../../security/openssl/buildlink2.mk"
 .endif
-.if defined(USE_GCC3)
-.  include "../../lang/gcc3/buildlink2.mk"
-.endif
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index f1b31c4ce70..c4cea48d6f8 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/09/12 20:07:22 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/17 19:40:47 grant Exp $
 
 DISTNAME=	octave-2.1.33
 PKGNAME=	octave-2.1.34
@@ -22,7 +22,7 @@ BUILD_DEPENDS+= teTeX>=1.0.7:../../print/teTeX
 DEPENDS+=	gnuplot>=3.7:../../graphics/gnuplot
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
+GCC_REQD=	3.0
 .endif
 
 USE_X11=	yes
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index aa1fc5b0ff6..f789f595c06 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2003/09/12 20:46:47 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.43 2003/09/17 19:40:48 grant Exp $
 #
 
 DISTNAME=	${SCIBASE}.src
@@ -76,7 +76,7 @@ post-install:
 	${RM} -f ${PREFIX}/lib/${SCIBASE}/macros/util/scipad.sci.orig
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 # the "SCI=0 && unset SCI" is done because some of the tests really will
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 8f5eef868a0..83625803171 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2003/09/12 20:07:23 grant Exp $
+# $NetBSD: Makefile,v 1.28 2003/09/17 19:40:50 grant Exp $
 
 DISTNAME=	koffice-1.2.1
 PKGREVISION=	4
@@ -24,7 +24,7 @@ GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
-USE_GCC2=		# defined
+GCC_REQD=		2.95.3
 
 PTHREAD_OPTS+=		require
 
diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
index e04d5c907fb..17e1fd64432 100644
--- a/net/djbdns/Makefile
+++ b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/09/12 20:07:24 grant Exp $
+# $NetBSD: Makefile,v 1.26 2003/09/17 19:40:51 grant Exp $
 # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp
 #
 
@@ -38,7 +38,7 @@ INSTALL_TARGET=	setup check
 MANVERSION=	20021211
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
+GCC_REQD=	3.0
 .endif
 
 post-extract:
diff --git a/net/tightvncviewer/Makefile b/net/tightvncviewer/Makefile
index eb7e47e6e61..5f587ab5a93 100644
--- a/net/tightvncviewer/Makefile
+++ b/net/tightvncviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:51:56 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/17 19:40:54 grant Exp $
 # FreeBSD Id: Makefile,v 1.2 1998/03/19 01:54:59 msmith Exp
 #
 
@@ -34,8 +34,5 @@ post-install:
 
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
-.if defined(USE_GCC3)
-.  include "../../lang/gcc3/buildlink2.mk"
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
index 0e254588e2c..2ac3ec82211 100644
--- a/net/ucspi-tcp/Makefile
+++ b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2003/09/12 20:07:25 grant Exp $
+# $NetBSD: Makefile,v 1.16 2003/09/17 19:40:55 grant Exp $
 # FreeBSD Id: ports/sysutils/ucspi-tcp/Makefile,v 1.12 2000/07/10 01:41:24 steve Exp
 
 DISTNAME=	ucspi-tcp-0.88
@@ -21,7 +21,7 @@ ALL_TARGET=	it
 INSTALL_TARGET=	setup check
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
+GCC_REQD=	3.0
 .endif
 
 post-configure:
diff --git a/news/inn/Makefile b/news/inn/Makefile
index 453970416d2..5e18f03f961 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2003/09/12 20:07:25 grant Exp $
+# $NetBSD: Makefile,v 1.51 2003/09/17 19:40:56 grant Exp $
 
 DISTNAME=		inn-${INN_VERSION}
 PKGREVISION=		1
@@ -85,7 +85,7 @@ CONFIGURE_ARGS+=	--with-sendmail=/usr/sbin/sendmail
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 post-patch:
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 2869e412542..9a7e7312d16 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2003/09/12 20:07:26 grant Exp $
+# $NetBSD: Makefile.common,v 1.9 2003/09/17 19:40:59 grant Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 BASEGS_VERS=	7.05
@@ -51,6 +51,10 @@ PLIST_SRC=		${.CURDIR}/../ghostscript-esp/PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD=	3.0
+.endif
+
 .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
 CFLAGS+=		-DA4
 .endif
@@ -91,7 +95,3 @@ post-install:
 
 .include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
-.endif
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 275c8d4a203..7ffce6fdfe9 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/09/12 20:07:27 grant Exp $
+# $NetBSD: Makefile.common,v 1.10 2003/09/17 19:41:01 grant Exp $
 
 DISTNAME=	ghostscript-${GS_VERS}
 GS_VERS=	7.05
@@ -42,6 +42,10 @@ PLIST_SRC=		${.CURDIR}/../../print/ghostscript-gnu/PLIST
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD=		3.0
+.endif
+
 .if defined(PAPERSIZE) && (${PAPERSIZE} == "A4" || ${PAPERSIZE} == "a4")
 CFLAGS+=		-DA4
 .endif
@@ -81,7 +85,3 @@ post-install:
 
 .include "../../graphics/png/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
-.endif
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index f1be422208b..f6fd91822fb 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.48 2003/09/04 08:27:37 wiz Exp $
+# $NetBSD: Makefile.common,v 1.49 2003/09/17 19:41:03 grant Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -136,8 +136,11 @@ ALL_TARGET=		std
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.  include "../../mk/gcc.buildlink2.mk"
+GCC_REQD=		2.95.3
+.elif ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD=		3.0
 .endif
+
 .if defined(ZOULARISBASE)
 LDFLAGS+=	-L${ZOULARISBASE}/lib -Wl,${RPATH_FLAG}${ZOULARISBASE}/lib
 .endif
@@ -300,8 +303,3 @@ post-install:
 .include "../../graphics/png/buildlink2.mk"
 .include "../../print/ja-vflib-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=YES
-.  include "../../mk/gcc.buildlink2.mk"
-.endif
diff --git a/print/hpijs/Makefile b/print/hpijs/Makefile
index 04d4aff6196..15bca0f3bdf 100644
--- a/print/hpijs/Makefile
+++ b/print/hpijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:52:29 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/17 19:41:31 grant Exp $
 
 DISTNAME=	hpijs-1.3
 CATEGORIES=	print
@@ -17,7 +17,7 @@ CPPFLAGS+=		-DAPDK_BUFFER_SEND
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "SunOS"
-.  include "../../mk/gcc.buildlink2.mk"
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index bbf08625a71..bbbfd8a1c5a 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/12 20:07:27 grant Exp $
+# $NetBSD: Makefile,v 1.9 2003/09/17 19:41:07 grant Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -22,9 +22,7 @@ USE_PKGINSTALL=		yes
 USE_BUILDLINK2=		yes
 USE_PERL5=		yes
 
-USE_GCC2=		# defined
-
-DIST_GCC=		2.95.3
+USE_PKGSRC_GCC=		# defined
 
 PKG_USERS=		sfs:sfs::Self-certifying\\ file\\ system:/
 PKG_GROUPS=		sfs
diff --git a/time/asclock/Makefile b/time/asclock/Makefile
index 74ca58a004c..53aa19dcbae 100644
--- a/time/asclock/Makefile
+++ b/time/asclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 22:54:57 grant Exp $
+# $NetBSD: Makefile,v 1.13 2003/09/17 19:41:10 grant Exp $
 
 DISTNAME=	asclock-classic-1.0
 PKGNAME=	asclock-1.0
@@ -72,8 +72,5 @@ do-install:
 .endfor
 	@${ECHO} @dirrm share/asclock-classic >> ${PLIST_SRC}
 
-.if defined(USE_GCC3)
-.  include "../../lang/gcc3/buildlink2.mk"
-.endif
 .include "../../graphics/xpm/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index b4e9ee29079..7cf35dce658 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/08 08:30:48 grant Exp $
+# $NetBSD: Makefile,v 1.17 2003/09/17 19:41:13 grant Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -18,5 +18,4 @@ USE_X11=	YES
 GNU_CONFIGURE=	YES
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/bsetroot/Makefile b/wm/bsetroot/Makefile
index b5213ed8aae..87ff95839ec 100644
--- a/wm/bsetroot/Makefile
+++ b/wm/bsetroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/08/08 08:30:19 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/17 19:41:14 grant Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -26,5 +26,4 @@ do-install:
 	( cd ${WRKSRC}/nls && ${MAKE} install )
 
 .include "../../devel/gettext-lib/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 611c9f7d607..5673aae279e 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/09/12 20:07:28 grant Exp $
+# $NetBSD: Makefile,v 1.39 2003/09/17 19:41:15 grant Exp $
 
 DISTNAME=		WindowMaker-0.80.2
 PKGNAME=		windowmaker-0.80.2
@@ -31,6 +31,10 @@ INSTALL_TARGET=		install-strip
 
 .include "../../mk/bsd.prefs.mk"
 
+.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
+GCC_REQD=	3.0
+.endif
+
 PKG_SYSCONFSUBDIR=	WindowMaker
 EGDIR=			${PREFIX}/share/examples/WindowMaker
 CONF_FILES=
@@ -92,7 +96,3 @@ post-install:
 .include "../../graphics/xpm/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
-
-.if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
-.endif
diff --git a/www/apache/Makefile b/www/apache/Makefile
index 53537c0f5d6..3dc5fcfd459 100644
--- a/www/apache/Makefile
+++ b/www/apache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.132 2003/07/19 12:31:05 tron Exp $
+# $NetBSD: Makefile,v 1.133 2003/09/17 19:41:17 grant Exp $
 #
 # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of
 # code hooks that allow mod_ssl to be compiled separately later, if desired).
@@ -91,9 +91,10 @@ CONFIGURE_ARGS+=	${_ENABLE_MOD}=define	# from mod_ssl pkg.addon
 
 APACHE_CUSTOM_CFLAGS?=	# empty
 
-.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == YES
+.if defined(APACHE_PERF_TUNING) && ${APACHE_PERF_TUNING} == "YES"
 APACHE_CUSTOM_CFLAGS+=	-DBUFFERED_LOGS
-APACHE_CUSTOM_CFLAGS+=	-O6 -fomit-frame-pointer -fexpensive-optimizations
+APACHE_CUSTOM_CFLAGS+=	${COMPILER_PERFTUNE_FLAGS}
+LDFLAGS+=		${COMPILER_PERFTUNE_FLAGS}
 .endif
 
 # Explicitly turn on large file support
@@ -111,7 +112,7 @@ MAKE_ENV+=		LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}"
 # if we are using gcc3, we need to link against libgcc_s, too. This
 # ensures modules can resolve symbols they require from gcc.
 .    if defined(USE_GCC3)
-USE_GCC_SHLIB=		# defined
+USE_GCC_SHLIB=		YES # defined
 LINK_LIBGCC_LDFLAGS+=	-lgcc_s
 .    endif
 .  endif
diff --git a/www/apache6/Makefile b/www/apache6/Makefile
index 53caff2d4fe..8abf582d2d1 100644
--- a/www/apache6/Makefile
+++ b/www/apache6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2003/09/13 23:37:06 itojun Exp $
+# $NetBSD: Makefile,v 1.81 2003/09/17 19:41:19 grant Exp $
 #
 # This package does not compile in mod_ssl support hooks, as it conflicts
 # with IPv6-enable patch.
@@ -8,7 +8,12 @@
 
 DISTNAME=		apache_${APACHE_VERSION}
 PKGNAME=		apache6-${APACHE_VERSION}
+<<<<<<< Makefile
+#PKGREVISION=		3
 APACHE_VERSION=		1.3.28
+=======
+APACHE_VERSION=		1.3.28
+>>>>>>> 1.79
 CATEGORIES=		www
 MASTER_SITES=		${MASTER_SITE_APACHE:=httpd/} \
 			${MASTER_SITE_APACHE:=httpd/old/}
diff --git a/x11/kdelibs2/Makefile b/x11/kdelibs2/Makefile
index 45e734c4d88..8ef18d5e756 100644
--- a/x11/kdelibs2/Makefile
+++ b/x11/kdelibs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2003/09/12 20:07:31 grant Exp $
+# $NetBSD: Makefile,v 1.56 2003/09/17 19:41:20 grant Exp $
 
 DISTNAME=	kdelibs-2.2.2
 PKGREVISION=	6
@@ -96,11 +96,11 @@ post-install:
 
 # XXX See below for NetBSD/alpha issues.
 .if ${MACHINE_ARCH} == "alpha"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=	# defined
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC3=	# defined
+GCC_REQD=	3.0
 .endif
 
 .include "../../archivers/bzip2/buildlink2.mk"
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 5fd40b826c6..aea9a9b1802 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2003/09/12 20:07:32 grant Exp $
+# $NetBSD: Makefile,v 1.40 2003/09/17 19:41:21 grant Exp $
 
 DISTNAME=	kdelibs-3.1.3
 PKGREVISION=	2
@@ -109,8 +109,9 @@ post-install:
 	) > ${PLIST_SRC}
 
 .if ${MACHINE_ARCH} == "alpha"
-USE_GCC2=	 # defined
+USE_PKGSRC_GCC=		# defined
 .endif
+
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../audio/arts/buildlink2.mk"
 .include "../../audio/libaudiofile/buildlink2.mk"
diff --git a/x11/neXtaw/Makefile b/x11/neXtaw/Makefile
index 74f1889f3e1..491c40f974d 100644
--- a/x11/neXtaw/Makefile
+++ b/x11/neXtaw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/09/12 20:07:33 grant Exp $
+# $NetBSD: Makefile,v 1.12 2003/09/17 19:41:23 grant Exp $
 
 DISTNAME=	neXtaw-0.14.1
 CATEGORIES=	x11
@@ -21,7 +21,7 @@ EGDIR=		${PREFIX}/share/examples/${PKGBASE}
 .include "../../mk/bsd.prefs.mk"
 
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 post-install:
diff --git a/x11/xephem/Makefile b/x11/xephem/Makefile
index 646c8830d8a..5b9b230ce39 100644
--- a/x11/xephem/Makefile
+++ b/x11/xephem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/09/12 20:07:33 grant Exp $
+# $NetBSD: Makefile,v 1.22 2003/09/17 19:41:24 grant Exp $
 
 DISTNAME=	xephem-3.5.2
 PKGREVISION=	1
@@ -24,7 +24,7 @@ BUILD_DIRS=	${LIBSRC1} ${LIBSRC2} ${WRKSRC}
 INSTALL_DIRS=	${WRKSRC}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=	# defined
 .endif
 
 post-install:
diff --git a/x11/xfce/Makefile b/x11/xfce/Makefile
index cf3514f8d5e..471fc12e98d 100644
--- a/x11/xfce/Makefile
+++ b/x11/xfce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/09/12 20:07:34 grant Exp $
+# $NetBSD: Makefile,v 1.38 2003/09/17 19:41:25 grant Exp $
 
 DISTNAME=		xfce-3.8.18
 PKGREVISION=		2
@@ -22,7 +22,7 @@ USE_GMAKE=		# defined
 GNU_CONFIGURE=		# defined
 
 .if ${MACHINE_ARCH} == "alpha"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 CONFIGURE_ARGS+=	--without-included-gettext
diff --git a/x11/xphoon/Makefile b/x11/xphoon/Makefile
index 67e8e0aa1c3..646f8909779 100644
--- a/x11/xphoon/Makefile
+++ b/x11/xphoon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/09/12 20:07:35 grant Exp $
+# $NetBSD: Makefile,v 1.10 2003/09/17 19:41:27 grant Exp $
 #
 
 DISTNAME=	xphoon.tar
@@ -22,7 +22,7 @@ MAKE_FLAGS+=	EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=	# defined
+USE_PKGSRC_GCC=	# defined
 .endif
 
 .if ${OPSYS} == "NetBSD"
diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common
index c8a851a4e44..4bc91d4edeb 100644
--- a/x11/xscreensaver/Makefile.common
+++ b/x11/xscreensaver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.55 2003/09/12 20:07:35 grant Exp $
+# $NetBSD: Makefile.common,v 1.56 2003/09/17 19:41:28 grant Exp $
 #
 
 DISTNAME=		xscreensaver-4.13
@@ -49,7 +49,7 @@ CONFIGURE_ARGS+=	--without-kerberos
 .endif
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
-USE_GCC2=		# defined
+USE_PKGSRC_GCC=		# defined
 .endif
 
 .include "../../graphics/gle/buildlink2.mk"