replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

29 files changed, 58 insertions, 58 deletions

diff --git a/misc/blackbook/Makefile b/misc/blackbook/Makefile
index 64bdd29fd76..6a5588cbc0c 100644
--- a/misc/blackbook/Makefile
+++ b/misc/blackbook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/13 13:52:34 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 14:11:09 grant Exp $
 #
 
 DISTNAME=	blackbook-3
@@ -11,7 +11,7 @@ MAINTAINER=	sjr@hispabsd.org
 HOMEPAGE=	http://blackbook.sourceforge.net/
 COMMENT=	Simple address book (Gtk+ based)
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index d5a61b6e143..100f6e0a185 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/11 16:42:04 kim Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 14:11:09 grant Exp $
 # FreeBSD Id: ports/misc/bottlerocket/Makefile,v 1.4 2000/04/14 08:45:23 asami Exp
 
 DISTNAME=	bottlerocket-0.04c
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mlug.missouri.edu/~tymm/
 COMMENT=	Home Automation Software for the X10 FireCracker kit
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 ALL_TARGET=	br
 
diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common
index ac08a3f06ae..ca9463f5b1a 100644
--- a/misc/celestia/Makefile.common
+++ b/misc/celestia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2003/05/22 09:39:07 salo Exp $
+# $NetBSD: Makefile.common,v 1.3 2004/01/24 14:11:09 grant Exp $
 #
 
 DISTNAME=	celestia-${CELESTIA_VERS}
@@ -16,7 +16,7 @@ CELESTIA_VERS=	1.3.0
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/misc/cuecat/Makefile b/misc/cuecat/Makefile
index cad08fd4937..7475ce76625 100644
--- a/misc/cuecat/Makefile
+++ b/misc/cuecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/21 17:01:14 martti Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 14:11:09 grant Exp $
 #
 
 DISTNAME=	cuecat-0.2.1
@@ -15,7 +15,7 @@ NO_SOURCE_ON_CDROM=	${NO_SOURCE_ON_FTP}
 NO_BIN_ON_FTP=		${NO_SOURCE_ON_FTP}
 NO_BIN_ON_CDROM=	${NO_SOURCE_ON_FTP}
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/read_cuecat ${PREFIX}/bin
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index 516bc5a37de..8f503971e8e 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 14:11:09 grant Exp $
 
 DISTNAME=       dialog-0.6z
 PKGREVISION=	2
@@ -9,7 +9,7 @@ MAINTAINER=	jlam@NetBSD.org
 COMMENT=	Display dialog boxes from shell scripts
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 INCOMPAT_CURSES=	NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-P]-*
 
diff --git a/misc/elizatalk/Makefile b/misc/elizatalk/Makefile
index cf256c06c6d..e0dcb8d8b73 100644
--- a/misc/elizatalk/Makefile
+++ b/misc/elizatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/20 12:21:01 agc Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=	elizatalk-0.4
 CATEGORIES=	misc
@@ -9,6 +9,6 @@ HOMEPAGE=	http://elizatalk.sourceforge.net/
 COMMENT=	Eliza talkback program
 
 WRKSRC=		${WRKDIR}/elizatalk-src
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome-pim/Makefile b/misc/gnome-pim/Makefile
index 85ef0951d50..0efa76320c3 100644
--- a/misc/gnome-pim/Makefile
+++ b/misc/gnome-pim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=		gnome-pim-1.4.6
 PKGREVISION=		5
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=		bison-[0-9]*:../../devel/bison
 
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 BUILD_USES_MSGFMT=	YES
diff --git a/misc/gnome-utils/Makefile b/misc/gnome-utils/Makefile
index 11735e45dfc..07b514a5b96 100644
--- a/misc/gnome-utils/Makefile
+++ b/misc/gnome-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.68 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=		gnome-utils-1.4.1.2
 PKGREVISION=		6
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.gnome-panel=	gnome-panel<2.0
 
 CONFLICTS=		coreutils<=5.0
 
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11BASE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile
index 0e6851cf0a1..44fe58a91b7 100644
--- a/misc/gnome2-user-docs/Makefile
+++ b/misc/gnome2-user-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/14 21:57:34 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=	gnome2-user-docs-2.4.1
@@ -13,7 +13,7 @@ COMMENT=	The GNOME 2 users guide
 DEPENDS=	gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 0c1ed7fef41..56f23eefbdb 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=		gnome-utils-2.4.1
@@ -14,7 +14,7 @@ COMMENT=		Set of useful GNOME2 utilities and applications
 BUILD_USES_MSGFMT=	yes
 
 USE_PERL5=		build
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index bd90344e295..222903c81f9 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=		gok-0.8.4
@@ -14,7 +14,7 @@ COMMENT=		GNOME On-Screen Keyboard
 DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index 75dd558a5bc..ac8525f20ed 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=		gperiodic-2.0.7
 PKGREVISION=		1
@@ -15,7 +15,7 @@ DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
 ALL_TARGET=		gperiodic
diff --git a/misc/gst-plugins/Makefile b/misc/gst-plugins/Makefile
index cad7244148d..8f6094601f2 100644
--- a/misc/gst-plugins/Makefile
+++ b/misc/gst-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=		gst-plugins-0.6.1
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=		nasm>=0.98:../../devel/nasm
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/misc/gstreamer/Makefile b/misc/gstreamer/Makefile
index 65e6fe98715..1642ab1c39b 100644
--- a/misc/gstreamer/Makefile
+++ b/misc/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=		gstreamer-0.6.1
@@ -17,7 +17,7 @@ GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PERL5=		build
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index 901798dbdd6..b69f0182f33 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=	gxmame-0.34b
@@ -16,7 +16,7 @@ DEPENDS+=		xmame-[0-9]*:../../emulators/xmame
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 
diff --git a/misc/koffice-devel/Makefile b/misc/koffice-devel/Makefile
index 34da8f5a533..d3adf658e07 100644
--- a/misc/koffice-devel/Makefile
+++ b/misc/koffice-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/23 21:50:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=	koffice-1.2.94
 PKGREVISION=	4
@@ -15,7 +15,7 @@ COMMENT=	KDE Office Suite
 CONFLICTS+=	koffice3-[0-9]*
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 5f1db1bd0db..b35a2ae731f 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=	koffice-1.2.1
 PKGREVISION=	8
@@ -19,7 +19,7 @@ COMMENT=	KDE Office Suite
 CONFLICTS+=	koffice3-[0-9]*
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/misc/libdvdplay/Makefile b/misc/libdvdplay/Makefile
index e171d9c67fd..a3be9dcf201 100644
--- a/misc/libdvdplay/Makefile
+++ b/misc/libdvdplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=	libdvdplay-1.0.1
 CATEGORIES=	misc
@@ -9,7 +9,7 @@ HOMEPAGE=	http://developers.videolan.org/libdvdplay/
 COMMENT=	simple API library designed for DVD navigation
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/misc/libdvdread/Makefile b/misc/libdvdread/Makefile
index 503448a45a9..58cfcf29218 100644
--- a/misc/libdvdread/Makefile
+++ b/misc/libdvdread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/12/27 04:05:08 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=	libdvdread-0.9.4
 CATEGORIES=	misc
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.dtek.chalmers.se/groups/dvd/
 COMMENT=	DVD access library, primarily used in Ogle
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_BUILDLINK2=	yes
 
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 23a6e174d6a..3c3bb450e20 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2003/12/13 12:08:15 magick Exp $
+# $NetBSD: Makefile,v 1.30 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=	nxtvepg-2.6.0
 
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM=      NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 			NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-*
 
 USE_PERL5=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 USE_BUILDLINK2= yes
 
diff --git a/misc/ooqstart/Makefile b/misc/ooqstart/Makefile
index f230dd38592..141c869f7cd 100644
--- a/misc/ooqstart/Makefile
+++ b/misc/ooqstart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:47 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=	ooqstart-0.8.3
@@ -14,7 +14,7 @@ COMMENT=	OpenOffice quickstart applet for GNOME
 DEPENDS+=	gnome-applets>=1.4.0:../../x11/gnome-applets
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11BASE=	YES
 NO_CONFIGURE=	YES
 
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index aae7a0cd163..91d9b2d72fb 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/01/22 08:57:03 grant Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=		openoffice-0.0.0.641
 PKGREVISION=		2
@@ -29,7 +29,7 @@ BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 BUILD_DEPENDS+=		stlport>=4.0nb1:../../devel/stlport
 
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 PKG_JVMS_ACCEPTED=	sun-jdk13
 
 CONFLICTS+=		staroffice-[0-9]*
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 24e1f4dae64..2d0262cba87 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/01/20 12:21:02 agc Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=	pdmenu_1.2.65
@@ -13,7 +13,7 @@ COMMENT=	Simple console menu program
 
 WRKSRC=		${WRKDIR}/pdmenu
 GNU_CONFIGURE=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PERL5=	YES
 
 REPLACE_PERL=	examples/showdir.pl
diff --git a/misc/proj/Makefile b/misc/proj/Makefile
index 20605f98e38..26aa620099d 100644
--- a/misc/proj/Makefile
+++ b/misc/proj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 21:49:47 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=		proj-4.4.7
 CATEGORIES=		misc
@@ -11,7 +11,7 @@ COMMENT=		Cartographic projection software
 
 USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/misc/root/Makefile b/misc/root/Makefile
index f10d3b5663f..a3967f48cfc 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/20 12:21:02 agc Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=		root_v2.23.08.source
 PKGNAME=		root-2.23
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=		cint-5.14.40:../../lang/cint
 WRKSRC=			${WRKDIR}
 USE_BUILDLINK2=		YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 ALL_TARGET=		netbsd
 MAKE_ENV=		LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR}
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index e30d3ff57f6..7dec5d719f7 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2003/08/30 22:51:23 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2004/01/24 14:11:10 grant Exp $
 
 DISTNAME=	rpm-2.5.4
 PKGREVISION=	1
@@ -15,7 +15,7 @@ CONFLICTS+=		rpm2cpio<1.0nb1
 
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 USE_PKGINSTALL=		yes
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 7c8017a65d5..a3338315f67 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2003/09/28 09:13:58 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=       siag-3.5.7
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=--with-guile
 CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag
 USE_BUILDLINK2=	YES
 GNU_CONFIGURE=  YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/misc/xchm/Makefile b/misc/xchm/Makefile
index dd50aeaa72c..26147bc5942 100644
--- a/misc/xchm/Makefile
+++ b/misc/xchm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/14 01:59:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=	xchm-0.8.10
@@ -12,7 +12,7 @@ COMMENT=	CHM viewer for UNIX
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 
 .include "../../devel/chmlib/buildlink2.mk"
 .include "../../x11/wxGTK/buildlink2.mk"
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index e0cd2c5eb7b..e0c286627f7 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 14:11:10 grant Exp $
 #
 
 DISTNAME=		yelp-2.4.2
@@ -15,7 +15,7 @@ DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 BUILD_USES_MSGFMT=	yes
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes