replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

75 files changed, 150 insertions, 150 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
diff --git a/textproc/GutenMark/Makefile b/textproc/GutenMark/Makefile
index 1fe95f79b2f..b98384613f1 100644
--- a/textproc/GutenMark/Makefile
+++ b/textproc/GutenMark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:49 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:13:19 grant Exp $
 #
 
 DISTNAME=	GutenMark_source_${GVER}
@@ -15,7 +15,7 @@ DEPENDS+=	GutenMark-words-[0-9]*:../../textproc/GutenMark-words
 WRKSRC=		${WRKDIR}/GutenMark-source
 GVER=		20020714
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 ALL_TARGET=	GutenMark
 
 do-install:
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index ad84c1c4551..1207cfd80fa 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/12/03 16:49:06 recht Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 15:13:19 grant Exp $
 #
 
 DISTNAME=		aspell-0.50.4.1
@@ -14,7 +14,7 @@ CONFLICTS=		libpspell-[0-9]*
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_GCC_SHLIB=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile
index 148684cfede..af7f987f922 100644
--- a/textproc/dict-client/Makefile
+++ b/textproc/dict-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/03/24 02:19:20 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 15:13:19 grant Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=        dict-client-1.8.0
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol client
 
 USE_BUILDLINK2=	# defined
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	# defined
 
 ALL_TARGET=	dict
diff --git a/textproc/dict-dictionaries/Makefile b/textproc/dict-dictionaries/Makefile
index 029310104ed..9ee25daa848 100644
--- a/textproc/dict-dictionaries/Makefile
+++ b/textproc/dict-dictionaries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2002/12/27 02:43:47 uebayasi Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 15:13:19 grant Exp $
 
 DISTNAME=       #
 PKGNAME=	dict-data-1.8.0
@@ -17,7 +17,7 @@ COMMENT=	Dictionary data for DICTD
 
 DEPENDS=	dict-server>=1.8.0nb1:../../textproc/dict-server
 
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 
 # Strip '.gz', strip '.tar'.
 DICTIONARIES=	${DISTFILES:R:R}
diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index 015e009b286..cd498987d83 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2002/12/27 02:50:37 uebayasi Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:13:19 grant Exp $
 
 DISTNAME=       dictd-1.8.0
 PKGNAME=	dict-server-1.8.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.dict.org/
 COMMENT=	Dictionary Service Protocol server
 
 USE_BUILDLINK2=	# defined
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	# defined
 CONFIGURE_ARGS+=--with-etcdir=${PREFIX}/etc
 
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 87ca1221cb0..359ba5269c8 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/09 11:27:45 seb Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 15:13:19 grant Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 #
 
@@ -54,7 +54,7 @@ DIST_SUBDIR=	eb
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 2e8f011bd56..b12ba30eb71 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/05 23:43:06 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:13:19 grant Exp $
 #
 
 DISTNAME=	expat-1.95.6
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		YES
 
 DOCDIR=	${PREFIX}/share/doc/html/expat
diff --git a/textproc/expatobjc/Makefile b/textproc/expatobjc/Makefile
index bd82c2d745f..e3e13a76b3b 100644
--- a/textproc/expatobjc/Makefile
+++ b/textproc/expatobjc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/12/24 09:53:50 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:19 grant Exp $
 #
 
 DISTNAME=		expatobjc-1.0
@@ -12,7 +12,7 @@ COMMENT=		Objective-C Wrapper for Expat
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 CONFIGURE_ENV+=		objc_works=yes
diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile
index 70c83ebd83b..6531147fea0 100644
--- a/textproc/freepwing/Makefile
+++ b/textproc/freepwing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 22:54:15 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 15:13:19 grant Exp $
 
 DISTNAME=	freepwing-1.4.3
 CATEGORIES=	japanese textproc
@@ -10,7 +10,7 @@ COMMENT=	Free JIS X 4081 (subset of EPWING V1) formatter
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-pkgdocdir=${PREFIX}/share/doc/freepwing
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_PERL5=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index fa2dd5bc799..c27ffa277e6 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/11/19 02:57:43 jschauma Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:13:20 grant Exp $
 # FreeBSD Id: Makefile,v 1.12 1997/07/17 19:29:07 andreas Exp
 #
 
@@ -16,7 +16,7 @@ RESTRICTED=	"Restrictive copyright (don't sell for profit)"
 NO_SRC_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_CDROM=	${RESTRICTED}
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 
 post-install:
diff --git a/textproc/gocr/Makefile b/textproc/gocr/Makefile
index 55c47eaa1e2..4416e397d59 100644
--- a/textproc/gocr/Makefile
+++ b/textproc/gocr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/24 17:47:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
 
 DISTNAME=	gocr-0.37
 CATEGORIES=	textproc
@@ -9,7 +9,7 @@ HOMEPAGE=	http://sourceforge.net/projects/jocr
 COMMENT=	GOCR is a set of OCR tools
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2= yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 9dbfcdf2e6d..56fd129024a 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/01/20 12:26:49 agc Exp $
+# $NetBSD: Makefile,v 1.28 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	icu-2.6.1
@@ -16,7 +16,7 @@ HOMEPAGE=	http://oss.software.ibm.com/icu/
 COMMENT=	Robust and full-featured Unicode services
 
 WRKSRC=			${WRKDIR}/${PKGBASE}/source
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
 TEST_TARGET=		check
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index 83a92262fd5..88422a979a0 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/12/13 17:19:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=		intltool-0.28
@@ -14,7 +14,7 @@ DEPENDS=		p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
 
 CONFLICTS=		xml-i18n-tools<=0.9
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 
diff --git a/textproc/ispell-german/Makefile b/textproc/ispell-german/Makefile
index 0874227d0d6..15d9047bc3d 100644
--- a/textproc/ispell-german/Makefile
+++ b/textproc/ispell-german/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 22:54:24 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	igerman98-20021114
@@ -14,7 +14,7 @@ COMMENT=	German dictionary for interactive spelling checker
 DEPENDS+=	ispell-base>=3.1.20nb1:../../textproc/ispell-base
 
 ALL_TARGET=	german.hash
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PERL5=	build
 REPLACE_PERL=	bin/dic2iso.pl bin/grepl bin/sq.pl bin/myspellfixprefix.pl \
 		bin/clear_affix.pl bin/unsq.pl bin/uniqflag.pl
diff --git a/textproc/ja-groff/Makefile b/textproc/ja-groff/Makefile
index 96800e3dac7..5b0ec0d4ba6 100644
--- a/textproc/ja-groff/Makefile
+++ b/textproc/ja-groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 22:54:27 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:13:20 grant Exp $
 # FreeBSD Id: Makefile,v 1.15 1999/01/27 07:41:16 fenner Exp $
 
 DISTNAME=	groff-1.10
@@ -15,7 +15,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 HOMEPAGE=	http://www.gnu.org/software/groff/groff.html
 COMMENT=	Japanese enhancement of GNU groff
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 #CONFIGURE_ENV+= CXXFLAGS="-fno-rtti -fno-exceptions -O"
 
diff --git a/textproc/ja-sed/Makefile b/textproc/ja-sed/Makefile
index 0b45901bb7a..77e1eaa5c65 100644
--- a/textproc/ja-sed/Makefile
+++ b/textproc/ja-sed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/09 11:27:49 seb Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
 # FreeBSD Id: Makefile,v 1.7 1999/01/27 07:41:18 fenner Exp $
 
 DISTNAME=	sed-3.02
@@ -18,7 +18,7 @@ INFO_FILES=	sed.info
 
 CONFLICTS+=	gsed-[0-9]*
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--program-transform-name='s,^,j,'
 
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index 48958593548..911e32e97e3 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/01/23 17:18:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/24 15:13:20 grant Exp $
 
 DISTNAME=	jade-1.2.1
 PKGREVISION=	8
@@ -18,7 +18,7 @@ PATCH_DIST_STRIP=	-p1
 CONFLICTS+=	sp-[0-9]*
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/ltconfig
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 12e9e603b47..8593465d737 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 22:54:28 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
 DISTNAME=	kakasi-2.3.4
@@ -12,7 +12,7 @@ COMMENT=	Kanji-Kana Simple Inverter, language filter for Japanese
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index eaec1690d8d..6d4699331a0 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/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:13:20 grant Exp $
 #
 
 DISTNAME=	libcroco-0.4.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.freespiders.org/projects/libcroco/
 COMMENT=	Toolkit to parse and manipulate CSS (Cascading Style Sheets)
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index f6a2d9bc9b4..6e310474d51 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/01/23 17:18:32 jmmv Exp $
+# $NetBSD: Makefile,v 1.43 2004/01/24 15:13:20 grant Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 PKGREVISION=	1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://xmlsoft.org/
 COMMENT=	XML parser library from the GNOME project
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml-2.0.pc.in
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 1f012ee9035..b19b7b80768 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/23 21:50:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/24 15:13:20 grant Exp $
 
 DISTNAME=	libxslt-1.1.2
 PKGNAME=	${DISTNAME}
@@ -12,7 +12,7 @@ HOMEPAGE=	http://xmlsoft.org/XSLT/
 COMMENT=	XSLT parser library from the GNOME project
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PERL5=		build
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index 4d76960f7b0..b7a43fd84a3 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/23 08:35:52 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	openjade-1.3.2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://openjade.sourceforge.net/
 COMMENT=	SGML/XML parser toolkit and DSSSL engine, successor to "jade"
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PERL5=	build
 GNU_CONFIGURE=	YES
 
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index 62f010858fb..8f9022d9e12 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/17 22:54:43 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	XML-Xerces-1.7.0-3
@@ -13,7 +13,7 @@ COMMENT=	Validating XML parser API for Perl
 CONFLICTS+=	XML-Xerces-[0-9]*
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 PERL5_REQD=	5.6.0
 PERL5_PACKLIST=	${PERL5_SITEARCH}/auto/XML/Xerces/.packlist
 
diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile
index ba517f67d67..059d2938f68 100644
--- a/textproc/postgresql-autodoc/Makefile
+++ b/textproc/postgresql-autodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	postgresql_autodoc-1.12
@@ -14,7 +14,7 @@ DEPENDS+=	p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
 
 WRKSRC=		${WRKDIR}/postgresql_autodoc
 USE_PERL5=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/${PKGBASE}
diff --git a/textproc/regexx/Makefile b/textproc/regexx/Makefile
index 390c5351bcf..ab40009a0f5 100644
--- a/textproc/regexx/Makefile
+++ b/textproc/regexx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/19 23:08:29 dent Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=		regexx-0.98.1
@@ -10,7 +10,7 @@ HOMEPAGE=		http://bazar.conectiva.com.br/~niemeyer/projects/regexx/
 COMMENT=		C++ regular expression library
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
diff --git a/textproc/robodoc/Makefile b/textproc/robodoc/Makefile
index b51b6dc8a4f..76ab19b1ae9 100644
--- a/textproc/robodoc/Makefile
+++ b/textproc/robodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/21 17:27:50 martti Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	robodoc-3.2.3
@@ -10,7 +10,7 @@ HOMEPAGE=	https://sourceforge.net/projects/robodoc/
 COMMENT=	Tool to support project documentation within source code
 
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 MAKEFILE=	makefile
 
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 22ea4fe7931..5889eaad480 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/05 19:11:25 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:13:20 grant Exp $
 
 DISTNAME=		Sablot-1.0.1
 PKGNAME=		${DISTNAME:S/Sablot/sablotron/}
@@ -12,7 +12,7 @@ COMMENT=		XML toolkit implementing XSLT, DOM, and XPath
 USE_BUILDLINK2=		YES
 USE_GCC_SHLIB=		YES
 GNU_CONFIGURE=  	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 7cd1499d603..b0c8558e54f 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=		scrollkeeper-0.3.14
@@ -16,7 +16,7 @@ DEPENDS=		docbook-xml>=4.2:../../textproc/docbook-xml
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile
index 29aae261a42..4012fee3cd0 100644
--- a/textproc/subtitleripper/Makefile
+++ b/textproc/subtitleripper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	subtitleripper-0.3-1
@@ -15,7 +15,7 @@ DEPENDS+=	gocr-[0-9]*:../../textproc/gocr
 
 WRKSRC=			${WRKDIR}/subtitleripper
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pgm2txt ${PREFIX}/bin
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index cda7f34f980..8f07a595f94 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	Xalan-C_1_0-linux
@@ -15,7 +15,7 @@ DEPENDS+=	xerces-c>=1.3.0:../../textproc/xerces-c
 
 WRKSRC=		${WRKDIR}/xml-xalan/c/src
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 #MAN1=		testXSLT.1
 
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 9373b88720b..cf2e676ef49 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:26:50 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 15:13:20 grant Exp $
 #
 
 DISTNAME=	xerces-c-src1_7_0
@@ -12,7 +12,7 @@ COMMENT=	Validating C++ XML parser with DOM and SAX support
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/src/xercesc
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 .include "../../mk/bsd.prefs.mk"
 .if ${LOWER_OPSYS} == "SunOS"
diff --git a/textproc/xml-i18n-tools/Makefile b/textproc/xml-i18n-tools/Makefile
index e3bc7a54828..700d5ede98f 100644
--- a/textproc/xml-i18n-tools/Makefile
+++ b/textproc/xml-i18n-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:54:56 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 15:13:20 grant Exp $
 
 DISTNAME=	xml-i18n-tools-0.9
 PKGREVISION=	1
@@ -13,7 +13,7 @@ CONFLICTS=	intltool<=0.25
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 DOCDIR=		${PREFIX}/share/doc/${PKGBASE}
 
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index fc1fe1fc035..f44b9899c1a 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:27:58 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:13:20 grant Exp $
 
 DISTNAME=	yodl-1.31.18
 PKGREVISION=	2
@@ -13,7 +13,7 @@ BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 MAKEFILE=	GNUmakefile
 
 do-build:
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index 92d0aa1ff2c..93163047556 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/20 12:27:16 agc Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:14:11 grant Exp $
 #
 
 DISTNAME=	wmCalClock-1.25
@@ -12,7 +12,7 @@ COMMENT=	Another WindowMaker calendar/clock dockapp
 WRKSRC=		${WRKDIR}/${DISTNAME}/Src
 USE_BUILDLINK2=	YES
 USE_X11BASE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index 597c905f052..c3d0563c18f 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:27:16 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:14:11 grant Exp $
 #
 
 DISTNAME=	wmMoonClock-1.27
@@ -11,7 +11,7 @@ COMMENT=	Shows lunar ephemeris to fairly high accuracy
 
 WRKSRC=         ${WRKDIR}/${DISTNAME}/Src
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	YES
 
 MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}