replace deprecated USE_GMAKE with USE_GNU_TOOLS+=make.

15 files changed, 30 insertions, 30 deletions

diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index dbb2ab0b206..f280c494f8d 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:27:34 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/24 15:18:32 grant Exp $
 
 DISTNAME=	bbrun-1.3
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	Run utility for BlackBox
 WRKSRC=		${WRKDIR}/${DISTNAME}/bbrun
 USE_BUILDLINK2=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 ALL_TARGET=	bbrun
 
diff --git a/wm/econf/Makefile b/wm/econf/Makefile
index 6ae7b3f7ee8..486d29e0d72 100644
--- a/wm/econf/Makefile
+++ b/wm/econf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=		enlightenment-conf-0.15
@@ -13,7 +13,7 @@ COMMENT=		Configuration tool for easily setting up Enlightenment
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
-USE_GMAKE=		yes
+USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 39382bbcf81..093cd8a5cc2 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/10/08 22:13:48 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	golem-0.0.5
@@ -12,7 +12,7 @@ COMMENT=	Fast and lightweight yet customizable window manager
 
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 GNU_CONFIGURE=	YES
 CONFIG_GUESS_OVERRIDE=	${WRKSRC}/config.guess
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index adaa67881a6..25cc4904c49 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2003/12/28 16:10:04 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.31 2004/01/24 15:18:32 grant Exp $
 
 DISTNAME=		icewm-1.2.13
 CATEGORIES=		x11 wm
@@ -10,7 +10,7 @@ HOMEPAGE=		http://icewm.sourceforge.net/
 GNU_CONFIGURE=		# defined
 USE_BUILDLINK2=		yes
 USE_X11=		# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	# defined
 BUILD_USES_MSGFMT=	# defined
diff --git a/wm/ion-devel/Makefile b/wm/ion-devel/Makefile
index 44bdaa3e3e4..f9f5a149ee4 100644
--- a/wm/ion-devel/Makefile
+++ b/wm/ion-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/09 23:03:19 cube Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	ion-devel-20031211
@@ -16,7 +16,7 @@ BUILDLINK_DEPENDS.lua=	lua>=5.0.1
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 PKG_SYSCONFSUBDIR=	ion
 EGDIR=			${PREFIX}/share/examples/ion
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index d4745b9076e..177f44e6531 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/07 02:21:17 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	ion-20020207
@@ -12,7 +12,7 @@ COMMENT=	Keyboard friendly tiling window manager
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 PKG_SYSCONFSUBDIR=	ion
 EGDIR=			${PREFIX}/share/examples/ion
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 6d7cbe4b40a..0f1cad61196 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	metacity-2.6.3
@@ -17,7 +17,7 @@ DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 USE_X11=		YES
-USE_GMAKE=		YES
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 
diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile
index f9ca9811ffb..5e09c374b5e 100644
--- a/wm/novawm/Makefile
+++ b/wm/novawm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/08/28 20:05:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	NovaWM-0.8_alpha
@@ -12,7 +12,7 @@ COMMENT=	Nova window manager
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 .include "../../graphics/xpm/buildlink2.mk"
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 14afab434b4..e35849abbec 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/11/10 15:36:58 gavan Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	pekwm-0.1.3
@@ -13,7 +13,7 @@ COMMENT=	Window manager based on aewm++
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 USE_PERL5=	run
 USE_PKGINSTALL=	YES
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 7890b4d85f4..6ff4d4d3e26 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/05 12:49:42 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	pwm-20030617
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 USE_BUILDLINK3=	YES
 USE_PKGINSTALL=	YES
 USE_X11=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 
 CFLAGS+=	-DPKG_SYSCONFDIR=\"\\\"${PKG_SYSCONFDIR}\\\"\"
 
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index e6e62355a8e..74f59395426 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:54 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -12,7 +12,7 @@ COMMENT=	Windows 95/98/NT like window manager for X11
 
 USE_X11=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
+USE_GNU_TOOLS+=	make
 USE_BUILDLINK2=	yes
 USE_GCC_SHLIB=	yes
 
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index 5d989f1c8d7..ae81f15d513 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2003/08/06 19:57:23 seb Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/01/24 15:18:32 grant Exp $
 
 DISTNAME=		sawfish-${SF_VERS}-gtk1
 SF_VERS=		1.2
@@ -13,7 +13,7 @@ DEPENDS+=		rep-gtk>=0.15nb2:../../x11/rep-gtk
 USE_X11=		# defined
 USE_BUILDLINK2=		# defined
 USE_PKGLOCALEDIR=	# defined
-USE_GMAKE=		# defined
+USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		# defined
 
 DISTINFO_FILE=		${.CURDIR}/../../wm/sawfish/distinfo
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index c7764a33cc4..dc210a2c403 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/06 06:49:54 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	waimea-0.4.0
@@ -12,7 +12,7 @@ COMMENT=	Fast and highly customizable virtual window manager
 
 GNU_CONFIGURE=	YES
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_PERL5=	run
 USE_X11=	YES
 
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index 80e94fd2933..64b276c64ad 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/07/17 22:55:17 grant Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	whiteBOX-0.5
@@ -11,7 +11,7 @@ HOMEPAGE=	http://whitebox.sourceforge.net/
 COMMENT=	Multi-purpose configuration tool for Blackbox
 
 USE_BUILDLINK2=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	YES
 
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index c1fc5377d7a..5092202d3d6 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/09/02 07:23:59 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/24 15:18:32 grant Exp $
 #
 
 DISTNAME=	windowlab-1.12
@@ -12,7 +12,7 @@ COMMENT=	Small and simple window manager
 
 USE_BUILDLINK2=	YES
 USE_PKGINSTALL=	YES
-USE_GMAKE=	YES
+USE_GNU_TOOLS+=	make
 USE_X11=	YES
 
 PKG_SYSCONFSUBDIR=	windowlab