summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/GConf2/Makefile.common4
-rw-r--r--devel/Gorm/Makefile4
-rw-r--r--devel/ProjectCenter/Makefile4
-rw-r--r--devel/SDL/Makefile.common4
-rw-r--r--devel/SDL_gfx/Makefile4
-rw-r--r--devel/anjuta/Makefile4
-rw-r--r--devel/at-spi/Makefile4
-rw-r--r--devel/atk/Makefile4
-rw-r--r--devel/autogen/Makefile4
-rw-r--r--devel/boehm-gc/Makefile4
-rw-r--r--devel/bonobo-conf/Makefile4
-rw-r--r--devel/bonobo/Makefile4
-rw-r--r--devel/c-cpp-reference/Makefile4
-rw-r--r--devel/cervisia2/Makefile4
-rw-r--r--devel/chmlib/Makefile4
-rw-r--r--devel/cmake/Makefile4
-rw-r--r--devel/cvsps/Makefile4
-rw-r--r--devel/cvsync/Makefile4
-rw-r--r--devel/ddd/Makefile4
-rw-r--r--devel/devhelp/Makefile4
-rw-r--r--devel/distcc/Makefile4
-rw-r--r--devel/doc++/Makefile4
-rw-r--r--devel/doxygen/Makefile4
-rw-r--r--devel/eXdbm/Makefile4
-rw-r--r--devel/eel/Makefile4
-rw-r--r--devel/eel2/Makefile4
-rw-r--r--devel/elib/Makefile4
-rw-r--r--devel/fastdep/Makefile4
-rw-r--r--devel/g-wrap/Makefile4
-rw-r--r--devel/gail/Makefile4
-rw-r--r--devel/gal2/Makefile4
-rw-r--r--devel/gconfmm/Makefile4
-rw-r--r--devel/gcvs/Makefile4
-rw-r--r--devel/gdb/Makefile4
-rw-r--r--devel/glade/Makefile4
-rw-r--r--devel/glade2/Makefile4
-rw-r--r--devel/glib2/Makefile4
-rw-r--r--devel/gnustep-base/Makefile4
-rw-r--r--devel/gnustep-examples/Makefile4
-rw-r--r--devel/gnustep-make/Makefile4
-rw-r--r--devel/gnustep-objc/Makefile4
-rw-r--r--devel/gputils/Makefile4
-rw-r--r--devel/gtranslator/Makefile4
-rw-r--r--devel/kdbg/Makefile4
-rw-r--r--devel/ldapsdk/Makefile4
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libbonoboui/Makefile4
-rw-r--r--devel/libebml/Makefile4
-rw-r--r--devel/libgnome/Makefile4
-rw-r--r--devel/libgnomeui/Makefile4
-rw-r--r--devel/libgtop/Makefile4
-rw-r--r--devel/libgtop2/Makefile4
-rw-r--r--devel/libmpeg3/Makefile4
-rw-r--r--devel/libsigc++/Makefile4
-rw-r--r--devel/libslang/Makefile4
-rw-r--r--devel/libtecla/Makefile4
-rw-r--r--devel/libwnck/Makefile4
-rw-r--r--devel/loudmouth/Makefile4
-rw-r--r--devel/maketool/Makefile4
-rw-r--r--devel/nasm/Makefile4
-rw-r--r--devel/ode/Makefile4
-rw-r--r--devel/ogre/Makefile4
-rw-r--r--devel/opencm/Makefile4
-rw-r--r--devel/pango/Makefile4
-rw-r--r--devel/pilrc/Makefile4
-rw-r--r--devel/popt/Makefile4
-rw-r--r--devel/prc-tools/Makefile4
-rw-r--r--devel/pwlib/Makefile4
-rw-r--r--devel/rapidsvn/Makefile6
-rw-r--r--devel/ratfor/Makefile4
-rw-r--r--devel/re2c/Makefile4
-rw-r--r--devel/rpc2/Makefile4
-rw-r--r--devel/rvm/Makefile4
-rw-r--r--devel/sdcc/Makefile5
-rw-r--r--devel/semantic/Makefile4
-rw-r--r--devel/smpeg/Makefile4
-rw-r--r--devel/splint/Makefile4
-rw-r--r--devel/st/Makefile4
-rw-r--r--devel/stlport/Makefile4
-rw-r--r--devel/tla/Makefile4
-rw-r--r--devel/tpasm/Makefile4
-rw-r--r--devel/treecc/Makefile4
-rw-r--r--devel/umbrello/Makefile4
-rw-r--r--devel/uml/Makefile4
-rw-r--r--devel/xdelta/Makefile4
-rw-r--r--devel/z80-asm/Makefile4
86 files changed, 174 insertions, 173 deletions
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 1949a8ee3cd..e3ccf7d981b 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= GConf-2.4.0.1
@@ -21,7 +21,7 @@ USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PERL5= build
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/Gorm/Makefile b/devel/Gorm/Makefile
index f767e45b2a0..8f124f2d55d 100644
--- a/devel/Gorm/Makefile
+++ b/devel/Gorm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= Gorm-0.4.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnustep.org/
COMMENT= Graphical user interface builder for GNUstep
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_X11= YES
MAKEFILE= GNUmakefile
NO_CONFIGURE= YES
diff --git a/devel/ProjectCenter/Makefile b/devel/ProjectCenter/Makefile
index ef6a37bf47b..a9bd1c31175 100644
--- a/devel/ProjectCenter/Makefile
+++ b/devel/ProjectCenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:13:27 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= ProjectCenter-0.3.6
@@ -12,7 +12,7 @@ COMMENT= GNUstep Integrated Developement Environment
WRKSRC= ${WRKDIR}/ProjectCenter
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_X11= YES
NO_CONFIGURE= YES
MAKEFILE= GNUmakefile
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index d77a0f1ffca..5fdca41bbee 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2004/01/10 05:46:44 jlam Exp $
+# $NetBSD: Makefile.common,v 1.7 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= SDL-1.2.6
@@ -15,7 +15,7 @@ PATCHDIR= ${.CURDIR}/../../devel/SDL/patches
USE_BUILDLINK3= YES
USE_X11= YES
GNU_CONFIGURE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
PTHREAD_OPTS+= require
USE_LIBTOOL= YES
diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile
index de119e22b1b..8e0a65badf3 100644
--- a/devel/SDL_gfx/Makefile
+++ b/devel/SDL_gfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= SDL_gfx-2.0.3
@@ -13,7 +13,7 @@ COMMENT= Basic drawing routines for SDL
USE_BUILDLINK2= YES
USE_X11= YES
GNU_CONFIGURE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 516f33afb1b..e48e87bd811 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= anjuta-1.0.1
@@ -16,7 +16,7 @@ DEPENDS+= gnome1-dirs>=1.2:../../misc/gnome1-dirs
USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index a9fec548abf..3527d25e2cd 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/03 18:49:36 reed Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= at-spi-1.3.8
@@ -14,7 +14,7 @@ COMMENT= Assistive Technology Service Provider Interface
DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index ce965e441b7..d9b0e199005 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2003/12/13 00:44:50 wiz Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= atk-1.4.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://developer.gnome.org/projects/gap/
COMMENT= Set of interfaces for accessibility
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 413a10090ca..4b421595276 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/12/04 19:48:24 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 08:24:28 grant Exp $
DISTNAME= autogen-5.5.3
PKGREVISION= 4
@@ -10,7 +10,7 @@ HOMEPAGE= http://autogen.sourceforge.net/
COMMENT= The Automated Program Generator
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 8a0fd79954a..9bdb335b4e2 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/01/05 23:22:51 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= gc6.2
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_BUILDLINK3= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
INSTALLATION_DIRS= man/man3
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 8d948dd28d9..246982912a0 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/22 08:24:28 grant Exp $
DISTNAME= bonobo-conf-0.14
PKGREVISION= 7
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 511646abd91..a133eb1c463 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.42 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= bonobo-1.0.18
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.libxml= libxml>1.8.15
USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
diff --git a/devel/c-cpp-reference/Makefile b/devel/c-cpp-reference/Makefile
index 5ae41101e61..ab3592775bb 100644
--- a/devel/c-cpp-reference/Makefile
+++ b/devel/c-cpp-reference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2003/07/30 15:56:08 markd Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= c_cpp_reference-2.0.2
@@ -14,7 +14,7 @@ COMMENT= C and C++ reference for the KDE IDE
DEPENDS+= kdevelop-base>=2.1.1:../kdevelop-base
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/devel/cervisia2/Makefile b/devel/cervisia2/Makefile
index 4e4d3bce487..e631025be7e 100644
--- a/devel/cervisia2/Makefile
+++ b/devel/cervisia2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/22 08:24:28 grant Exp $
DISTNAME= cervisia-1.4.1
PKGREVISION= 4
@@ -12,7 +12,7 @@ COMMENT= Graphical frontend for the CVS client
BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
.include "../../x11/kde2/buildlink2.mk"
diff --git a/devel/chmlib/Makefile b/devel/chmlib/Makefile
index ffde0d685c6..72af9358b08 100644
--- a/devel/chmlib/Makefile
+++ b/devel/chmlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/06 15:34:01 wiz Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= chmlib-0.31
@@ -11,7 +11,7 @@ HOMEPAGE= http://66.93.236.84/%7Ejedwin/projects/chmlib/
COMMENT= Library for dealing with Microsoft ITSS/CHM format files
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
PTHREAD_OPTS= require
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index c67adcc4328..a9e8cb0a220 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/12/30 17:21:55 cjep Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= cmake-1.6.6
@@ -12,7 +12,7 @@ COMMENT= Cross platform make
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_NCURSES= YES
post-patch:
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index d830b63a7d8..ba1f4a314ba 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:43:19 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= cvsps-1.3.3
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.cobite.com/cvsps/
COMMENT= Generates 'patchset' information from a CVS repository
USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
+USE_GNU_TOOLS+= make
ALL_TARGET= cvsps
diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile
index 0299c68f3b8..d0cbf3069c2 100644
--- a/devel/cvsync/Makefile
+++ b/devel/cvsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2003/11/28 23:52:10 gehenna Exp $
+# $NetBSD: Makefile,v 1.58 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= cvsync-0.24.13
@@ -11,7 +11,7 @@ COMMENT= Portable incremental cvs repository syncer
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
MAKE_ENV+= PTHREAD_TYPE=${PTHREAD_TYPE}
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index e60847dcaeb..561c13cc0e1 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2003/09/17 19:40:11 grant Exp $
+# $NetBSD: Makefile,v 1.55 2004/01/22 08:24:28 grant Exp $
#
DISTNAME= ddd-3.3.7
@@ -12,7 +12,7 @@ COMMENT= Data Display Debugger -- a common graphical front-end for GDB/DBX/XDB
USE_BUILDLINK2= YES
USE_X11BASE= YES
GNU_CONFIGURE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
TEST_TARGET= check
INFO_FILES= ddd-themes.info ddd.info
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 4698d40f7b9..7f0db4093af 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:24:29 grant Exp $
DISTNAME= devhelp-0.7
PKGREVISION= 4
@@ -13,7 +13,7 @@ COMMENT= Documentation viewer based on GNOME2
DEPENDS+= gnome2-dirs>=1.2:../../misc/gnome2-dirs
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_PERL5= build
USE_PKGLOCALEDIR= yes
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index fa63679bbd9..0f323758207 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/16 07:09:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:29 grant Exp $
DISTNAME= distcc-2.12.1
CATEGORIES= devel
@@ -10,7 +10,7 @@ HOMEPAGE= http://distcc.samba.org/
COMMENT= Tool for distributed C/C++ compiling
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --enable-rfc2553
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index cd4b6d58dd3..a7ff89be164 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/07/21 16:43:19 martti Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 08:24:29 grant Exp $
DISTNAME= doc++-3.4.9
CATEGORIES= devel
@@ -8,7 +8,7 @@ MAINTAINER= jlam@NetBSD.org
HOMEPAGE= http://docpp.sourceforge.net/
COMMENT= Documentation system for C, C++ and Java
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 988147800cb..b023c81ffae 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/22 08:24:29 grant Exp $
DISTNAME= doxygen-1.3.5.src
PKGNAME= doxygen-1.3.5
@@ -13,7 +13,7 @@ COMMENT= Documentation system for C++, Java, IDL and C
DEPENDS+= teTeX-[0-9]*:../../print/teTeX
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PERL5= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --make ${GMAKE}
diff --git a/devel/eXdbm/Makefile b/devel/eXdbm/Makefile
index a4f49ddd5bc..f50948bc59f 100644
--- a/devel/eXdbm/Makefile
+++ b/devel/eXdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/05/02 13:16:27 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= eXdbm-beta-1.0b1
@@ -10,7 +10,7 @@ MAINTAINER= snoonan@tbearsiberians.com
HOMEPAGE= http://www.linux-france.org/pesch/exode/exdbm.html
COMMENT= eXode configuration database routines
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_BUILDLINK2= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index b7465de778d..39aba18a0cb 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= eel-1.0.1
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
USE_LIBTOOL= YES
USE_PERL5= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
CPPFLAGS+= -D_POSIX_THREAD_SYSCALL_SOFT=1
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 008e1b3d343..961d680adc5 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= eel-2.4.1
@@ -18,7 +18,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
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 48a645bb5fd..391b8ed874d 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/11/18 16:29:50 cube Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= elib-1.0
@@ -18,7 +18,7 @@ BUILD_ENV+= EMACS=${EMACS_FLAVOR}
MAKEFLAGS+= EMACS=${EMACS_FLAVOR}
NO_CONFIGURE= # set
-USE_GMAKE= # set
+USE_GNU_TOOLS+= make
USE_MAKEINFO= YES
INFO_FILES= elib.info
diff --git a/devel/fastdep/Makefile b/devel/fastdep/Makefile
index df3c845ea9f..1957351065d 100644
--- a/devel/fastdep/Makefile
+++ b/devel/fastdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/12/22 10:31:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= fastdep-0.16
@@ -11,7 +11,7 @@ COMMENT= Dependancy generator for C/C++ files
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
post-extract:
${RM} -f ${WRKSRC}/*.orig
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index bf2fd7c2249..75596dda5f2 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2003/09/19 05:18:36 dent Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/22 08:24:29 grant Exp $
DISTNAME= g-wrap-1.3.4
PKGREVISION= 3
@@ -14,7 +14,7 @@ DEPENDS+= guile-slib>=2.4.2:../../devel/guile-slib
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
USE_MAKEINFO= YES
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index 30b3179cc91..d5fd45534fa 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:37 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gail-1.4.1
@@ -13,7 +13,7 @@ COMMENT= GNOME Accessibility Implementation Library
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_X11= yes
USE_LIBTOOL= yes
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index 1407cf3f382..fb941e56254 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.16 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gal-1.99.10
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Library functions that came from Gnumeric and Evolution
USE_X11= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
BUILD_USES_MSGFMT= yes
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index 026f9911a7a..f72c920a315 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gconfmm-2.0.1
@@ -13,7 +13,7 @@ COMMENT= C++ interface to GConf2
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_LIBTOOL= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/gconf/gconfmm-2.0.pc.in
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 24981d08312..82444937b20 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/08/09 10:44:40 seb Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/22 08:24:29 grant Exp $
DISTNAME= gcvs-1.0a7
PKGREVISION= 2
@@ -13,7 +13,7 @@ CONFLICTS= cvs-[0-9]*
USE_BUILDLINK2= yes
USE_X11= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
USE_MAKEINFO= yes
INFO_FILES= cvs.info cvsclient.info
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index f6fbb904113..bef5ed4d650 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/10/24 18:49:52 reed Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gdb-5.3
@@ -14,7 +14,7 @@ GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
LIBTOOL_OVERRIDE= ${WRKSRC}/bfd/libtool ${WRKSRC}/opcodes/libtool
REPLACE_LOCALEDIR_PATTERNS+= Make-in
INSTALL_TARGET= install install-info
diff --git a/devel/glade/Makefile b/devel/glade/Makefile
index 82d2ddeabea..7cf9881e692 100644
--- a/devel/glade/Makefile
+++ b/devel/glade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.44 2004/01/22 08:24:29 grant Exp $
DISTNAME= glade-0.6.4
PKGREVISION= 5
@@ -10,7 +10,7 @@ HOMEPAGE= http://glade.gnome.org/
COMMENT= User interface builder for GTK+
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_X11BASE= yes
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index 60e041bd6cd..54010812216 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= glade-2.0.1
@@ -17,7 +17,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
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 6cb9b154cd6..d298d7d7232 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2003/11/02 07:03:40 xtraeme Exp $
+# $NetBSD: Makefile,v 1.34 2004/01/22 08:24:29 grant Exp $
DISTNAME= glib-2.2.3
PKGREVISION= 1
@@ -16,7 +16,7 @@ COMMENT= Some useful routines for C programming
BUILD_USES_MSGFMT= yes
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PERL5= yes
USE_LIBTOOL= yes
diff --git a/devel/gnustep-base/Makefile b/devel/gnustep-base/Makefile
index 818c63659ea..c076ecc1546 100644
--- a/devel/gnustep-base/Makefile
+++ b/devel/gnustep-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/05 09:55:46 adam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gnustep-base-1.8.0
@@ -12,7 +12,7 @@ COMMENT= GNUstep foundation classes
PTHREAD_LIBS= -lpthread
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_X11= YES
MAKEFILE= GNUmakefile
GNU_CONFIGURE= YES
diff --git a/devel/gnustep-examples/Makefile b/devel/gnustep-examples/Makefile
index 71d3eaa48ca..09a0cc789fa 100644
--- a/devel/gnustep-examples/Makefile
+++ b/devel/gnustep-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.8 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gnustep-examples-0.9.7
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnustep.org/
COMMENT= Some GUI programming examples for GNUstep
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_X11= YES
MAKEFILE= GNUmakefile
NO_CONFIGURE= YES
diff --git a/devel/gnustep-make/Makefile b/devel/gnustep-make/Makefile
index 087e6226037..0f08aa49e3e 100644
--- a/devel/gnustep-make/Makefile
+++ b/devel/gnustep-make/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/12/08 15:31:40 adam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gnustep-make-1.8.0
@@ -9,7 +9,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= GNUstep makefile package
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_X11= YES
MAKEFILE= GNUmakefile
GNU_CONFIGURE= YES
diff --git a/devel/gnustep-objc/Makefile b/devel/gnustep-objc/Makefile
index d37861e1ea3..555228b89b1 100644
--- a/devel/gnustep-objc/Makefile
+++ b/devel/gnustep-objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2003/12/05 09:22:26 adam Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gnustep-objc-1.3.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnustep.org/
COMMENT= Objective-C runtime
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
MAKEFILE= GNUmakefile
NO_CONFIGURE= YES
diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 6c64ed7fb65..7b910fed9ae 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/24 09:53:48 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/22 08:24:29 grant Exp $
DISTNAME= gputils-0.11.6
CATEGORIES= devel
@@ -11,7 +11,7 @@ COMMENT= collection of tools for Microchip's PIC micro-processors
CONFLICTS= gpasm-*
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gputils
diff --git a/devel/gtranslator/Makefile b/devel/gtranslator/Makefile
index 83bda537e2e..b891b4928ae 100644
--- a/devel/gtranslator/Makefile
+++ b/devel/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:24:29 grant Exp $
#
DISTNAME= gtranslator-1.0
@@ -15,7 +15,7 @@ DEPENDS= gnome2-dirs>=1.2:../../misc/gnome2-dirs
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PKGLOCALEDIR= yes
USE_X11= yes
MANCOMPRESSED= yes
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 8e15406ab62..f5a75a9f27c 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.43 2004/01/22 08:24:29 grant Exp $
DISTNAME= kdbg-1.2.9
PKGREVISION= 2
@@ -13,7 +13,7 @@ COMMENT= Graphical User Interface around gdb using KDE
BUILD_USES_MSGFMT= yes
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index 3d32bb2cb6e..0bfe0140ca9 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/22 08:24:29 grant Exp $
DISTNAME= ldapsdk_12311998
PKGNAME= ${DISTNAME:S/_/-/}
@@ -13,7 +13,7 @@ COMMENT= LDAP C-SDK from the Mozilla project
CONFLICTS+= openldap*
WRKSRC= ${WRKDIR}/mozilla
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PERL5= build
USE_BUILDLINK2= yes
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index bc56fd64379..9f61cb90d09 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/12/14 19:46:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/22 08:24:29 grant Exp $
DISTNAME= libbonobo-2.4.2
CATEGORIES= devel gnome
@@ -16,7 +16,7 @@ USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= bonobo/libbonobo-2.0.pc.in
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 3d6e9a7bdf2..72b010b5a0b 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.23 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= libbonoboui-2.4.1
@@ -17,7 +17,7 @@ DEPENDS= gnome2-dirs>=1.1:../../misc/gnome2-dirs
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/devel/libebml/Makefile b/devel/libebml/Makefile
index 71fe6884d42..83262b0cbc8 100644
--- a/devel/libebml/Makefile
+++ b/devel/libebml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/18 20:14:58 kristerw Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= libebml-0.6.3
@@ -11,7 +11,7 @@ COMMENT= Librarys for the EBML (Extensible Binary Meta Language) format
BUILD_DIRS= ${WRKSRC}/make/linux
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
.include "../../mk/bsd.prefs.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 1ed91dc8a3d..08da7f9a825 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/07 02:21:16 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= libgnome-2.4.0
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.esound= esound>=0.2.26
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_PKGINSTALL= YES
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index b5a28d01d13..6b278a23724 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.20 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= libgnomeui-2.4.0.1
@@ -17,7 +17,7 @@ DEPENDS= gnome2-dirs>=1.0:../../misc/gnome2-dirs
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PERL5= yes
USE_X11= yes
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index fb7e8c1d255..8883378d688 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.76 2004/01/22 08:24:30 grant Exp $
DISTNAME= libgtop-1.0.13
PKGREVISION= 4
@@ -34,7 +34,7 @@ USE_PERL5= build
USE_BUILDLINK2= yes
USE_PKGLOCALEDIR= yes
USE_X11BASE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_MAKEINFO= YES
diff --git a/devel/libgtop2/Makefile b/devel/libgtop2/Makefile
index 672fbec1a52..764d5338a52 100644
--- a/devel/libgtop2/Makefile
+++ b/devel/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/08 23:31:18 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2004/01/22 08:24:30 grant Exp $
DISTNAME= libgtop-2.0.7
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -33,7 +33,7 @@ USE_PERL5= build
USE_BUILDLINK2= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE= ${WRKSRC}/libgtop-2.0.pc.in
diff --git a/devel/libmpeg3/Makefile b/devel/libmpeg3/Makefile
index 3dfcfe6d531..503b8252bce 100644
--- a/devel/libmpeg3/Makefile
+++ b/devel/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/17 21:31:36 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= libmpeg3-1.3
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --no-mmx --no-css
USE_BUILDLINK2= yes
HAS_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
PTHREAD_OPTS+= require
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index cb200422c9c..638e962e607 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/11/06 17:11:59 gavan Exp $
+# $NetBSD: Makefile,v 1.13 2004/01/22 08:24:30 grant Exp $
DISTNAME= libsigc++-1.2.5
CATEGORIES= devel
@@ -13,7 +13,7 @@ BUILD_DEPENDS= m4>=1.4:../../devel/m4
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_GCC_SHLIB= YES
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 6fe026055c1..9ec7936ed96 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/01/06 19:12:33 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= slang-1.4.9
@@ -20,7 +20,7 @@ COMMENT= Routines for rapid alpha-numeric terminal applications development
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index bacdba44570..6b2a7659837 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:13:28 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= libtecla-1.5.0
@@ -11,7 +11,7 @@ COMMENT= Interactive command line editing facilities
WRKSRC= ${WRKDIR}/${PKGBASE}
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
ALL_TARGET= default
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 30076877fa9..c8411a7b090 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= libwnck-2.4.0.1
@@ -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_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/loudmouth/Makefile b/devel/loudmouth/Makefile
index 4bce10cfc98..a60f97c8822 100644
--- a/devel/loudmouth/Makefile
+++ b/devel/loudmouth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/12/16 07:48:19 recht Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= loudmouth-0.14.1
@@ -13,7 +13,7 @@ COMMENT= Lightweight Jabber client library
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
PKGCONFIG_OVERRIDE+= ${WRKSRC}/loudmouth-1.0.pc.in
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index dda9bffaa58..eb6bc3efc75 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2003/09/27 15:29:47 grant Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= maketool-0.7
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= # defined
USE_BUILDLINK2= # defined
USE_PKGLOCALEDIR= # defined
USE_X11= # defined
-USE_GMAKE= # defined
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= # defined
USE_PKGLOCALEDIR= # defined
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 35ab1521f36..38642e0a97c 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/05 11:45:05 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= nasm-0.98.38
@@ -15,7 +15,7 @@ USE_BUILDLINK3= YES
ALL_TARGET= everything
INSTALL_TARGET= install_everything
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_PERL5= build
USE_MAKEINFO= YES
INFO_FILES= nasm.info
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index b1a71db36b2..7f9b232fdf9 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/12/03 19:00:56 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= ode-0.039
@@ -11,7 +11,7 @@ HOMEPAGE= http://opende.sourceforge.net/
COMMENT= Library for the simulation of Rigid Body Dynamics
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_X11= yes
do-configure:
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 78770e08f40..fc05fd73dcb 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= ogre-v0-12-1
@@ -15,7 +15,7 @@ COMMENT= Object-Oriented Graphics Rendering Engine
WRKSRC= ${WRKDIR}/ogrenew
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 20060914bb4..051e96e1faa 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.24 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= ${OPENCM_VERSION}-1-src
@@ -15,7 +15,7 @@ COMMENT= Secure, high-integrity replacement for CVS
WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base
USE_BUILDLINK2= YES
USE_PKGINSTALL= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --infodir=${PREFIX}/info
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 7ea1f878903..9c1a78a6595 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2003/12/30 17:21:55 cjep Exp $
+# $NetBSD: Makefile,v 1.31 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= pango-1.2.5
@@ -14,7 +14,7 @@ COMMENT= Library for layout and rendering of text
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_X11= yes
GNU_CONFIGURE= yes
TEST_TARGET= check
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 762f7ff1a04..924c89ce674 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2003/12/03 02:42:35 xtraeme Exp $
+# $NetBSD: Makefile,v 1.19 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= pilrc-2.9p9
@@ -25,7 +25,7 @@ COMMENT= Generate resources for PalmOS applications from textual description
#EXTRACT_CMD= unzip -aq ${DOWNLOADED_DISTFILE}
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 63413b1dd3c..1fcc2e4ea3d 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.26 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= popt-1.7
@@ -21,7 +21,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}
USE_BUILDLINK3= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index a20540ef799..2aaf8635930 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/10/11 14:20:20 dillo Exp $
+# $NetBSD: Makefile,v 1.17 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= prc-tools-2.2
@@ -30,7 +30,7 @@ CONFLICTS+= prc-tools-binutils-[0-9]*
CONFLICTS+= prc-tools-gcc-[0-9]*
CONFLICTS+= prc-tools-gdb-[0-9]*
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_BUILDLINK2= YES
AUTOCONF_REQD= 2.50
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index e06ba0c384b..ec3f1da9e17 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.27 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= pwlib_1.4.4
@@ -20,7 +20,7 @@ BUILD_DEPENDS= bison-[0-9]*:../../devel/bison
WRKSRC= ${WRKDIR}/pwlib
USE_BUILDLINK2= yes
USE_PKGINSTALL= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_LIBTOOL= yes
PTHREAD_OPTS+= require
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 5b0db9117b0..730a619e1b4 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/10 14:25:42 recht Exp $
+# $NetBSD: Makefile,v 1.7 2004/01/22 08:24:30 grant Exp $
DISTNAME= rapidsvn-0.4.0
PKGREVISION= 4
@@ -9,8 +9,8 @@ MAINTAINER= epg@NetBSD.org
HOMEPAGE= http://rapidsvn.tigris.org/
COMMENT= Cross-platform Subversion GUI
-USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_BUILDLINK2= YES
+USE_GNU_TOOLS+= make
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/devel/ratfor/Makefile b/devel/ratfor/Makefile
index 13f55e94d0f..f6a5085aec8 100644
--- a/devel/ratfor/Makefile
+++ b/devel/ratfor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2003/07/17 21:33:31 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:24:30 grant Exp $
DISTNAME= ratfor77
PKGNAME= ratfor-1.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://sepwww.stanford.edu/software/ratfor.html
COMMENT= Preprocessor for the Ratfor dialect of Fortran
ALL_TARGET= ratfor77
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${PREFIX}/bin/ratfor
diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index 69bf2b0ee2d..2aa2cfb068f 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/07/29 16:17:41 agc Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 08:24:30 grant Exp $
DISTNAME= re2c-0.9.1
CATEGORIES= devel
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.tildeslash.org/
COMMENT= Deterministic Finite State Automaton generator
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
ALL_TARGET= default
do-install:
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index b0c9ba9f346..021fee5ef18 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2003/08/25 10:28:43 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= rpc2-1.19
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.coda.cs.cmu.edu/
COMMENT= CMU (Coda) remote procedure call package
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PERL=${PERL5}
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index b60fba08934..c9fce4c9102 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/25 10:31:07 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= rvm-1.8
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.coda.cs.cmu.edu/
COMMENT= Recoverable Virtual Memory
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-lwp-includes=${BUILDLINK_PREFIX.lwp}/include
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index f6bbcf22c91..9e56daad5af 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.21 2004/01/22 08:24:30 grant Exp $
# FreeBSD: ports/devel/sdcc/Makefile,v 1.5 2000/04/15 15:13:38 knu Exp
DISTNAME= sdcc-2.2.1-src
@@ -24,7 +24,8 @@ YACC= bison
WRKSRC= ${WRKDIR}/${PKGBASE}
USE_BUILDLINK2= YES
GNU_CONFIGURE= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
+
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/sdcc
# needed for some arch's. -fdollars-in-identifiers is enabled
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 25a598af596..0e8784e7b4d 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/08/09 10:44:49 seb Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 08:24:30 grant Exp $
#
DISTNAME= semantic-1.4.2
@@ -23,7 +23,7 @@ EMACS= xemacs
BUILD_ENV+= EMACS=${EMACS}
NO_CONFIGURE= # set
-USE_GMAKE= # set
+USE_GNU_TOOLS+= make
INFO_FILES= semantic.info
OTHER_INFO= semantic.info-1 semantic.info-2
diff --git a/devel/smpeg/Makefile b/devel/smpeg/Makefile
index 9cc748dbe67..9e72393c619 100644
--- a/devel/smpeg/Makefile
+++ b/devel/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2004/01/05 22:44:04 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2004/01/22 08:24:31 grant Exp $
#
DISTNAME= smpeg-0.4.4
@@ -14,7 +14,7 @@ COMMENT= SDL MPEG Player Library
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_BUILDLINK3= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
USE_X11= yes
diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index 52056093aeb..a626107712b 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.6 2004/01/22 08:24:31 grant Exp $
#
VERSION= 3.0.1.6
@@ -13,7 +13,7 @@ HOMEPAGE= http://lclint.cs.virginia.edu/
COMMENT= Statically check C programs
WRKSRC= ${WRKDIR}/splint-${VERSION}
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
post-install:
diff --git a/devel/st/Makefile b/devel/st/Makefile
index 906138f3f76..438ba8c415e 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/07/17 21:34:06 grant Exp $
+# $NetBSD: Makefile,v 1.5 2004/01/22 08:24:31 grant Exp $
#
DISTNAME= st-1.4
@@ -13,7 +13,7 @@ COMMENT= Non-preemptive thread library for Internet applications
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-vax
USE_LIBTOOL= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
ALL_TARGET= netbsd-debug
HTMLDIR= ${PREFIX}/share/doc/html/st
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index 22accd35de3..36be662834e 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/05 22:14:18 mrauch Exp $
+# $NetBSD: Makefile,v 1.14 2004/01/22 08:24:31 grant Exp $
DISTNAME= STLport-4.6
PKGNAME= stlport-4.6
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.stlport.org/
COMMENT= Complete C++ standard library
USE_BUILDLINK2= # defined
-USE_GMAKE= # defined
+USE_GNU_TOOLS+= make
USE_LIBTOOL= # defined
USE_GCC_SHLIB= # defined
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 7ca41e1a28a..504db04e230 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/01/22 08:24:31 grant Exp $
#
DISTNAME= tla-1.1pre8
@@ -13,7 +13,7 @@ COMMENT= Revision control system ideal for widely distributed development
DEPENDS+= patch-[0-9]*:../../devel/patch
WRKSRC= ${WRKDIR}/${DISTNAME}/src/=build
-USE_GMAKE= # defined
+USE_GNU_TOOLS+= make
HAS_CONFIGURE= # defined
CONFIGURE_SCRIPT= ../configure
diff --git a/devel/tpasm/Makefile b/devel/tpasm/Makefile
index 56d985a9e2d..6d1c0002b1f 100644
--- a/devel/tpasm/Makefile
+++ b/devel/tpasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.11 2004/01/22 08:24:31 grant Exp $
#
DISTNAME= tpasm1.0r
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.sqt.com/
COMMENT= Assembler for 6805, 68HC11, 6502, Surplus, 8051, Z80, PIC, and AVR
WRKSRC= ${WRKDIR}/tpasm
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/libdata/tpasm
diff --git a/devel/treecc/Makefile b/devel/treecc/Makefile
index a3ccafb35d5..32ce35fbd33 100644
--- a/devel/treecc/Makefile
+++ b/devel/treecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/12 17:10:10 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 08:24:31 grant Exp $
#
DISTNAME= treecc-0.2.6
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnu.org/projects/dotgnu/
COMMENT= DotGNU Portable.NET aspect-oriented programming tool
GNU_CONFIGURE= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
USE_BUILDLINK2= yes
INFO_FILES= treecc.info
diff --git a/devel/umbrello/Makefile b/devel/umbrello/Makefile
index 725b216b651..4c47330e66a 100644
--- a/devel/umbrello/Makefile
+++ b/devel/umbrello/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/03 18:49:39 reed Exp $
+# $NetBSD: Makefile,v 1.9 2004/01/22 08:24:31 grant Exp $
DISTNAME= umbrello-1.1.1
PKGREVISION= 5
@@ -11,7 +11,7 @@ HOMEPAGE= http://uml.sourceforge.net/
COMMENT= Unified Modelling Language diagram program for KDE
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
.include "../../meta-pkgs/kde3/buildlink2.mk"
diff --git a/devel/uml/Makefile b/devel/uml/Makefile
index f6ba2110de1..dff05af47e7 100644
--- a/devel/uml/Makefile
+++ b/devel/uml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/01/20 12:13:29 agc Exp $
+# $NetBSD: Makefile,v 1.10 2004/01/22 08:24:31 grant Exp $
DISTNAME= uml-1.0.3-1
PKGNAME= uml-1.0.3
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= qt2-designer-kde>=2.3.1nb2:../../x11/qt2-designer-kde
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_BUILDLINK2= YES
-USE_GMAKE= YES
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/admin/ltconfig
diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index e65ade5faf6..bba33dfa05f 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2003/08/09 10:44:50 seb Exp $
+# $NetBSD: Makefile,v 1.25 2004/01/22 08:24:31 grant Exp $
#
DISTNAME= xdelta-1.1.1
@@ -13,7 +13,7 @@ COMMENT= Enhanced diff that works on binary files
USE_BUILDLINK2= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
GNU_CONFIGURE= yes
INFO_FILES= xdelta.info
diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile
index 5dae11eb0eb..939a243bb57 100644
--- a/devel/z80-asm/Makefile
+++ b/devel/z80-asm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2003/03/20 19:33:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/01/22 08:24:31 grant Exp $
#
DISTNAME= z80-asm-1.0
@@ -11,7 +11,7 @@ COMMENT= Z80 assembly code assembler and disassembler
GNU_CONFIGURE= yes
USE_BUILDLINK2= yes
-USE_GMAKE= yes
+USE_GNU_TOOLS+= make
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/z80-asm ${PREFIX}/bin/z80-asm