summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/GConf2/Makefile.common4
-rw-r--r--devel/SDL/Makefile.common4
-rw-r--r--devel/SDL_gfx/Makefile4
-rw-r--r--devel/allegro/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/cgdb/Makefile4
-rw-r--r--devel/check/Makefile4
-rw-r--r--devel/chmlib/Makefile4
-rw-r--r--devel/cmake/Makefile4
-rw-r--r--devel/cppunit/Makefile4
-rw-r--r--devel/cscope/Makefile4
-rw-r--r--devel/cvsgraph/Makefile4
-rw-r--r--devel/cvsps/Makefile4
-rw-r--r--devel/cvsync/Makefile4
-rw-r--r--devel/darcs/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/eel/Makefile4
-rw-r--r--devel/eel2/Makefile4
-rw-r--r--devel/elib/Makefile4
-rw-r--r--devel/fastdep/Makefile4
-rw-r--r--devel/flex/Makefile4
-rw-r--r--devel/florist/Makefile4
-rw-r--r--devel/g-wrap/Makefile4
-rw-r--r--devel/g-wrap1/Makefile4
-rw-r--r--devel/gail/Makefile4
-rw-r--r--devel/gal2/Makefile4
-rw-r--r--devel/gal20/Makefile4
-rw-r--r--devel/gconfmm/Makefile4
-rw-r--r--devel/gconfmm26/Makefile4
-rw-r--r--devel/gcvs/Makefile4
-rw-r--r--devel/gdb/Makefile4
-rw-r--r--devel/gdb6/Makefile4
-rw-r--r--devel/gdbada/Makefile4
-rw-r--r--devel/generate/Makefile4
-rw-r--r--devel/glade2/Makefile.common4
-rw-r--r--devel/glib2/Makefile4
-rw-r--r--devel/glibmm24/Makefile4
-rw-r--r--devel/gmp/Makefile4
-rw-r--r--devel/gnustep-make/gnustep.mk4
-rw-r--r--devel/gnustep-objc/Makefile4
-rw-r--r--devel/gputils/Makefile4
-rw-r--r--devel/guile-lib/Makefile4
-rw-r--r--devel/hdf/Makefile4
-rw-r--r--devel/ht/Makefile4
-rw-r--r--devel/kdbg/Makefile4
-rw-r--r--devel/kdesdk3/Makefile4
-rw-r--r--devel/kscope/Makefile4
-rw-r--r--devel/ldapsdk/Makefile4
-rw-r--r--devel/libbonobo/Makefile4
-rw-r--r--devel/libbonoboui/Makefile4
-rw-r--r--devel/libcfg+/Makefile4
-rw-r--r--devel/libebml/Makefile4
-rw-r--r--devel/libextractor/Makefile4
-rw-r--r--devel/libglade2/Makefile4
-rw-r--r--devel/libglademm20/Makefile4
-rw-r--r--devel/libglademm24/Makefile4
-rw-r--r--devel/libgnome/Makefile4
-rw-r--r--devel/libgnomemm20/Makefile4
-rw-r--r--devel/libgnomemm26/Makefile4
-rw-r--r--devel/libgnomeui/Makefile4
-rw-r--r--devel/libgnomeuimm20/Makefile4
-rw-r--r--devel/libgnomeuimm26/Makefile4
-rw-r--r--devel/libiberty/Makefile4
-rw-r--r--devel/libjit/Makefile4
-rw-r--r--devel/libsigc++/Makefile4
-rw-r--r--devel/libsigc++2/Makefile4
-rw-r--r--devel/libslang/Makefile4
-rw-r--r--devel/libstroke/Makefile4
-rw-r--r--devel/libtecla/Makefile4
-rw-r--r--devel/libwnck/Makefile4
-rw-r--r--devel/maketool/Makefile4
-rw-r--r--devel/monotone/Makefile4
-rw-r--r--devel/nasm/Makefile4
-rw-r--r--devel/nbitools/Makefile4
-rw-r--r--devel/nbitools/buildlink3.mk4
-rw-r--r--devel/ncurses/Makefile4
-rw-r--r--devel/newt/Makefile4
-rw-r--r--devel/nspr/Makefile4
-rw-r--r--devel/nss/Makefile4
-rw-r--r--devel/oaf/Makefile4
-rw-r--r--devel/ode/Makefile4
-rw-r--r--devel/ogre/Makefile4
-rw-r--r--devel/opencm/Makefile5
-rw-r--r--devel/p5-glib2/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/py-generate/Makefile4
-rw-r--r--devel/rapidsvn/Makefile4
-rw-r--r--devel/ratfor/Makefile4
-rw-r--r--devel/re2c/Makefile4
-rw-r--r--devel/rpc2/Makefile4
-rw-r--r--devel/rsltc/Makefile4
-rw-r--r--devel/rudiments/Makefile4
-rw-r--r--devel/rvm/Makefile4
-rw-r--r--devel/sdcc/Makefile4
-rw-r--r--devel/semantic/Makefile4
-rw-r--r--devel/splint/Makefile4
-rw-r--r--devel/st/Makefile4
-rw-r--r--devel/stlport/Makefile4
-rw-r--r--devel/teem/Makefile4
-rw-r--r--devel/tla/Makefile4
-rw-r--r--devel/tpasm/Makefile4
-rw-r--r--devel/treecc/Makefile4
-rw-r--r--devel/xdelta/Makefile4
-rw-r--r--devel/z80-asm/Makefile4
119 files changed, 238 insertions, 239 deletions
diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index 833b55cd09e..cec2a9ea15c 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:07:47 jlam Exp $
#
DISTNAME= GConf-2.10.0
@@ -22,7 +22,7 @@ PATCHDIR= ${.CURDIR}/../GConf2/patches
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
PKGCONFIG_OVERRIDE= gconf-2.0.pc.in
diff --git a/devel/SDL/Makefile.common b/devel/SDL/Makefile.common
index 990756a4539..f5477f518fe 100644
--- a/devel/SDL/Makefile.common
+++ b/devel/SDL/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:07:47 jlam Exp $
DISTNAME= SDL-1.2.8
CATEGORIES= devel games
@@ -13,7 +13,7 @@ PATCHDIR= ${.CURDIR}/../../devel/SDL/patches
USE_X11= YES
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
PTHREAD_OPTS+= require
diff --git a/devel/SDL_gfx/Makefile b/devel/SDL_gfx/Makefile
index 0871106dba8..49170b2dabe 100644
--- a/devel/SDL_gfx/Makefile
+++ b/devel/SDL_gfx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:47 jlam Exp $
DISTNAME= SDL_gfx-2.0.13
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= ben@NetBSD.org
HOMEPAGE= http://www.ferzkopp.net/~aschiffler/Software/SDL_gfx-2.0/
COMMENT= Basic drawing routines for SDL
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/devel/allegro/Makefile b/devel/allegro/Makefile
index bc895627da9..8123fecbe9b 100644
--- a/devel/allegro/Makefile
+++ b/devel/allegro/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:47 jlam Exp $
DISTNAME= allegro-4.1.18
CATEGORIES= devel
@@ -8,7 +8,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://alleg.sourceforge.net/
COMMENT= Allegro game programming library
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/devel/anjuta/Makefile b/devel/anjuta/Makefile
index 3f53228090a..4d0fcefe08d 100644
--- a/devel/anjuta/Makefile
+++ b/devel/anjuta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:07:47 jlam Exp $
#
DISTNAME= anjuta-1.2.2
@@ -24,7 +24,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
SUBST_CLASSES+= make
diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index 0e99086a379..09329069023 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:17 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:47 jlam Exp $
#
DISTNAME= at-spi-1.6.3
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Assistive Technology Service Provider Interface
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 30d62c1de56..80fc521649b 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/10 16:37:16 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:48 jlam Exp $
#
DISTNAME= atk-1.10.1
@@ -12,7 +12,7 @@ COMMENT= Set of interfaces for accessibility
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/devel/autogen/Makefile b/devel/autogen/Makefile
index 668fb7a6eb5..f13379b1491 100644
--- a/devel/autogen/Makefile
+++ b/devel/autogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:49 jlam Exp $
DISTNAME= autogen-5.6.4
CATEGORIES= devel
@@ -9,7 +9,7 @@ MAINTAINER= kristerw@NetBSD.org
HOMEPAGE= http://autogen.sourceforge.net/
COMMENT= The Automated Program Generator
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_MAKEINFO= YES
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index a27d988cd83..da828682547 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/05/16 03:04:44 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:07:49 jlam Exp $
DISTNAME= gc6.4
PKGNAME= ${DISTNAME:S/gc/boehm-gc-/}
@@ -11,7 +11,7 @@ COMMENT= Garbage collection and memory leak detection for C and C++
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/devel/bonobo-conf/Makefile b/devel/bonobo-conf/Makefile
index 4da29c46c7b..ccd6652f38b 100644
--- a/devel/bonobo-conf/Makefile
+++ b/devel/bonobo-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:49 jlam Exp $
DISTNAME= bonobo-conf-0.14
PKGREVISION= 11
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
post-install:
diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index a1ff2547242..70e6f974f2b 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.51 2005/05/22 20:07:49 jlam Exp $
DISTNAME= bonobo-1.0.22
CATEGORIES= devel
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LOCALBASE="${LOCALBASE}"
CONFIGURE_ENV+= X11BASE="${X11BASE}"
diff --git a/devel/c-cpp-reference/Makefile b/devel/c-cpp-reference/Makefile
index c5f14699752..9be06e938de 100644
--- a/devel/c-cpp-reference/Makefile
+++ b/devel/c-cpp-reference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:49 jlam Exp $
#
DISTNAME= c_cpp_reference-2.0.2
@@ -13,7 +13,7 @@ COMMENT= C and C++ reference for the KDE IDE
DEPENDS+= kdevelop-base>=3.1.0:../../devel/kdevelop-base
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/devel/cgdb/Makefile b/devel/cgdb/Makefile
index 5c861b9e048..343bee711dc 100644
--- a/devel/cgdb/Makefile
+++ b/devel/cgdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:49 jlam Exp $
#
DISTNAME= cgdb-0.4.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://cgdb.sourceforge.net/
COMMENT= Curses-based interface to the GNU Debugger (GDB)
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_NCURSES= # tigetstr()
USE_GNU_READLINE= # rl_mark and others
diff --git a/devel/check/Makefile b/devel/check/Makefile
index 658d210f6d1..8cfe9958202 100644
--- a/devel/check/Makefile
+++ b/devel/check/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/09/27 20:41:19 cube Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:49 jlam Exp $
#
DISTNAME= check-0.9.1
@@ -11,6 +11,6 @@ COMMENT= Unit test framework for C
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+=--enable-plain-docdir
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/chmlib/Makefile b/devel/chmlib/Makefile
index d5ec3d40c01..786c82fb3b7 100644
--- a/devel/chmlib/Makefile
+++ b/devel/chmlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:18 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:49 jlam Exp $
#
DISTNAME= chmlib-0.35
@@ -13,7 +13,7 @@ COMMENT= Library for dealing with Microsoft ITSS/CHM format files
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-io64
diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
index d600cb82484..92f3c2c7c2b 100644
--- a/devel/cmake/Makefile
+++ b/devel/cmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:49 jlam Exp $
DISTNAME= cmake-2.0.5
CATEGORIES= devel
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.cmake.org/
COMMENT= Cross platform make
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_NCURSES= yes
GNU_CONFIGURE= yes
diff --git a/devel/cppunit/Makefile b/devel/cppunit/Makefile
index b1409d5e4a1..e4e00dc08ac 100644
--- a/devel/cppunit/Makefile
+++ b/devel/cppunit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/02/06 11:28:17 wulf Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= cppunit-1.10.2
@@ -12,7 +12,7 @@ COMMENT= CppUnit is a C++ unit testing framework
BUILD_DEPENDS+= doxygen>=1.3.6:../../devel/doxygen
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/cscope/Makefile b/devel/cscope/Makefile
index 4a48f1fb14d..e7944666440 100644
--- a/devel/cscope/Makefile
+++ b/devel/cscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= cscope-15.4
@@ -11,7 +11,7 @@ HOMEPAGE= http://cscope.sourceforge.net/
COMMENT= Interactive C program browser
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
CONFIGURE_ARGS+= --with-ncurses=${BUILDLINK_PREFIX.ncurses}
CONFIGURE_ARGS+= --with-flex
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index 60b7c7e8efc..22a9878bb6a 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= cvsgraph-1.5.1
@@ -9,7 +9,7 @@ MAINTAINER= adrianp@NetBSD.org
HOMEPAGE= http://www.akhphd.au.dk/~bertho/cvsgraph/
COMMENT= Graphically represents CVS/RCS branches and file revisions
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/devel/cvsps/Makefile b/devel/cvsps/Makefile
index b57225c0d0b..9a30304ddd5 100644
--- a/devel/cvsps/Makefile
+++ b/devel/cvsps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= cvsps-2.0rc1
@@ -12,7 +12,7 @@ COMMENT= Generates 'patchset' information from a CVS repository
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
diff --git a/devel/cvsync/Makefile b/devel/cvsync/Makefile
index ab0bbd9102f..b5d08e86934 100644
--- a/devel/cvsync/Makefile
+++ b/devel/cvsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.73 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= cvsync-0.24.18
@@ -12,7 +12,7 @@ COMMENT= Portable incremental cvs repository syncer
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
MAKE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} BINMODE=${BINMODE}
diff --git a/devel/darcs/Makefile b/devel/darcs/Makefile
index 168b2a3a764..95408bc15a9 100644
--- a/devel/darcs/Makefile
+++ b/devel/darcs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2005/04/28 15:05:15 augustss Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:50 jlam Exp $
DISTNAME= darcs-1.0.2
CATEGORIES= devel
@@ -11,7 +11,7 @@ COMMENT= A distributed revision control system
BUILD_DEPENDS+= teTeX>=2.0.2nb1:../../print/teTeX
BUILD_DEPENDS+= latex2html>=2002.2.1nb3:../../textproc/latex2html
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
GNU_CONFIGURE= yes
#CONFIGURE_ARGS+= --without-libcurl
diff --git a/devel/ddd/Makefile b/devel/ddd/Makefile
index 78a46ce99dc..9f251df01bb 100644
--- a/devel/ddd/Makefile
+++ b/devel/ddd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/05/15 22:02:26 jlam Exp $
+# $NetBSD: Makefile,v 1.64 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= ddd-3.3.10
@@ -13,7 +13,7 @@ COMMENT= Data Display Debugger -- graphical front-end for GDB/DBX/XDB
GNU_CONFIGURE= YES
INFO_FILES= ddd-themes.info ddd.info
TEST_TARGET= check
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11BASE= YES
PKGSRC_USE_TOOLS+= gzip
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 6b4f6668153..e4a214f2a5a 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:50 jlam Exp $
DISTNAME= devhelp-0.7
PKGREVISION= 11
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.imendio.com/projects/devhelp/
COMMENT= Documentation viewer based on GNOME2
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PERL5= build
USE_PKGLOCALEDIR= yes
diff --git a/devel/distcc/Makefile b/devel/distcc/Makefile
index 9f2a0279912..4b0a49c2ed7 100644
--- a/devel/distcc/Makefile
+++ b/devel/distcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:19 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:50 jlam Exp $
DISTNAME= distcc-2.18.2
PKGREVISION= 2
@@ -10,7 +10,7 @@ MAINTAINER= martti@NetBSD.org
HOMEPAGE= http://distcc.samba.org/
COMMENT= Tool for distributed C/C++ compiling
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/devel/doc++/Makefile b/devel/doc++/Makefile
index 8f9b26f0941..d2aca8a9a68 100644
--- a/devel/doc++/Makefile
+++ b/devel/doc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:50 jlam Exp $
DISTNAME= doc++-3.4.10
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://docpp.sourceforge.net/
COMMENT= Documentation system for C, C++ and Java
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/devel/doxygen/Makefile b/devel/doxygen/Makefile
index 3ddd3d07d13..cbb0d2bd406 100644
--- a/devel/doxygen/Makefile
+++ b/devel/doxygen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:50 jlam Exp $
DISTNAME= doxygen-1.4.1.src
PKGNAME= doxygen-1.4.1
@@ -12,7 +12,7 @@ COMMENT= Documentation system for C++, Java, IDL and C
DEPENDS+= teTeX-[0-9]*:../../print/teTeX
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_PERL5= yes
HAS_CONFIGURE= yes
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 326e4716b1a..279fe19b851 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:50 jlam Exp $
DISTNAME= eel-1.0.2
CATEGORIES= devel gnome
@@ -11,7 +11,7 @@ COMMENT= Eazel Extensions Library
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PERL5= build
USE_PKGLOCALEDIR= yes
diff --git a/devel/eel2/Makefile b/devel/eel2/Makefile
index 57944561a26..b5e6b4475b6 100644
--- a/devel/eel2/Makefile
+++ b/devel/eel2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/04/19 17:28:04 drochner Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:50 jlam Exp $
DISTNAME= eel-2.10.1
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -13,7 +13,7 @@ COMMENT= Eazel Extensions Library for GNOME2
BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/devel/elib/Makefile b/devel/elib/Makefile
index 391b8ed874d..f35c7bdf83e 100644
--- a/devel/elib/Makefile
+++ b/devel/elib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/22 08:24:29 grant Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= elib-1.0
@@ -18,7 +18,7 @@ BUILD_ENV+= EMACS=${EMACS_FLAVOR}
MAKEFLAGS+= EMACS=${EMACS_FLAVOR}
NO_CONFIGURE= # set
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= YES
INFO_FILES= elib.info
diff --git a/devel/fastdep/Makefile b/devel/fastdep/Makefile
index a1a4ccfaace..6c34dc2217f 100644
--- a/devel/fastdep/Makefile
+++ b/devel/fastdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:50 jlam Exp $
#
DISTNAME= fastdep-0.16
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.irule.be/bvh/c++/fastdep/
COMMENT= Dependency generator for C/C++ files
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-extract:
${RM} -f ${WRKSRC}/*.orig
diff --git a/devel/flex/Makefile b/devel/flex/Makefile
index 2fe2dd7c4d2..edc3d6c836e 100644
--- a/devel/flex/Makefile
+++ b/devel/flex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/02/24 15:17:54 grant Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:50 jlam Exp $
DISTNAME= flex-2.5.4a
CATEGORIES= lang
@@ -10,7 +10,7 @@ COMMENT= Fast clone of lex(1), the lexical scanner generator
WRKSRC= ${WRKDIR}/flex-2.5.4
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= yacc
+USE_TOOLS+= bison
TEST_TARGET= check
diff --git a/devel/florist/Makefile b/devel/florist/Makefile
index 8b668512046..30ab951c737 100644
--- a/devel/florist/Makefile
+++ b/devel/florist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= florist-3.15p-src
@@ -16,7 +16,7 @@ USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_AUTOCONF= yes
AUTOCONF_REQD= 2.12
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/g-wrap/Makefile b/devel/g-wrap/Makefile
index 4eede51f996..a42d170a52d 100644
--- a/devel/g-wrap/Makefile
+++ b/devel/g-wrap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/04/19 00:17:40 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2005/05/22 20:07:51 jlam Exp $
DISTNAME= g-wrap-1.9.6
CATEGORIES= devel
@@ -12,7 +12,7 @@ DEPENDS+= guile-lib>=0.1.2:../../devel/guile-lib
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
TEST_TARGET= check
diff --git a/devel/g-wrap1/Makefile b/devel/g-wrap1/Makefile
index c6da1d228bb..ed51381524b 100644
--- a/devel/g-wrap1/Makefile
+++ b/devel/g-wrap1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:51 jlam Exp $
DISTNAME= g-wrap-1.3.4
PKGREVISION= 6
@@ -13,7 +13,7 @@ DEPENDS+= guile-slib>=2.4.2nb6:../../devel/guile-slib
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_MAKEINFO= YES
diff --git a/devel/gail/Makefile b/devel/gail/Makefile
index d34cd6b0b0e..38b478dafb2 100644
--- a/devel/gail/Makefile
+++ b/devel/gail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/13 15:26:39 drochner Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= gail-1.8.4
@@ -11,7 +11,7 @@ HOMEPAGE= http://developer.gnome.org/projects/gap/
COMMENT= GNOME Accessibility Implementation Library
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/devel/gal2/Makefile b/devel/gal2/Makefile
index c1809c936b5..c44cbf5fc98 100644
--- a/devel/gal2/Makefile
+++ b/devel/gal2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/26 19:06:00 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:51 jlam Exp $
#
# Check the API before updating this package! gal-2.5 and above should
# get their own gal26 package!
@@ -15,7 +15,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Library functions that came from Gnumeric and Evolution (gal-2.4 API)
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/devel/gal20/Makefile b/devel/gal20/Makefile
index 4bd8458372e..c19fea99ee0 100644
--- a/devel/gal20/Makefile
+++ b/devel/gal20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:20 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= gal-1.99.11
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Library functions that came from Gnumeric and Evolution
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
BUILD_USES_MSGFMT= yes
USE_LIBTOOL= yes
diff --git a/devel/gconfmm/Makefile b/devel/gconfmm/Makefile
index ba9ca55859a..e48fa53b231 100644
--- a/devel/gconfmm/Makefile
+++ b/devel/gconfmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:21 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= gconfmm-2.0.2
@@ -12,7 +12,7 @@ COMMENT= C++ interface to GConf2
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= gconf/gconfmm-2.0.pc.in
diff --git a/devel/gconfmm26/Makefile b/devel/gconfmm26/Makefile
index a2a18d520fa..b5329b0e799 100644
--- a/devel/gconfmm26/Makefile
+++ b/devel/gconfmm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:21 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= gconfmm-2.6.1
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/gconf/gconfmm-2.6.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/gcvs/Makefile b/devel/gcvs/Makefile
index 133195ec22a..6c900e88c6e 100644
--- a/devel/gcvs/Makefile
+++ b/devel/gcvs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:21 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:51 jlam Exp $
DISTNAME= gcvs-1.0
PKGREVISION= 1
@@ -14,7 +14,7 @@ COMMENT= GTK interface for CVS
CONFLICTS= cvs-[0-9]*
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_MAKEINFO= yes
INFO_FILES= cvs.info cvsclient.info
diff --git a/devel/gdb/Makefile b/devel/gdb/Makefile
index a0100f852c0..d5e6ff34d04 100644
--- a/devel/gdb/Makefile
+++ b/devel/gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:22 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= gdb-5.3
@@ -13,7 +13,7 @@ COMMENT= Symbolic debugger for multiple language frontends
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
REPLACE_LOCALEDIR_PATTERNS+= Make-in
INSTALL_TARGET= install install-info
TEST_TARGET= check
diff --git a/devel/gdb6/Makefile b/devel/gdb6/Makefile
index b46375014b5..cd27fc00e91 100644
--- a/devel/gdb6/Makefile
+++ b/devel/gdb6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:23 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= gdb-6.2.1
@@ -13,7 +13,7 @@ COMMENT= The GNU Project Debugger
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
USE_PKGLOCALEDIR= yes
diff --git a/devel/gdbada/Makefile b/devel/gdbada/Makefile
index 3c4685bbe9a..8f771e3d054 100644
--- a/devel/gdbada/Makefile
+++ b/devel/gdbada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:23 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:51 jlam Exp $
DISTNAME= gdbada-5.3
PKGREVISION= 1
@@ -20,7 +20,7 @@ GDB_SUBPREFIX= gdbada
GDB_PREFIX= ${PREFIX}/${GDB_SUBPREFIX}
GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
TEST_TARGET= check
INFO_DIR= ${GDB_PREFIX}/info
LIB_DIR= ${GDB_PREFIX}/lib
diff --git a/devel/generate/Makefile b/devel/generate/Makefile
index 9143d425f62..f1da63f4216 100644
--- a/devel/generate/Makefile
+++ b/devel/generate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/01/04 13:29:08 darcy Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= generate-2.2
@@ -13,6 +13,6 @@ COMMENT= Simple text pre-processor
MAKE_ENV+= MANDIR=${LOCALBASE}/man
MAKE_ENV+= BINDIR=${LOCALBASE}/bin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/devel/glade2/Makefile.common b/devel/glade2/Makefile.common
index 2e8f9096d9f..e3bc7e2f55d 100644
--- a/devel/glade2/Makefile.common
+++ b/devel/glade2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/05/13 15:19:27 drochner Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/05/22 20:07:51 jlam Exp $
DISTNAME= glade-2.10.0
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -16,7 +16,7 @@ PLIST_SRC= ${.CURDIR}/../../devel/glade2/PLIST
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index f498a55cb5a..97b04249662 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.72 2005/05/22 20:07:51 jlam Exp $
DISTNAME= glib-2.6.4
PKGNAME= ${DISTNAME:S/glib/glib2/}
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
USE_LIBTOOL= yes
TEST_TARGET= check
diff --git a/devel/glibmm24/Makefile b/devel/glibmm24/Makefile
index 1056ee907db..06b5f10268b 100644
--- a/devel/glibmm24/Makefile
+++ b/devel/glibmm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:24 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:51 jlam Exp $
DISTNAME= glibmm-2.4.5
PKGNAME= glibmm24-2.4.5
@@ -14,7 +14,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/glib/glibmm-2.4.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/gmp/Makefile b/devel/gmp/Makefile
index 891dbd9ad84..a8f6dd205df 100644
--- a/devel/gmp/Makefile
+++ b/devel/gmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:45:24 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:51 jlam Exp $
DISTNAME= gmp-4.1.4
PKGREVISION= 1
@@ -13,7 +13,7 @@ COMMENT= Library for arbitrary precision arithmetic
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= m4
+USE_TOOLS+= gm4
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-cxx --without-readline
diff --git a/devel/gnustep-make/gnustep.mk b/devel/gnustep-make/gnustep.mk
index 766d6ba2b4e..8fa86c0c1d9 100644
--- a/devel/gnustep-make/gnustep.mk
+++ b/devel/gnustep-make/gnustep.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gnustep.mk,v 1.3 2005/04/24 02:47:03 rh Exp $
+# $NetBSD: gnustep.mk,v 1.4 2005/05/22 20:07:51 jlam Exp $
.if !defined(GNUSTEP_MK)
GNUSTEP_MK= #defined
@@ -45,7 +45,7 @@ LDFLAGS+= ${GNUSTEP_LDFLAGS}
CPPFLAGS+= ${GNUSTEP_IFLAGS}
CFLAGS+= ${GNUSTEP_IFLAGS}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.if defined(GNUSTEP_MAKEFILE)
MAKEFILE= ${GNUSTEP_MAKEFILE}
.else
diff --git a/devel/gnustep-objc/Makefile b/devel/gnustep-objc/Makefile
index 5a4f798eac2..2e9a7bcf69d 100644
--- a/devel/gnustep-objc/Makefile
+++ b/devel/gnustep-objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:24 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:51 jlam Exp $
#
DISTNAME= gnustep-objc-1.3.0
@@ -9,7 +9,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://www.gnustep.org/
COMMENT= Objective-C runtime
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
NO_CONFIGURE= YES
diff --git a/devel/gputils/Makefile b/devel/gputils/Makefile
index 7b910fed9ae..0c0d713ce54 100644
--- a/devel/gputils/Makefile
+++ b/devel/gputils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/22 08:24:29 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:51 jlam 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_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gputils
diff --git a/devel/guile-lib/Makefile b/devel/guile-lib/Makefile
index cf0eff7365c..64382cfad86 100644
--- a/devel/guile-lib/Makefile
+++ b/devel/guile-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
DISTNAME= guile-lib-0.1.2
CATEGORIES= devel
@@ -17,7 +17,7 @@ BUILD_DIRS= ${WRKSRC}/build
CONFIGURE_SCRIPT= ../src/configure
CONFIGURE_ARGS= --prefix=${PREFIX}
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_MAKEINFO= yes
TEXINFO_REQD= 4.2
INFO_FILES= guile-library.info
diff --git a/devel/hdf/Makefile b/devel/hdf/Makefile
index ec7e43ceb43..dc9e1de0e0b 100644
--- a/devel/hdf/Makefile
+++ b/devel/hdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:52 jlam Exp $
DISTNAME= HDF4.2r1
PKGNAME= hdf-4.2r1
@@ -12,7 +12,7 @@ COMMENT= NCSA Hierarchical Data Format
#BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
#YACC= ${PREFIX}/bin/bison
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c fortran
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/hdf
diff --git a/devel/ht/Makefile b/devel/ht/Makefile
index eb12c601543..62f0334bc85 100644
--- a/devel/ht/Makefile
+++ b/devel/ht/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/12 20:19:47 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= ht-0.9.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://hte.sourceforge.net/
COMMENT= Viewer, editor and analyzer for text, binary and executable files
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= lex yacc
+USE_TOOLS+= bison lex
USE_NCURSES= # missing WA_BOLD and WA_NORMAL
LIBS+= -lm
diff --git a/devel/kdbg/Makefile b/devel/kdbg/Makefile
index 2f104165a84..8575703d15c 100644
--- a/devel/kdbg/Makefile
+++ b/devel/kdbg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.52 2005/05/22 20:07:52 jlam Exp $
DISTNAME= kdbg-1.2.10
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= Graphical User Interface around gdb using KDE
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index 3a1f1f20d56..8e6a4e831ec 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:52 jlam Exp $
DISTNAME= kdesdk-${_KDE_VERSION}
CATEGORIES= devel
@@ -10,7 +10,7 @@ CONFLICTS+= umbrello-[0-9]*
.include "../../meta-pkgs/kde3/Makefile.kde3"
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
USE_PERL5= run
REPLACE_PERL= cervisia/change_colors.pl \
diff --git a/devel/kscope/Makefile b/devel/kscope/Makefile
index 3b0c918e6ed..0d226590716 100644
--- a/devel/kscope/Makefile
+++ b/devel/kscope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= kscope-1.0
@@ -14,7 +14,7 @@ DEPENDS+= cscope>=15.4:../../devel/cscope
DEPENDS+= exctags>=5.5.4:../../devel/exctags
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index a3b832ed058..b5e20788c26 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:25 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:52 jlam Exp $
DISTNAME= ldapsdk_12311998
PKGNAME= ${DISTNAME:S/_/-/}
@@ -13,7 +13,7 @@ COMMENT= LDAP C-SDK from the Mozilla project
CONFLICTS+= openldap-[0-9]*
WRKSRC= ${WRKDIR}/mozilla
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
PKG_SYSCONFSUBDIR= ldapsdk
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index 5539a5ecb3e..5357f9ccd9e 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:52 jlam Exp $
DISTNAME= libbonobo-2.8.1
CATEGORIES= devel gnome
@@ -15,7 +15,7 @@ GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make yacc
+USE_TOOLS+= bison gmake
PKGCONFIG_OVERRIDE= bonobo/libbonobo-2.0.pc.in
PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in
diff --git a/devel/libbonoboui/Makefile b/devel/libbonoboui/Makefile
index 1e76d7cbd6a..2733c0ceb8e 100644
--- a/devel/libbonoboui/Makefile
+++ b/devel/libbonoboui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libbonoboui-2.8.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_LIBTOOL= yes
diff --git a/devel/libcfg+/Makefile b/devel/libcfg+/Makefile
index cf4287cd941..d5803e73a52 100644
--- a/devel/libcfg+/Makefile
+++ b/devel/libcfg+/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libcfg+-0.6.2
@@ -13,7 +13,7 @@ COMMENT= Command line and configuration file parsing library
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MANCOMPRESSED= yes
diff --git a/devel/libebml/Makefile b/devel/libebml/Makefile
index be4c5823024..af90ebee411 100644
--- a/devel/libebml/Makefile
+++ b/devel/libebml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/18 00:51:51 salo Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libebml-0.7.4
@@ -12,7 +12,7 @@ COMMENT= Extensible Binary Meta Language support library
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
NO_CONFIGURE= yes
diff --git a/devel/libextractor/Makefile b/devel/libextractor/Makefile
index e4b22d1c242..d1a2782798d 100644
--- a/devel/libextractor/Makefile
+++ b/devel/libextractor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libextractor-0.3.11
@@ -10,7 +10,7 @@ MAINTAINER= tv@duh.org
HOMEPAGE= http://ovmj.org/libextractor/
COMMENT= Metadata extractor for various file data types
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index e0c460b307b..d6c544b8cf1 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libglade-2.5.1
@@ -13,7 +13,7 @@ COMMENT= Runtime interpreter for GLADE GUI files (v2)
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/devel/libglademm20/Makefile b/devel/libglademm20/Makefile
index 04aaf5a2c89..b61a4d2e47b 100644
--- a/devel/libglademm20/Makefile
+++ b/devel/libglademm20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libglademm-2.2.0
@@ -17,7 +17,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libglade/libglademm-2.0.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/libglademm24/Makefile b/devel/libglademm24/Makefile
index 52b872df3bc..7a579905f9b 100644
--- a/devel/libglademm24/Makefile
+++ b/devel/libglademm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libglademm-2.4.1
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libglade/libglademm-2.4.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 369ceecde6c..f5f3468e35c 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libgnome-2.10.0
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= YES
BUILDLINK_DEPENDS.esound+= esound>=0.2.26
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_PKGINSTALL= YES
diff --git a/devel/libgnomemm20/Makefile b/devel/libgnomemm20/Makefile
index 007fc3ffef3..4a4f25e1f9d 100644
--- a/devel/libgnomemm20/Makefile
+++ b/devel/libgnomemm20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libgnomemm-2.0.1
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnome/libgnomemm-2.0.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/libgnomemm26/Makefile b/devel/libgnomemm26/Makefile
index 13172a7142a..59698e8801a 100644
--- a/devel/libgnomemm26/Makefile
+++ b/devel/libgnomemm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libgnomemm-2.6.0
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnome/libgnomemm-2.6.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index e3801154e8b..c283df8b137 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libgnomeui-2.10.0
@@ -17,7 +17,7 @@ CONFLICTS+= gnome-libs<=1.4.2nb1
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
USE_X11= yes
USE_LIBTOOL= yes
diff --git a/devel/libgnomeuimm20/Makefile b/devel/libgnomeuimm20/Makefile
index 28827481b89..1c891c637ce 100644
--- a/devel/libgnomeuimm20/Makefile
+++ b/devel/libgnomeuimm20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:26 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:52 jlam Exp $
#
DISTNAME= libgnomeuimm-2.0.0
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomeui/libgnomeuimm-2.0.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/libgnomeuimm26/Makefile b/devel/libgnomeuimm26/Makefile
index b94d81a9ed5..777e30fd822 100644
--- a/devel/libgnomeuimm26/Makefile
+++ b/devel/libgnomeuimm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:27 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= libgnomeuimm-2.6.0
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomeui/libgnomeuimm-2.6.pc.in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/devel/libiberty/Makefile b/devel/libiberty/Makefile
index baee1c70f10..985b24dd183 100644
--- a/devel/libiberty/Makefile
+++ b/devel/libiberty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:27 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= libiberty-1.0
@@ -11,7 +11,7 @@ COMMENT= This package provides the GNU liberty library of "missing" functions
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
INSTALLATION_DIRS= include lib
diff --git a/devel/libjit/Makefile b/devel/libjit/Makefile
index 823689911ec..d5312e386bc 100644
--- a/devel/libjit/Makefile
+++ b/devel/libjit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:27 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= libjit-0.0.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.southern-storm.com.au/libjit.html
COMMENT= Just-In-Time compilation functionality
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
INFO_FILES= libjit.info
diff --git a/devel/libsigc++/Makefile b/devel/libsigc++/Makefile
index b27d0be2345..6ff16e22e28 100644
--- a/devel/libsigc++/Makefile
+++ b/devel/libsigc++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/13 16:54:12 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:53 jlam Exp $
DISTNAME= libsigc++-1.2.7
CATEGORIES= devel
@@ -10,7 +10,7 @@ COMMENT= Type-safe callback system for C++ programs
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= m4 make
+USE_TOOLS+= gm4 gmake
USE_LANGUAGES= c c++
PKGCONFIG_OVERRIDE= sigc++-1.2.pc.in
diff --git a/devel/libsigc++2/Makefile b/devel/libsigc++2/Makefile
index 2cb7aa1c027..664f2ac1869 100644
--- a/devel/libsigc++2/Makefile
+++ b/devel/libsigc++2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/13 16:54:13 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:53 jlam Exp $
DISTNAME= libsigc++-2.0.11
PKGNAME= libsigc++2-2.0.11
@@ -10,7 +10,7 @@ MAINTAINER= bsieker@freenet.de
HOMEPAGE= http://libsigc.sourceforge.net/
COMMENT= Type-safe callback system for C++ programs
-USE_GNU_TOOLS+= m4 make
+USE_TOOLS+= gm4 gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/devel/libslang/Makefile b/devel/libslang/Makefile
index 32b8ee84a36..b6bef82d507 100644
--- a/devel/libslang/Makefile
+++ b/devel/libslang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/05/21 14:39:44 minskim Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= slang-1.4.9
@@ -19,7 +19,7 @@ COMMENT= Routines for rapid alpha-numeric terminal applications development
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/devel/libstroke/Makefile b/devel/libstroke/Makefile
index cb0e2158f66..b253d9c0850 100644
--- a/devel/libstroke/Makefile
+++ b/devel/libstroke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:28 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= libstroke-0.5.1
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_X11= YES
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/devel/libtecla/Makefile b/devel/libtecla/Makefile
index a1351822bb7..7b683a59a16 100644
--- a/devel/libtecla/Makefile
+++ b/devel/libtecla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:28 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:53 jlam Exp $
DISTNAME= libtecla-1.6.1
CATEGORIES= devel
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.astro.caltech.edu/~mcs/tecla/
COMMENT= Interactive command line editing facilities
WRKSRC= ${WRKDIR}/${PKGBASE}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
BUILD_TARGET= default
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 15c5e615d6e..43ae4a8b15f 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:28 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= libwnck-2.10.0
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= libwnck-1.0.pc.in
diff --git a/devel/maketool/Makefile b/devel/maketool/Makefile
index f79798cf6df..c3f98322561 100644
--- a/devel/maketool/Makefile
+++ b/devel/maketool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:28 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= maketool-0.7
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= # defined
USE_PKGLOCALEDIR= # defined
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
USE_PKGLOCALEDIR= # defined
diff --git a/devel/monotone/Makefile b/devel/monotone/Makefile
index 8e1016e30ed..e0a1aa97fec 100644
--- a/devel/monotone/Makefile
+++ b/devel/monotone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/04 12:17:59 jmmv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= monotone-0.19
@@ -13,7 +13,7 @@ GCC_REQD+= 3.0
GNU_CONFIGURE= yes
INFO_FILES= monotone.info
UNLIMIT_RESOURCES+= datasize
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_MAKEINFO= yes
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index be778ecebb8..0c06184d7af 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/05 20:12:46 adrianp Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:53 jlam Exp $
DISTNAME= nasm-0.98.39
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= General-purpose x86 assembler
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GCC_REQD+= 3.0
USE_MAKEINFO= yes
USE_PERL5= build
diff --git a/devel/nbitools/Makefile b/devel/nbitools/Makefile
index 04f27a8cd6d..c1693416096 100644
--- a/devel/nbitools/Makefile
+++ b/devel/nbitools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/08 03:14:35 minskim Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:53 jlam Exp $
#
DISTNAME= nbitools-R6.3
@@ -20,7 +20,7 @@ MAKE_ENV+= GCCCMD=gcc
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "Linux"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.endif
post-patch:
diff --git a/devel/nbitools/buildlink3.mk b/devel/nbitools/buildlink3.mk
index 298ec491884..a07fd1e6391 100644
--- a/devel/nbitools/buildlink3.mk
+++ b/devel/nbitools/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2005/01/18 17:05:21 minskim Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2005/05/22 20:07:53 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
NBITOOLS_BUILDLINK3_MK:= ${NBITOOLS_BUILDLINK3_MK}+
@@ -22,7 +22,7 @@ BUILDLINK_FILES.nbitools+= lib/itools/X11/config/*
XMKMF_CMD= ${BUILDLINK_PREFIX.nbitools}/libexec/itools/xmkmf
.if ${OPSYS} == "Linux"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.endif
.endif # NBITOOLS_BUILDLINK3_MK
diff --git a/devel/ncurses/Makefile b/devel/ncurses/Makefile
index 9326b40a0be..e48a69c93d6 100644
--- a/devel/ncurses/Makefile
+++ b/devel/ncurses/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/04/11 21:45:28 tv Exp $
+# $NetBSD: Makefile,v 1.64 2005/05/22 20:07:54 jlam Exp $
DISTNAME= ncurses-${NC_VERS}
PKGREVISION= 1
@@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --without-gpm
CONFIGURE_ARGS+= --with-manpage-format=normal
CONFIGURE_ARGS+= --with-manpage-tbl
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
USE_TBL= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/newt/Makefile b/devel/newt/Makefile
index b5205199dc1..a23a4697de3 100644
--- a/devel/newt/Makefile
+++ b/devel/newt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:54 jlam Exp $
DISTNAME= ${PKGNAME_NOREV}-5.src.rpm
PKGNAME= newt-0.51.6
@@ -13,7 +13,7 @@ COMMENT= Windowing toolkit based on libslang
BUILD_DEPENDS+= rpm2pkg>=2.0:../../pkgtools/rpm2pkg
-USE_GNU_TOOLS+= make gzcat
+USE_TOOLS+= gmake gzcat
PKGSRC_USE_TOOLS+= tar
USE_LIBTOOL= yes
diff --git a/devel/nspr/Makefile b/devel/nspr/Makefile
index f618407c6eb..2e7217e06a8 100644
--- a/devel/nspr/Makefile
+++ b/devel/nspr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:29 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:54 jlam Exp $
DISTNAME= nspr-4.4.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Platform-neutral API for system level and libc like functions
WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/nsprpub/build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-debug
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 588ae927e73..0d5ceffaf76 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:29 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:54 jlam Exp $
DISTNAME= nss-3.9.2
PKGREVISION= 2
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
WRKSRC= ${WRKDIR}/${DISTNAME}/mozilla/security/nss
USE_PERL5= build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
DIST= ${WRKSRC}/../../dist
BUILD_TARGET= nss_build_all
MAKE_ENV= BSD_LDOPTS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index 1a27a7f0226..e7d53eec754 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:29 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= oaf-0.6.10
@@ -14,7 +14,7 @@ COMMENT= New object activation framework for GNOME
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= lex yacc
+USE_TOOLS+= bison lex
USE_LIBTOOL= YES
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/devel/ode/Makefile b/devel/ode/Makefile
index b26bdae7826..0ff0adc277b 100644
--- a/devel/ode/Makefile
+++ b/devel/ode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:29 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= ode-0.039
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://opende.sourceforge.net/
COMMENT= Library for the simulation of Rigid Body Dynamics
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
do-configure:
diff --git a/devel/ogre/Makefile b/devel/ogre/Makefile
index 4eb3d3f291a..12f4d4e536e 100644
--- a/devel/ogre/Makefile
+++ b/devel/ogre/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:29 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= ogre-v0-12-1
@@ -14,7 +14,7 @@ COMMENT= Object-Oriented Graphics Rendering Engine
WRKSRC= ${WRKDIR}/ogrenew
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/devel/opencm/Makefile b/devel/opencm/Makefile
index 0ebc2d548c3..9859b8040dc 100644
--- a/devel/opencm/Makefile
+++ b/devel/opencm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/05/19 01:27:51 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= ${OPENCM_VERSION}-2-src
@@ -13,8 +13,7 @@ COMMENT= Secure, high-integrity replacement for CVS
WRKSRC= ${WRKDIR}/${OPENCM_VERSION}/base
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
-USE_TOOLS+= gzip
+USE_TOOLS+= gmake gzip
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --infodir=${PREFIX}/${INFO_DIR}
CONFIGURE_ARGS+= --with-ssl-dir=${BUILDLINK_PREFIX.openssl}
diff --git a/devel/p5-glib2/Makefile b/devel/p5-glib2/Makefile
index e7126c5db20..794f00b9a24 100644
--- a/devel/p5-glib2/Makefile
+++ b/devel/p5-glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= Glib-${DIST_VERSION}
@@ -16,7 +16,7 @@ DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PERL5_REQD= 5.8
MAKE_PARAMS+= disable-threadsafe
diff --git a/devel/pango/Makefile b/devel/pango/Makefile
index 68eb9e0f0b5..c516b0ee4e0 100644
--- a/devel/pango/Makefile
+++ b/devel/pango/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= pango-1.8.1
@@ -15,7 +15,7 @@ COMMENT= Library for layout and rendering of text
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
TEST_TARGET= check
diff --git a/devel/pilrc/Makefile b/devel/pilrc/Makefile
index 7d43d65b818..ba5adefbe32 100644
--- a/devel/pilrc/Makefile
+++ b/devel/pilrc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/19 01:25:01 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= pilrc-2.9p9
@@ -23,7 +23,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.ardiri.com/index.cfm?redir=palm&cat=pilrc
COMMENT= Generate resources for PalmOS applications from textual description
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
DOCDIR= ${PREFIX}/share/doc/html/pilrc
diff --git a/devel/popt/Makefile b/devel/popt/Makefile
index 9c3ce0aa954..2cb57ddb5a7 100644
--- a/devel/popt/Makefile
+++ b/devel/popt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= popt-1.7
@@ -20,7 +20,7 @@ BUILD_USES_MSGFMT= yes
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/devel/prc-tools/Makefile b/devel/prc-tools/Makefile
index c35d9da135a..5c563c268b5 100644
--- a/devel/prc-tools/Makefile
+++ b/devel/prc-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= prc-tools-2.2
@@ -32,7 +32,7 @@ CONFLICTS+= prc-tools-binutils-[0-9]*
CONFLICTS+= prc-tools-gcc-[0-9]*
CONFLICTS+= prc-tools-gdb-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
AUTOCONF_REQD= 2.50
USE_MAKEINFO= YES
diff --git a/devel/pwlib/Makefile b/devel/pwlib/Makefile
index 1f3a6eaa2d7..f1a8a2cfa69 100644
--- a/devel/pwlib/Makefile
+++ b/devel/pwlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/05/16 01:32:23 jlam Exp $
+# $NetBSD: Makefile,v 1.43 2005/05/22 20:07:54 jlam Exp $
DISTNAME= pwlib-v1_8_3-src
PKGNAME= pwlib-1.8.3
@@ -14,7 +14,7 @@ COMMENT= Portable Windows Libary
BUILD_DEPENDS= bison-[0-9]*:../../devel/bison
WRKSRC= ${WRKDIR}/pwlib
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGSRC_USE_TOOLS+= tar
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/devel/py-generate/Makefile b/devel/py-generate/Makefile
index 486cdc0582f..31fa2b38b59 100644
--- a/devel/py-generate/Makefile
+++ b/devel/py-generate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:37 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= generate-2.2
@@ -13,7 +13,7 @@ COMMENT= Python interface to Generate
MAKE_ENV+= MANDIR=${LOCALBASE}/man
MAKE_ENV+= BINDIR=${LOCALBASE}/bin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/devel/rapidsvn/Makefile b/devel/rapidsvn/Makefile
index 36763ddf4ca..b08aca92d19 100644
--- a/devel/rapidsvn/Makefile
+++ b/devel/rapidsvn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:54 jlam Exp $
DISTNAME= rapidsvn-0.7.0
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= epg@NetBSD.org
HOMEPAGE= http://rapidsvn.tigris.org/
COMMENT= Cross-platform Subversion GUI
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/devel/ratfor/Makefile b/devel/ratfor/Makefile
index 1ed0b4a7ee7..f062c85e26c 100644
--- a/devel/ratfor/Makefile
+++ b/devel/ratfor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/03 15:14:55 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:54 jlam 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
BUILD_TARGET= ratfor77
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/ratfor77 ${PREFIX}/bin/ratfor
diff --git a/devel/re2c/Makefile b/devel/re2c/Makefile
index 9051542b5f8..af9880ad278 100644
--- a/devel/re2c/Makefile
+++ b/devel/re2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/09/10 18:52:29 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:54 jlam Exp $
DISTNAME= re2c-0.9.3
CATEGORIES= devel
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://re2c.org/
COMMENT= Deterministic Finite State Automaton generator
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index 104e1d9613d..cb268c42f43 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= rpc2-1.26
@@ -10,7 +10,7 @@ MAINTAINER= phil@cs.wwu.edu
HOMEPAGE= http://www.coda.cs.cmu.edu/
COMMENT= CMU (Coda) remote procedure call package
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
diff --git a/devel/rsltc/Makefile b/devel/rsltc/Makefile
index fe5ee106329..1aae34f0b05 100644
--- a/devel/rsltc/Makefile
+++ b/devel/rsltc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:54 jlam Exp $
#
DISTNAME= rsltcsrc
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
DEPENDS+= gentle>=97:../../devel/gentle
MAKEFILE= make_sunos
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/rsl.2.4
do-install:
diff --git a/devel/rudiments/Makefile b/devel/rudiments/Makefile
index ed59e8fb4e0..d83e9842677 100644
--- a/devel/rudiments/Makefile
+++ b/devel/rudiments/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= rudiments-0.25.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://rudiments.sourceforge.net/
COMMENT= C++ class library for client/server/daemon applications
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/devel/rvm/Makefile b/devel/rvm/Makefile
index 25feb85c4ac..1a8cc1d6426 100644
--- a/devel/rvm/Makefile
+++ b/devel/rvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= rvm-1.10
@@ -10,7 +10,7 @@ MAINTAINER= phil@cs.wwu.edu
HOMEPAGE= http://www.coda.cs.cmu.edu/
COMMENT= Recoverable Virtual Memory
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/devel/sdcc/Makefile b/devel/sdcc/Makefile
index 88470db4641..3c53638a1e3 100644
--- a/devel/sdcc/Makefile
+++ b/devel/sdcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:07:55 jlam Exp $
DISTNAME= sdcc-2.4.0
PKGNAME= ${DISTNAME:S/-src//}
@@ -22,7 +22,7 @@ BUILD_TARGET= dep all
WRKSRC= ${WRKDIR}/${DISTNAME:S/-2.4.0//}
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/sdcc
diff --git a/devel/semantic/Makefile b/devel/semantic/Makefile
index 03dd76acba2..8135fbd18ea 100644
--- a/devel/semantic/Makefile
+++ b/devel/semantic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/04/05 22:13:43 reed Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= semantic-1.4.2
@@ -23,7 +23,7 @@ EMACS= xemacs
BUILD_ENV+= EMACS=${EMACS}
NO_CONFIGURE= # set
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INFO_FILES= semantic.info
OTHER_INFO= semantic.info-1 semantic.info-2
diff --git a/devel/splint/Makefile b/devel/splint/Makefile
index 9264f222534..b966f2e3847 100644
--- a/devel/splint/Makefile
+++ b/devel/splint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/10 16:49:59 jschauma Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:55 jlam Exp $
#
VERSION= 3.1.1
@@ -13,7 +13,7 @@ HOMEPAGE= http://lclint.cs.virginia.edu/
COMMENT= Statically check C programs
WRKSRC= ${WRKDIR}/splint-${VERSION}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
post-install:
diff --git a/devel/st/Makefile b/devel/st/Makefile
index d250a7a9015..5be18867d31 100644
--- a/devel/st/Makefile
+++ b/devel/st/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:14:55 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= st-1.5.1
@@ -12,7 +12,7 @@ COMMENT= Non-preemptive thread library for Internet applications
ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-vax
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= netbsd-debug
HTMLDIR= ${PREFIX}/share/doc/html/st
diff --git a/devel/stlport/Makefile b/devel/stlport/Makefile
index e8f7218fb44..7ee24153c5c 100644
--- a/devel/stlport/Makefile
+++ b/devel/stlport/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:38 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:55 jlam Exp $
DISTNAME= STLport-4.6
PKGNAME= stlport-4.6
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.stlport.org/
COMMENT= Complete C++ standard library
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= # defined
USE_LANGUAGES= c c++
diff --git a/devel/teem/Makefile b/devel/teem/Makefile
index f0555eaaf44..1b3c4a28f83 100644
--- a/devel/teem/Makefile
+++ b/devel/teem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= teem-1.8.0-src
@@ -10,7 +10,7 @@ MAINTAINER= jschauma@NetBSD.org
HOMEPAGE= http://teem.sourceforge.net/
COMMENT= Libraries for manipulation of Structured Scientific Data
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/devel/tla/Makefile b/devel/tla/Makefile
index 565d7439fe9..5875dd4471f 100644
--- a/devel/tla/Makefile
+++ b/devel/tla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/10 21:10:24 recht Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= tla-1.3.2
@@ -18,7 +18,7 @@ DEPENDS+= gtar-base-[0-9]*:../../archivers/gtar-base
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME}/src/=build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ../configure
diff --git a/devel/tpasm/Makefile b/devel/tpasm/Makefile
index 6d1c0002b1f..f13f71095ba 100644
--- a/devel/tpasm/Makefile
+++ b/devel/tpasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/22 08:24:31 grant Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:55 jlam 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_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/libdata/tpasm
diff --git a/devel/treecc/Makefile b/devel/treecc/Makefile
index 99b87fb4b49..69ec249f082 100644
--- a/devel/treecc/Makefile
+++ b/devel/treecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= treecc-0.3.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnu.org/projects/dotgnu/
COMMENT= DotGNU Portable.NET aspect-oriented programming tool
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= yes
INFO_FILES= treecc.info
diff --git a/devel/xdelta/Makefile b/devel/xdelta/Makefile
index aeb8c2ff14a..a78b934151f 100644
--- a/devel/xdelta/Makefile
+++ b/devel/xdelta/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= xdelta-1.1.1
@@ -12,7 +12,7 @@ COMMENT= Enhanced diff that works on binary files
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
INFO_FILES= xdelta.info
diff --git a/devel/z80-asm/Makefile b/devel/z80-asm/Makefile
index b73b8baf988..e1113cc9ee1 100644
--- a/devel/z80-asm/Makefile
+++ b/devel/z80-asm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= z80-asm-1.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://artax.karlin.mff.cuni.cz/~brain/
COMMENT= Z80 assembly code assembler and disassembler
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/z80-asm ${PREFIX}/bin/z80-asm