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

53 files changed, 106 insertions, 106 deletions

diff --git a/sysutils/acpi-iasl/Makefile b/sysutils/acpi-iasl/Makefile
index 53beb7d0708..17d0b9d91d2 100644
--- a/sysutils/acpi-iasl/Makefile
+++ b/sysutils/acpi-iasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:31 jlam Exp $
 #
 
 DISTNAME=	acpica-unix-${ACPI_IASL_VERSION}
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 INSTALLATION_DIRS=	bin share/doc/acpi-iasl
 
-USE_GNU_TOOLS+=	m4 make yacc
+USE_TOOLS+=	bison gm4 gmake
 
 do-build:
 	@cd ${WRKSRC}/compiler && ${MAKE_PROGRAM}
diff --git a/sysutils/acpidump/Makefile b/sysutils/acpidump/Makefile
index 6ff20f0571d..73d61454672 100644
--- a/sysutils/acpidump/Makefile
+++ b/sysutils/acpidump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:31 jlam Exp $
 #
 
 DISTNAME=	pacpidump
@@ -10,7 +10,7 @@ MAINTAINER=	uebayasi@NetBSD.org
 HOMEPAGE=	${MASTER_SITES}	# Just a directory list. :-)
 COMMENT=	Portable ACPI table dumper
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 BUILD_TARGET=	# null
 
 do-install:
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index b1a0688f7fc..eec25c600ba 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:31 jlam Exp $
 
 PKGNAME=		amanda-server-${VERS}
 # PKGREVISION=		1
@@ -7,7 +7,7 @@ SVR4_PKGNAME=		amase
 COMMENT=		Server part of Amanda, a network backup system
 
 USE_PERL5=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 5558a0a6825..8a8ba4df172 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=		apcupsd-3.8.6
 PKGREVISION=		3
@@ -12,7 +12,7 @@ COMMENT=		UPS power management for APCC Products
 BUILD_USES_MSGFMT=	yes
 
 USE_PKGINSTALL=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 GNU_CONFIGURE=		yes
 
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index 0889689e2c0..988799ff533 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/16 10:51:17 rh Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:31 jlam Exp $
 #
 
 DISTNAME=	burn-0.4.0
@@ -17,7 +17,7 @@ DEPENDS+=	gworkspace-[0-9]*:../../sysutils/gworkspace
 NO_CONFIGURE=	YES
 USE_X11=	YES
 MAKEFILE=	GNUmakefile
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 WRKSRC=		${WRKDIR}/${PKGBASE}
 MAKE_ENV+=	ADDITIONAL_CPPFLAGS=-D_POSIX_SOURCE
 MAKE_ENV+=	ADDITIONAL_LDFLAGS=-lutil
diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile
index 81eb42ab205..113b59f20ac 100644
--- a/sysutils/ccze/Makefile
+++ b/sysutils/ccze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	ccze-0.2.1
 CATEGORIES=	sysutils
@@ -13,7 +13,7 @@ INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6*
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/pcre/buildlink3.mk"
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index af8204e4c62..16360248f6c 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:31 jlam Exp $
 #
 
 DISTNAME=		cdrdao-1.1.9
@@ -12,7 +12,7 @@ COMMENT=		Records audio or data CD-Rs in disk-at-once (DAO) mode
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 CONFIGURE_ARGS+=	--with-pcctsbin=${PREFIX}/bin
 CONFIGURE_ARGS+=	--with-pcctsinc=${PREFIX}/include/pccts
diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile
index 8efc7e948c4..7eccc45e19f 100644
--- a/sysutils/cdrecord-xcdroast/Makefile
+++ b/sysutils/cdrecord-xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	cdrtools-2.01a21
 PKGNAME=	cdrecord-xcdroast-0.98a15.2.01a21
@@ -16,7 +16,7 @@ CONFLICTS+=	cdrecord-xcdroast098a13-*
 .include "../../mk/bsd.prefs.mk"
 
 WRKSRC=			${WRKDIR}/${DISTNAME:C/a.*//}
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .if ${LOCALBASE} != "/opt/schily"
 BUILDLINK_TRANSFORM=	rmdir:/opt/schily
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index f7a4390dedd..0b26a8755a7 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.66 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	cdrtools-2.00.3
 PKGNAME=	cdrecord-2.00.3
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_TBL=		yes
 
 # avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index aff39eac992..de5fcbd23c3 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:31 jlam Exp $
 
 DISTNAME=	cdrtools-2.01a32
 PKGNAME=	cdrtools-ossdvd-2.01.1.32
@@ -20,7 +20,7 @@ CONFLICTS=	mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-*
 .include "../../mk/bsd.prefs.mk"
 
 WRKSRC=			${WRKDIR}/cdrtools-2.01
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_TBL=		yes
 
 .if ${LOCALBASE} != "/opt/schily"
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 2dfefec6aee..b62b59f5bfc 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/08 12:55:45 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/05/22 20:08:31 jlam Exp $
 #
 
 # XXX Do not update to 0.30 or above yet.  The API in the 0.2x series is
@@ -18,7 +18,7 @@ DISTINFO_FILE=	${.CURDIR}/../../sysutils/dbus/distinfo
 PATCHDIR=	${.CURDIR}/../../sysutils/dbus/patches
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 
diff --git a/sysutils/dog/Makefile b/sysutils/dog/Makefile
index 03c2d2043f9..bd81e4396e5 100644
--- a/sysutils/dog/Makefile
+++ b/sysutils/dog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/24 21:13:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:32 jlam Exp $
 
 DISTNAME=	dog-1.7
 CATEGORIES=	misc
@@ -8,7 +8,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://jl.photodex.com/dog/
 COMMENT=	Dog writes the contents of each given file, URL, or stdin
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 BUILD_TARGET=	dog
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index 56e8d571ead..dee439cc739 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	extipl-5.04
@@ -12,6 +12,6 @@ COMMENT=	IPL compatible OS boot selector
 BUILD_DEPENDS+=	nasm-[0-9]*:../../devel/nasm
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}/src
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 29605d6db0a..288d41489f5 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/09 23:13:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=		fam-2.7.0
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 # fam is bundled with IRIX
 NOT_FOR_PLATFORM=	IRIX-*-*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
diff --git a/sysutils/fsv/Makefile b/sysutils/fsv/Makefile
index cd98da598ad..f0ffc6edb36 100644
--- a/sysutils/fsv/Makefile
+++ b/sysutils/fsv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	fsv-0.9
@@ -11,7 +11,7 @@ HOMEPAGE=	http://fsv.sourceforge.net/
 COMMENT=	3D filesystem visualizer
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 
 .include "../../x11/gtkglarea/buildlink3.mk"
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 407c7213b02..963a748c39c 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:32 jlam Exp $
 
 DISTNAME=	FSViewer.app-0.2.5
 PKGNAME=	FSViewer-0.2.5
@@ -13,7 +13,7 @@ MAINTAINER=	johnam@mail.kemper.org
 HOMEPAGE=	http://www.bayernline.de/~gscholz/linux/fsviewer/
 COMMENT=	NextStep-like Filemanager for WindowMaker
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 24274ec026a..1bbb16450a4 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=		cdrdao-1.1.9
@@ -17,7 +17,7 @@ WRKSRC=			${WRKDIR}/cdrdao-1.1.9
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome1-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin
 CONFIGURE_ARGS+=	--with-pcctsinc=${LOCALBASE}/include/pccts
 CONFIGURE_ARGS+=	--without-posix-threads
diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common
index 0c95f557016..89bea1d1a4b 100644
--- a/sysutils/gkrellm/Makefile.common
+++ b/sysutils/gkrellm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2005/03/22 15:14:41 cube Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/05/22 20:08:32 jlam Exp $
 
 DISTNAME=	${GKRELLM_DISTBASE}
 PKGNAME=	${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -11,7 +11,7 @@ HOMEPAGE=	http://gkrellm.net/
 
 CONFLICTS+=	gkrellm-1*
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 
 MAKE_ENV+=		LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile
index 4b9fc68c9bf..f9d85ff50ff 100644
--- a/sysutils/gkrellm1/Makefile
+++ b/sysutils/gkrellm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	gkrellm-1.2.13
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 
 OSVERSION_SPECIFIC=	YES
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 
 CONFLICTS+=	gkrellm-share>=2.0
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 5eb698afde1..36a7f23069e 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/19 11:00:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	gnome-menus-2.10.1
@@ -13,7 +13,7 @@ COMMENT=	Implementation of the desktop menu specification for GNOME
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.2
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 9bd035354dc..856dcc6a6bf 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/04/15 02:09:26 rh Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:08:32 jlam Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
 PKGREVISION=		8
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS.gnome-mime-data=	gnome-mime-data>=2.0.1
 
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index ed51e0046b0..9f022d7a429 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/05/18 16:08:17 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=		gnome-vfs-2.10.1
@@ -19,7 +19,7 @@ PATCHDIR=		${.CURDIR}/../../sysutils/gnome-vfs2/patches
 
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 
diff --git a/sysutils/gnome-vfsmm26/Makefile b/sysutils/gnome-vfsmm26/Makefile
index caefec252c5..ff4aab9f5f4 100644
--- a/sysutils/gnome-vfsmm26/Makefile
+++ b/sysutils/gnome-vfsmm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=		gnome-vfsmm-2.6.1
@@ -16,7 +16,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libgnomevfs/gnome-vfsmm-2.6.pc.in
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 
 .include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index f4230575fe9..1d287771c1c 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/19 21:11:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.10.1
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_X11=		yes
 
 LIBS+=			-lutil
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 06ada03e5d4..a102af5a195 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
@@ -14,7 +14,7 @@ COMMENT=	CD recording frontend for X/GTK+
 
 WRKSRC=			${WRKDIR}/gtoaster
 USE_X11=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-oss --without-esd
diff --git a/sysutils/gpart/Makefile b/sysutils/gpart/Makefile
index b63db0b3a9b..dcf642f6605 100644
--- a/sysutils/gpart/Makefile
+++ b/sysutils/gpart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/31 22:56:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:32 jlam Exp $
 
 DISTNAME=	gpart-0.1h
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://home.pages.de/~michab/gpart/
 COMMENT=	Tool to show the partitions on a PC type harddisk
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 # Doesn't work on 1.4.x due to problems with dlopen
 NOT_FOR_PLATFORM=	NetBSD-1.4*-*
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 9cea9f87a21..e0022022121 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/09 17:35:16 xtraeme Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	grub-0.97
@@ -12,7 +12,7 @@ COMMENT=	GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2
 ONLY_FOR_PLATFORM=	*-*-i386
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 INFO_FILES=		grub.info multiboot.info
 
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index ca0d78529b1..6244355cefa 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:32 jlam Exp $
 
 DISTNAME=	grun-0.9.2
 PKGREVISION=	3
@@ -11,7 +11,7 @@ COMMENT=	GTK+ based Run dialog
 
 USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 PTHREAD_OPTS+=		require
 
 post-install:
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index e50dfe345db..9da3820aab1 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:32 jlam Exp $
 #
 
 DISTNAME=	idesk-0.3.5
@@ -10,7 +10,7 @@ MAINTAINER=	pancake@phreaker.net
 HOMEPAGE=	http://sourceforge.net/projects/idesk/
 COMMENT=	Gives users of minimal WMs icons on their desktop
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_X11=	yes
 
 do-install:
diff --git a/sysutils/isapnptools/Makefile b/sysutils/isapnptools/Makefile
index 7534a1d4849..7c6164b0f8b 100644
--- a/sysutils/isapnptools/Makefile
+++ b/sysutils/isapnptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=	isapnptools-1.26
@@ -14,7 +14,7 @@ COMMENT=	Manually query and configure isapnp devices
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--disable-realtime --disable-pci
 
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 8eed943b53f..a201edfe27c 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:33 jlam Exp $
 
 DISTNAME=	kdirstat-2.4.0
 PKGREVISION=	3
@@ -10,7 +10,7 @@ MAINTAINER=	markd@NetBSD.org
 HOMEPAGE=	http://kdirstat.sourceforge.net/
 COMMENT= 	A graphical disk usage utility
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=          yes
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile
index 40c983d3c1b..ab99460ef0e 100644
--- a/sysutils/krusader/Makefile
+++ b/sysutils/krusader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=	krusader-1.51
@@ -9,7 +9,7 @@ MAINTAINER=	ianzag@mail.ru
 HOMEPAGE=	http://krusader.sourceforge.net/
 COMMENT=	Advanced twin-panel (commander-style) file-manager for KDE 3.x
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index b1d76d4702b..ca1c79365d2 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:33 jlam Exp $
 
 DISTNAME=		libgtop-2.10.1
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -17,7 +17,7 @@ USE_MSGFMT_PLURALS=	YES
 
 USE_PERL5=		build
 USE_PKGLOCALEDIR=	YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libgtop-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	support/gnome-support-2.0.pc.in
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index db7974b8bc0..7efeb283ff8 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/05/12 07:12:14 rillig Exp $
+# $NetBSD: Makefile,v 1.56 2005/05/22 20:08:33 jlam Exp $
 
 DISTNAME=	mc-4.6.1-pre4a
 PKGNAME=	mc-4.6.1rc4
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.ibiblio.org/mc/
 COMMENT=	User-friendly file manager and visual shell
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	YES
 
 # see options.mk for an explanation of these options
diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
index 0bc07b2c1f5..c3d889c9451 100644
--- a/sysutils/memtest86/Makefile
+++ b/sysutils/memtest86/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=		memtest86-3.1a
@@ -11,7 +11,7 @@ COMMENT=		Thorough, stand alone memory test for x86 arch
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 Linux-*-i386
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/mdec
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index b9e857bb0f7..49a7d2eb806 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/04 08:56:18 adam Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:33 jlam Exp $
 
 DISTNAME=	mtools-3.9.10
 CATEGORIES=	sysutils
@@ -12,7 +12,7 @@ COMMENT=	FAT (MS-DOS, Atari) disk access tools
 NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
 
 GNU_CONFIGURE=		YES
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_MAKEINFO=		YES
 INFO_FILES=		mtools.info
 
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 1cfc6e4b292..c255994b512 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/25 19:25:25 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=	nautilus-cd-burner-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 USE_MSGFMT_PLURALS=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index d7b9f9c5ebe..f7f8b9c3550 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/05/18 17:23:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=		nautilus-2.10.1
@@ -13,7 +13,7 @@ COMMENT=		Nautilus file manager for GNOME2
 USE_PKGLOCALEDIR=	yes
 USE_DIRS+=		xdg-1.1
 USE_X11=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index 33554d49bfe..461665ac5d5 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:28 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:33 jlam Exp $
 
 DISTNAME=	pciutils-2.1.11
 CATEGORIES=	sysutils
@@ -10,7 +10,7 @@ MAINTAINER=	cube@NetBSD.org
 HOMEPAGE=	http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
 COMMENT=	PCI bus manipulation utility similar to NetBSD pcictl(8)
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 ONLY_FOR_PLATFORM+=	AIX-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
 
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index 2e1f0c238c4..3c1039c5ea6 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:28 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=		pv-0.8.6
@@ -13,7 +13,7 @@ COMMENT=		Monitor the progress of data through a pipeline
 BUILD_USES_MSGFMT=	yes
 
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGLOCALEDIR=	yes
 
 INFO_FILES=		pv.info
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index e2dddb49565..eb8278ab6e5 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=		sformat-3.5
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 TBL?=			tbl
 
 # avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 60cdcbd373a..886a799553b 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:33 jlam Exp $
 
 DISTNAME=		smartmontools-5.32
 PKGREVISION=		2
@@ -11,7 +11,7 @@ COMMENT=		Control and monitor storage systems using SMART
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 
diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile
index f36b64bfed8..51385e619f2 100644
--- a/sysutils/swapd/Makefile
+++ b/sysutils/swapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=	swapd-1.0.3
@@ -11,7 +11,7 @@ COMMENT=	Swap daemon for POSIX-compliant operating systems
 
 ONLY_FOR_PLATFORM=	NetBSD-*-* SunOS-*-* Linux-*-*
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 USE_PKGINSTALL=	yes
 GNU_CONFIGURE=	yes
 
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index 03b6e4b336c..830a413e986 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/18 18:48:37 drochner Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=	vcdimager-0.7.22
@@ -9,7 +9,7 @@ MAINTAINER=	ben@NetBSD.org
 HOMEPAGE=	http://www.vcdimager.org/
 COMMENT=	Mastering suite for Video CDs
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
 INFO_FILES=	vcd-info.info vcdimager.info vcdxrip.info
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
index 64f0141d7e5..ac8449e30f9 100644
--- a/sysutils/vcdimager/Makefile
+++ b/sysutils/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:30 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=	vcdimager-0.6.2
@@ -12,7 +12,7 @@ COMMENT=	Mastering suite for Video CDs
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 GNU_CONFIGURE=	YES
 INFO_FILES=	vcdimager.info
 
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index 0332bbf1034..7abf75fa19c 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:30 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=	vifm-0.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://vifm.sourceforge.net/
 COMMENT=	Ncurses based file manager with vi like keybindings
 
 GNU_CONFIGURE=	yes
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 
 INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6[-_.]*
 INCOMPAT_CURSES+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 3079418c64c..4312fe4b3dd 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:33 jlam Exp $
 
 DISTNAME=	xcdroast-0.98alpha15
 PKGNAME=	xcdroast-0.98a15
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 DEPENDS+=		cdrecord-xcdroast-0.98a15.*:../cdrecord-xcdroast
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/sysutils/xen12/Makefile b/sysutils/xen12/Makefile
index 60413a5a3dd..16f2c30ffc4 100644
--- a/sysutils/xen12/Makefile
+++ b/sysutils/xen12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/14 16:06:46 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=		xeno-1.2-src-040418
@@ -20,7 +20,7 @@ BUILD_TARGET=		default
 
 USE_PKGINSTALL=		yes
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/xentools12/Makefile b/sysutils/xentools12/Makefile
index 9daed2293b8..c191e0c5c32 100644
--- a/sysutils/xentools12/Makefile
+++ b/sysutils/xentools12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:33 jlam Exp $
 #
 
 DISTNAME=		xeno-1.2-src-040418
@@ -24,7 +24,7 @@ CONF_FILES=		${EGDIR}/defaults ${PKG_SYSCONFDIR}/defaults
 CONF_FILES+=		${EGDIR}/democd ${PKG_SYSCONFDIR}/democd
 CONF_FILES+=		${EGDIR}/netbsd ${PKG_SYSCONFDIR}/netbsd
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKE_ENV+=		EGDIR="${EGDIR}"
 MAKE_ENV+=		MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}"
 PYTHON_VERSIONS_ACCEPTED= 22 23
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 68e8f9d79e5..035a66c005f 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/16 13:35:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:34 jlam Exp $
 #
 
 DISTNAME=		xen-2.0.3-src
@@ -23,7 +23,7 @@ WRKSRC=			${WRKDIR}/xen-2.0/tools
 
 EGDIR=			${PREFIX}/share/examples/${PKGNAME_NOREV}
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 MAKE_ENV+=		EGDIR="${EGDIR}"
 MAKE_ENV+=		MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}"
 PYTHON_VERSIONS_ACCEPTED= 24 23 22
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index 949598115c3..4c8bb7b84d6 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:34 jlam Exp $
 #
 
 DISTNAME=	xfe-0.54.2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PKGINSTALL=		yes
 USE_X11=		yes
 
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index d4c737a4c09..469bc889d34 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:34 jlam Exp $
 
 DISTNAME=	xosview-1.8.2
 CATEGORIES=	sysutils
@@ -29,7 +29,7 @@ UVM=		# defined
 BUILD_DEFS=	UVM
 .  endif
 .elif ${OPSYS} == "SunOS"
-USE_GNU_TOOLS+=	make
+USE_TOOLS+=	gmake
 CPPFLAGS+=	-I${X11BASE}/include
 LIBS+=		-lsocket -lnsl
 .endif
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index 69325711a0c..f548f933f4d 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:34 jlam Exp $
 
 DISTNAME=	xps-4.2
 CATEGORIES=	sysutils
@@ -8,7 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://motif-pstree.sourceforge.net/
 COMMENT=	Displays the Unix process list as a hierarchical tree
 
-USE_GNU_TOOLS+=		make
+USE_TOOLS+=		gmake
 USE_PERL5=		build
 GNU_CONFIGURE=		yes