replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

30 files changed, 60 insertions, 60 deletions

diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index 493bf475747..1fa8d8187a3 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/17 22:52:21 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 14:57:59 grant Exp $
 # FreeBSD Id: Makefile,v 1.5 1998/10/21 00:57:27 steve Exp
 #
 
@@ -14,7 +14,7 @@ COMMENT=		Enhanced Printer Spooler
 
 CONFLICTS+=		cups-[0-9]*
 
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--sysconfdir="/etc"
 CONFIGURE_ARGS+=	--with-lpd_perms_path="${LPD_PERMS_PATH}"
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index ffaf4c947a4..96840d0692b 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2004/01/20 12:24:28 agc Exp $
+# $NetBSD: Makefile,v 1.47 2004/01/24 14:57:59 grant Exp $
 
 DISTNAME=		a2ps-4.13b
 PKGNAME=		a2ps-4.13.0.2
@@ -17,7 +17,7 @@ DEPENDS+=		psutils>=1.17:../../print/psutils
 WRKSRC=			${WRKDIR}/a2ps-4.13
 STRIP=			# empty
 USE_PERL5=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/auxdir/ltconfig
 
diff --git a/print/advi/Makefile b/print/advi/Makefile
index f2e57ae047c..f320a5a3e35 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 13:02:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/24 14:57:59 grant Exp $
 
 DISTNAME=		advi-1.4.0
 PKGREVISION=		1
@@ -14,7 +14,7 @@ DEPENDS+=		teTeX-[0-9]*:../../print/teTeX
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 
 post-extract:
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index f8919e7a0f3..065c6e86a0e 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/08/09 11:20:36 seb Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=		auctex-11.13
 PKGREVISION=		1
@@ -9,7 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.nongnu.org/auctex/
 COMMENT=		Enhanced LaTeX mode for Emacs
 
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 
 TEX_PREFIX_DEFAULT=	${LOCALBASE}
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index 06e62587599..d70183050ab 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/24 13:02:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	chktex-1.6.1
@@ -13,7 +13,7 @@ COMMENT=	LaTeX semantic checker
 DEPENDS+=	lynx-[0-9]*:../../www/lynx
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PERL5=	YES
 GNU_CONFIGURE=	YES
 CFLAGS+=	-D__unix__
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 2d02436ccc3..4b7927bff2f 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2004/01/20 12:24:28 agc Exp $
+# $NetBSD: Makefile,v 1.72 2004/01/24 14:58:00 grant Exp $
 #
 # The CUPS author is very good about taking back changes into the main
 # CUPS distribution.  The correct place to send patches or bug-fixes is:
@@ -32,7 +32,7 @@ UNLIMIT_RESOURCES=	datasize memorysize
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 INSTALL_TARGET=		installcups
 
 USE_LIBTOOL=		yes
diff --git a/print/ggv/Makefile b/print/ggv/Makefile
index a6cabb3a054..0d6c47d080d 100644
--- a/print/ggv/Makefile
+++ b/print/ggv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=		ggv-1.0.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_X11BASE=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 88c0b84ee6e..f6f6592da07 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=		ggv-2.4.0.2
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_LIBTOOL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 2114a4c91b9..09200ce16cf 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2004/01/20 12:24:28 agc Exp $
+# $NetBSD: Makefile.common,v 1.14 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	espgs-${GS_VERS}-source
 BASEGS_VERS=	7.07
@@ -25,7 +25,7 @@ DEPENDS+=	ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-source//}
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ijs
 CONFIGURE_ARGS+=	--with-gimp-print
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 7ffce6fdfe9..ce01e8869eb 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2003/09/17 19:41:01 grant Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	ghostscript-${GS_VERS}
 GS_VERS=	7.05
@@ -17,7 +17,7 @@ CONFLICTS+=	ghostscript-gnu{,-nox11,-x11}-[0-9]*
 DEPENDS+=	ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-ijs
 
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 8dcb28bbe0a..a77a57b07d6 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.50 2004/01/20 12:24:28 agc Exp $
+# $NetBSD: Makefile.common,v 1.51 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=		ghostscript-${GS_VERS}
 GS_VERS=		6.01
@@ -20,7 +20,7 @@ DEPENDS+=		watanabe-vfont-19930318:../../fonts/watanabe_vfont
 
 WRKSRC=			${WRKDIR}/gs${GS_VERS}
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
 GS_SRCS=		${DISTNAME}${EXTRACT_SUFX}
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index 238b6445f81..1a60fd66b62 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	gimp-print-4.2.5
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --enable-escputil=no
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 
 .include "../../print/gimp-print-lib/buildlink2.mk"
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index 3aae3b923b6..17573dc533e 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/07/17 22:52:28 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	gimp-print-4.2.5
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --without-cups --without-translated-ppds
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 
 .include "../../print/gimp-print-lib/buildlink2.mk"
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index c0fa5eb7df9..6ce63bbd8f8 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/17 22:52:28 grant Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	gimp-print-4.2.5
 PKGNAME=	gimp-print-ijs-4.2.5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://gimp-print.sourceforge.net/
 COMMENT=	GIMP print IJS server
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--with-ijs
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index 017e412477a..921e3511f7b 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/10/08 22:40:42 reed Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	gimp-print-4.2.5
@@ -17,7 +17,7 @@ LEX=			${LOCALBASE}/bin/flex
 .endif
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index ff28ca2615a..abd2c07d0ec 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:51 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	gimp-print-4.2.5
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-escputil=no
 CONFIGURE_ARGS+= --enable-libgimpprint=no
 USE_LIBTOOL=	yes
 LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 USE_X11=	yes
 
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index 960a74dc450..354e641a14d 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	gpdf-0.111
@@ -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_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 USE_X11=		yes
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 7aae8f037f4..0f6e076fd19 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2003/07/17 22:52:29 grant Exp $
+# $NetBSD: Makefile,v 1.41 2004/01/24 14:58:00 grant Exp $
 # FreeBSD Id: Makefile,v 1.16 1997/07/13 18:49:29 max Exp
 #
 
@@ -20,7 +20,7 @@ IMAKEOPTS+=		-DCONVERT_INCLUDE_DIRECTIVES
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Linux"
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 .elif ${OPSYS} == "IRIX" && !empty(ABI)
 # Hack to put the correct path first -- otherwise, buildlink will first try to link X11BASE/lib
 .  if ${ABI} == "64"
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index a19692b6902..884d509df37 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/21 17:16:22 martti Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	ijs-0.34
 CATEGORIES=	print
@@ -9,7 +9,7 @@ HOMEPAGE=	http://www.linuxprinting.org/ijs/
 COMMENT=	Protocol library for raster page transmission
 
 USE_BUILDLINK2=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		# defined
 GNU_CONFIGURE=		# defined
 
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 8c92504a74b..e8e4a17c0de 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	xdvik-${XDVIK_ORIGINAL_VERS}
 PKGNAME=	ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -26,7 +26,7 @@ DEPENDS+=	ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
 XDVI_DIR=	${WRKDIR}/${DISTNAME}/texk/xdvik
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 LTCONFIG_OVERRIDE=	${WRKSRC}/config/config
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 31fb57f0fff..e2010d99e77 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	libgnomeprint-2.4.2
@@ -14,7 +14,7 @@ COMMENT=	Library for the GNOME2 Printing Architecture
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 37db45d8941..53815544fe4 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/23 21:50:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	libgnomeprintui-2.4.2
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT=	YES
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_LIBTOOL=		YES
 
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 649af13a189..4e95f1fca8c 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 14:58:00 grant Exp $
 #
 
 DISTNAME=	lilypond-1.4.13
@@ -15,7 +15,7 @@ BUILD_DEPENDS+=	bison>=1.875nb1:../../devel/bison
 GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 MAKEFILE=		GNUmakefile
 
 USE_MAKEINFO=	YES
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index 6b739082363..d88123f26a8 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2003/07/21 17:16:25 martti Exp $
+# $NetBSD: Makefile,v 1.38 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	magicfilter-1.2
 PKGREVISION=	2
@@ -15,7 +15,7 @@ DEPENDS+=	netpbm-[0-9]*:../../graphics/netpbm
 DEPENDS+=	teTeX-bin-[0-9]*:../../print/teTeX-bin
 DEPENDS+=	papersize-[0-9]*:../../print/papersize
 
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	GHOSTSCRIPT=${LOCALBASE}/bin/gs
 
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index a13171f0fec..4dc9c389f08 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2003/11/05 21:04:07 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.10 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=		pdflib-${PDFLIB_DIST_VERS}
 PKGREVISION=		1
@@ -20,7 +20,7 @@ DISTINFO_FILE=		${.CURDIR}/../pdflib/distinfo
 PATCHDIR=		${.CURDIR}/../pdflib/patches
 
 USE_BUILDLINK2=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--with-pnglib
 CONFIGURE_ARGS+=	--with-tifflib
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index e2c72825629..e32cb2eaa6f 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/03 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	scribus-1.1.1
 PKGREVISION=	1
@@ -15,7 +15,7 @@ COMMENT=	Publishing layout with graphical interface
 
 USE_BUILDLINK2=		# defined
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 PTHREAD_OPTS+=		require
 
 USE_LIBTOOL=		YES
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
index 6355edd4255..c6be760af1f 100644
--- a/print/teTeX-bin/Makefile.common
+++ b/print/teTeX-bin/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2003/12/24 12:51:31 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/01/24 14:58:00 grant Exp $
 
 TETEX_BIN_VERS=		2.0.2
 DIST_SUBDIR=		teTeX
@@ -6,7 +6,7 @@ ALL_TARGET=		all
 INSTALL_TARGET=		install strip
 
 USE_BUILDLINK2=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 USE_X11=		yes
 CFLAGS+=		-Dunix
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index eb102bec045..32022b529c9 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/20 12:24:29 agc Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	teTeX-src-1.0.7
 PKGNAME=	teTeX-bin-1.0.7
@@ -25,7 +25,7 @@ INSTALL_TARGET=		install strip
 USE_BUILDLINK2=		yes
 USE_PKGINSTALL=		yes
 USE_GCC_SHLIB=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_X11=		yes
 CFLAGS+=		-Dunix
 
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index 17ae8553cc7..d2c25e3feaa 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/12/24 13:02:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	TeXfamily-1.2.1
 PKGREVISION=	4
@@ -37,7 +37,7 @@ EXTRACT_ONLY=	# none
 
 ALL_TARGET=	all
 INSTALL_TARGET=	install strip
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_X11=	yes
 PLIST_SUBST+=	MV="${MV}"
 CFLAGS+=	-Dunix
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index 8017ee3d456..2e2b8ae3c37 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/03 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/24 14:58:00 grant Exp $
 
 DISTNAME=	xpp-1.1
 PKGREVISION=	2
@@ -11,7 +11,7 @@ COMMENT=	X Printing Panel
 
 USE_BUILDLINK2=	# defined
 USE_X11=	# defined
-USE_GMAKE=	# defined
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	# defined
 
 DOCDIR=		${PREFIX}/share/doc/xpp