replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

40 files changed, 80 insertions, 80 deletions

diff --git a/sysutils/amanda-dev-server/Makefile b/sysutils/amanda-dev-server/Makefile
index fdb2f2cf5df..dda96e75e72 100644
--- a/sysutils/amanda-dev-server/Makefile
+++ b/sysutils/amanda-dev-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2002/10/25 19:29:00 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:57 grant Exp $
 #
 
 PKGNAME=		amanda-server-${VERS}
@@ -7,7 +7,7 @@ COMMENT=		Server part of Amanda, a network backup system
 
 USE_BUILDLINK2=		yes
 USE_PERL5=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-dev-common/Makefile.common"
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index bf22c9ba462..278104416a3 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/07/17 22:53:26 grant Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/24 15:06:57 grant Exp $
 # FreeBSD Id: Makefile,v 1.9 1997/03/08 05:00:11 gpalmer Exp
 #
 
@@ -14,7 +14,7 @@ COMMENT=		Server part of Amanda, a network backup system
 
 USE_PERL5=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 9fa115429f6..c93c6f9d779 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=		apcupsd-3.8.6
 PKGREVISION=		1
@@ -13,7 +13,7 @@ BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		yes
 
diff --git a/sysutils/apotheke/Makefile b/sysutils/apotheke/Makefile
index 1d5991ec6b5..82092f1f873 100644
--- a/sysutils/apotheke/Makefile
+++ b/sysutils/apotheke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	apotheke-0.2
@@ -14,7 +14,7 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 GCONF2_SCHEMAS+=	apotheke.schemas
 
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index 01abfd208e4..8041e49fa2d 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=		${PKGNAME}.src
@@ -12,7 +12,7 @@ COMMENT=		Records audio or data CD-Rs in disk-at-once (DAO) mode
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--with-pcctsbin=${PREFIX}/bin
 CONFIGURE_ARGS+=	--with-pcctsinc=${PREFIX}/include/pccts
 CONFIGURE_ARGS+=	--without-posix-threads
diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile
index b19f550d9cf..f00d1f9eb07 100644
--- a/sysutils/cdrecord-xcdroast/Makefile
+++ b/sysutils/cdrecord-xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=	cdrtools-2.01a21
 PKGNAME=	cdrecord-xcdroast-0.98a15.2.01a21
@@ -17,7 +17,7 @@ CONFLICTS+=	cdrecord-xcdroast098a13-*
 
 WRKSRC=			${WRKDIR}/${DISTNAME:C/a.*//}
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 .if ${LOCALBASE} != "/opt/schily"
 BUILDLINK_TRANSFORM=	r:-I/opt/schily
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index c123a881a55..d382e568d4a 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2004/01/05 12:48:30 jlam Exp $
+# $NetBSD: Makefile,v 1.53 2004/01/24 15:06:57 grant 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_BUILDLINK3=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 TBL?=			tbl
 
 # avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index ccce6953485..067a0a51a65 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=	cdrtools-2.01a18
 PKGNAME=	cdrtools-ossdvd-2.01.1.18
@@ -19,7 +19,7 @@ CONFLICTS=	mkisofs-[0-9]* cdrecord-* cdrtools-*
 
 WRKSRC=			${WRKDIR}/cdrtools-2.01
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 TBL?=			tbl
 
 .if ${LOCALBASE} != "/opt/schily"
diff --git a/sysutils/dog/Makefile b/sysutils/dog/Makefile
index 18afe667656..9b598f664df 100644
--- a/sysutils/dog/Makefile
+++ b/sysutils/dog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/09/23 13:34:44 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
 # FreeBSD Id: ports/misc/dog/Makefile,v 1.1 2000/06/10 05:45:34 will Exp
 
 DISTNAME=	dog-1.7
@@ -9,7 +9,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://jl.photodex.com/dog/
 COMMENT=	Dog writes the contents of each given file, URL, or stdin
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 ALL_TARGET=	dog
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index 16b4e2c40ce..56e8d571ead 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant 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_GMAKE=	#defined
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index e2f4d22f51e..55774584516 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:53:33 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=		fam-2.6.9
@@ -13,7 +13,7 @@ HOMEPAGE=		http://oss.sgi.com/projects/fam/
 COMMENT=		File Alteration Monitor
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 42a13f84299..534a13b214c 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	FSViewer.app-0.2.3
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 # when the application gets updated for windowmaker>=0.64.0
 CFLAGS+=	-I${BUILDLINK_PREFIX.windowmaker}/include/WINGs
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 USE_X11=		yes
 USE_BUILDLINK2=		yes
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index f36a947a539..7e2e95d6350 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=		cdrdao-1.1.7.src
@@ -17,7 +17,7 @@ WRKSRC=			${WRKDIR}/cdrdao-1.1.7
 USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 CONFIGURE_ARGS+=	--with-pcctsbin=${LOCALBASE}/bin
 CONFIGURE_ARGS+=	--with-pcctsinc=${LOCALBASE}/include/pccts
 CONFIGURE_ARGS+=	--without-posix-threads
diff --git a/sysutils/gkrellm/Makefile b/sysutils/gkrellm/Makefile
index b105f6df598..13f9b1e80cf 100644
--- a/sysutils/gkrellm/Makefile
+++ b/sysutils/gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/03 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	gkrellm-1.2.13
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	YES
 OSVERSION_SPECIFIC=	YES
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 
 ALL_TARGET=		netbsd
diff --git a/sysutils/gnome-acme/Makefile b/sysutils/gnome-acme/Makefile
index c4211a75455..2c46e0e686c 100644
--- a/sysutils/gnome-acme/Makefile
+++ b/sysutils/gnome-acme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=	acme-2.4.2
 PKGNAME=	gnome-${DISTNAME}
@@ -14,7 +14,7 @@ COMMENT=	Small GNOME tool to make use of the multimedia buttons
 DEPENDS=	gnome2-control-center>=2.0:../../x11/gnome2-control-center
 
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 633bf769866..618f253648a 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/01/03 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
 PKGREVISION=		5
@@ -15,7 +15,7 @@ BUILDLINK_DEPENDS.gnome-mime-data=	gnome-mime-data>=2.0.1
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 05afb8d16bb..0bcaab7376a 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=		gnome-vfs-2.4.1
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT=	YES
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 
diff --git a/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index a11cf59ac40..59f0bb11a60 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	gnome-system-monitor-2.4.0
@@ -18,7 +18,7 @@ BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 LIBS+=			-lutil
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index ef2534f721f..e7b930e9edf 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	gtoaster1.0Beta5
@@ -15,7 +15,7 @@ COMMENT=	Cd recording frontend for X/Gtk
 WRKSRC=			${WRKDIR}/gtoaster
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-oss --without-esd
diff --git a/sysutils/gpart/Makefile b/sysutils/gpart/Makefile
index 4af10c893f9..1d338286cef 100644
--- a/sysutils/gpart/Makefile
+++ b/sysutils/gpart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/17 22:53:35 grant Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=	gpart-0.1g
 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_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 # 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 cd5041d0602..12b4320c2e0 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	grub-0.93
@@ -13,7 +13,7 @@ COMMENT=	GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2
 ONLY_FOR_PLATFORM=	*-*-i386
 
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 
 INFO_FILES=		grub.info
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index 806f1dfd0d8..f3056c51f1d 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/13 13:53:17 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=	grun-0.9.2
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	GTK+ based Run dialog
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 PTHREAD_OPTS+=		require
 
 post-install:
diff --git a/sysutils/gtop/Makefile b/sysutils/gtop/Makefile
index 172aba043d1..4effb1fa40b 100644
--- a/sysutils/gtop/Makefile
+++ b/sysutils/gtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/24 15:06:57 grant Exp $
 
 DISTNAME=		gtop-1.0.13
 PKGREVISION=		6
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 OSVERSION_SPECIFIC=	YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/sysutils/gworkspace/Makefile.common b/sysutils/gworkspace/Makefile.common
index 34b42785f70..b88df3d7757 100644
--- a/sysutils/gworkspace/Makefile.common
+++ b/sysutils/gworkspace/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=		gworkspace-0.5.3
@@ -11,7 +11,7 @@ HOMEPAGE?=		http://www.gnustep.it/enrico/gworkspace/
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/gw/GW/}
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 MAKEFILE=		GNUmakefile
 GNU_CONFIGURE=		YES
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index fe47a066d26..f34c77f79b5 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	idesk-0.3.5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://idesk.timmfin.net/
 COMMENT=	Gives users of minimal WMs icons on their desktop
 
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 
 do-install:
diff --git a/sysutils/isapnptools/Makefile b/sysutils/isapnptools/Makefile
index 901001752dd..7534a1d4849 100644
--- a/sysutils/isapnptools/Makefile
+++ b/sysutils/isapnptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/30 17:27:31 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
 #
 
 DISTNAME=	isapnptools-1.26
@@ -14,7 +14,7 @@ COMMENT=	Manually query and configure isapnp devices
 
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--disable-realtime --disable-pci
 
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 6d4f897d4f3..af1ad4d2e29 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:06:58 grant Exp $
 
 DISTNAME=	kdirstat-2.3.7
 PKGREVISION=	5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://kdirstat.sourceforge.net/
 COMMENT= 	A graphical disk usage utility
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=              yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=          yes
 
 .include "../../meta-pkgs/kde3/buildlink2.mk"
diff --git a/sysutils/mc/Makefile.common b/sysutils/mc/Makefile.common
index 4d13e4908fc..75257248fbd 100644
--- a/sysutils/mc/Makefile.common
+++ b/sysutils/mc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2003/09/19 02:27:12 hubertf Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/01/24 15:06:58 grant Exp $
 
 DISTNAME=		mc-4.5.51
 CATEGORIES+=		sysutils
@@ -16,7 +16,7 @@ PATCHDIR=		${.CURDIR}/../../sysutils/mc/patches
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--without-included-gettext
diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
index 1f4615cf5f4..45fdead6266 100644
--- a/sysutils/memtest86/Makefile
+++ b/sysutils/memtest86/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=		memtest86-2.9
@@ -12,7 +12,7 @@ COMMENT=		Thorough, stand alone memory test for x86 arch
 ONLY_FOR_PLATFORM=	NetBSD-*-i386
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 post-patch:
 	${CP} ${FILESDIR}/linkage.h ${WRKSRC}
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index c98b6e939d6..5ddf993f856 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2003/12/11 16:05:40 adam Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=	mtools-3.9.9
@@ -13,7 +13,7 @@ COMMENT=	FAT (MS-DOS, Atari) disk access tools
 NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64	# LP64 problem
 
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_MAKEINFO=		YES
 INFO_FILES=		mtools.info
 
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index ff31c29a820..46379db38e4 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=		nautilus-2.4.1
@@ -14,7 +14,7 @@ COMMENT=		Nautilus file manager for GNOME2
 USE_PKGLOCALEDIR=	yes
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index 41cae3dd6df..62e366a3ccd 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/09/19 09:30:42 cube Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:58 grant 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_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index 3aeda726758..40bcada0870 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/08/09 11:25:15 seb Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=		pv-0.4.5
@@ -13,7 +13,7 @@ COMMENT=		Monitor the progress of data through a pipeline
 
 BUILD_USES_MSGFMT=	yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index d63634a45de..fa1bde639e1 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=	vcdimager-0.7.12
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnu.org/software/vcdimager/
 COMMENT=	Mastering suite for Video CDs
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
index 4ec2aae429c..353fc4c3e16 100644
--- a/sysutils/vcdimager/Makefile
+++ b/sysutils/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=	vcdimager-0.6.2
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.gnu.org/software/vcdimager/
 COMMENT=	Mastering suite for Video CDs
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 INFO_FILES=	vcdimager.info
 
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index a9a36466c82..6af43184b3a 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/12/29 18:22:47 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=	vifm-0.1
@@ -12,7 +12,7 @@ COMMENT=	Ncurses based file manager with vi like keybindings
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 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 eda827a7ce6..50f7fe3fcb5 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/03 18:49:53 reed Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 15:06:58 grant Exp $
 
 DISTNAME=	xcdroast-0.98alpha15
 PKGNAME=	xcdroast-0.98a15
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 DEPENDS+=		cdrecord-xcdroast-0.98a15.*:../cdrecord-xcdroast
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index 0a48cb4d372..d1c214d31c0 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:06:58 grant Exp $
 #
 
 DISTNAME=	xfe-0.54.2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 USE_X11=		yes
 
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index e3782104322..d0a84cda4c0 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/01/05 12:48:30 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2004/01/24 15:06:58 grant Exp $
 
 DISTNAME=	xosview-1.8.1
 CATEGORIES=	sysutils
@@ -29,7 +29,7 @@ UVM=		# defined
 BUILD_DEFS=	UVM
 .  endif
 .elif ${OPSYS} == "SunOS"
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 BUILD_DEPENDS+=	egcs-1.1.2:../../lang/egcs
 CXX=		${LOCALBASE}/egcs/bin/g++
 CPPFLAGS+=	-I${X11BASE}/include
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index ee341f59798..b3467ad7a59 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/07/21 17:24:48 martti Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 15:06:58 grant Exp $
 
 DISTNAME=	xps-3.14
 CATEGORIES=	sysutils
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.netwinder.org/~rocky/xps-home/
 COMMENT=	Displays the Unix process list as a hierarchical tree
 
 USE_PERL5=	build
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	# defined
 
 USE_BUILDLINK2=	# defined