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

26 files changed, 52 insertions, 52 deletions

diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 3df06b809ed..257869d403e 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/05/18 15:37:46 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:55 jlam Exp $
 
 DISTNAME=	TeXmacs-1.0.5.1-src
 PKGNAME=	${DISTNAME:S/-src//}
@@ -13,7 +13,7 @@ DEPENDS+=	teTeX>=1.0:../../print/teTeX
 
 BUILD_TARGET=	TEXMACS
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index db5dae6ba99..4f3e984f7dd 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/04/18 13:20:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:07:55 jlam Exp $
 
 # Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
 ABIWORD_VERSION=	2.2.7
@@ -18,7 +18,7 @@ MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 USE_DIRS+=		xdg-1.1
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 
 CONFIGURE_ARGS+=        --with-libpng=${BUILDLINK_PREFIX.png}
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 107864939a1..f5f58939d6b 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:55 jlam Exp $
 #
 
 DISTNAME=	biew562
@@ -13,7 +13,7 @@ COMMENT=	Binary viewer/editor
 
 ONLY_FOR_PLATFORM=	*-*-i386
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/biew-562
 
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 17e196b32cd..cd26aac9e07 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:55 jlam Exp $
 #
 
 DISTNAME=	conglomerate-0.9.0
@@ -16,7 +16,7 @@ DEPENDS+=		docbook-xml>=4.2nb6:../../textproc/docbook-xml
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_LIBTOOL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
 
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 01aef899ce0..747bdafba65 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:55 jlam Exp $
 
 DISTNAME=	cooledit-3.17.14
 CATEGORIES=	editors
@@ -10,7 +10,7 @@ COMMENT=	Full-featured text editor
 
 BUILD_USES_MSGFMT=	yes
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 409eae2d748..59416891235 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:55 jlam Exp $
 #
 
 DISTNAME=	dasher-3.2.15
@@ -12,7 +12,7 @@ COMMENT=	Easy typing without using keyboard
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 763f1f4add8..1d6bc305ac4 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	emacs-21.4a
 PKGNAME=	emacs-nox11-21.4a
@@ -14,7 +14,7 @@ CONFLICTS=	mule-[0-9]*
 CONFLICTS+=	emacs-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 PATCHDIR=	${.CURDIR}/../emacs/patches
 FILESDIR=	${.CURDIR}/../emacs/files
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 67a31bb9e83..2a7c6155360 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2005/05/09 05:23:40 minskim Exp $
+# $NetBSD: Makefile,v 1.84 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	emacs-21.4a
 PKGREVISION=	1
@@ -12,7 +12,7 @@ COMMENT=	GNU editing macros (editor)
 CONFLICTS=	mule-[0-9]*
 
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		yes
 
 # needed for 21.4a, can probably go away on next update
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index ae5e68a206a..2fe57db903b 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/16 21:05:27 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	emacs-20.7
 PKGREVISION=	5
@@ -25,7 +25,7 @@ NOT_FOR_PLATFORM=	Darwin-*-*
 CONFLICTS=	mule-[0-9]*
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_ARCH.mipsbe= mips
 
 BUILD_DEFS+=	USE_INET6 EMACS_USE_POP
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 714b4193a35..5557887842b 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:56 jlam Exp $
 #
 
 DISTNAME=		gconf-editor-2.10.0
@@ -16,7 +16,7 @@ GNU_CONFIGURE=		YES
 USE_DIRS+=		xdg-1.1 gnome2-1.5
 USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		YES
 
 CONFIGURE_ARGS+=	--with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE}
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index d84bc114547..f94a7cfaaa4 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/05/19 21:08:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:56 jlam Exp $
 #
 
 DISTNAME=		gedit-2.10.2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 USE_PERL5=		build
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 430615f9cfe..127da75128e 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:56 jlam Exp $
 #
 
 DISTNAME=		gice-0.6.2
@@ -12,7 +12,7 @@ COMMENT=		Powerful C text editor with advanced features
 
 WRKSRC=			${WRKDIR}/gice
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 
 BUILD_TARGET=		gice
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 88b0f9a2b35..a9748a464fa 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	gtranslator-1.0.2
 CATEGORIES=	editors
@@ -11,7 +11,7 @@ COMMENT=	Gettext po file editor for the GNOME2 desktop environment
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index f6836d24e67..766684e9f98 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:56 jlam Exp $
 #
 
 DISTNAME=	hnb-1.9.17
@@ -11,7 +11,7 @@ COMMENT=	Hierarchical data organizer
 
 INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-U]-*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 BUILD_DIRS=		${WRKSRC}/src
 BUILD_TARGET=		hnb
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 8e1c56d37a8..207c399ae6c 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	joe-3.2
 CATEGORIES=	editors
@@ -8,7 +8,7 @@ MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://joe-editor.sourceforge.net/
 COMMENT=	Joe's own editor
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--sysconfdir="${PREFIX}/share/examples"
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 6bfe527f530..8a8df6a6911 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=		kile-1.7.1
 PKGREVISION=		1
@@ -11,7 +11,7 @@ HOMEPAGE=		http://kile.sourceforge.net/
 COMMENT=		LaTeX source editor - TeX shell - Gnuplot front end
 
 USE_DIRS+=		xdg-1.1
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_PERL5=		build
diff --git a/editors/leim/Makefile b/editors/leim/Makefile
index 6373abe13b1..a1674ab4a56 100644
--- a/editors/leim/Makefile
+++ b/editors/leim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/02/26 16:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	leim-${VERSION}
 CATEGORIES=	editors
@@ -11,7 +11,7 @@ COMMENT=	Libraries of Emacs Input Methods (for emacs21)
 
 WRKSRC=		${WRKDIR}/emacs-${VERSION}/leim
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 VERSION=	21.4
 
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 2e25af4b458..5bca1c08fe1 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/17 00:42:10 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	leim-${VERSION}
 PKGREVISION=	5
@@ -14,7 +14,7 @@ DEPENDS+=	emacs-${VERSION}nb5:../emacs20
 
 WRKSRC=		${WRKDIR}/emacs-20.7/leim
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 VERSION=	20.7
 
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index be316065b97..052d2fd42b3 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:56 jlam Exp $
 #
 
 DISTNAME=	lpe-1.2.6
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	YES
 USE_PKGLOCALEDIR=	YES
 USE_PKGINSTALL=		YES
 USE_LIBTOOL=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 
 SHLIBTOOL_OVERRIDE=	libtool
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 039ddbdfde3..6cc924dd8ca 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/05/22 20:07:56 jlam Exp $
 #
 
 DISTNAME=		lyx-1.3.5
@@ -25,7 +25,7 @@ UNLIMIT_RESOURCES+=	datasize
 
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PERL5=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 8098424468d..fbc63de5a28 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:56 jlam Exp $
 #
 
 DISTNAME=	mlview-0.7.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 18b0f2e33cd..6134eebe836 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:56 jlam Exp $
 
 DISTNAME=	mule-2.3
 PKGREVISION=	2
@@ -22,7 +22,7 @@ CONFLICTS=	emacs-[0-9]*
 
 WRKSRC=		${WRKDIR}/mule
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	yes
 
 CONFIGURE_ARGS+=	${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 67d5be0528a..67521e08b27 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=	poedit-1.2.5
@@ -14,7 +14,7 @@ DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 
 .include "../../databases/db4/buildlink3.mk"
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 9bea37528a8..85cbbf7920f 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/22 08:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=	speedbar-0.14beta4
@@ -15,7 +15,7 @@ COMMENT=	Directory and code browser for emacs
 BUILD_ENV+=	EMACS=${EMACS}
 
 NO_CONFIGURE=	# set
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 INFO_FILES=	speedbar.info
 
diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile
index e2e89fa8f4b..28c0fa91a5a 100644
--- a/editors/xwpe/Makefile
+++ b/editors/xwpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=	xwpe-1.5.29a
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.identicalsoftware.com/xwpe/
 COMMENT=	Programming environment for UNIX systems
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_NCURSES=		# tigetstr()
 USE_X11=		yes
 
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 0f4d55cd986..31ba2bd9be3 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:57 jlam Exp $
 #
 
 DISTNAME=	yudit-2.7.6
@@ -10,7 +10,7 @@ MAINTAINER=	wulf@NetBSD.org
 HOMEPAGE=	http://yudit.org/
 COMMENT=	Unicode Text Editor
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_X11=	yes
 GNU_CONFIGURE=	yes