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

20 files changed, 40 insertions, 40 deletions

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index dc2fa8cae80..be6ca59207a 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=	AfterStep-2.00.01
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		run
 USE_X11=		YES
 
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index e61b712d5f3..af408471185 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:46 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:43 jlam Exp $
 
 DISTNAME=	bbrun-1.3
 PKGREVISION=	3
@@ -11,7 +11,7 @@ COMMENT=	Run utility for BlackBox
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
 USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 BUILD_TARGET=	bbrun
 
diff --git a/wm/econf/Makefile b/wm/econf/Makefile
index 95e1efb4547..86e246d6e13 100644
--- a/wm/econf/Makefile
+++ b/wm/econf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=		enlightenment-conf-0.15
@@ -13,7 +13,7 @@ COMMENT=		Configuration tool for easily setting up Enlightenment
 
 USE_LANGUAGES=		c c++
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index dccfd47786c..f05e08bc6fe 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $
 
 DISTNAME=	enlightenment-0.16.7.2
 CATEGORIES=	x11 gnome wm
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.enlightenment.org/
 COMMENT=	Highly themeable and configurable window manager
 
-USE_GNU_TOOLS+=		yacc
+USE_TOOLS+=		bison
 USE_PERL5=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 21d123cb706..ab6e58ff89a 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/22 15:55:59 jmcneill Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=	fluxbox-0.9.12
@@ -15,7 +15,7 @@ DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
 USE_X11=	YES
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS=	make
+USE_TOOLS=	gmake
 USE_LIBTOOL=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 00802e984fb..8e429b50b4a 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=	golem-0.0.5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://golem.sourceforge.net/
 COMMENT=	Fast and lightweight yet customizable window manager
 
 USE_PKGINSTALL=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index a82f2747225..1d394c0caa6 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile.common,v 1.43 2005/05/22 20:08:43 jlam Exp $
 
 DISTNAME=		icewm-1.2.20
 CATEGORIES=		x11 wm
@@ -9,7 +9,7 @@ HOMEPAGE=		http://icewm.sourceforge.net/
 
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 BUILD_USES_MSGFMT=	yes
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index 9789e20fed8..b51c8233ef8 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=	ion-2-20040729
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGINSTALL=	YES
 USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile
index d723df2dea2..98ce4892493 100644
--- a/wm/ion3-devel/Makefile
+++ b/wm/ion3-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=	ion-3ds-20040906
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGINSTALL=	YES
 USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 USE_PKGLOCALEDIR=	YES
 
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 0e11b8ad13e..1bb261d97c5 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/26 20:17:33 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=	metacity-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		gnome2-1.5 theme-1.0
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile
index 40c097b640f..7e6667a1034 100644
--- a/wm/novawm/Makefile
+++ b/wm/novawm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:43 jlam Exp $
 #
 
 DISTNAME=	NovaWM-0.8_alpha
@@ -11,7 +11,7 @@ HOMEPAGE=	http://novawm.sourceforge.net/
 COMMENT=	Nova window manager
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	YES
 
 .include "../../graphics/xpm/buildlink3.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index fe18df7156a..bd1e4192d63 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $
 
 DISTNAME=	openbox-3.2
 PKGREVISION=	1
@@ -14,7 +14,7 @@ DEPENDS+=		vera-ttf>=1.10:../../fonts/vera-ttf
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index e14e9062f0a..5f2c103357c 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	pekwm-0.1.3
@@ -12,7 +12,7 @@ HOMEPAGE=	http://pekwm.org/
 COMMENT=	Window manager based on aewm++
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	YES
 USE_PERL5=	run
 USE_PKGINSTALL=	YES
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 7372f022123..32a889245db 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	pwm-20030617
@@ -16,7 +16,7 @@ CONFLICTS+=	ion<=20040729nb2
 
 USE_PKGINSTALL=	YES
 USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 CFLAGS+=	-DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
 
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 43e4b7c6bbf..96edf7630dd 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -12,7 +12,7 @@ COMMENT=	Windows 95/98/NT like window manager for X11
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c++
 
 post-install:
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index ff22b63a782..f3b98ab3b54 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/05/22 20:08:44 jlam Exp $
 
 DISTNAME=		sawfish-${SF_VERS}-gtk1
 SF_VERS=		1.2
@@ -13,7 +13,7 @@ DEPENDS+=		rep-gtk>=0.15nb2:../../x11/rep-gtk
 USE_X11=		# defined
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	# defined
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		# defined
 
 DISTINFO_FILE=		${.CURDIR}/../../wm/sawfish/distinfo
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 7990a21b01d..0f0d4e5ad15 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	waimea-0.4.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.waimea.org/
 COMMENT=	Fast and highly customizable virtual window manager
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_PERL5=	run
 USE_X11=	YES
 
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index da44560eb30..85f86a89780 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	whiteBOX-0.5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://whitebox.sourceforge.net/
 COMMENT=	Multi-purpose configuration tool for Blackbox
 
 USE_X11=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 8179f2aefd8..739dd179ca1 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=	windowlab-1.12
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.nickgravgaard.com/windowlab/
 COMMENT=	Small and simple window manager
 
 USE_PKGINSTALL=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	YES
 
 PKG_SYSCONFSUBDIR=	windowlab
diff --git a/wm/wmdrawer/Makefile b/wm/wmdrawer/Makefile
index e0c72f350df..c20e9002fbf 100644
--- a/wm/wmdrawer/Makefile
+++ b/wm/wmdrawer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:44 jlam Exp $
 #
 
 DISTNAME=		wmdrawer-0.10.5
@@ -9,7 +9,7 @@ MAINTAINER=		joel@carnat.net
 HOMEPAGE=		http://people.easter-eggs.org/~valos/wmdrawer/
 COMMENT=		Drawer (retractable button bar) to launch applications
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/wmdrawer ${PREFIX}/bin