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

12 files changed, 24 insertions, 24 deletions

diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 41b5652bf2a..1423514fe5a 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:36 jlam Exp $
 
 DISTNAME=	arj-3.10.21
 CATEGORIES=	archivers
@@ -10,7 +10,7 @@ COMMENT=	Open-source ARJ
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	${WRKSRC}/gnu/configure
 MAKEFILE=		makefile.gnu
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 7ca4ba02624..4f2065fd3d0 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:36 jlam Exp $
 #
 
 DISTNAME=		cabextract-1.1
@@ -12,6 +12,6 @@ COMMENT=		Microsoft cabinet (.CAB) file extractor
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile
index a9edce5541d..b9e4178a1cc 100644
--- a/archivers/cxunzip/Makefile
+++ b/archivers/cxunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:36 jlam Exp $
 
 DISTNAME=	cxunzip-0.98
 PKGREVISION=	2
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	yes
 
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 32e98f5754b..7490cb0e892 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:36 jlam Exp $
 #
 
 DISTNAME=	dact-0.8.3
@@ -13,7 +13,7 @@ COMMENT=	Dynamic adaptive compression tool
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ENV+=		ac_cv_lib_mcrypt_main=no
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 4db99124540..7d0ac4c7186 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/20 16:12:45 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:36 jlam Exp $
 #
 
 DISTNAME=	file-roller-2.10.2
@@ -17,7 +17,7 @@ DEPENDS+=		zip>=2.3nb2:../../archivers/zip
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
 
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 4894858b794..a85cbd2e183 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:37 jlam Exp $
 
 DISTNAME=       ha0999
 PKGNAME=        ha-0.999b
@@ -15,7 +15,7 @@ WRKSRC=		${WRKDIR}
 
 MAKEFILE=       makefile.nix
 BUILD_TARGET=     ha
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 do-install:
 	cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 28717164ecf..ac8df43f215 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/17 07:22:37 adam Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:37 jlam Exp $
 
 DISTNAME=	p7zip_4.18_src
 PKGNAME=	p7zip-4.18
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_LANGUAGES=		c c++
 MAKEFILE=		makefile
 NO_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 PTHREAD_OPTS+=		require
 
 # compiles, but does not recognize any archives as supported
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 4b06de46ed6..9464ae1b67d 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/09/18 20:14:18 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:37 jlam Exp $
 #
 
 DISTNAME=	star-1.4.3
@@ -11,7 +11,7 @@ COMMENT=	The fastest tar like archiver for UNIX
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 MAKE_FLAGS+=	INS_BASE=${PREFIX}
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index ec86f897d0c..7f79d45a8e9 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:37 jlam Exp $
 #
 
 DISTNAME=	unace-1.2b
@@ -13,7 +13,7 @@ COMMENT=	Extract, list and test files in ACE archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 BUILD_TARGET=	clean unace
 
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 6f3705de251..012d5e90d5a 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:37 jlam Exp $
 
 DISTNAME=	unzip552
 PKGNAME=	unzip-5.52
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 DIST_SUBDIR=	${PKGNAME}	# Remove on next update.
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index da4b5896b4a..1d3b3ae523d 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:37 jlam Exp $
 
 DISTNAME=	upx-1.25-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -11,7 +11,7 @@ COMMENT=	Ultimate packer for executables
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_PERL5=	build
 
 do-build:
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 5a2cb85302b..60535dff33c 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:37 jlam Exp $
 
 DISTNAME=		xmill-0.9.1
 PKGREVISION=		2
@@ -11,7 +11,7 @@ COMMENT=		Specialized compressor for XML
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKEFILE=		makefile
 USE_LANGUAGES=		c c++