replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

33 files changed, 66 insertions, 66 deletions

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: