Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:

	USE_GNU_TOOLS	-> USE_TOOLS
	awk		-> gawk
	m4		-> gm4
	make		-> gmake
	sed		-> gsed
	yacc		-> bison

34 files changed, 68 insertions, 69 deletions

diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index b18adc57778..6111eec6ab6 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=	amaya-fullsrc-9.0
 PKGNAME=	${DISTNAME:S/-fullsrc//}
@@ -15,7 +15,7 @@ COMMENT=	Web browser/editor from the World Wide Web Consortium (W3C)
 EXTRACT_ELEMENTS=	Amaya libwww
 WRKSRC=			${WRKDIR}/Amaya/work
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../configure
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 0f895883e18..aceed98480f 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=	jakarta-tomcat-connectors-${JK_VERSION}-src
 PKGNAME=	ap-jk-${JK_VERSION}
@@ -15,7 +15,7 @@ APACHE_MODULE=	YES
 BUILD_DEFS+=	JK_ENABLE_JNI
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 SUBST_CLASSES+=		jk-lt
 SUBST_STAGE.jk-lt=	post-configure
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index f3e4ca0b78f..14e4a3c5be2 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/12/29 15:42:38 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=	ApacheJServ-1.1.2
 PKGNAME=	ap-jserv-1.1.2
@@ -14,7 +14,7 @@ DEPENDS+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9]
 DEPENDS+=	jsdk-2.0:../../www/jsdk20
 USE_PERL5=	build	# for "apxs"
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/src/scripts/build/unix/ltconfig
 GNU_CONFIGURE=		yes
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 3923c1d1b2f..62cc601ed2c 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=	bluefish-1.0
 PKGREVISION=	1
@@ -18,7 +18,7 @@ DEPENDS+=		weblint-[0-9]*:../../www/weblint
 BUILD_USES_MSGFMT=	YES
 
 USE_DIRS+=		xdg-1.1
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 492969aec7d..4b2882f214f 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:25 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=	cgicc-3.1.5
 PKGREVISION=	1
@@ -9,7 +9,7 @@ MAINTAINER=	shell@shellhung.org
 HOMEPAGE=	http://www.gnu.org/software/cgicc/cgicc.html
 COMMENT=	C++ compliant CGI applications libraries
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/www/clearsilver/Makefile.common b/www/clearsilver/Makefile.common
index b7d3d5682ac..fc47cac0f3f 100644
--- a/www/clearsilver/Makefile.common
+++ b/www/clearsilver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=		clearsilver-0.9.14
 CLEARSILVER_BASE=       ${DISTNAME:S/-/-base-/}
@@ -17,7 +17,7 @@ FILESDIR=       	${.CURDIR}/../../www/clearsilver/files
 PATCHDIR=		${.CURDIR}/../../www/clearsilver/patches
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--disable-apache
 CONFIGURE_ARGS+=	--disable-csharp
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 43a0d4471f7..f42a6766ed9 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	drivel-1.2.4
@@ -12,7 +12,7 @@ COMMENT=	LiveJournal client for the GNOME Desktop
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 
 GCONF2_SCHEMAS=		drivel.schemas
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 240e67aae8b..30a9da95db8 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=		elinks-0.10.4
 CATEGORIES=		www
@@ -11,7 +11,7 @@ COMMENT=		Extended/Enhanced Links
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--without-x
 CONFIGURE_ARGS+=	--enable-256-colors
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index d2d57bfdb8a..2f5372485d5 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/02 16:10:12 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	epiphany-extensions-1.6.3
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnome.org/projects/epiphany/extensions.html
 COMMENT=	Extensions for the Epiphany web browser
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS=		make
+USE_TOOLS=		gmake
 USE_LIBTOOL=		YES
 USE_MSGFMT_PLURALS=	YES
 USE_PKGLOCALEDIR=	YES
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index ba745e1a5cc..1d4bf89e3c8 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/19 20:39:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	epiphany-1.6.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_MSGFMT_PLURALS=	YES
 USE_PKGLOCALEDIR=	YES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 383961d2198..3481ebe49c6 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.77 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	galeon-1.3.20
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 CONFLICTS+=		galeon-devel-[0-9]*
 
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile
index daf4979865b..d203c136d7e 100644
--- a/www/galeon12/Makefile
+++ b/www/galeon12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:45 jlam Exp $
 
 DISTNAME=	galeon-1.2.14
 PKGREVISION=	4
@@ -20,7 +20,7 @@ USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \
 			--with-mozilla-libs=${BUILDLINK_PREFIX.mozilla}/lib/mozilla \
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 9d0bd6c00b5..cb6677d7cdb 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:45 jlam Exp $
 
 DISTNAME=		gtkhtml-1.1.10
 PKGREVISION=		5
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.gnome.org/
 COMMENT=		Lightweight HTML rendering/printing/editing engine
 
 USE_X11BASE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 16a8249d918..a9b1e628a75 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/21 19:07:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	gtkhtml-3.2.5
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
diff --git a/www/gtkhtml30/Makefile b/www/gtkhtml30/Makefile
index f87c28591ef..273b6dc5eeb 100644
--- a/www/gtkhtml30/Makefile
+++ b/www/gtkhtml30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	gtkhtml-3.0.10
@@ -12,7 +12,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
diff --git a/www/gtkhtml36/Makefile b/www/gtkhtml36/Makefile
index 41a121350a4..536d1e20d0a 100644
--- a/www/gtkhtml36/Makefile
+++ b/www/gtkhtml36/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/18 16:40:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	gtkhtml-3.6.2
@@ -11,7 +11,7 @@ MAINTAINER=	recht@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Lightweight HTML rendering/printing/editing engine
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	src/libgtkhtml.pc.in
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index fdb699d9eae..ed6a2e3ff1c 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:45 jlam Exp $
 
 DISTNAME=	ApacheJSSI-1.1.2
 PKGNAME=	jssi-1.1.2
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/ApacheJSSI-1.1.2/src/java
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 NO_CONFIGURE=
 MAKE_ENV+=	CLASSPATH=${CLASSPATH}
 
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index cfbc92c024c..33df7601d23 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	gateway-${KANNEL_VER}
@@ -14,7 +14,7 @@ COMMENT=	Open source WAP and SMS gateway
 KANNEL_VER=	1.4.0
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		YES
 PTHREAD_OPTS+=		require
 
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index ac91af2701c..b38a478b610 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	libgtkhtml-2.6.3
@@ -13,7 +13,7 @@ COMMENT=	Lightweight HTML rendering GTK2 widget
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_X11=		yes
 
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index bf290c5ea7e..41cd61ccc42 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.60 2005/05/22 20:08:45 jlam Exp $
 
 DISTNAME=		w3c-libwww-5.4.0
 PKGNAME=		libwww-5.4.0
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 EXTRACT_ONLY=		${DISTNAME}${EXTRACT_SUFX}
 SITES_libwww-configure-5.4.0nb1.gz=	${MASTER_SITE_LOCAL}
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PERL5=		build
 
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index f62deb2a6a7..58c21d5c7d7 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:45 jlam Exp $
 
 DISTNAME=		liferea-0.6.4
 CATEGORIES=		www
@@ -10,7 +10,7 @@ COMMENT=		Simple FeedReader clone for reading RSS/RDF feeds
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 523e4dd5af0..28e4fa390ff 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.80 2005/05/22 20:08:45 jlam Exp $
 #
 
 DISTNAME=	lynx2.8.5
@@ -27,7 +27,7 @@ DIST_SUBDIR=		lynx
 WRKSRC=			${WRKDIR}/${DISTNAME:S/./-/g}
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 INSTALL_TARGET=		install-full install-lss
 MAKEFILE=       	makefile
 
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 4c170b4b9c5..d00e9477e4e 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2005/05/15 02:58:05 taya Exp $
+# $NetBSD: Makefile.common,v 1.55 2005/05/22 20:08:45 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-${MOZ_DIST_VER}-source
@@ -16,7 +16,7 @@ BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 WRKSRC=		${WRKDIR}/mozilla
 USE_LANGUAGES=	c c++
 USE_PERL5=	build
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index a98b0b4a8b9..75a09ad78b2 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:46 jlam Exp $
 
 DISTNAME=	libapreq2-2.04_03-dev
 PKGNAME=	p5-libapreq2-2.4.3
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.apache+=	apache>=2.0.48
 BUILDLINK_DEPENDS.ap2-perl+=	ap2-perl>=1.99.15
 
 WRKSRC=		${WRKDIR}/libapreq2-2.04-dev
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/libapreq2/.packlist
 PERL5_REQD+=	5.6.1
diff --git a/www/php4/Makefile b/www/php4/Makefile
index a826645e375..45b5c29bdbf 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:46 jlam Exp $
 
 PKGNAME=		php-${PHP_BASE_VERS}
 CATEGORIES+=		lang
@@ -10,7 +10,7 @@ USE_PKGINSTALL=		YES
 # PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now
 # LIBTOOL_OVERRIDE=	libtool
 LIBTOOL_OVERRIDE=	# empty
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "Makefile.php"
 
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index af43d8cb3b0..078ff9848e5 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:46 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
@@ -31,7 +31,7 @@ CPPFLAGS+=		-Dunix
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}-stable
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		GNUmakefile
 
 USE_PERL5=		build
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 3d7d50f4b15..0d5569b1c0d 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:46 jlam Exp $
 
 DISTNAME=		sitecopy-0.13.4
 PKGREVISION=		5
@@ -11,7 +11,7 @@ COMMENT=		Utility for synchronizing remote and local web sites
 
 BUILD_USES_MSGFMT=	# defined
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	# defined
 
 GNU_CONFIGURE=		# defined
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index bf387d4cb52..0b31b3b31ac 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:46 jlam Exp $
 
 DISTNAME=	snownews-1.5.5.1
 CATEGORIES=	www
@@ -10,7 +10,7 @@ COMMENT=	Small, curses based RSS feed reader
 
 BUILD_USES_MSGFMT=	YES
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_NCURSES=		# missing WA_BOLD, WA_REVERSE, KEY_RESIZE
 USE_PKGLOCALEDIR=	YES
 
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index 5adf420b010..cf13ffc1777 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:46 jlam Exp $
 
 DISTNAME=	spfc-0.2.0
 CATEGORIES=	www java
@@ -14,7 +14,7 @@ DEPENDS+=	jsdk-2.0:../../www/jsdk20
 .include "../../mk/bsd.prefs.mk"
 
 WRKSRC=		${WRKDIR}/spfc-0.2.0/src/
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 NO_CONFIGURE=
 MAKE_ENV+=	CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
 
diff --git a/www/swiftsurf/Makefile b/www/swiftsurf/Makefile
index 9c5a3046e17..8915ae158ca 100644
--- a/www/swiftsurf/Makefile
+++ b/www/swiftsurf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:46 jlam Exp $
 
 DISTNAME=		swiftsurf-1.2.5
 PKGREVISION=		2
@@ -9,7 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://swiftsurf.sourceforge.net/
 COMMENT=		Web proxy that can handle http and https
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
 BUILD_TARGET=	nat
diff --git a/www/thy/Makefile b/www/thy/Makefile
index 5a856a7dbc7..ab5e6981485 100644
--- a/www/thy/Makefile
+++ b/www/thy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:46 jlam Exp $
 #
 
 DISTNAME=		thy-0.9.3
@@ -15,7 +15,7 @@ COMMENT=		Tiny and fast HTTP daemon
 
 BUILD_DEFS+=		USE_INET6
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make lex yacc
+USE_TOOLS+=		bison gmake lex
 USE_PKGINSTALL=		yes
 
 PKG_SYSCONFSUBDIR=	thy
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 737e9e2716b..b547bee843a 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:46 jlam Exp $
 #
 
 DISTNAME=	tidy_src_040811
@@ -17,7 +17,7 @@ COMMENT=	Fixes and tidies up HTML files
 
 WRKSRC=		${WRKDIR}/tidy
 NO_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 BUILD_DIRS=	${WRKSRC}/build/gmake
 
 OPSYSVARS+=	MAKEFLAGS
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 0a959eaf4ff..cc0f945024d 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2005/05/05 20:50:49 kei Exp $
+# $NetBSD: Makefile.common,v 1.34 2005/05/22 20:08:46 jlam Exp $
 #
 
 DISTNAME=	w3m-${W3M_VERS}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://w3m.sourceforge.net/
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	# defined
-USE_GNU_TOOLS+=	make	# Needed for some combinations of options...
+USE_TOOLS+=	gmake	# Needed for some combinations of options...
 
 W3M_VERS=	0.5.1
 
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 1b20bd97e31..812f210e438 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/05/16 01:15:34 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2005/05/22 20:08:46 jlam Exp $
 
 DISTNAME=	wwwoffle-2.8e
 CATEGORIES=	www
@@ -10,8 +10,7 @@ MAINTAINER=	abs@NetBSD.org
 HOMEPAGE=	http://www.gedanken.demon.co.uk/wwwoffle/
 COMMENT=	WWW proxy with support for offline browsing
 
-USE_TOOLS+=	gtar
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake gtar
 USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes