summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--wm/bbrun/Makefile4
-rw-r--r--wm/econf/Makefile4
-rw-r--r--wm/golem/Makefile4
-rw-r--r--wm/icewm/Makefile.common4
-rw-r--r--wm/ion-devel/Makefile4
-rw-r--r--wm/ion/Makefile4
-rw-r--r--wm/metacity/Makefile4
-rw-r--r--wm/novawm/Makefile4
-rw-r--r--wm/pekwm/Makefile4
-rw-r--r--wm/pwm/Makefile4
-rw-r--r--wm/qvwm/Makefile4
-rw-r--r--wm/sawfish/Makefile.common4
-rw-r--r--wm/waimea/Makefile4
-rw-r--r--wm/whiteBOX/Makefile4
-rw-r--r--wm/windowlab/Makefile4
-rw-r--r--www/amaya/Makefile4
-rw-r--r--www/ap-jserv/Makefile4
-rw-r--r--www/arena/Makefile4
-rw-r--r--www/bluefish/Makefile4
-rw-r--r--www/cgicc/Makefile4
-rw-r--r--www/galeon/Makefile4
-rw-r--r--www/gtkhtml/Makefile4
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/jssi/Makefile4
-rw-r--r--www/kannel/Makefile4
-rw-r--r--www/kimagemapeditor/Makefile4
-rw-r--r--www/libgtkhtml/Makefile4
-rw-r--r--www/libwww/Makefile4
-rw-r--r--www/lynx-current/Makefile4
-rw-r--r--www/mozilla/Makefile.common4
-rw-r--r--www/php4/Makefile4
-rw-r--r--www/privoxy/Makefile4
-rw-r--r--www/quanta/Makefile4
-rw-r--r--www/quanta3/Makefile4
-rw-r--r--www/sitecopy/Makefile4
-rw-r--r--www/snownews/Makefile4
-rw-r--r--www/spfc/Makefile4
-rw-r--r--www/swiftsurf/Makefile4
-rw-r--r--www/tidy/Makefile4
-rw-r--r--www/wwwoffle/Makefile4
40 files changed, 80 insertions, 80 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
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index a7f1410f586..6e15320e601 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/01/20 12:27:57 agc Exp $
+# $NetBSD: Makefile,v 1.32 2004/01/24 15:23:46 grant Exp $
#
DISTNAME= amaya-src-8.2
@@ -19,7 +19,7 @@ EXTRACT_ELEMENTS= Amaya libwww
WRKSRC= ${WRKDIR}/Amaya/work
USE_BUILDLINK2= YES
USE_X11= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_SCRIPT= ../configure
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 155d1e4e21e..6916c343628 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/08/23 15:26:25 jschauma Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/24 15:23:46 grant Exp $
DISTNAME= ApacheJServ-1.1.2
PKGNAME= ap-jserv-1.1.2
@@ -14,7 +14,7 @@ DEPENDS+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9]
DEPENDS+= jsdk-2.0:../../www/jsdk20
USE_PERL5= build # for "apxs"
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/src/scripts/build/unix/ltconfig
GNU_CONFIGURE= yes
diff --git a/www/arena/Makefile b/www/arena/Makefile
index c21aa5a7de6..874b4990c6b 100644
--- a/www/arena/Makefile
+++ b/www/arena/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2004/01/20 12:27:58 agc Exp $
+# $NetBSD: Makefile,v 1.52 2004/01/24 15:23:46 grant Exp $
DISTNAME= arena-0.3.62
PKGREVISION= 3
@@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/Arena-0.3.62
BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index e75419b89ed..43eae6aa4f9 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2004/01/24 15:23:46 grant Exp $
#
DISTNAME= bluefish-0.12
@@ -22,7 +22,7 @@ BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= # defined
USE_PKGLOCALEDIR= # defined
USE_X11= # defined
-USE_GMAKE= # defined
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-autocomplet
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index bea08bad768..6546bd382d6 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/08/09 11:32:30 seb Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:23:46 grant Exp $
DISTNAME= cgicc-3.1.5
CATEGORIES= www
@@ -8,7 +8,7 @@ MAINTAINER= shell@shellhung.org
HOMEPAGE= http://www.gnu.org/software/cgicc/cgicc.html
COMMENT= C++ compliant CGI applications libraries
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 5ba48bc5392..2ad883c4f54 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2004/01/20 12:45:04 abs Exp $
+# $NetBSD: Makefile,v 1.60 2004/01/24 15:23:46 grant Exp $
DISTNAME= galeon-1.2.13
PKGREVISION= 2
@@ -22,7 +22,7 @@ USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \
--with-mozilla-libs=${BUILDLINK_PREFIX.mozilla}/lib/mozilla \
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 4c61df47a73..8edfc56a89a 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/01/03 18:49:55 reed Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/24 15:23:46 grant Exp $
DISTNAME= gtkhtml-1.1.10
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= Lightweight HTML rendering/printing/editing engine
USE_BUILDLINK2= YES
USE_X11BASE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 6d3583c4ab5..0a15768d4e1 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:23:46 grant Exp $
#
DISTNAME= gtkhtml-3.0.9
@@ -12,7 +12,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index 51efcd94d8e..fdb699d9eae 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:27:59 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/24 15:23:47 grant Exp $
DISTNAME= ApacheJSSI-1.1.2
PKGNAME= jssi-1.1.2
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
.include "../../mk/bsd.prefs.mk"
-USE_GMAKE=
+USE_GNU_TOOLS+= make
NO_CONFIGURE=
MAKE_ENV+= CLASSPATH=${CLASSPATH}
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 4f687285527..5af3be06708 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/24 15:23:47 grant Exp $
#
DISTNAME= gateway-${KANNEL_VER}
@@ -15,7 +15,7 @@ KANNEL_VER= 1.2.1
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_PERL5= YES
PTHREAD_OPTS+= require
diff --git a/www/kimagemapeditor/Makefile b/www/kimagemapeditor/Makefile
index d246fa7c16e..4d163745cc4 100644
--- a/www/kimagemapeditor/Makefile
+++ b/www/kimagemapeditor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/24 15:23:47 grant Exp $
DISTNAME= kimagemapeditor-1.0
PKGREVISION= 3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.nongnu.org/kimagemap/
COMMENT= Edit HTML Image maps
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index 8dfa74d8786..aa5d21507e1 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/24 15:23:47 grant Exp $
#
DISTNAME= libgtkhtml-2.4.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index 5d7b6ffb170..78727663b5c 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2003/11/12 03:39:44 jschauma Exp $
+# $NetBSD: Makefile,v 1.47 2004/01/24 15:23:47 grant Exp $
DISTNAME= w3c-libwww-5.4.0
PKGNAME= libwww-5.4.0
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.w3.org/Library/
COMMENT= The W3C Reference Library
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
USE_PERL5= build
diff --git a/www/lynx-current/Makefile b/www/lynx-current/Makefile
index 16a68f5d343..4c2e5fc611b 100644
--- a/www/lynx-current/Makefile
+++ b/www/lynx-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/01/20 12:27:59 agc Exp $
+# $NetBSD: Makefile,v 1.51 2004/01/24 15:23:47 grant Exp $
#
DISTNAME= lynx2.8.5dev.7
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/lynx2-8-5
USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
INSTALL_TARGET= install-full install-lss
MAKEFILE= makefile
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 2b58a398e43..ee4ade64792 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2004/01/22 00:21:26 wiz Exp $
+# $NetBSD: Makefile.common,v 1.29 2004/01/24 15:23:47 grant Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-source-${MOZ_DIST_VER}
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/mozilla
USE_BUILDLINK2= yes
USE_GCC_SHLIB= yes
USE_PERL5= build
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_X11= yes
GNU_CONFIGURE= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/build/unix/mozilla-gtkmozembed.pc.in
diff --git a/www/php4/Makefile b/www/php4/Makefile
index 037a57ceef8..a6855330c49 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2003/11/08 06:58:10 jdolecek Exp $
+# $NetBSD: Makefile,v 1.36 2004/01/24 15:23:47 grant Exp $
PKGNAME= php-${PHP_BASE_VERS}
CATEGORIES+= lang
@@ -10,7 +10,7 @@ USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
# PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now
# LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
.include "Makefile.php"
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index 78009c41ca6..eacd00c047c 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:27:59 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/24 15:23:47 grant Exp $
#
DISTNAME= ${PKGNAME_NOREV}-stable-src
@@ -32,7 +32,7 @@ CPPFLAGS+= -Dunix
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}-stable
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
MAKEFILE= GNUmakefile
USE_PERL5= build
diff --git a/www/quanta/Makefile b/www/quanta/Makefile
index 2ebb8a1d5f0..df1acfab420 100644
--- a/www/quanta/Makefile
+++ b/www/quanta/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:23:47 grant Exp $
DISTNAME= quanta-2.0-pr2
PKGNAME= quanta-1.9.9.2
@@ -19,7 +19,7 @@ BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
USE_PERL5= build
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/admin/ltconfig
diff --git a/www/quanta3/Makefile b/www/quanta3/Makefile
index 81d2950608e..5225fee9474 100644
--- a/www/quanta3/Makefile
+++ b/www/quanta3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/24 15:23:47 grant Exp $
DISTNAME= quanta-3.1.5
PKGREVISION= 1
@@ -10,7 +10,7 @@ COMMENT= HTML editor suitable for experienced web developers
USE_BUILDLINK2= YES
USE_PERL5= build
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index b69fd41f2c9..faca331a395 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/24 15:23:47 grant Exp $
DISTNAME= sitecopy-0.13.4
PKGREVISION= 3
@@ -11,7 +11,7 @@ COMMENT= Utility for synchronizing remote and local web sites
BUILD_USES_MSGFMT= # defined
-USE_GMAKE= # defined
+USE_GNU_TOOLS+= make
USE_BUILDLINK2= # defined
USE_PKGLOCALEDIR= # defined
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index e8b1c9bb0df..6d1e413b718 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/23 21:55:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:23:47 grant Exp $
DISTNAME= snownews-1.4.2
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Small, curses based RSS feed reader
BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_NCURSES= # missing WA_BOLD, WA_REVERSE, KEY_RESIZE
USE_PKGLOCALEDIR= YES
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index d654c592e18..5adf420b010 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:28:00 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:23:47 grant Exp $
DISTNAME= spfc-0.2.0
CATEGORIES= www java
@@ -14,7 +14,7 @@ DEPENDS+= jsdk-2.0:../../www/jsdk20
.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
-USE_GMAKE=
+USE_GNU_TOOLS+= make
NO_CONFIGURE=
MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
diff --git a/www/swiftsurf/Makefile b/www/swiftsurf/Makefile
index 0b8410e2d25..fb9f2e4644b 100644
--- a/www/swiftsurf/Makefile
+++ b/www/swiftsurf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/12/30 17:28:39 cjep Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/24 15:23:47 grant Exp $
DISTNAME= swiftsurf-1.2.5
CATEGORIES= www
@@ -11,7 +11,7 @@ COMMENT= Web proxy that can handle http and https
BUILD_DEPENDS= ocaml>=3.00:../../lang/ocaml
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
ALL_TARGET= nat
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 7ad6ef50962..00461431bba 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:28:00 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/24 15:23:47 grant Exp $
#
DISTNAME= tidy_src_031002
@@ -17,7 +17,7 @@ COMMENT= Fixes and tidies up HTML files
WRKSRC= ${WRKDIR}/tidy
USE_BUILDLINK2= yes
NO_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
BUILD_DIRS= ${WRKSRC}/build/gmake
HTML_DOCFILES= Overview.html doxygen.cfg grid.gif quickref.html tidy.css \
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index ff912c4a60c..fdf4accc377 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2003/12/23 16:43:56 fredb Exp $
+# $NetBSD: Makefile,v 1.49 2004/01/24 15:23:47 grant Exp $
DISTNAME= wwwoffle-2.7f
PKGREVISION= 2
@@ -12,7 +12,7 @@ MAINTAINER= fredb@NetBSD.org
HOMEPAGE= http://www.gedanken.demon.co.uk/wwwoffle/
COMMENT= WWW proxy with support for offline browsing
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes