replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

9 files changed, 18 insertions, 18 deletions

diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index e954fa41768..84ed89ba327 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2003/10/04 08:12:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	xft-2.1.2
@@ -19,7 +19,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 # Uses libtool 1.5 features
 #USE_LIBTOOL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 USE_GNU_TOOLS+=		awk
 
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index dfb8b927a6e..cbcfe54e003 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	chkfontpath-1.9.7
@@ -14,7 +14,7 @@ BUILD_DEPENDS+=	rpm2cpio>=1.1:../../converters/rpm2cpio
 
 MAKE_ENV+=	VERSION=${PKGVERSION}
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 # Might as well make this a general scheme for .src.rpm files... - HF
 do-extract:
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 1572a484168..cdfbd959076 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/12/21 16:44:02 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	fontconfig-2.2.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/fontconfig.pc.in
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index 66771691171..4b720d899d0 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/03 18:49:40 reed Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	gucharmap-1.2.0
@@ -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/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 9cc1b94e63e..5d1839be74f 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/30 22:51:17 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=		shinonome-0.9.10-src
@@ -15,7 +15,7 @@ COMMENT=		12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
 GNU_CONFIGURE=		YES
 USE_PERL5=		build
 USE_X11BASE=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 FONTDIR=		${PREFIX}/lib/X11/fonts/local
 FOUNDRY=		Misc
 ALIAS_SHINONOME=	${PREFIX}/share/examples/fonts.alias.shinonome
diff --git a/fonts/oto/Makefile b/fonts/oto/Makefile
index a7c8e2c86a4..a62be33fc13 100644
--- a/fonts/oto/Makefile
+++ b/fonts/oto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:47:08 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	oto-0.4
@@ -12,7 +12,7 @@ COMMENT=	List and modify OpenType font files
 
 GNU_CONFIGURE=	yes
 USE_BUILDLINK2=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oto
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index bad44b8bdb8..0e7d861f083 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	pcf2bdf-1.04
@@ -11,7 +11,7 @@ HOMEPAGE=	http://www.tsg.ne.jp/GANA/S/pcf2bdf/
 COMMENT=	Convert X font from PCF to BDF
 
 WRKSRC=		${WRKDIR}
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 MAKEFILE=	Makefile.gcc
 
 do-install:
diff --git a/fonts/pfaedit/Makefile b/fonts/pfaedit/Makefile
index a56039cc29e..5fceaf41148 100644
--- a/fonts/pfaedit/Makefile
+++ b/fonts/pfaedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/20 12:15:17 agc Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:38:29 grant Exp $
 #
 
 DISTNAME=	pfaedit_full-${VERSION}
@@ -14,7 +14,7 @@ COMMENT=	Postscript font editor
 VERSION=	040102
 
 WRKSRC=		${WRKDIR}/pfaedit-${VERSION}
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 5bb51f0dc00..ef5bd922089 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/21 16:47:09 martti Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:38:29 grant Exp $
 
 DISTNAME=	t1lib-1.3.1
 CATEGORIES=	fonts devel graphics
@@ -10,7 +10,7 @@ COMMENT=	Library for generating bitmaps from Adobe Type 1 fonts
 
 USE_BUILDLINK2=		YES
 USE_PKGINSTALL=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 USE_X11=		YES