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

13 files changed, 26 insertions, 26 deletions

diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index a69805293fe..65056adaf81 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/17 03:48:59 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:43 jlam Exp $
 #
 
 DISTNAME=		asterisk-1.0.7
@@ -11,7 +11,7 @@ MAINTAINER=		riz@NetBSD.org
 HOMEPAGE=		http://www.asterisk.org/
 COMMENT=		The Asterisk Software PBX
 
-USE_GNU_TOOLS+= 	make yacc
+USE_TOOLS+= 		bison gmake
 
 MANCOMPRESSED= 		yes
 
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index cf377a6c8c9..056632c3d4d 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/12 15:11:18 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:07:43 jlam Exp $
 #
 
 DISTNAME=	fidogate-4.4.9
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.fidogate.org/
 COMMENT=	FidoNet (FTN) <-> Internet mail and news gateway
 
 USE_PKGINSTALL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKE_ENV=		DEBUG="${CFLAGS} -Werror"
 BUILDLINK_SETENV.CC=	CC="cc ${_STRIPFLAG_CC}"
 
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index ef1d9eeb4dd..beffb3fe896 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:43 jlam Exp $
 #
 
 DISTNAME=	gsmlib-1.10
@@ -12,7 +12,7 @@ COMMENT=	Library to access GSM mobile phones through GSM modems or IrDA devices
 
 BUILD_USES_MSGFMT=	yes
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 8a9f1bb6655..d7490929dc6 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:43 jlam Exp $
 
 DISTNAME=		jpilot-syncmal_0.71.2
 PKGNAME=		jpilot-syncmal-0.71.2
@@ -13,7 +13,7 @@ COMMENT=		MAL synchronization plugin for J-Pilot
 BUILDLINK_DEPMETHOD.jpilot=	full
 
 USE_X11=		# defined
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 USE_LIBTOOL=		# defined
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/comms/libmal/Makefile b/comms/libmal/Makefile
index 79ace2f74da..e9ce7bd79fb 100644
--- a/comms/libmal/Makefile
+++ b/comms/libmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:43 jlam Exp $
 
 DISTNAME=		libmal-0.40
 PKGREVISION=		1
@@ -11,7 +11,7 @@ COMMENT=		MAL convenience library
 
 CONFLICTS+=		malsync-[0-9]*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		# defined
 
 GNU_CONFIGURE=		# defined
diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index d5bf4c77999..34a6dbe0d70 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:43 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV:S/-/_/}.src
@@ -14,7 +14,7 @@ COMMENT=	Utility to synchronize Palm Pilots to the AvantGo.com service
 CONFLICTS+=	libmal-[0-9]*
 
 WRKSRC=		${WRKDIR}/malsync
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKE_ENV+=		PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
 CPPFLAGS+=		-D__unix__=1
 
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 60ecf98e6bb..a1f9435e0c3 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:44 jlam Exp $
 
 DISTNAME=	minicom-1.83.1.src
 PKGNAME=	${DISTNAME:S/.src//}
@@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}/src
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 NO_CONFIGURE=		yes
 
 PKG_SYSCONFSUBDIR=	minicom
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 84bd6d3a419..fbb05762e98 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:44 jlam Exp $
 #
 
 DISTNAME=	openobex-1.0.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://openobex.sourceforge.net/
 COMMENT=	Implementation of the Object Exchange (OBEX) protocol
 
 GNU_CONFIGURE=	YES
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 1b57c5539d4..d5e21005867 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:44 jlam Exp $
 #
 
 .include "../../comms/pilot-link/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT=		Perl bindings for pilot-link
 BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
 
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 CONFIGURE_ARGS+=	--with-perl=${PERL5}
 PERL5_CONFIGURE=	NO
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 26a62f85b70..c57b8d8c766 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:44 jlam Exp $
 
 .include "../../comms/pilot-link/Makefile.common"
 
@@ -9,7 +9,7 @@ COMMENT=		Tools to talk to the 3Com Pilot PDA
 BUILDLINK_DEPENDS.pilot-link-libs=	pilot-link-libs>=${PILOT_LINK_VERS}
 
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_GNU_READLINE=	YES
 
 CONFIGURE_ARGS+=	--with-perl5=${PERL5}
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 9d2c1094251..107f23daac3 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:44 jlam Exp $
 
 DISTNAME=	plp_1_8
 PKGNAME=	plp-1.8
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.proudman51.freeserve.co.uk/psion/
 COMMENT=	Tools to talk to the PSION organiser
 
 USE_LANGUAGES=	c c++
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	# defined
 
 do-install:
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index 4af916af2a9..cb8fb6f5d07 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:44 jlam Exp $
 #
 
 DISTNAME=	plptools-0.12
@@ -11,7 +11,7 @@ HOMEPAGE=	http://plptools.sourceforge.net/
 COMMENT=	FTP-like and NFS-like access tools to talk to the PSION
 
 USE_GNU_READLINE=	# uses rl_filename_quoting_desired flag
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANUGAGES=		c c++
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 0f3e5f3eb64..701a83feb97 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:45:08 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:44 jlam Exp $
 #
 
 DISTNAME=		scmxx-0.7.5
@@ -12,7 +12,7 @@ COMMENT=		Data exchange utility for Siemens mobile phones
 
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scmxx