summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--archivers/arj/Makefile4
-rw-r--r--archivers/cabextract/Makefile4
-rw-r--r--archivers/cxunzip/Makefile4
-rw-r--r--archivers/dact/Makefile4
-rw-r--r--archivers/file-roller/Makefile4
-rw-r--r--archivers/ha/Makefile4
-rw-r--r--archivers/p7zip/Makefile4
-rw-r--r--archivers/star/Makefile4
-rw-r--r--archivers/unace/Makefile4
-rw-r--r--archivers/unzip/Makefile4
-rw-r--r--archivers/upx/Makefile4
-rw-r--r--archivers/xmill/Makefile4
-rw-r--r--audio/amarok/Makefile4
-rw-r--r--audio/audacity/Makefile4
-rw-r--r--audio/cdparanoia/Makefile4
-rw-r--r--audio/cdplayer/Makefile4
-rw-r--r--audio/cmp3/Makefile4
-rw-r--r--audio/csound4/Makefile4
-rw-r--r--audio/daapd/Makefile4
-rw-r--r--audio/darkice/Makefile4
-rw-r--r--audio/easytag/Makefile4
-rw-r--r--audio/faad2/Makefile4
-rw-r--r--audio/festival/Makefile4
-rw-r--r--audio/flac/Makefile4
-rw-r--r--audio/gkrellm-volume/Makefile4
-rw-r--r--audio/gkrellm-xmms/Makefile4
-rw-r--r--audio/gnome-speech/Makefile4
-rw-r--r--audio/gogo/Makefile4
-rw-r--r--audio/gramofile/Makefile4
-rw-r--r--audio/hydrogen/Makefile4
-rw-r--r--audio/id3ed/Makefile4
-rw-r--r--audio/id3v2/Makefile4
-rw-r--r--audio/ladspa/Makefile4
-rw-r--r--audio/lame/Makefile4
-rw-r--r--audio/libao/Makefile.common4
-rw-r--r--audio/libhydrogen/Makefile4
-rw-r--r--audio/libmikmod/Makefile4
-rw-r--r--audio/libsidplay/Makefile4
-rw-r--r--audio/liteamp/Makefile4
-rw-r--r--audio/mikmod/Makefile4
-rw-r--r--audio/mp3blaster/Makefile4
-rw-r--r--audio/muse/Makefile4
-rw-r--r--audio/musicbrainz/Makefile4
-rw-r--r--audio/nas/Makefile4
-rw-r--r--audio/nosefart/Makefile4
-rw-r--r--audio/openal/Makefile4
-rw-r--r--audio/portaudio/Makefile4
-rw-r--r--audio/rhythmbox/Makefile4
-rw-r--r--audio/rio500/Makefile4
-rw-r--r--audio/rosegarden/Makefile4
-rw-r--r--audio/sidplay/Makefile4
-rw-r--r--audio/spiralloops/Makefile4
-rw-r--r--audio/spiralsynth/Makefile4
-rw-r--r--audio/streamtuner/Makefile4
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/toolame/Makefile4
-rw-r--r--audio/tremor-tools/Makefile4
-rw-r--r--audio/tremor/Makefile4
-rw-r--r--audio/tunepimp/Makefile4
-rw-r--r--audio/wmusic/Makefile4
-rw-r--r--audio/xamp/Makefile4
-rw-r--r--audio/xmms-faad/Makefile4
-rw-r--r--audio/xmms-flac/Makefile4
-rw-r--r--audio/xmms-madspin/Makefile4
-rw-r--r--audio/xmms-neato/Makefile4
-rw-r--r--audio/xmms-wma/Makefile4
-rw-r--r--audio/xmms/Makefile.common4
-rw-r--r--audio/xmmsctrl/Makefile4
-rw-r--r--audio/xmp/Makefile4
-rw-r--r--audio/xsidplay/Makefile4
-rw-r--r--audio/yamt/Makefile4
-rw-r--r--benchmarks/benchfft/Makefile4
-rw-r--r--benchmarks/bonnie++/Makefile4
-rw-r--r--benchmarks/httperf/Makefile4
-rw-r--r--benchmarks/lmbench/Makefile4
-rw-r--r--benchmarks/postal/Makefile4
-rw-r--r--biology/chemtool/Makefile4
-rw-r--r--biology/mummer/Makefile4
-rw-r--r--biology/nut/Makefile4
-rw-r--r--cad/boolean/Makefile4
-rw-r--r--cad/covered-current/Makefile4
-rw-r--r--cad/covered/Makefile4
-rw-r--r--cad/dinotrace/Makefile4
-rw-r--r--cad/geda-examples/Makefile4
-rw-r--r--cad/geda-symbols/Makefile4
-rw-r--r--cad/gerbv/Makefile4
-rw-r--r--cad/gnetlist/Makefile4
-rw-r--r--cad/gnucap/Makefile4
-rw-r--r--cad/gsmc/Makefile4
-rw-r--r--cad/ipal-current/Makefile4
-rw-r--r--cad/magic/Makefile4
-rw-r--r--cad/ng-spice/Makefile4
-rw-r--r--cad/pcb-current/Makefile4
-rw-r--r--cad/tkgate/Makefile4
-rw-r--r--cad/tnt-mmtl/Makefile4
-rw-r--r--cad/transcalc/Makefile4
-rw-r--r--cad/verilog-current/Makefile4
-rw-r--r--cad/verilog/Makefile4
-rw-r--r--cad/vipec/Makefile4
-rw-r--r--chat/bitlbee/Makefile4
-rw-r--r--chat/centericq/Makefile4
-rw-r--r--chat/ekg/Makefile4
-rw-r--r--chat/fisg/Makefile4
-rw-r--r--chat/gaim-encryption/Makefile4
-rw-r--r--chat/gaim-otr/Makefile4
-rw-r--r--chat/gaim/Makefile4
-rw-r--r--chat/gg2/Makefile4
-rw-r--r--chat/gnomeicu/Makefile4
-rw-r--r--chat/gossip/Makefile4
-rw-r--r--chat/gtkyahoo/Makefile4
-rw-r--r--chat/icqlib/Makefile4
-rw-r--r--chat/ircservices/Makefile6
-rw-r--r--chat/jabberd/Makefile4
-rw-r--r--chat/kadu/Makefile4
-rw-r--r--chat/kmess/Makefile4
-rw-r--r--chat/loudmouth/Makefile4
-rw-r--r--chat/micq/Makefile4
-rw-r--r--chat/mu-conference/Makefile4
-rw-r--r--chat/navi2ch/Makefile4
-rw-r--r--chat/ninja/Makefile4
-rw-r--r--chat/psi/Makefile4
-rw-r--r--chat/quirc/Makefile4
-rw-r--r--chat/ser/Makefile4
-rw-r--r--chat/silc-client/Makefile4
-rw-r--r--chat/xaric/Makefile4
-rw-r--r--chat/xchat-systray-integration/Makefile4
-rw-r--r--chat/xchat/Makefile.common5
-rw-r--r--chat/xchat2/Makefile.common4
-rw-r--r--comms/asterisk/Makefile4
-rw-r--r--comms/fidogate/Makefile4
-rw-r--r--comms/gsmlib/Makefile4
-rw-r--r--comms/jpilot-syncmal/Makefile4
-rw-r--r--comms/libmal/Makefile4
-rw-r--r--comms/malsync/Makefile4
-rw-r--r--comms/minicom/Makefile4
-rw-r--r--comms/openobex/Makefile4
-rw-r--r--comms/p5-pilot-link/Makefile4
-rw-r--r--comms/pilot-link/Makefile4
-rw-r--r--comms/plp/Makefile4
-rw-r--r--comms/plptools/Makefile4
-rw-r--r--comms/scmxx/Makefile4
-rw-r--r--converters/autoconvert/Makefile4
-rw-r--r--converters/cn2jp/Makefile4
-rw-r--r--converters/macfork/Makefile4
-rw-r--r--converters/rss2html/Makefile4
-rw-r--r--converters/wv/Makefile4
-rw-r--r--converters/xlhtml/Makefile4
-rw-r--r--cross/COMMON/cross.mk4
-rw-r--r--cross/avr-binutils/Makefile4
-rw-r--r--cross/avr-gcc/Makefile4
-rw-r--r--cross/avr-gdb/Makefile4
-rw-r--r--cross/binutils/Makefile4
-rw-r--r--cross/h8300-hms-binutils/Makefile4
-rw-r--r--cross/h8300-hms-gcc/Makefile4
-rw-r--r--cross/i386-mingw32/Makefile4
-rw-r--r--cross/mipsEEel-netbsd/Makefile4
-rw-r--r--databases/db/Makefile4
-rw-r--r--databases/freetds/Makefile4
-rw-r--r--databases/geneweb/Makefile4
-rw-r--r--databases/gnats/Makefile4
-rw-r--r--databases/guile-pg/Makefile4
-rw-r--r--databases/jdbc-postgresql/Makefile4
-rw-r--r--databases/jdbc-postgresql74/Makefile4
-rw-r--r--databases/lbdb/Makefile4
-rw-r--r--databases/libgda/Makefile.common4
-rw-r--r--databases/libgnomedb/Makefile4
-rw-r--r--databases/mergeant/Makefile4
-rw-r--r--databases/myodbc/Makefile4
-rw-r--r--databases/mysql-client/Makefile.common4
-rw-r--r--databases/mysql4-client/Makefile.common4
-rw-r--r--databases/odbc-postgresql/Makefile.common4
-rw-r--r--databases/postgresql73/Makefile.common4
-rw-r--r--databases/postgresql74/Makefile.common4
-rw-r--r--databases/postgresql80/Makefile.common4
-rw-r--r--databases/pxtools/Makefile4
-rw-r--r--databases/py-gdbm/Makefile4
-rw-r--r--databases/py-pgnotify/Makefile4
-rw-r--r--databases/py-postgresql/Makefile4
-rw-r--r--databases/py-table/Makefile4
-rw-r--r--databases/rrdtool/Makefile4
-rw-r--r--databases/sqlite/Makefile4
-rw-r--r--databases/sqlite3/Makefile.common4
-rw-r--r--databases/sqlrelay/Makefile4
-rw-r--r--databases/tdb/Makefile4
-rw-r--r--databases/xsqlmenu/Makefile4
-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
-rw-r--r--editors/TeXmacs/Makefile4
-rw-r--r--editors/abiword/Makefile.common4
-rw-r--r--editors/biew/Makefile4
-rw-r--r--editors/conglomerate/Makefile4
-rw-r--r--editors/cooledit/Makefile4
-rw-r--r--editors/dasher/Makefile4
-rw-r--r--editors/emacs-nox11/Makefile4
-rw-r--r--editors/emacs/Makefile4
-rw-r--r--editors/emacs20/Makefile4
-rw-r--r--editors/gconf-editor/Makefile4
-rw-r--r--editors/gedit/Makefile4
-rw-r--r--editors/gice/Makefile4
-rw-r--r--editors/gtranslator/Makefile4
-rw-r--r--editors/hnb/Makefile4
-rw-r--r--editors/joe/Makefile4
-rw-r--r--editors/kile/Makefile4
-rw-r--r--editors/leim/Makefile4
-rw-r--r--editors/leim20/Makefile4
-rw-r--r--editors/lpe/Makefile4
-rw-r--r--editors/lyx-qt/Makefile.common4
-rw-r--r--editors/mlview/Makefile4
-rw-r--r--editors/mule/Makefile4
-rw-r--r--editors/poedit/Makefile4
-rw-r--r--editors/speedbar/Makefile4
-rw-r--r--editors/xwpe/Makefile4
-rw-r--r--editors/yudit/Makefile4
-rw-r--r--emulators/BasiliskII/Makefile4
-rw-r--r--emulators/DatLib/Makefile4
-rw-r--r--emulators/DatUtil/Makefile4
-rw-r--r--emulators/MAMEDiff/Makefile4
-rw-r--r--emulators/ROMBuild/Makefile4
-rw-r--r--emulators/ROMInfo/Makefile4
-rw-r--r--emulators/ZIPIdent/Makefile4
-rw-r--r--emulators/aranym/Makefile4
-rw-r--r--emulators/arcem/Makefile4
-rw-r--r--emulators/atari800/Makefile4
-rw-r--r--emulators/bochs/Makefile4
-rw-r--r--emulators/darcnes/Makefile.common4
-rw-r--r--emulators/dega/Makefile4
-rw-r--r--emulators/dgen/Makefile4
-rw-r--r--emulators/gcube/Makefile4
-rw-r--r--emulators/gens/Makefile4
-rw-r--r--emulators/gpsim-devel/Makefile4
-rw-r--r--emulators/gpsim/Makefile4
-rw-r--r--emulators/hatari/Makefile4
-rw-r--r--emulators/hercules/Makefile4
-rw-r--r--emulators/ia64sim/Makefile4
-rw-r--r--emulators/openmsx/Makefile4
-rw-r--r--emulators/p11/Makefile4
-rw-r--r--emulators/palmosemulator/Makefile4
-rw-r--r--emulators/qemu/Makefile4
-rw-r--r--emulators/raine/Makefile4
-rw-r--r--emulators/snes9x/Makefile4
-rw-r--r--emulators/spim/Makefile4
-rw-r--r--emulators/stella/Makefile4
-rw-r--r--emulators/tme/Makefile4
-rw-r--r--emulators/tuxnes/Makefile4
-rw-r--r--emulators/twin/Makefile4
-rw-r--r--emulators/uae/Makefile4
-rw-r--r--emulators/vba/Makefile4
-rw-r--r--emulators/vice/Makefile4
-rw-r--r--emulators/wine/Makefile4
-rw-r--r--emulators/winelib/Makefile4
-rw-r--r--emulators/xmame/Makefile4
-rw-r--r--emulators/xmess/Makefile4
-rw-r--r--emulators/zsnes/Makefile4
-rw-r--r--finance/emma/Makefile4
-rw-r--r--finance/gnofin/Makefile4
-rw-r--r--finance/gnucash-docs/Makefile4
-rw-r--r--finance/gnucash/Makefile4
-rw-r--r--finance/kmymoney2/Makefile4
-rw-r--r--fonts/Xft2/Makefile5
-rw-r--r--fonts/chkfontpath/Makefile4
-rw-r--r--fonts/ec-fonts-mftraced/Makefile4
-rw-r--r--fonts/fontconfig/Makefile4
-rw-r--r--fonts/fontforge/Makefile4
-rw-r--r--fonts/gucharmap/Makefile4
-rw-r--r--fonts/ja-elisau/Makefile4
-rw-r--r--fonts/ja-shinonome/Makefile4
-rw-r--r--fonts/mftrace/Makefile4
-rw-r--r--fonts/oto/Makefile4
-rw-r--r--fonts/pcf2bdf/Makefile4
-rw-r--r--fonts/t1lib/Makefile4
-rw-r--r--fonts/ttmkfdir2/Makefile4
-rw-r--r--games/KoboDeluxe/Makefile4
-rw-r--r--games/abuse/Makefile4
-rw-r--r--games/asc/Makefile4
-rw-r--r--games/boson/Makefile4
-rw-r--r--games/bzflag/Makefile4
-rw-r--r--games/cbzone/Makefile4
-rw-r--r--games/copter-commander/Makefile4
-rw-r--r--games/corewars/Makefile4
-rw-r--r--games/craft/Makefile4
-rw-r--r--games/crimsonfields/Makefile4
-rw-r--r--games/criticalmass/Makefile4
-rw-r--r--games/crossfire-cli/Makefile4
-rw-r--r--games/crossfire-srv/Makefile4
-rw-r--r--games/cube/Makefile4
-rw-r--r--games/d2x/Makefile4
-rw-r--r--games/defendguin/Makefile4
-rw-r--r--games/digger/Makefile4
-rw-r--r--games/dopewars/Makefile4
-rw-r--r--games/enigma/Makefile4
-rw-r--r--games/falcons-eye/Makefile4
-rw-r--r--games/fkiss/Makefile4
-rw-r--r--games/foobillard/Makefile4
-rw-r--r--games/frozen-bubble/Makefile4
-rw-r--r--games/gemdropx/Makefile4
-rw-r--r--games/glaxium/Makefile4
-rw-r--r--games/gnocatan/Makefile4
-rw-r--r--games/gnome2-games/Makefile4
-rw-r--r--games/gnuchess/Makefile4
-rw-r--r--games/gnugo/Makefile4
-rw-r--r--games/gtetrinet/Makefile4
-rw-r--r--games/gtkballs/Makefile4
-rw-r--r--games/gtkmagnetic/Makefile4
-rw-r--r--games/gturing/Makefile4
-rw-r--r--games/hugo/Makefile4
-rw-r--r--games/icebreaker/Makefile4
-rw-r--r--games/kajaani-kombat/Makefile4
-rw-r--r--games/kapooka/Makefile4
-rw-r--r--games/ketm/Makefile4
-rw-r--r--games/knights/Makefile4
-rw-r--r--games/lincity/Makefile4
-rw-r--r--games/mirrormagic-sdl/Makefile4
-rw-r--r--games/mirrormagic/Makefile4
-rw-r--r--games/nagi/Makefile4
-rw-r--r--games/netris/Makefile4
-rw-r--r--games/neverball/Makefile4
-rw-r--r--games/nighthawk/Makefile4
-rw-r--r--games/openmortal/Makefile4
-rw-r--r--games/openttd/Makefile4
-rw-r--r--games/pag/Makefile4
-rw-r--r--games/powwow/Makefile4
-rw-r--r--games/qnetwalk/Makefile4
-rw-r--r--games/quake/Makefile4
-rw-r--r--games/quake2forge/Makefile4
-rw-r--r--games/quake6/Makefile4
-rw-r--r--games/quakeforge/Makefile4
-rw-r--r--games/rocksndiamonds/Makefile.common4
-rw-r--r--games/sarien/Makefile4
-rw-r--r--games/scid/Makefile4
-rw-r--r--games/scummvm/Makefile4
-rw-r--r--games/sirius/Makefile4
-rw-r--r--games/starfighter/Makefile4
-rw-r--r--games/stratagus/Makefile4
-rw-r--r--games/tileworld/Makefile5
-rw-r--r--games/tuxmath/Makefile4
-rw-r--r--games/wormz/Makefile4
-rw-r--r--games/wxhugo/Makefile4
-rw-r--r--games/xarchon/Makefile4
-rw-r--r--games/xbomb/Makefile4
-rw-r--r--games/xconq/Makefile4
-rw-r--r--games/xdoom/Makefile4
-rw-r--r--games/xfreecell/Makefile4
-rw-r--r--games/xfrisk/Makefile4
-rw-r--r--games/xnibbles/Makefile4
-rw-r--r--games/xpuyopuyo/Makefile4
-rw-r--r--games/xracer/Makefile4
-rw-r--r--games/xrick/Makefile4
-rw-r--r--games/zoom/Makefile4
-rw-r--r--graphics/3DKit/Makefile.common4
-rw-r--r--graphics/ImageMagick/Makefile4
-rw-r--r--graphics/Ngraph/Makefile4
-rw-r--r--graphics/aqsis/Makefile4
-rw-r--r--graphics/blender/Makefile4
-rw-r--r--graphics/camlimages/Makefile4
-rw-r--r--graphics/compface/Makefile4
-rw-r--r--graphics/dia/Makefile.common4
-rw-r--r--graphics/digikam/Makefile4
-rw-r--r--graphics/digikamimageplugins/Makefile4
-rw-r--r--graphics/dvdview/Makefile4
-rw-r--r--graphics/dx/Makefile5
-rw-r--r--graphics/dxsamples/Makefile4
-rw-r--r--graphics/eog2/Makefile4
-rw-r--r--graphics/exiv2/Makefile4
-rw-r--r--graphics/freetype2/Makefile4
-rw-r--r--graphics/g3d/Makefile4
-rw-r--r--graphics/gdk-pixbuf/Makefile.common4
-rw-r--r--graphics/gfract/Makefile4
-rw-r--r--graphics/gimageview/Makefile4
-rw-r--r--graphics/gimp-docs/Makefile4
-rw-r--r--graphics/gimp-ufraw/Makefile4
-rw-r--r--graphics/gimp/Makefile4
-rw-r--r--graphics/gimp1-base/Makefile4
-rw-r--r--graphics/gimp1-wideangle/Makefile4
-rw-r--r--graphics/giram/Makefile4
-rw-r--r--graphics/gliv/Makefile4
-rw-r--r--graphics/gnome-backgrounds/Makefile4
-rw-r--r--graphics/gnome-icon-theme/Makefile4
-rw-r--r--graphics/gnome-iconedit/Makefile4
-rw-r--r--graphics/gpaint/Makefile4
-rw-r--r--graphics/gri/Makefile4
-rw-r--r--graphics/gtkglext/Makefile4
-rw-r--r--graphics/gtksee/Makefile4
-rw-r--r--graphics/gwenview/Makefile4
-rw-r--r--graphics/hermes/Makefile4
-rw-r--r--graphics/hicolor-icon-theme/Makefile4
-rw-r--r--graphics/imlib/Makefile4
-rw-r--r--graphics/inkscape/Makefile4
-rw-r--r--graphics/kbarcode/Makefile4
-rw-r--r--graphics/kipi-plugins/Makefile4
-rw-r--r--graphics/kphotobook/Makefile4
-rw-r--r--graphics/kphotools/Makefile4
-rw-r--r--graphics/libgdiplus/Makefile4
-rw-r--r--graphics/libgnomecanvas/Makefile4
-rw-r--r--graphics/libgnomecanvasmm20/Makefile4
-rw-r--r--graphics/libgnomecanvasmm26/Makefile4
-rw-r--r--graphics/libkexif/Makefile4
-rw-r--r--graphics/libkipi/Makefile4
-rw-r--r--graphics/metacam/Makefile4
-rw-r--r--graphics/mgl/Makefile4
-rw-r--r--graphics/netpbm/Makefile4
-rw-r--r--graphics/openexr/Makefile4
-rw-r--r--graphics/pixieplus/Makefile4
-rw-r--r--graphics/plotutils-nox11/Makefile4
-rw-r--r--graphics/py-gdchart/Makefile4
-rw-r--r--graphics/qiv/Makefile4
-rw-r--r--graphics/resize_image/Makefile4
-rw-r--r--graphics/sane-backends/Makefile.common4
-rw-r--r--graphics/scigraphica/Makefile4
-rw-r--r--graphics/showimg/Makefile4
-rw-r--r--graphics/sodipodi/Makefile4
-rw-r--r--graphics/tuxpaint-config/Makefile4
-rw-r--r--graphics/tuxpaint/Makefile4
-rw-r--r--graphics/wmphoto/Makefile4
-rw-r--r--graphics/xbmbrowser/Makefile4
-rw-r--r--graphics/xpaint/Makefile4
-rw-r--r--graphics/xsane/Makefile4
-rw-r--r--graphics/xzgv/Makefile4
-rw-r--r--ham/7plus/Makefile4
-rw-r--r--ham/cwtext/Makefile4
-rw-r--r--ham/dpbox/Makefile4
-rw-r--r--ham/gmfsk/Makefile4
-rw-r--r--ham/grig/Makefile4
-rw-r--r--ham/hamlib/Makefile4
-rw-r--r--ham/linpsk/Makefile4
-rw-r--r--ham/tfkiss/Makefile4
-rw-r--r--ham/tlf/Makefile4
-rw-r--r--ham/tnt/Makefile4
-rw-r--r--ham/xdx/Makefile4
-rw-r--r--ham/xlog/Makefile4
-rw-r--r--inputmethod/anthy/Makefile4
-rw-r--r--inputmethod/imhangul_status_applet/Makefile4
-rw-r--r--inputmethod/tc/Makefile4
-rw-r--r--inputmethod/uim/Makefile4
-rw-r--r--lang/ccsh/Makefile4
-rw-r--r--lang/cdl3/Makefile4
-rw-r--r--lang/chicken/Makefile4
-rw-r--r--lang/classpath/Makefile.common4
-rw-r--r--lang/coq/Makefile4
-rw-r--r--lang/drscheme/Makefile4
-rw-r--r--lang/dylan-interpreter/Makefile.common4
-rw-r--r--lang/eieio/Makefile4
-rw-r--r--lang/erlang/Makefile4
-rw-r--r--lang/ezm3/Makefile4
-rw-r--r--lang/gcc-ssp/Makefile4
-rw-r--r--lang/gcc/Makefile4
-rw-r--r--lang/gcc3/Makefile.common4
-rw-r--r--lang/gcc34-ada/Makefile4
-rw-r--r--lang/gcc34/Makefile4
-rw-r--r--lang/ghc/Makefile4
-rw-r--r--lang/gpc/Makefile4
-rw-r--r--lang/guile/Makefile4
-rw-r--r--lang/guile14/Makefile4
-rw-r--r--lang/inform/Makefile4
-rw-r--r--lang/japhar/Makefile4
-rw-r--r--lang/jdk-openjit/Makefile.common4
-rw-r--r--lang/jikes/Makefile4
-rw-r--r--lang/kaffe/Makefile.common4
-rw-r--r--lang/librep/Makefile4
-rw-r--r--lang/mercury/Makefile4
-rw-r--r--lang/mono/Makefile4
-rw-r--r--lang/nhc98/Makefile4
-rw-r--r--lang/objc/Makefile5
-rw-r--r--lang/ocaml/Makefile.common4
-rw-r--r--lang/oo2c/Makefile4
-rw-r--r--lang/perl58/Makefile4
-rw-r--r--lang/pforth/Makefile4
-rw-r--r--lang/php5/Makefile4
-rw-r--r--lang/pnet/Makefile4
-rw-r--r--lang/pnetC/Makefile4
-rw-r--r--lang/pnetlib/Makefile.common4
-rw-r--r--lang/py-basicproperty/Makefile4
-rw-r--r--lang/rexx-regina/Makefile4
-rw-r--r--lang/sablevm-classpath/Makefile.common4
-rw-r--r--lang/sablevm/Makefile4
-rw-r--r--lang/sather/Makefile4
-rw-r--r--lang/scm/Makefile4
-rw-r--r--lang/smalltalk/Makefile4
-rw-r--r--lang/smlnj/Makefile4
-rw-r--r--lang/swi-prolog-packages/Makefile4
-rw-r--r--lang/vscm/Makefile4
-rw-r--r--mail/balsa2/Makefile4
-rw-r--r--mail/courier-imap/Makefile4
-rw-r--r--mail/courier-maildir/Makefile4
-rw-r--r--mail/dbmail/Makefile4
-rw-r--r--mail/evolution-data-server/Makefile4
-rw-r--r--mail/evolution/Makefile4
-rw-r--r--mail/evolution12/Makefile4
-rw-r--r--mail/evolution14/Makefile4
-rw-r--r--mail/gmime/Makefile4
-rw-r--r--mail/ifile/Makefile4
-rw-r--r--mail/kbiff/Makefile4
-rw-r--r--mail/libesmtp/Makefile4
-rw-r--r--mail/mail-notification/Makefile4
-rw-r--r--mail/maildrop/Makefile4
-rw-r--r--mail/mailsync/Makefile4
-rw-r--r--mail/prayer/Makefile4
-rw-r--r--mail/pulsar/Makefile4
-rw-r--r--mail/qmail/options.mk4
-rw-r--r--mail/sendmail/Makefile.common4
-rw-r--r--mail/sendmail812/Makefile.common4
-rw-r--r--mail/sigrot/Makefile4
-rw-r--r--mail/spruce/Makefile4
-rw-r--r--mail/sqwebmail/Makefile5
-rw-r--r--mail/ssmtp/Makefile4
-rw-r--r--mail/sylpheed-claws/Makefile.common4
-rw-r--r--mail/sylpheed-devel/Makefile4
-rw-r--r--mail/sylpheed/Makefile4
-rw-r--r--mail/wmbiff/Makefile4
-rw-r--r--mail/wmmail/Makefile4
-rw-r--r--mail/ximian-connector/Makefile4
-rw-r--r--math/R/Makefile5
-rw-r--r--math/blitz++/Makefile4
-rw-r--r--math/capc-calc/Makefile4
-rw-r--r--math/cln/Makefile4
-rw-r--r--math/eukleides/Makefile4
-rw-r--r--math/fftw/Makefile4
-rw-r--r--math/fftw2/Makefile4
-rw-r--r--math/galculator/Makefile4
-rw-r--r--math/gcalctool/Makefile4
-rw-r--r--math/glpk/Makefile4
-rw-r--r--math/gnumeric/Makefile4
-rw-r--r--math/gnumeric14/Makefile4
-rw-r--r--math/grace/Makefile4
-rw-r--r--math/guppi/Makefile4
-rw-r--r--math/libffm/Makefile4
-rw-r--r--math/octave-current/Makefile4
-rw-r--r--math/octave-forge/Makefile4
-rw-r--r--math/octave/Makefile4
-rw-r--r--math/qalculate/Makefile4
-rw-r--r--math/vista/Makefile4
-rw-r--r--math/xeukleides/Makefile4
-rw-r--r--math/yacas/Makefile4
-rw-r--r--mbone/mdp/Makefile4
-rw-r--r--mbone/nte/Makefile4
-rw-r--r--mbone/rat/Makefile4
-rw-r--r--mbone/sdr/Makefile4
-rw-r--r--meta-pkgs/XFree86/Makefile.common4
-rw-r--r--meta-pkgs/kde3/Makefile.kde34
-rw-r--r--meta-pkgs/xfce4/Makefile.common4
-rw-r--r--meta-pkgs/xorg/Makefile.common4
-rw-r--r--misc/bottlerocket/Makefile4
-rw-r--r--misc/celestia/Makefile.common4
-rw-r--r--misc/cuecat/Makefile4
-rw-r--r--misc/cuetools/Makefile4
-rw-r--r--misc/dialog/Makefile4
-rw-r--r--misc/dpkg/Makefile4
-rw-r--r--misc/elizatalk/Makefile4
-rw-r--r--misc/getopt/Makefile4
-rw-r--r--misc/gkrellm-flynn/Makefile4
-rw-r--r--misc/gkrellm-weather/Makefile4
-rw-r--r--misc/gnome2-user-docs/Makefile4
-rw-r--r--misc/gnome2-utils/Makefile4
-rw-r--r--misc/gok/Makefile4
-rw-r--r--misc/gperiodic/Makefile4
-rw-r--r--misc/gxmame/Makefile4
-rw-r--r--misc/kanjipad/Makefile4
-rw-r--r--misc/kdepim3/Makefile4
-rw-r--r--misc/koffice-i18n-af/Makefile4
-rw-r--r--misc/koffice-i18n-bg/Makefile4
-rw-r--r--misc/koffice-i18n-br/Makefile4
-rw-r--r--misc/koffice-i18n-ca/Makefile4
-rw-r--r--misc/koffice-i18n-cs/Makefile4
-rw-r--r--misc/koffice-i18n-cy/Makefile4
-rw-r--r--misc/koffice-i18n-da/Makefile4
-rw-r--r--misc/koffice-i18n-de/Makefile4
-rw-r--r--misc/koffice-i18n-el/Makefile4
-rw-r--r--misc/koffice-i18n-en_GB/Makefile4
-rw-r--r--misc/koffice-i18n-eo/Makefile4
-rw-r--r--misc/koffice-i18n-es/Makefile4
-rw-r--r--misc/koffice-i18n-et/Makefile4
-rw-r--r--misc/koffice-i18n-fa/Makefile4
-rw-r--r--misc/koffice-i18n-fi/Makefile4
-rw-r--r--misc/koffice-i18n-fr/Makefile4
-rw-r--r--misc/koffice-i18n-he/Makefile4
-rw-r--r--misc/koffice-i18n-hsb/Makefile4
-rw-r--r--misc/koffice-i18n-hu/Makefile4
-rw-r--r--misc/koffice-i18n-it/Makefile4
-rw-r--r--misc/koffice-i18n-ja/Makefile4
-rw-r--r--misc/koffice-i18n-lo/Makefile4
-rw-r--r--misc/koffice-i18n-mt/Makefile4
-rw-r--r--misc/koffice-i18n-nb/Makefile4
-rw-r--r--misc/koffice-i18n-nl/Makefile4
-rw-r--r--misc/koffice-i18n-nn/Makefile4
-rw-r--r--misc/koffice-i18n-pl/Makefile4
-rw-r--r--misc/koffice-i18n-pt/Makefile4
-rw-r--r--misc/koffice-i18n-pt_BR/Makefile4
-rw-r--r--misc/koffice-i18n-ru/Makefile4
-rw-r--r--misc/koffice-i18n-se/Makefile4
-rw-r--r--misc/koffice-i18n-sk/Makefile4
-rw-r--r--misc/koffice-i18n-sl/Makefile4
-rw-r--r--misc/koffice-i18n-sr/Makefile4
-rw-r--r--misc/koffice-i18n-sv/Makefile4
-rw-r--r--misc/koffice-i18n-tg/Makefile4
-rw-r--r--misc/koffice-i18n-th/Makefile4
-rw-r--r--misc/koffice-i18n-tr/Makefile4
-rw-r--r--misc/koffice-i18n-ven/Makefile4
-rw-r--r--misc/koffice-i18n-xh/Makefile4
-rw-r--r--misc/koffice-i18n-zh_CN/Makefile4
-rw-r--r--misc/koffice-i18n-zh_TW/Makefile4
-rw-r--r--misc/koffice-i18n-zu/Makefile4
-rw-r--r--misc/koffice/Makefile4
-rw-r--r--misc/nxtvepg/Makefile4
-rw-r--r--misc/openoffice/Makefile4
-rw-r--r--misc/pdmenu/Makefile4
-rw-r--r--misc/proj/Makefile4
-rw-r--r--misc/qbrew/Makefile4
-rw-r--r--misc/root/Makefile4
-rw-r--r--misc/rpm/Makefile4
-rw-r--r--misc/siag/Makefile4
-rw-r--r--misc/stellarium/Makefile4
-rw-r--r--misc/yelp/Makefile4
-rw-r--r--mk/tools/replace.mk9
-rw-r--r--multimedia/alevt/Makefile4
-rw-r--r--multimedia/avidemux/Makefile4
-rw-r--r--multimedia/dvdauthor/Makefile4
-rw-r--r--multimedia/ffmpeg/Makefile4
-rw-r--r--multimedia/fxtv/Makefile4
-rw-r--r--multimedia/gmencoder/Makefile4
-rw-r--r--multimedia/gnome2-media/Makefile4
-rw-r--r--multimedia/gst-plugins/Makefile.common4
-rw-r--r--multimedia/gstreamer/Makefile4
-rw-r--r--multimedia/kmplayer/Makefile4
-rw-r--r--multimedia/libassetml/Makefile4
-rw-r--r--multimedia/libdvbpsi/Makefile4
-rw-r--r--multimedia/libdvdplay/Makefile4
-rw-r--r--multimedia/libdvdread/Makefile4
-rw-r--r--multimedia/libmatroska/Makefile4
-rw-r--r--multimedia/libmpeg2/Makefile4
-rw-r--r--multimedia/libmpeg3/Makefile4
-rw-r--r--multimedia/mjpegtools/Makefile4
-rw-r--r--multimedia/mkvtoolnix/Makefile4
-rw-r--r--multimedia/mmg/Makefile4
-rw-r--r--multimedia/mpeg_encode/Makefile4
-rw-r--r--multimedia/mplayer-plugin-firefox/Makefile.common4
-rw-r--r--multimedia/mplayer-share/Makefile.common4
-rw-r--r--multimedia/mplex/Makefile4
-rw-r--r--multimedia/ogle/Makefile4
-rw-r--r--multimedia/ogle_gui/Makefile4
-rw-r--r--multimedia/openquicktime/Makefile4
-rw-r--r--multimedia/smpeg-xmms/Makefile4
-rw-r--r--multimedia/smpeg/Makefile4
-rw-r--r--multimedia/totem/Makefile.common4
-rw-r--r--multimedia/transcode/Makefile4
-rw-r--r--multimedia/vlc/Makefile4
-rw-r--r--multimedia/vls/Makefile4
-rw-r--r--multimedia/xawtv/Makefile4
-rw-r--r--multimedia/xine-lib/Makefile.common4
-rw-r--r--net/ORBit/Makefile4
-rw-r--r--net/ORBit2/Makefile4
-rw-r--r--net/adns/Makefile4
-rw-r--r--net/amule/Makefile4
-rw-r--r--net/bmon/Makefile4
-rw-r--r--net/boinc3-seti/Makefile4
-rw-r--r--net/bug-buddy/Makefile4
-rw-r--r--net/chrony/Makefile4
-rw-r--r--net/dc_gui2/Makefile4
-rw-r--r--net/dctc/Makefile4
-rw-r--r--net/docsis/Makefile4
-rw-r--r--net/entropy/Makefile4
-rw-r--r--net/etherape/Makefile4
-rw-r--r--net/flan/Makefile4
-rw-r--r--net/freenet-tools/Makefile4
-rw-r--r--net/freeradius/Makefile4
-rw-r--r--net/ftplibpp/Makefile4
-rw-r--r--net/gini/Makefile4
-rw-r--r--net/gkrellm-ping/Makefile4
-rw-r--r--net/gkrellm-wireless/Makefile4
-rw-r--r--net/gkrellm1-snmp/Makefile4
-rw-r--r--net/gkrellm1-wireless/Makefile4
-rw-r--r--net/gnome-netstatus/Makefile4
-rw-r--r--net/gnugk/Makefile4
-rw-r--r--net/gopher/Makefile4
-rw-r--r--net/gtk-gnutella/Makefile4
-rw-r--r--net/gtk_wicontrol/Makefile4
-rw-r--r--net/hobbitmon/Makefile4
-rw-r--r--net/iplog/Makefile4
-rw-r--r--net/ipv6calc/Makefile4
-rw-r--r--net/ishell/Makefile4
-rw-r--r--net/kphone/Makefile4
-rw-r--r--net/libIDL/Makefile4
-rw-r--r--net/libdnet/Makefile4
-rw-r--r--net/libpcap/Makefile4
-rw-r--r--net/lopster/Makefile4
-rw-r--r--net/mDNSResponder/Makefile4
-rw-r--r--net/md-whois/Makefile4
-rw-r--r--net/mldonkey/Makefile.common4
-rw-r--r--net/mtr-gtk/Makefile4
-rw-r--r--net/mtr/Makefile4
-rw-r--r--net/netatalk/Makefile4
-rw-r--r--net/netatalk1/Makefile4
-rw-r--r--net/netsaint-base/Makefile.common4
-rw-r--r--net/nprobe/Makefile4
-rw-r--r--net/ntop/Makefile4
-rw-r--r--net/openh323/Makefile4
-rw-r--r--net/openslp/Makefile4
-rw-r--r--net/polsms/Makefile4
-rw-r--r--net/poptop/Makefile4
-rw-r--r--net/pppd/Makefile4
-rw-r--r--net/proftpd/Makefile4
-rw-r--r--net/py-ORBit/Makefile4
-rw-r--r--net/quagga/Makefile4
-rw-r--r--net/rp-l2tp/Makefile4
-rw-r--r--net/socket++/Makefile4
-rw-r--r--net/tightvnc/Makefile4
-rw-r--r--net/torrentutils/Makefile4
-rw-r--r--net/tsclient/Makefile4
-rw-r--r--net/tsocks/Makefile4
-rw-r--r--net/unison-devel/Makefile4
-rw-r--r--net/unison/Makefile4
-rw-r--r--net/vino/Makefile4
-rw-r--r--net/vpnc/Makefile4
-rw-r--r--net/wol/Makefile4
-rw-r--r--net/xmftp/Makefile4
-rw-r--r--net/xorp/Makefile4
-rw-r--r--net/zebra/Makefile4
-rw-r--r--news/leafnode/Makefile4
-rw-r--r--news/nget/Makefile4
-rw-r--r--news/nntpcache/Makefile4
-rw-r--r--parallel/glunix/Makefile4
-rw-r--r--parallel/sge/Makefile4
-rw-r--r--print/LPRng-core/Makefile4
-rw-r--r--print/a2ps/Makefile4
-rw-r--r--print/advi/Makefile4
-rw-r--r--print/auctex/Makefile4
-rw-r--r--print/chktex/Makefile4
-rw-r--r--print/cups/Makefile4
-rw-r--r--print/enscript/Makefile4
-rw-r--r--print/foomatic-filters/Makefile4
-rw-r--r--print/ggv2/Makefile4
-rw-r--r--print/ghostscript-esp/Makefile.common4
-rw-r--r--print/ghostscript-gnu/Makefile.common4
-rw-r--r--print/ghostscript-nox11/Makefile.common4
-rw-r--r--print/gimp-print-cups/Makefile4
-rw-r--r--print/gimp-print-escputil/Makefile4
-rw-r--r--print/gimp-print-ijs/Makefile4
-rw-r--r--print/gimp-print-lib/Makefile4
-rw-r--r--print/gimp-print/Makefile4
-rw-r--r--print/glabels/Makefile4
-rw-r--r--print/gpdf/Makefile4
-rw-r--r--print/gv/Makefile4
-rw-r--r--print/ijs/Makefile4
-rw-r--r--print/imposter/Makefile4
-rw-r--r--print/ja-vfxdvik/Makefile4
-rw-r--r--print/libgnomeprint/Makefile4
-rw-r--r--print/libgnomeprintui/Makefile4
-rw-r--r--print/lilypond/Makefile4
-rw-r--r--print/magicfilter/Makefile4
-rw-r--r--print/pdflib/Makefile.common4
-rw-r--r--print/psify/Makefile4
-rw-r--r--print/scribus/Makefile4
-rw-r--r--print/teTeX-bin/Makefile.common4
-rw-r--r--print/teTeX-share/Makefile4
-rw-r--r--print/teTeX1-bin/Makefile4
-rw-r--r--print/teTeX1-share/Makefile4
-rw-r--r--print/teTeX3-bin/Makefile.common4
-rw-r--r--print/teTeX3-texmf/Makefile4
-rw-r--r--print/texfamily/Makefile4
-rw-r--r--print/transfig/Makefile4
-rw-r--r--print/xpp/Makefile4
-rw-r--r--regress/ignore-tools/Makefile4
-rw-r--r--security/MyPasswordSafe/Makefile4
-rw-r--r--security/PAM/Makefile4
-rw-r--r--security/aide/Makefile4
-rw-r--r--security/aide06/Makefile4
-rw-r--r--security/avcheck/Makefile4
-rw-r--r--security/chkrootkit/Makefile4
-rw-r--r--security/courier-authlib/Makefile4
-rw-r--r--security/crypto++/Makefile4
-rw-r--r--security/cyrus-sasl2/Makefile.common4
-rw-r--r--security/dirmngr/Makefile4
-rw-r--r--security/dropbear/Makefile4
-rw-r--r--security/fwbuilder/Makefile4
-rw-r--r--security/gnupg-devel/Makefile4
-rw-r--r--security/gnupg/Makefile4
-rw-r--r--security/gnustep-ssl/Makefile4
-rw-r--r--security/heimdal/Makefile4
-rw-r--r--security/jessie/Makefile4
-rw-r--r--security/kssh/Makefile4
-rw-r--r--security/libfwbuilder/Makefile4
-rw-r--r--security/libgpg-error/Makefile4
-rw-r--r--security/lsh/Makefile4
-rw-r--r--security/lsh2/Makefile4
-rw-r--r--security/mhash/Makefile4
-rw-r--r--security/openssl/Makefile4
-rw-r--r--security/otpcalc/Makefile4
-rw-r--r--security/pam-ldap/Makefile4
-rw-r--r--security/pinentry/Makefile4
-rw-r--r--security/putty/Makefile4
-rw-r--r--security/py-crack/Makefile4
-rw-r--r--security/qca-tls/Makefile4
-rw-r--r--security/qca/Makefile4
-rw-r--r--security/seahorse/Makefile4
-rw-r--r--security/sign/Makefile4
-rw-r--r--security/skey/Makefile4
-rw-r--r--security/ssldump/Makefile4
-rw-r--r--security/zebedee/Makefile4
-rw-r--r--shells/xsh/Makefile4
-rw-r--r--sysutils/acpi-iasl/Makefile4
-rw-r--r--sysutils/acpidump/Makefile4
-rw-r--r--sysutils/amanda-server/Makefile4
-rw-r--r--sysutils/apcupsd/Makefile4
-rw-r--r--sysutils/burn/Makefile4
-rw-r--r--sysutils/ccze/Makefile4
-rw-r--r--sysutils/cdrdao/Makefile4
-rw-r--r--sysutils/cdrecord-xcdroast/Makefile4
-rw-r--r--sysutils/cdrecord/Makefile4
-rw-r--r--sysutils/cdrtools-ossdvd/Makefile4
-rw-r--r--sysutils/dbus/Makefile.common4
-rw-r--r--sysutils/dog/Makefile4
-rw-r--r--sysutils/extipl/Makefile4
-rw-r--r--sysutils/fam/Makefile4
-rw-r--r--sysutils/fsv/Makefile4
-rw-r--r--sysutils/fsviewer/Makefile4
-rw-r--r--sysutils/gcdmaster/Makefile4
-rw-r--r--sysutils/gkrellm/Makefile.common4
-rw-r--r--sysutils/gkrellm1/Makefile4
-rw-r--r--sysutils/gnome-menus/Makefile4
-rw-r--r--sysutils/gnome-vfs/Makefile4
-rw-r--r--sysutils/gnome-vfs2/Makefile.common4
-rw-r--r--sysutils/gnome-vfsmm26/Makefile4
-rw-r--r--sysutils/gnome2-system-monitor/Makefile4
-rw-r--r--sysutils/gnometoaster/Makefile4
-rw-r--r--sysutils/gpart/Makefile4
-rw-r--r--sysutils/grub/Makefile4
-rw-r--r--sysutils/grun/Makefile4
-rw-r--r--sysutils/idesk/Makefile4
-rw-r--r--sysutils/isapnptools/Makefile4
-rw-r--r--sysutils/kdirstat/Makefile4
-rw-r--r--sysutils/krusader/Makefile4
-rw-r--r--sysutils/libgtop2/Makefile4
-rw-r--r--sysutils/mc/Makefile4
-rw-r--r--sysutils/memtest86/Makefile4
-rw-r--r--sysutils/mtools/Makefile4
-rw-r--r--sysutils/nautilus-cd-burner/Makefile4
-rw-r--r--sysutils/nautilus/Makefile4
-rw-r--r--sysutils/pciutils/Makefile4
-rw-r--r--sysutils/pv/Makefile4
-rw-r--r--sysutils/sformat/Makefile4
-rw-r--r--sysutils/smartmontools/Makefile4
-rw-r--r--sysutils/swapd/Makefile4
-rw-r--r--sysutils/vcdimager-devel/Makefile4
-rw-r--r--sysutils/vcdimager/Makefile4
-rw-r--r--sysutils/vifm/Makefile4
-rw-r--r--sysutils/xcdroast/Makefile4
-rw-r--r--sysutils/xen12/Makefile4
-rw-r--r--sysutils/xentools12/Makefile4
-rw-r--r--sysutils/xentools20/Makefile4
-rw-r--r--sysutils/xfe/Makefile4
-rw-r--r--sysutils/xosview/Makefile4
-rw-r--r--sysutils/xps/Makefile4
-rw-r--r--textproc/GutenMark/Makefile4
-rw-r--r--textproc/aspell/Makefile4
-rw-r--r--textproc/dict-client/Makefile4
-rw-r--r--textproc/dict-dictionaries/Makefile4
-rw-r--r--textproc/dict-server/Makefile4
-rw-r--r--textproc/eb/Makefile4
-rw-r--r--textproc/expat/Makefile4
-rw-r--r--textproc/expatobjc/Makefile4
-rw-r--r--textproc/freepwing/Makefile4
-rw-r--r--textproc/glimpse/Makefile4
-rw-r--r--textproc/gnome-spell/Makefile4
-rw-r--r--textproc/gocr/Makefile4
-rw-r--r--textproc/gsed/Makefile4
-rw-r--r--textproc/helpdeco/Makefile4
-rw-r--r--textproc/icu/Makefile4
-rw-r--r--textproc/intltool/Makefile4
-rw-r--r--textproc/ispell-german/Makefile4
-rw-r--r--textproc/ja-groff/Makefile4
-rw-r--r--textproc/ja-sed/Makefile4
-rw-r--r--textproc/jade/Makefile4
-rw-r--r--textproc/kakasi/Makefile4
-rw-r--r--textproc/libcroco/Makefile4
-rw-r--r--textproc/libpathan/Makefile4
-rw-r--r--textproc/libxml2/Makefile4
-rw-r--r--textproc/libxslt/Makefile4
-rw-r--r--textproc/lua-expat/Makefile4
-rw-r--r--textproc/openjade/Makefile4
-rw-r--r--textproc/p5-XML-Xerces/Makefile4
-rw-r--r--textproc/postgresql-autodoc/Makefile4
-rw-r--r--textproc/regexx/Makefile4
-rw-r--r--textproc/robodoc/Makefile4
-rw-r--r--textproc/rubber/Makefile4
-rw-r--r--textproc/sablotron/Makefile4
-rw-r--r--textproc/scrollkeeper/Makefile4
-rw-r--r--textproc/subtitleripper/Makefile4
-rw-r--r--textproc/xalan-c/Makefile4
-rw-r--r--textproc/xerces-c/Makefile4
-rw-r--r--textproc/xml2doc/Makefile4
-rw-r--r--textproc/xmlindent/Makefile4
-rw-r--r--textproc/yodl/Makefile4
-rw-r--r--time/anacron/Makefile4
-rw-r--r--time/evolution-webcal/Makefile4
-rw-r--r--time/gnotime/Makefile4
-rw-r--r--time/gtodo/Makefile4
-rw-r--r--time/ptimetracker/Makefile4
-rw-r--r--time/wmcalclock/Makefile4
-rw-r--r--time/wmmoonclock/Makefile4
-rw-r--r--wm/afterstep/Makefile4
-rw-r--r--wm/bbrun/Makefile4
-rw-r--r--wm/econf/Makefile4
-rw-r--r--wm/enlightenment/Makefile4
-rw-r--r--wm/fluxbox/Makefile4
-rw-r--r--wm/golem/Makefile4
-rw-r--r--wm/icewm/Makefile.common4
-rw-r--r--wm/ion/Makefile4
-rw-r--r--wm/ion3-devel/Makefile4
-rw-r--r--wm/metacity/Makefile4
-rw-r--r--wm/novawm/Makefile4
-rw-r--r--wm/openbox/Makefile4
-rw-r--r--wm/pekwm/Makefile4
-rw-r--r--wm/pwm/Makefile4
-rw-r--r--wm/qvwm/Makefile4
-rw-r--r--wm/sawfish/Makefile.common4
-rw-r--r--wm/waimea/Makefile4
-rw-r--r--wm/whiteBOX/Makefile4
-rw-r--r--wm/windowlab/Makefile4
-rw-r--r--wm/wmdrawer/Makefile4
-rw-r--r--www/amaya/Makefile4
-rw-r--r--www/ap-jk/Makefile4
-rw-r--r--www/ap-jserv/Makefile4
-rw-r--r--www/bluefish/Makefile4
-rw-r--r--www/cgicc/Makefile4
-rw-r--r--www/clearsilver/Makefile.common4
-rw-r--r--www/drivel/Makefile4
-rw-r--r--www/elinks/Makefile4
-rw-r--r--www/epiphany-extensions/Makefile4
-rw-r--r--www/epiphany/Makefile4
-rw-r--r--www/galeon/Makefile4
-rw-r--r--www/galeon12/Makefile4
-rw-r--r--www/gtkhtml/Makefile4
-rw-r--r--www/gtkhtml3/Makefile4
-rw-r--r--www/gtkhtml30/Makefile4
-rw-r--r--www/gtkhtml36/Makefile4
-rw-r--r--www/jssi/Makefile4
-rw-r--r--www/kannel/Makefile4
-rw-r--r--www/libgtkhtml/Makefile4
-rw-r--r--www/libwww/Makefile4
-rw-r--r--www/liferea/Makefile4
-rw-r--r--www/lynx/Makefile4
-rw-r--r--www/mozilla/Makefile.common4
-rw-r--r--www/p5-libapreq2/Makefile4
-rw-r--r--www/php4/Makefile4
-rw-r--r--www/privoxy/Makefile4
-rw-r--r--www/sitecopy/Makefile4
-rw-r--r--www/snownews/Makefile4
-rw-r--r--www/spfc/Makefile4
-rw-r--r--www/swiftsurf/Makefile4
-rw-r--r--www/thy/Makefile4
-rw-r--r--www/tidy/Makefile4
-rw-r--r--www/w3m/Makefile.common4
-rw-r--r--www/wwwoffle/Makefile5
-rw-r--r--x11/XaoS/Makefile4
-rw-r--r--x11/XmHTML/Makefile4
-rw-r--r--x11/controlcenter/Makefile4
-rw-r--r--x11/ebuilder/Makefile4
-rw-r--r--x11/fltk/Makefile4
-rw-r--r--x11/gnome-desktop/Makefile4
-rw-r--r--x11/gnome-gkrellm/Makefile4
-rw-r--r--x11/gnome-libs/Makefile4
-rw-r--r--x11/gnome-mag/Makefile4
-rw-r--r--x11/gnome-panel/Makefile4
-rw-r--r--x11/gnome-session/Makefile4
-rw-r--r--x11/gnome-themes-extras/Makefile4
-rw-r--r--x11/gnome-themes/Makefile4
-rw-r--r--x11/gnome2-applets/Makefile4
-rw-r--r--x11/gnome2-control-center/Makefile4
-rw-r--r--x11/gnome2-terminal/Makefile4
-rw-r--r--x11/gnopernicus/Makefile4
-rw-r--r--x11/gnustep-preferences/Makefile4
-rw-r--r--x11/gtk+extra/Makefile4
-rw-r--r--x11/gtk-thinice-engine/Makefile4
-rw-r--r--x11/gtk/Makefile4
-rw-r--r--x11/gtk2-chtheme/Makefile4
-rw-r--r--x11/gtk2-engines-bluecurve/Makefile4
-rw-r--r--x11/gtk2-theme-switch/Makefile4
-rw-r--r--x11/gtk2/Makefile6
-rw-r--r--x11/gtkmm/Makefile4
-rw-r--r--x11/gtkmm24/Makefile4
-rw-r--r--x11/gtksourceview/Makefile4
-rw-r--r--x11/kdebase3/Makefile4
-rw-r--r--x11/keylaunch/Makefile4
-rw-r--r--x11/kkbswitch/Makefile4
-rw-r--r--x11/kmessage/Makefile4
-rw-r--r--x11/lablgtk/Makefile4
-rw-r--r--x11/lablgtk2/Makefile4
-rw-r--r--x11/lesstif/Makefile4
-rw-r--r--x11/libzvt/Makefile4
-rw-r--r--x11/multi-gnome-terminal/Makefile4
-rw-r--r--x11/openmotif/Makefile4
-rw-r--r--x11/p5-gtk2/Makefile4
-rw-r--r--x11/py-gtk2/Makefile4
-rw-r--r--x11/py-qt3-base/Makefile4
-rw-r--r--x11/py-qt3-modules/Makefile4
-rw-r--r--x11/py-qt3-qscintilla/Makefile4
-rw-r--r--x11/py-qt3-sip/Makefile4
-rw-r--r--x11/py-wxWidgets/Makefile4
-rw-r--r--x11/pygtk/Makefile4
-rw-r--r--x11/qt1/Makefile4
-rw-r--r--x11/qt2-libs/Makefile.common4
-rw-r--r--x11/qt3-libs/Makefile.common6
-rw-r--r--x11/qt3-qscintilla/Makefile4
-rw-r--r--x11/qtarch/Makefile4
-rw-r--r--x11/qwspritefield/Makefile4
-rw-r--r--x11/qwt/Makefile4
-rw-r--r--x11/rep-gtk/Makefile4
-rw-r--r--x11/vte/Makefile4
-rw-r--r--x11/wmweather/Makefile4
-rw-r--r--x11/wxhaskell/Makefile4
-rw-r--r--x11/xfce3/Makefile4
-rw-r--r--x11/xfstt/Makefile4
-rw-r--r--x11/xglobe/Makefile4
-rw-r--r--x11/xpad/Makefile4
-rw-r--r--x11/xplanet/Makefile4
-rw-r--r--x11/zenity/Makefile4
1131 files changed, 2264 insertions, 2280 deletions
diff --git a/archivers/arj/Makefile b/archivers/arj/Makefile
index 41b5652bf2a..1423514fe5a 100644
--- a/archivers/arj/Makefile
+++ b/archivers/arj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:36 jlam Exp $
DISTNAME= arj-3.10.21
CATEGORIES= archivers
@@ -10,7 +10,7 @@ COMMENT= Open-source ARJ
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ${WRKSRC}/gnu/configure
MAKEFILE= makefile.gnu
diff --git a/archivers/cabextract/Makefile b/archivers/cabextract/Makefile
index 7ca4ba02624..4f2065fd3d0 100644
--- a/archivers/cabextract/Makefile
+++ b/archivers/cabextract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:36 jlam Exp $
#
DISTNAME= cabextract-1.1
@@ -12,6 +12,6 @@ COMMENT= Microsoft cabinet (.CAB) file extractor
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/archivers/cxunzip/Makefile b/archivers/cxunzip/Makefile
index a9edce5541d..b9e4178a1cc 100644
--- a/archivers/cxunzip/Makefile
+++ b/archivers/cxunzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:36 jlam Exp $
DISTNAME= cxunzip-0.98
PKGREVISION= 2
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile
index 32e98f5754b..7490cb0e892 100644
--- a/archivers/dact/Makefile
+++ b/archivers/dact/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:48 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:36 jlam Exp $
#
DISTNAME= dact-0.8.3
@@ -13,7 +13,7 @@ COMMENT= Dynamic adaptive compression tool
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ENV+= ac_cv_lib_mcrypt_main=no
diff --git a/archivers/file-roller/Makefile b/archivers/file-roller/Makefile
index 4db99124540..7d0ac4c7186 100644
--- a/archivers/file-roller/Makefile
+++ b/archivers/file-roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/20 16:12:45 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:36 jlam Exp $
#
DISTNAME= file-roller-2.10.2
@@ -17,7 +17,7 @@ DEPENDS+= zip>=2.3nb2:../../archivers/zip
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
USE_PKGLOCALEDIR= yes
diff --git a/archivers/ha/Makefile b/archivers/ha/Makefile
index 4894858b794..a85cbd2e183 100644
--- a/archivers/ha/Makefile
+++ b/archivers/ha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:37 jlam Exp $
DISTNAME= ha0999
PKGNAME= ha-0.999b
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}
MAKEFILE= makefile.nix
BUILD_TARGET= ha
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
cd ${WRKSRC}; ${INSTALL_PROGRAM} ha ${PREFIX}/bin
diff --git a/archivers/p7zip/Makefile b/archivers/p7zip/Makefile
index 28717164ecf..ac8df43f215 100644
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/17 07:22:37 adam Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:37 jlam Exp $
DISTNAME= p7zip_4.18_src
PKGNAME= p7zip-4.18
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
MAKEFILE= makefile
NO_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PTHREAD_OPTS+= require
# compiles, but does not recognize any archives as supported
diff --git a/archivers/star/Makefile b/archivers/star/Makefile
index 4b06de46ed6..9464ae1b67d 100644
--- a/archivers/star/Makefile
+++ b/archivers/star/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/09/18 20:14:18 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= star-1.4.3
@@ -11,7 +11,7 @@ COMMENT= The fastest tar like archiver for UNIX
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_FLAGS+= INS_BASE=${PREFIX}
.include "../../mk/bsd.prefs.mk"
diff --git a/archivers/unace/Makefile b/archivers/unace/Makefile
index ec86f897d0c..7f79d45a8e9 100644
--- a/archivers/unace/Makefile
+++ b/archivers/unace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= unace-1.2b
@@ -13,7 +13,7 @@ COMMENT= Extract, list and test files in ACE archives
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= clean unace
diff --git a/archivers/unzip/Makefile b/archivers/unzip/Makefile
index 6f3705de251..012d5e90d5a 100644
--- a/archivers/unzip/Makefile
+++ b/archivers/unzip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:37 jlam Exp $
DISTNAME= unzip552
PKGNAME= unzip-5.52
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
DIST_SUBDIR= ${PKGNAME} # Remove on next update.
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/archivers/upx/Makefile b/archivers/upx/Makefile
index da4b5896b4a..1d3b3ae523d 100644
--- a/archivers/upx/Makefile
+++ b/archivers/upx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:37 jlam Exp $
DISTNAME= upx-1.25-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -11,7 +11,7 @@ COMMENT= Ultimate packer for executables
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
do-build:
diff --git a/archivers/xmill/Makefile b/archivers/xmill/Makefile
index 5a2cb85302b..60535dff33c 100644
--- a/archivers/xmill/Makefile
+++ b/archivers/xmill/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:50 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:37 jlam Exp $
DISTNAME= xmill-0.9.1
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= Specialized compressor for XML
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
USE_LANGUAGES= c c++
diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile
index 6aa1b4decbb..24c4dd53b20 100644
--- a/audio/amarok/Makefile
+++ b/audio/amarok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:37 jlam Exp $
DISTNAME= amarok-1.2.3
CATEGORIES= audio kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://amarok.kde.org/
COMMENT= KDE audio player
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/audio/audacity/Makefile b/audio/audacity/Makefile
index cc3e7f4050d..89c8e791f06 100644
--- a/audio/audacity/Makefile
+++ b/audio/audacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:37 jlam Exp $
DISTNAME= audacity-src-1.2.3
PKGNAME= audacity-1.2.3
@@ -13,7 +13,7 @@ COMMENT= Audio editor
DEPENDS+= zip>=0.0:../../archivers/zip
WRKSRC= ${WRKDIR}/audacity-src-1.2.3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/audio/cdparanoia/Makefile b/audio/cdparanoia/Makefile
index cf4d2407366..9a189bd408d 100644
--- a/audio/cdparanoia/Makefile
+++ b/audio/cdparanoia/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= cdparanoia-III-alpha9.8
@@ -16,7 +16,7 @@ ONLY_FOR_PLATFORM= FreeBSD-*-* NetBSD-*-* Linux-*-* DragonFly-*-*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/audio/cdplayer/Makefile b/audio/cdplayer/Makefile
index 9dd2691879b..c5c4e902dac 100644
--- a/audio/cdplayer/Makefile
+++ b/audio/cdplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/16 10:12:28 rh Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= cdplayer-0.4.2
@@ -11,7 +11,7 @@ COMMENT= GNUstep CD player with CDDB support
WRKSRC= ${WRKDIR}/${PKGBASE}
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
MAKE_ENV+= ADDITIONAL_CPPFLAGS="-Wno-import"
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 1c92aa6ff96..8740375b1fe 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= cmp3-2.0pre6
@@ -14,7 +14,7 @@ DEPENDS+= mpg123-[0-9]*:../../audio/mpg123
DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
WRKSRC= ${WRKDIR}/cmp3-kenrevs
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*
diff --git a/audio/csound4/Makefile b/audio/csound4/Makefile
index a6a9cfa5dde..ccc9a4c82f0 100644
--- a/audio/csound4/Makefile
+++ b/audio/csound4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/19 20:22:52 ben Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= csound-4.23f12gbs.11
@@ -13,7 +13,7 @@ COMMENT= Software synthesizer and sequencer
DIST_SUBDIR= csound
CONFLICTS+= csound-bath-4*
CONFLICTS+= csound-dev-4*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_MAKEINFO= yes
USE_X11= yes
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index ee6ec48b6fc..9ca01bd060d 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:37 jlam Exp $
DISTNAME= daapd-0.2.3d
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= Server for DAA protocol (iTunes)
USE_LANGUAGES= c c++
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
RCD_SCRIPTS= daapd
diff --git a/audio/darkice/Makefile b/audio/darkice/Makefile
index 08380e2d1b3..6a932a76c9a 100644
--- a/audio/darkice/Makefile
+++ b/audio/darkice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= darkice-0.14
@@ -11,7 +11,7 @@ HOMEPAGE= http://darkice.sourceforge.net/
COMMENT= IceCast, IceCast2 and ShoutCast live audio streamer
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis}
diff --git a/audio/easytag/Makefile b/audio/easytag/Makefile
index 0854459ff34..f2a69608abd 100644
--- a/audio/easytag/Makefile
+++ b/audio/easytag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/04/19 00:24:13 wiz Exp $
+# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= easytag-1.1
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes # xgettext, really
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index 633ae0c4954..e15d31c07d9 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:37 jlam Exp $
#
DISTNAME= faad2-2.0
@@ -15,7 +15,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM=${RESTRICTED}
WRKSRC= ${WRKDIR}/faad2
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 5dd23599db7..16e88280773 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/28 22:21:52 jlam Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:37 jlam Exp $
DISTNAME= festival-1.95-beta
PKGNAME= festival-1.95beta
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.cstr.ed.ac.uk/projects/festival/
COMMENT= Advanced multi-lingual speech synthesis system
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
SPEECHTOOLS= ${WRKSRC}/speech_tools
diff --git a/audio/flac/Makefile b/audio/flac/Makefile
index c9ff013c8ad..d64a52c6e9a 100644
--- a/audio/flac/Makefile
+++ b/audio/flac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:07:38 jlam Exp $
DISTNAME= flac-1.1.2
CATEGORIES= audio archivers
@@ -12,7 +12,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_XMMS_CONFIG="no"
diff --git a/audio/gkrellm-volume/Makefile b/audio/gkrellm-volume/Makefile
index 0d86c6ca29b..6b400ec6697 100644
--- a/audio/gkrellm-volume/Makefile
+++ b/audio/gkrellm-volume/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:38 jlam Exp $
DISTNAME= gkrellm-volume-2.1.13
CATEGORIES= audio
@@ -10,7 +10,7 @@ COMMENT= Gkrellm2 volume mixer plugin
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
WRKSRC= ${WRKDIR}/gkrellm-volume
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index ac5407d8008..43257a1867c 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= gkrellmms-2.1.20
@@ -11,7 +11,7 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://gkrellm.luon.net/gkrellmms.phtml
COMMENT= GKrellM2 plugin to remotely control XMMS
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
BUILD_USES_MSGFMT= YES
diff --git a/audio/gnome-speech/Makefile b/audio/gnome-speech/Makefile
index 90190480a22..c859c3c04bb 100644
--- a/audio/gnome-speech/Makefile
+++ b/audio/gnome-speech/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:52 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= gnome-speech-0.3.6
@@ -14,7 +14,7 @@ DIST_SUBDIR= gnome-speech-0.3.6v2
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/audio/gogo/Makefile b/audio/gogo/Makefile
index aa64c60db00..df63650fae1 100644
--- a/audio/gogo/Makefile
+++ b/audio/gogo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/11/28 11:59:34 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= gogo239b
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
ONLY_FOR_PLATFORM= *-*-i386
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
RESTRICTED= 'Source based on patent protected Fraunhofer code'
NO_SRC_ON_FTP= ${RESTRICTED}
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index 88630947c2f..af3fb3e76ca 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= gramofile-1.6
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
BUILD_TARGET= gramofile makebplay
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin
diff --git a/audio/hydrogen/Makefile b/audio/hydrogen/Makefile
index 1477672400f..dbf4ed16af3 100644
--- a/audio/hydrogen/Makefile
+++ b/audio/hydrogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:38 jlam Exp $
DISTNAME= hydrogen-0.8.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://hydrogen.sourceforge.net/
COMMENT= Real time drum machine/sequencer
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-alsa-seq
diff --git a/audio/id3ed/Makefile b/audio/id3ed/Makefile
index 6e9febbf4c3..47afa95c027 100644
--- a/audio/id3ed/Makefile
+++ b/audio/id3ed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= id3ed-1.10.4
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_READLINE= # uses rl_startup_hook
diff --git a/audio/id3v2/Makefile b/audio/id3v2/Makefile
index 0ea1e67fbad..b99a1ae617b 100644
--- a/audio/id3v2/Makefile
+++ b/audio/id3v2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:38 jlam Exp $
DISTNAME= id3v2-0.1.11
CATEGORIES= audio
@@ -11,7 +11,7 @@ COMMENT= Command line editor for id3v2 tags
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
diff --git a/audio/ladspa/Makefile b/audio/ladspa/Makefile
index 1e3698779f7..94b6b30c6b3 100644
--- a/audio/ladspa/Makefile
+++ b/audio/ladspa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= ladspa_sdk_1.12
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.ladspa.org/
COMMENT= Linux Audio Developers Simple Plugin API
WRKSRC= ${WRKDIR}/ladspa_sdk/src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index 30db8ca9e19..bf7fb27921c 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/04/11 21:44:53 tv Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= lame-${VERS}
@@ -17,7 +17,7 @@ LICENSE= lame-license
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/audio/libao/Makefile.common b/audio/libao/Makefile.common
index 31ac81ce502..1c6ef53eac0 100644
--- a/audio/libao/Makefile.common
+++ b/audio/libao/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.19 2005/05/20 19:20:55 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.20 2005/05/22 20:07:38 jlam Exp $
DISTNAME= libao-0.8.6
CATEGORIES= audio devel
@@ -12,7 +12,7 @@ DISTINFO_FILE= ${.CURDIR}/../../audio/libao/distinfo
PATCHDIR= ${.CURDIR}/../../audio/libao/patches
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= ao.pc.in
diff --git a/audio/libhydrogen/Makefile b/audio/libhydrogen/Makefile
index 7e609afbaad..6bfc98604f2 100644
--- a/audio/libhydrogen/Makefile
+++ b/audio/libhydrogen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:38 jlam Exp $
DISTNAME= libhydrogen-0.8.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://hydrogen.sourceforge.net/
COMMENT= Shared library for the Hydrogen drum machine
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --disable-alsa-seq
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index e8032c74452..b5ac8175968 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:07:38 jlam Exp $
DISTNAME= libmikmod-3.1.11
PKGNAME= libmikmod-3.1.11.1
@@ -16,7 +16,7 @@ COMMENT= MikMod Sound Library
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
USE_MAKEINFO= yes
diff --git a/audio/libsidplay/Makefile b/audio/libsidplay/Makefile
index 5409c45b569..41fdb537f56 100644
--- a/audio/libsidplay/Makefile
+++ b/audio/libsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= libsidplay-1.36.59
@@ -15,7 +15,7 @@ CONFLICTS= sidplay-1.36.*
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/liteamp/Makefile b/audio/liteamp/Makefile
index fd52bac9868..b73889d582a 100644
--- a/audio/liteamp/Makefile
+++ b/audio/liteamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/12 01:02:19 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:38 jlam Exp $
DISTNAME= liteamp-0.2.4.2
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Light-weight Music Player for GNOME2
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_PERL5= build
USE_LIBTOOL= yes
diff --git a/audio/mikmod/Makefile b/audio/mikmod/Makefile
index ba10802cc23..3b18ba22199 100644
--- a/audio/mikmod/Makefile
+++ b/audio/mikmod/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/04/11 21:44:54 tv Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:38 jlam Exp $
DISTNAME= mikmod-3.2.1
CATEGORIES= audio
@@ -10,7 +10,7 @@ COMMENT= MOD player for UNI IT XM S3M MOD MTM STM DSM MED FAR ULT 669 files
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
.include "../../audio/libmikmod/buildlink3.mk"
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index a03a8c9fb6a..7a066325bda 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:07:38 jlam Exp $
DISTNAME= mp3blaster-3.2.0
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.stack.nl/~brama/mp3blaster.html
COMMENT= MP3 console curses-based player
PTHREAD_OPTS= require
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+="--with-cxxflags=${CXXFLAGS}" \
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 8c057ea0668..14bf55ab84c 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:38 jlam Exp $
#
DISTNAME= MuSE-0.9
@@ -14,7 +14,7 @@ HOMEPAGE= http://muse.dyne.org/
COMMENT= Multiple Streaming Engine
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_PKGLOCALEDIR= yes
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index c3ed0529206..2db0556e939 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:39 jlam Exp $
DISTNAME= libmusicbrainz-2.1.1
PKGNAME= ${DISTNAME:S/lib//}
@@ -12,7 +12,7 @@ COMMENT= Second generation incarnation of the CD Index
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 315b3173d63..9f209ff5e43 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.54 2005/05/22 20:07:39 jlam Exp $
DISTNAME= nas-1.7.src
PKGNAME= ${DISTNAME:S/.src//}
@@ -16,7 +16,7 @@ DEPENDS+= p5-perl-headers-${OS_VERSION}{,nb*}:../../devel/p5-perl-headers
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_IMAKE= yes
diff --git a/audio/nosefart/Makefile b/audio/nosefart/Makefile
index c0400d371a4..1536bff032f 100644
--- a/audio/nosefart/Makefile
+++ b/audio/nosefart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:39 jlam Exp $
DISTNAME= nosefart-2.3-mls
PKGNAME= ${DISTNAME:S/-mls//}
@@ -10,7 +10,7 @@ MAINTAINER= dgriffi@cs.csubak.edu
HOMEPAGE= http://nosefart.sourceforge.net/
COMMENT= Player for NES Sound Format (NSF) files
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE= YES
SUBST_CLASSES+= ossaudio
diff --git a/audio/openal/Makefile b/audio/openal/Makefile
index 3cc7e2f460a..96477ea4e25 100644
--- a/audio/openal/Makefile
+++ b/audio/openal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:39 jlam Exp $
DISTNAME= openal-20040816
CATEGORIES= audio
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.openal.org/
COMMENT= 3D positional spatialized sound library
WRKSRC= ${WRKDIR}/${DISTNAME}/linux
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index 440ea953c80..260ad094681 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:39 jlam Exp $
DISTNAME= portaudio_v18_1
PKGNAME= portaudio-18.1
@@ -11,7 +11,7 @@ MAINTAINER= dotz@irc.pl
HOMEPAGE= http://www.portaudio.com/
COMMENT= Portable cross-platform Audio API
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
HAS_CONFIGURE= yes
diff --git a/audio/rhythmbox/Makefile b/audio/rhythmbox/Makefile
index 89cafff1e2b..783fbf2b83b 100644
--- a/audio/rhythmbox/Makefile
+++ b/audio/rhythmbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= rhythmbox-0.8.8
@@ -21,7 +21,7 @@ BUILDLINK_DEPENDS.gst-plugins+= gst-plugins>=0.8.1
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/audio/rio500/Makefile b/audio/rio500/Makefile
index 2449904c158..d5a6872e9e1 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= rio500-0.7
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://rio500.sourceforge.net/
COMMENT= Utilities to manage your Diamond Rio 500 MP3 player
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-devicepath=/dev --with-deviceentry=urio0
diff --git a/audio/rosegarden/Makefile b/audio/rosegarden/Makefile
index 5a1bd67b488..2c6c152eee3 100644
--- a/audio/rosegarden/Makefile
+++ b/audio/rosegarden/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:39 jlam Exp $
DISTNAME= rosegarden-2.1pl4
PKGNAME= rosegarden-2.1.4
@@ -15,7 +15,7 @@ DEPENDS+= tcl-[0-9]*:../../lang/tcl
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= GCC=yes
USE_X11= YES
diff --git a/audio/sidplay/Makefile b/audio/sidplay/Makefile
index 3ff3ff381ce..66f6258a4ed 100644
--- a/audio/sidplay/Makefile
+++ b/audio/sidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:44:56 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= sidplay-base-1.0.9
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.geocities.com/SiliconValley/Lakes/5147/sidplay/
COMMENT= Tools for playing sidtunes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../audio/libsidplay/buildlink3.mk"
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index 17f2647f058..302488d0e87 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= SpiralLoops-2.0.0
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
USE_LANGUAGES= c++
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index c283fa77b75..96e56c36c87 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= SpiralSynth-2.0.0
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
USE_LANGUAGES= c++
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
diff --git a/audio/streamtuner/Makefile b/audio/streamtuner/Makefile
index 1481c04adea..8d5ea0601fc 100644
--- a/audio/streamtuner/Makefile
+++ b/audio/streamtuner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= streamtuner-0.99
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= hicolor-icon-theme-[0-9]*:../../graphics/hicolor-icon-theme
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/audio/sweep/Makefile b/audio/sweep/Makefile
index 1f651042420..9c4cf4475b5 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= sweep-0.8.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome1-1.5
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index 42e81dfa92a..529542aee92 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= toolame-02l
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://sourceforge.net/projects/toolame/
COMMENT= Optimized MPEG 1/2 layer 2 audio encoder
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
TOOLAME_ARCH?=
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index e37b206a2fa..f8fda3b7615 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:39 jlam Exp $
DISTNAME= vorbis-tools-1.0
PKGNAME= tremor-tools-1.0.0.8
@@ -17,7 +17,7 @@ CONFLICTS= vorbis-[0-9]*
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
--with-ao-prefix=${BUILDLINK_PREFIX.libao}
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 03de9a94c3d..1f7cba278dc 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:39 jlam Exp $
DISTNAME= tremor_snapshot_030406
PKGNAME= tremor-1.0.2
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/Tremor
AUTOMAKE_REQD= 1.4
AUTOCONF_REQD= 2.50
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PLIST_SUBST+= DISTNAME=${DISTNAME}
diff --git a/audio/tunepimp/Makefile b/audio/tunepimp/Makefile
index ce386a440cd..1d358e89c98 100644
--- a/audio/tunepimp/Makefile
+++ b/audio/tunepimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:39 jlam Exp $
DISTNAME= libtunepimp-0.3.0
PKGNAME= ${DISTNAME:S/lib//}
@@ -14,7 +14,7 @@ CONFLICTS= trm-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_LANGUAGES= c c++
diff --git a/audio/wmusic/Makefile b/audio/wmusic/Makefile
index dfba02cda2b..b44799ec9ce 100644
--- a/audio/wmusic/Makefile
+++ b/audio/wmusic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:39 jlam Exp $
DISTNAME= wmusic-1.5.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://home.jtan.com/~john/wmusic/
COMMENT= WindowMaker dockable remote for XMMS
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
do-install:
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 60e79d2d3a9..53b6b5e71de 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:39 jlam Exp $
DISTNAME= xamp-0.8-10
PKGNAME= xamp-0.8.10
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/xamp-0.8/xamp-0.8g
DIST_SUBDIR= xamp
GNU_CONFIGURE= yes
CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 8f3efc5d08f..b2d436b950a 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/21 03:16:23 grant Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:39 jlam Exp $
DISTNAME= faad2-2.0
PKGNAME= xmms-faad-2.0
@@ -14,7 +14,7 @@ COMMENT= XMMS plugin for faad
#NO_BIN_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}/faad2
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool
diff --git a/audio/xmms-flac/Makefile b/audio/xmms-flac/Makefile
index 8791b48ad96..06d02f2623f 100644
--- a/audio/xmms-flac/Makefile
+++ b/audio/xmms-flac/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:44:58 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:39 jlam Exp $
#
DISTNAME= flac-1.1.2
@@ -10,7 +10,7 @@ MAINTAINER= ben@NetBSD.org
HOMEPAGE= http://flac.sourceforge.net/
COMMENT= FLAC XMMS plugin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/audio/xmms-madspin/Makefile b/audio/xmms-madspin/Makefile
index 33d1da12edc..8296f993755 100644
--- a/audio/xmms-madspin/Makefile
+++ b/audio/xmms-madspin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= madspin-0.05
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.students.uiuc.edu/~birck/madspin.html
COMMENT= Based on the madspin winamp plugin
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
post-install:
diff --git a/audio/xmms-neato/Makefile b/audio/xmms-neato/Makefile
index 5b58f5c5543..3d7177f5984 100644
--- a/audio/xmms-neato/Makefile
+++ b/audio/xmms-neato/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= neato
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.rpi.edu/~mullr/xmms/
COMMENT= Circle effect XMMS plugin
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/audio/xmms-wma/Makefile b/audio/xmms-wma/Makefile
index c9d5bd12ecc..f0b87041e3a 100644
--- a/audio/xmms-wma/Makefile
+++ b/audio/xmms-wma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= xmms-wma-1.0.4
@@ -12,7 +12,7 @@ COMMENT= WMA input plugin for XMMS
ONLY_FOR_PLATFORM= *-*-i386 # Doesn't seem to be very portable...
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index 7bdcd6ee84c..5da725251b9 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/04/28 22:23:43 jlam Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= xmms-1.2.10
@@ -13,7 +13,7 @@ COMMENT= X Multimedia System - an audio player with a Winamp GUI
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/audio/xmmsctrl/Makefile b/audio/xmmsctrl/Makefile
index cf71c321c21..a9e3a2ef801 100644
--- a/audio/xmmsctrl/Makefile
+++ b/audio/xmmsctrl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= xmmsctrl-1.6
@@ -10,7 +10,7 @@ MAINTAINER= dotz@irc.pl
HOMEPAGE= http://www.docs.uu.se/~adavid/utils/
COMMENT= Small utility to control xmms from the command line
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../audio/xmms/buildlink3.mk"
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 1241329d6d8..b8ce2104c3b 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:40 jlam Exp $
DISTNAME= xmp-2.0.4
PKGREVISION= 2
@@ -18,7 +18,7 @@ CONFIGURE_ARGS+=--disable-alsa \
--sysconfdir=${PKG_SYSCONFDIR}
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
EGDIR= ${PREFIX}/share/examples/xmp
CONF_FILES= ${EGDIR}/xmp-modules.conf ${PKG_SYSCONFDIR}/xmp-modules.conf
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 763e9d02413..c99915bad3d 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= xsidplay-1.6.5.1a
@@ -14,7 +14,7 @@ COMMENT= Commodore 64 music player and SID chip emulator for X11
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
CONFIGURE_ARGS+= --with-qt-dir=${QTDIR}
diff --git a/audio/yamt/Makefile b/audio/yamt/Makefile
index 9aeb436c3d5..cb901b6a98e 100644
--- a/audio/yamt/Makefile
+++ b/audio/yamt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:40 jlam Exp $
DISTNAME= yamt-0.5
PKGREVISION= 7
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
.include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/benchmarks/benchfft/Makefile b/benchmarks/benchfft/Makefile
index fdab66cf0e2..eca78221249 100644
--- a/benchmarks/benchfft/Makefile
+++ b/benchmarks/benchfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:40 jlam Exp $
DISTNAME= benchfft-2.0
PKGREVISION= 1
@@ -14,7 +14,7 @@ COMMENT= Benchmark your machine with a number of FFT algorithms
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= fortran
USE_LIBTOOL= yes
diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile
index 2fe43ddd36d..d9c2f6f39da 100644
--- a/benchmarks/bonnie++/Makefile
+++ b/benchmarks/bonnie++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= bonnie++-1.03a
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
REPLACE_PERL= bon_csv2txt.in bon_csv2html.in
INSTALLATION_DIRS= bin man/man1 man/man8 sbin
diff --git a/benchmarks/httperf/Makefile b/benchmarks/httperf/Makefile
index cfddc06f7cd..df990e95535 100644
--- a/benchmarks/httperf/Makefile
+++ b/benchmarks/httperf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/11/27 18:14:24 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= httperf-0.6
@@ -13,7 +13,7 @@ LICENSE= no-commercial-use
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/benchmarks/lmbench/Makefile b/benchmarks/lmbench/Makefile
index 697ce49c25c..54171b1d5de 100644
--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:40 jlam Exp $
DISTNAME= lmbench-2alpha11
PKGNAME= lmbench-2.11a
@@ -12,7 +12,7 @@ COMMENT= Complete benchmark that gives a large amount of information
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= build
MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
diff --git a/benchmarks/postal/Makefile b/benchmarks/postal/Makefile
index 830f8ad16f0..4424997fadb 100644
--- a/benchmarks/postal/Makefile
+++ b/benchmarks/postal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/02 23:02:06 reed Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:40 jlam Exp $
DISTNAME= postal-0.62
PKGREVISION= 2
@@ -13,7 +13,7 @@ COMMENT= Tool for benchmarking SMTP/POP servers
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../security/openssl/buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
diff --git a/biology/chemtool/Makefile b/biology/chemtool/Makefile
index ed39259e709..8e5706684f3 100644
--- a/biology/chemtool/Makefile
+++ b/biology/chemtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:40 jlam Exp $
DISTNAME= chemtool-1.6
PKGREVISION= 1
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --without-gnomedir
diff --git a/biology/mummer/Makefile b/biology/mummer/Makefile
index eb2d57eb938..ee0dd58b935 100644
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= MUMmer3.15
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.tigr.org/software/mummer/
COMMENT= System for aligning whole genome sequences
WRKSRC= ${WRKDIR}/${DISTNAME}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= SH="${SH}"
diff --git a/biology/nut/Makefile b/biology/nut/Makefile
index 09750309a5f..2daf8e5e8b3 100644
--- a/biology/nut/Makefile
+++ b/biology/nut/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/19 10:45:19 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:40 jlam Exp $
DISTNAME= nut-10.18
CATEGORIES= biology
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.lafn.org/~av832/
COMMENT= Record what you eat and analyze your meals
BUILD_TARGET= nut
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/nut ${PREFIX}/bin
diff --git a/cad/boolean/Makefile b/cad/boolean/Makefile
index 61d93440ee1..ab9a4dc4443 100644
--- a/cad/boolean/Makefile
+++ b/cad/boolean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= boolean
@@ -17,7 +17,7 @@ REL= 6.4
BUILD_DEPENDS+= cmake>=1.6.6:../../devel/cmake
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# the zip archive messes up the case of these files which breaks
# cmake.
diff --git a/cad/covered-current/Makefile b/cad/covered-current/Makefile
index 9b327ba56ed..fc5f33ec573 100644
--- a/cad/covered-current/Makefile
+++ b/cad/covered-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= covered-${SNAPDATE}
@@ -21,7 +21,7 @@ SNAPDATE= 20040325
USE_PERL5= YES
REPLACE_PERL= diags/verilog/check_test
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
TEST_DIRS= ${WRKSRC}/diags/regress
TEST_TARGET= iverilog
diff --git a/cad/covered/Makefile b/cad/covered/Makefile
index 1ec42a19396..3886cbb5155 100644
--- a/cad/covered/Makefile
+++ b/cad/covered/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= covered-0.3
@@ -19,7 +19,7 @@ CONFLICTS+= covered-current-[0-9]*
USE_PERL5= YES
REPLACE_PERL= diags/verilog/check_test
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
TEST_DIRS= ${WRKSRC}/diags/regress
TEST_TARGET= iverilog
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 23470b0e319..f59460fafe6 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:40 jlam Exp $
#
DISTNAME= dinotrace-9.2a
@@ -13,7 +13,7 @@ GNU_CONFIGURE= YES
INFO_FILES= dinotrace.info
USE_PERL5= build
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/motif.buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/geda-examples/Makefile b/cad/geda-examples/Makefile
index c2e39f9e3c3..e99ab93630e 100644
--- a/cad/geda-examples/Makefile
+++ b/cad/geda-examples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= geda-examples-${PKGVERSION}
@@ -13,7 +13,7 @@ CONFLICTS+= gEDA<19991011
.include "../../cad/geda/Makefile.common"
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGSRC_USE_TOOLS+= tar
pre-install:
diff --git a/cad/geda-symbols/Makefile b/cad/geda-symbols/Makefile
index 87858d274ba..4b358341f23 100644
--- a/cad/geda-symbols/Makefile
+++ b/cad/geda-symbols/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/01/11 03:16:23 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= geda-symbols-${PKGVERSION}
@@ -13,6 +13,6 @@ CONFLICTS+= gEDA<19991011
.include "../../cad/geda/Makefile.common"
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make sed
+USE_TOOLS+= gmake gsed
.include "../../mk/bsd.pkg.mk"
diff --git a/cad/gerbv/Makefile b/cad/gerbv/Makefile
index d56e66489e5..6a836fd9128 100644
--- a/cad/gerbv/Makefile
+++ b/cad/gerbv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= gerbv-1.0.1
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFIGURE_ARGS+= --enable-exportpng
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../graphics/gdk-pixbuf/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
diff --git a/cad/gnetlist/Makefile b/cad/gnetlist/Makefile
index 1efcba771a2..42fd6f27480 100644
--- a/cad/gnetlist/Makefile
+++ b/cad/gnetlist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= geda-gnetlist-${PKGVERSION}
@@ -19,7 +19,7 @@ CONFLICTS+= gEDA<19991011
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
EVAL_PREFIX+= PCBDIR=pcb
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index 7a3c4bc6c13..76b0b385b11 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= gnucap-0.34
@@ -14,7 +14,7 @@ COMMENT= General purpose circuit simulator
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_READLINE= YES
do-build:
diff --git a/cad/gsmc/Makefile b/cad/gsmc/Makefile
index aa798806584..7f0a505497d 100644
--- a/cad/gsmc/Makefile
+++ b/cad/gsmc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= gsmc-1.1
@@ -13,7 +13,7 @@ COMMENT= Smith charting program
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/cad/ipal-current/Makefile b/cad/ipal-current/Makefile
index abdb9fb07d3..dd52bee7f43 100644
--- a/cad/ipal-current/Makefile
+++ b/cad/ipal-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= ipal-20001210
@@ -14,7 +14,7 @@ COMMENT= Libs and utils for manipulating PAL designs (development version)
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= lex make
+USE_TOOLS+= gmake lex
CFLAGS+= -fPIC
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index d3a7e290ddb..7813ab03aef 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= magic-7.1
@@ -10,7 +10,7 @@ MAINTAINER= dmcmahill@NetBSD.org
HOMEPAGE= http://vlsi.cornell.edu/magic/
COMMENT= Integrated circuit layout system
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
MAKE_ENV+= MAGIC_HOME=${PREFIX}
diff --git a/cad/ng-spice/Makefile b/cad/ng-spice/Makefile
index ebb899b1b1a..498e7f0e44f 100644
--- a/cad/ng-spice/Makefile
+++ b/cad/ng-spice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= ng-spice-rework-15c
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/ng-spice-rework-15
USE_X11= YES
USE_LIBTOOL= YES
USE_MAKEINFO= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_READLINE= uses rl_* interface
GNU_CONFIGURE= YES
diff --git a/cad/pcb-current/Makefile b/cad/pcb-current/Makefile
index d0377a1b343..e264f58c12c 100644
--- a/cad/pcb-current/Makefile
+++ b/cad/pcb-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= pcb-${SNAPDATE}
@@ -20,7 +20,7 @@ CONFLICTS+= pcb-[0-9]*
SNAPDATE= 20050315
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= lex make
+USE_TOOLS+= gmake lex
USE_X11= yes
INFO_FILES= pcb.info
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index e0fe76c8dd0..44754876a09 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= tkgate-1.6i
@@ -15,7 +15,7 @@ BUILD_DEPENDS+= bison>=1.35:../../devel/bison
BUILD_DEPENDS+= libiconv-[0-9]*:../../converters/libiconv
USE_IMAKE= yes
-USE_GNU_TOOLS+= m4
+USE_TOOLS+= gm4
TKGATE_SITENAME= Earth
diff --git a/cad/tnt-mmtl/Makefile b/cad/tnt-mmtl/Makefile
index b2d0a9f7f4e..bcbb50275a1 100644
--- a/cad/tnt-mmtl/Makefile
+++ b/cad/tnt-mmtl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= tnt-1.2.2
@@ -17,7 +17,7 @@ BUILD_DEPENDS+= teTeX>=1.0.7:../../print/teTeX
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++ fortran
post-patch:
diff --git a/cad/transcalc/Makefile b/cad/transcalc/Makefile
index fb365580093..cb564fceff4 100644
--- a/cad/transcalc/Makefile
+++ b/cad/transcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= transcalc-0.14
@@ -11,7 +11,7 @@ HOMEPAGE= http://transcalc.sourceforge.net/
COMMENT= Transmission line analysis/synthesis
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/cad/verilog-current/Makefile b/cad/verilog-current/Makefile
index 9a7c47065bc..7ce1e16b607 100644
--- a/cad/verilog-current/Makefile
+++ b/cad/verilog-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= verilog-${SNAPDATE}
@@ -18,7 +18,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
SNAPDATE= 20041004
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= lex make
+USE_TOOLS+= gmake lex
CONFIGURE_ARGS+= --without-ipal
YACC= ${LOCALBASE}/bin/bison
TEST_DIRS= ${WRKSRC}
diff --git a/cad/verilog/Makefile b/cad/verilog/Makefile
index dd9f2a09eba..05782e359c7 100644
--- a/cad/verilog/Makefile
+++ b/cad/verilog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:02 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= verilog-0.8.1
@@ -16,7 +16,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
CONFLICTS+= verilog-current-[0-9]*
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= lex make
+USE_TOOLS+= gmake lex
CONFIGURE_ARGS+= --without-ipal
YACC= ${LOCALBASE}/bin/bison
TEST_DIRS= ${WRKSRC}
diff --git a/cad/vipec/Makefile b/cad/vipec/Makefile
index 69cece5fc3d..9c3f9b69975 100644
--- a/cad/vipec/Makefile
+++ b/cad/vipec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= ViPEC-3.2.0
@@ -10,7 +10,7 @@ HOMEPAGE= http://vipec.sourceforge.net/
COMMENT= Network analyser for electrical networks
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
UNLIMIT_RESOURCES+= datasize
CONFLICTS+= vipec-[0-9]*
diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile
index 9a92589047d..84cb1a81c59 100644
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:41 jlam Exp $
#
DISTNAME= bitlbee-0.91
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.bitlbee.org/
COMMENT= IRC to other chat networks gateway
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --prefix=${PREFIX}
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index 2d9b9f1dc81..f4905eb9cde 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.50 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= centericq-4.20.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://konst.org.ua/eng/software/centericq/info.html
COMMENT= Instant Messenger interface supporting many protocols
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/chat/ekg/Makefile b/chat/ekg/Makefile
index f00f6a69ecf..3f1d84d8320 100644
--- a/chat/ekg/Makefile
+++ b/chat/ekg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/21 08:53:11 adam Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:42 jlam Exp $
DISTNAME= ekg-1.6rc1
PKGNAME= ekg-1.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://dev.null.pl/ekg/
COMMENT= Experimental Gadu-Gadu Client (Polish instant messaging system)
USE_GNU_READLINE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_NCURSES= yes
GNU_CONFIGURE= yes
diff --git a/chat/fisg/Makefile b/chat/fisg/Makefile
index 6fee10d87fb..4df783ee88d 100644
--- a/chat/fisg/Makefile
+++ b/chat/fisg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:42 jlam Exp $
DISTNAME= fisg-0.2.0
CATEGORIES= chat textproc
@@ -9,6 +9,6 @@ HOMEPAGE= http://www.tnsp.org/fisg.php
COMMENT= Fast IRC statistics generator
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/chat/gaim-encryption/Makefile b/chat/gaim-encryption/Makefile
index 1655574481c..98f00b559fe 100644
--- a/chat/gaim-encryption/Makefile
+++ b/chat/gaim-encryption/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gaim-encryption-2.34
CATEGORIES= chat security
@@ -10,7 +10,7 @@ COMMENT= Plugin for gaim to add TLS/SSL via nss/nspr
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/chat/gaim-otr/Makefile b/chat/gaim-otr/Makefile
index 1cfe6e69d97..717e83f8696 100644
--- a/chat/gaim-otr/Makefile
+++ b/chat/gaim-otr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gaim-otr-2.0.1
CATEGORIES= chat security
@@ -8,7 +8,7 @@ MAINTAINER= nathanw@NetBSD.org
HOMEPAGE= http://www.cypherpunks.ca/otr/
COMMENT= Plugin for gaim to add OTR (Off-The-Record) encryption
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
.include "../../chat/libotr/buildlink3.mk"
.include "../../security/libgcrypt/buildlink3.mk"
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index cdcfa5c868b..a3776d0e51a 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2005/05/12 10:32:18 salo Exp $
+# $NetBSD: Makefile,v 1.86 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gaim-1.3.0
CATEGORIES= chat x11
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= gaim-gnome-[0-9]*
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/chat/gg2/Makefile b/chat/gg2/Makefile
index 67fb38a0f74..344993bbcf4 100644
--- a/chat/gg2/Makefile
+++ b/chat/gg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gg2-2.2.5
CATEGORIES= chat
@@ -11,7 +11,7 @@ COMMENT= Instant messenger software for Poland; Jabber plugin included
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
LIBS+= -lm
PKGCONFIG_OVERRIDE+= lib/gg2_core.pc.in
diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile
index 6b8eff646a3..038d02f30e6 100644
--- a/chat/gnomeicu/Makefile
+++ b/chat/gnomeicu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gnomeicu-0.99.5
CATEGORIES= chat gnome
@@ -11,7 +11,7 @@ COMMENT= GNOME ICQ client
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile
index 024659e0cea..14b99cc9a37 100644
--- a/chat/gossip/Makefile
+++ b/chat/gossip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= gossip-0.8
@@ -14,7 +14,7 @@ BUILD_DEPENDS= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/chat/gtkyahoo/Makefile b/chat/gtkyahoo/Makefile
index 9890309682e..fa92738c30f 100644
--- a/chat/gtkyahoo/Makefile
+++ b/chat/gtkyahoo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:42 jlam Exp $
DISTNAME= gtkyahoo-0.18.2
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= GTK+ client for Yahoo! Messenger
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
USE_X11= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-libyahoo="${BUILDLINK_PREFIX.libyahoo}"
diff --git a/chat/icqlib/Makefile b/chat/icqlib/Makefile
index 6aa84fb381b..838c42d4b7a 100644
--- a/chat/icqlib/Makefile
+++ b/chat/icqlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:14 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:42 jlam Exp $
DISTNAME= icqlib-1.0.0
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= magick@NetBSD.org
HOMEPAGE= http://kicq.sourceforge.net/icqlib.shtml
COMMENT= Implementation of the icq protocol
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index 84d259bef54..f2c9f9623c4 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= ircservices-5.0.49
@@ -14,9 +14,7 @@ COMMENT= Services for IRC networks
HAS_CONFIGURE= YES
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
-
-USE_GNU_TOOLS+= grep sed
+USE_TOOLS+= gmake grep gsed
USE_PERL5= build
RCD_SCRIPTS= ircservices
diff --git a/chat/jabberd/Makefile b/chat/jabberd/Makefile
index 2d0181703fd..78c22f4b3dd 100644
--- a/chat/jabberd/Makefile
+++ b/chat/jabberd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= jabber-1.4.2
@@ -17,7 +17,7 @@ CONFLICTS= jabberd2-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --enable-ssl
diff --git a/chat/kadu/Makefile b/chat/kadu/Makefile
index 68788735e85..9f632d9382a 100644
--- a/chat/kadu/Makefile
+++ b/chat/kadu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/21 08:56:21 adam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:42 jlam Exp $
DISTNAME= kadu-0.4.0
CATEGORIES= chat
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.kadu.net/
COMMENT= Chat client for Gadu-Gadu network (Poland)
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-existing-libgadu=${BUILDLINK_PREFIX.ekg}
diff --git a/chat/kmess/Makefile b/chat/kmess/Makefile
index c5ebe16821d..31088769185 100644
--- a/chat/kmess/Makefile
+++ b/chat/kmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:04 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:42 jlam Exp $
#
DISTNAME= kmess-1.1
@@ -13,7 +13,7 @@ COMMENT= MSN Messenger Client for KDE3
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
.include "../../audio/arts/buildlink3.mk"
diff --git a/chat/loudmouth/Makefile b/chat/loudmouth/Makefile
index e1d7e6eb2bc..0c3ca2424f5 100644
--- a/chat/loudmouth/Makefile
+++ b/chat/loudmouth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:42 jlam Exp $
DISTNAME= loudmouth-0.17.2
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://loudmouth.imendio.org/
COMMENT= Lightweight Jabber client library
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/chat/micq/Makefile b/chat/micq/Makefile
index 676c2d4df39..6426255821a 100644
--- a/chat/micq/Makefile
+++ b/chat/micq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:43 jlam Exp $
DISTNAME= micq-0.4.10.3
PKGREVISION= 2
@@ -11,7 +11,7 @@ MAINTAINER= shell@NetBSD.org
HOMEPAGE= http://www.micq.org/
COMMENT= Text-mode ICQ client
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/chat/mu-conference/Makefile b/chat/mu-conference/Makefile
index 9b68477fa1a..1e4ca41e239 100644
--- a/chat/mu-conference/Makefile
+++ b/chat/mu-conference/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= mu-conference-0.6.0
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/jcr-0.1.2
SUBWRKSRC= ${WRKSRC}/${DISTNAME}/src
XMLCONFIG= ${WRKDIR}/${DISTNAME}/muc-jcr.xml
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
PKG_SYSCONFSUBDIR= jabberd
diff --git a/chat/navi2ch/Makefile b/chat/navi2ch/Makefile
index 52acd0c3348..32d4e295a9f 100644
--- a/chat/navi2ch/Makefile
+++ b/chat/navi2ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/11/30 08:46:53 uebayasi Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:43 jlam Exp $
DISTNAME= navi2ch-1.7.5
CATEGORIES= chat
@@ -11,7 +11,7 @@ COMMENT= 2ch BBS browser for Emacs
.include "../../mk/emacs.mk"
GNU_CONFIGURE= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.if ${EMACS_FLAVOR} == "emacs"
CONFIGURE_ARGS+=--with-emacs
CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/navi2ch
diff --git a/chat/ninja/Makefile b/chat/ninja/Makefile
index 3f3423c0fe1..7fbffe71ad2 100644
--- a/chat/ninja/Makefile
+++ b/chat/ninja/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= ninja-1.5.8.1
@@ -10,7 +10,7 @@ HOMEPAGE= http://ninja.qoop.org/
COMMENT= Another IRC client based on ircII
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_DEFS+= USE_INET6
diff --git a/chat/psi/Makefile b/chat/psi/Makefile
index d7e48202e29..a43cea5c880 100644
--- a/chat/psi/Makefile
+++ b/chat/psi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:43 jlam Exp $
PSI_VERSION= 0.9.3
DISTNAME= psi-${PSI_VERSION}
@@ -20,7 +20,7 @@ COMMENT= PSI Jabber Client
DEPENDS+= qca-tls>=1.0:../../security/qca-tls
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/chat/quirc/Makefile b/chat/quirc/Makefile
index 2ea51cc7d00..b7dfa5e9c89 100644
--- a/chat/quirc/Makefile
+++ b/chat/quirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= quirc-0.9.84
@@ -11,7 +11,7 @@ HOMEPAGE= http://quirc.org/
COMMENT= Stable and powerful graphical IRC client
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}
diff --git a/chat/ser/Makefile b/chat/ser/Makefile
index 6c0e0a798f8..71ef20b5291 100644
--- a/chat/ser/Makefile
+++ b/chat/ser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= ser-0.8.10_src
@@ -13,7 +13,7 @@ COMMENT= SIP express router
WRKSRC= ${WRKDIR}/ser-0.8.10
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= BUILDLINK_PREFIX.pthread=${BUILDLINK_PREFIX.pthread:Q}
MAKE_ENV+= BUILDLINK_PREFIX.mysql-client=${BUILDLINK_PREFIX.mysql-client:Q}
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 7ab6862cdba..1d69bf4c7f0 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/11 21:45:05 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= ${SILC_CLIENT_DISTNAME}
@@ -18,7 +18,7 @@ COMMENT= Client for the Secure Internet Live Conferencing (SILC)
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
SHLIBTOOL_OVERRIDE= libtool */libtool */*/*/libtool
diff --git a/chat/xaric/Makefile b/chat/xaric/Makefile
index ef1df34185c..c1e578158da 100644
--- a/chat/xaric/Makefile
+++ b/chat/xaric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= xaric-0.12.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.xaric.org/
COMMENT= IRC client similar to BitchX and ircII
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --enable-optimize
diff --git a/chat/xchat-systray-integration/Makefile b/chat/xchat-systray-integration/Makefile
index 4edff7c7193..fe60c7326bd 100644
--- a/chat/xchat-systray-integration/Makefile
+++ b/chat/xchat-systray-integration/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:43 jlam Exp $
DISTNAME= xchat-systray-integration-2.4.5-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -12,7 +12,7 @@ COMMENT= Systray icon plugin for X-Chat
DEPENDS= xchat>=2.0:../../chat/xchat2
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# We build a shared object, so ensure that the object files are PIC.
CFLAGS+= -fPIC
diff --git a/chat/xchat/Makefile.common b/chat/xchat/Makefile.common
index ad52655ebf8..47f56505d45 100644
--- a/chat/xchat/Makefile.common
+++ b/chat/xchat/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.36 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile.common,v 1.37 2005/05/22 20:07:43 jlam Exp $
DISTNAME= xchat-1.8.11
PKGREVISION= 11
@@ -21,9 +21,8 @@ PLIST_SRC= ${.CURDIR}/../xchat/PLIST
USE_DIRS+= gnome1-1.5
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake grep
USE_PERL5= YES
-USE_GNU_TOOLS+= grep
CONFIGURE_ARGS+= --enable-python
BUILD_DEFS+= USE_INET6 USE_SOCKS
diff --git a/chat/xchat2/Makefile.common b/chat/xchat2/Makefile.common
index 07332c75b22..beb26c1884e 100644
--- a/chat/xchat2/Makefile.common
+++ b/chat/xchat2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= xchat-2.4.1
@@ -13,7 +13,7 @@ DISTINFO_FILE= ${.CURDIR}/../../chat/xchat2/distinfo
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/glib2/buildlink3.mk"
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index a69805293fe..65056adaf81 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/17 03:48:59 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= asterisk-1.0.7
@@ -11,7 +11,7 @@ MAINTAINER= riz@NetBSD.org
HOMEPAGE= http://www.asterisk.org/
COMMENT= The Asterisk Software PBX
-USE_GNU_TOOLS+= make yacc
+USE_TOOLS+= bison gmake
MANCOMPRESSED= yes
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index cf377a6c8c9..056632c3d4d 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/12 15:11:18 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= fidogate-4.4.9
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.fidogate.org/
COMMENT= FidoNet (FTN) <-> Internet mail and news gateway
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV= DEBUG="${CFLAGS} -Werror"
BUILDLINK_SETENV.CC= CC="cc ${_STRIPFLAG_CC}"
diff --git a/comms/gsmlib/Makefile b/comms/gsmlib/Makefile
index ef1d9eeb4dd..beffb3fe896 100644
--- a/comms/gsmlib/Makefile
+++ b/comms/gsmlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= gsmlib-1.10
@@ -12,7 +12,7 @@ COMMENT= Library to access GSM mobile phones through GSM modems or IrDA devices
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/comms/jpilot-syncmal/Makefile b/comms/jpilot-syncmal/Makefile
index 8a9f1bb6655..d7490929dc6 100644
--- a/comms/jpilot-syncmal/Makefile
+++ b/comms/jpilot-syncmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:43 jlam Exp $
DISTNAME= jpilot-syncmal_0.71.2
PKGNAME= jpilot-syncmal-0.71.2
@@ -13,7 +13,7 @@ COMMENT= MAL synchronization plugin for J-Pilot
BUILDLINK_DEPMETHOD.jpilot= full
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= # defined
SHLIBTOOL_OVERRIDE= libtool
diff --git a/comms/libmal/Makefile b/comms/libmal/Makefile
index 79ace2f74da..e9ce7bd79fb 100644
--- a/comms/libmal/Makefile
+++ b/comms/libmal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:43 jlam Exp $
DISTNAME= libmal-0.40
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= MAL convenience library
CONFLICTS+= malsync-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
diff --git a/comms/malsync/Makefile b/comms/malsync/Makefile
index d5bf4c77999..34a6dbe0d70 100644
--- a/comms/malsync/Makefile
+++ b/comms/malsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:43 jlam Exp $
#
DISTNAME= ${PKGNAME_NOREV:S/-/_/}.src
@@ -14,7 +14,7 @@ COMMENT= Utility to synchronize Palm Pilots to the AvantGo.com service
CONFLICTS+= libmal-[0-9]*
WRKSRC= ${WRKDIR}/malsync
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= PILOT_LINK_DIR=${BUILDLINK_PREFIX.pilot-link-libs}
CPPFLAGS+= -D__unix__=1
diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile
index 60ecf98e6bb..a1f9435e0c3 100644
--- a/comms/minicom/Makefile
+++ b/comms/minicom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:44 jlam Exp $
DISTNAME= minicom-1.83.1.src
PKGNAME= ${DISTNAME:S/.src//}
@@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/src
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE= yes
PKG_SYSCONFSUBDIR= minicom
diff --git a/comms/openobex/Makefile b/comms/openobex/Makefile
index 84bd6d3a419..fbb05762e98 100644
--- a/comms/openobex/Makefile
+++ b/comms/openobex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:44 jlam Exp $
#
DISTNAME= openobex-1.0.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://openobex.sourceforge.net/
COMMENT= Implementation of the Object Exchange (OBEX) protocol
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile
index 1b57c5539d4..d5e21005867 100644
--- a/comms/p5-pilot-link/Makefile
+++ b/comms/p5-pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:44 jlam Exp $
#
.include "../../comms/pilot-link/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT= Perl bindings for pilot-link
BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-perl=${PERL5}
PERL5_CONFIGURE= NO
diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile
index 26a62f85b70..c57b8d8c766 100644
--- a/comms/pilot-link/Makefile
+++ b/comms/pilot-link/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:07:44 jlam Exp $
.include "../../comms/pilot-link/Makefile.common"
@@ -9,7 +9,7 @@ COMMENT= Tools to talk to the 3Com Pilot PDA
BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS}
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_READLINE= YES
CONFIGURE_ARGS+= --with-perl5=${PERL5}
diff --git a/comms/plp/Makefile b/comms/plp/Makefile
index 9d2c1094251..107f23daac3 100644
--- a/comms/plp/Makefile
+++ b/comms/plp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:44 jlam Exp $
DISTNAME= plp_1_8
PKGNAME= plp-1.8
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.proudman51.freeserve.co.uk/psion/
COMMENT= Tools to talk to the PSION organiser
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= # defined
do-install:
diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile
index 4af916af2a9..cb8fb6f5d07 100644
--- a/comms/plptools/Makefile
+++ b/comms/plptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:44 jlam Exp $
#
DISTNAME= plptools-0.12
@@ -11,7 +11,7 @@ HOMEPAGE= http://plptools.sourceforge.net/
COMMENT= FTP-like and NFS-like access tools to talk to the PSION
USE_GNU_READLINE= # uses rl_filename_quoting_desired flag
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANUGAGES= c c++
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/comms/scmxx/Makefile b/comms/scmxx/Makefile
index 0f3e5f3eb64..701a83feb97 100644
--- a/comms/scmxx/Makefile
+++ b/comms/scmxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:45:08 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:44 jlam Exp $
#
DISTNAME= scmxx-0.7.5
@@ -12,7 +12,7 @@ COMMENT= Data exchange utility for Siemens mobile phones
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/scmxx
diff --git a/converters/autoconvert/Makefile b/converters/autoconvert/Makefile
index 981aaaede53..df41b658f55 100644
--- a/converters/autoconvert/Makefile
+++ b/converters/autoconvert/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:08 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:44 jlam Exp $
DISTNAME= autoconvert-0.3.13
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://banyan.dlut.edu.cn/~ygh/
COMMENT= Intelligent Chinese encoding converter
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/examples/autoconvert
diff --git a/converters/cn2jp/Makefile b/converters/cn2jp/Makefile
index 8efbfaa1593..52346167a31 100644
--- a/converters/cn2jp/Makefile
+++ b/converters/cn2jp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:13:17 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:44 jlam Exp $
DISTNAME= cn2jp1.4b
PKGNAME= cn2jp-1.4b
@@ -12,7 +12,7 @@ COMMENT= Library for code translation between Chinese and Japanese
WRKSRC= ${WRKDIR}/cn2jp
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE= yes
diff --git a/converters/macfork/Makefile b/converters/macfork/Makefile
index 98e60d50251..7dc65882add 100644
--- a/converters/macfork/Makefile
+++ b/converters/macfork/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:08 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:44 jlam Exp $
DISTNAME= macfork-1.0
CATEGORIES= converters
@@ -10,7 +10,7 @@ COMMENT= Tool for extracting data from Macintosh resource forks
WRKSRC= ${WRKDIR}/macfork
USE_LANGUAGE= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
DOCDIR= ${PREFIX}/share/doc/macfork
diff --git a/converters/rss2html/Makefile b/converters/rss2html/Makefile
index 7a4a32a5acb..7f4fae6e890 100644
--- a/converters/rss2html/Makefile
+++ b/converters/rss2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:09 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:44 jlam Exp $
#
DISTNAME= rss2html-0.7.1
@@ -11,7 +11,7 @@ COMMENT= RSS to HTML converter
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS+= bin
diff --git a/converters/wv/Makefile b/converters/wv/Makefile
index 8b72a8ddaf1..5178d965621 100644
--- a/converters/wv/Makefile
+++ b/converters/wv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/04/20 15:42:11 drochner Exp $
+# $NetBSD: Makefile,v 1.45 2005/05/22 20:07:44 jlam Exp $
DISTNAME= wv-1.0.3
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://wvware.sourceforge.net/
COMMENT= Library and executables to access Microsoft Word files
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/converters/xlhtml/Makefile b/converters/xlhtml/Makefile
index 50c108a24e6..4632c065688 100644
--- a/converters/xlhtml/Makefile
+++ b/converters/xlhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:44 jlam Exp $
#
DISTNAME= xlhtml-0.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://chicago.sourceforge.net/xlhtml/
COMMENT= Microsoft xls/ppt to HTML converter
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# fabs
LIBS.SunOS+= -lm
diff --git a/cross/COMMON/cross.mk b/cross/COMMON/cross.mk
index 13afbceb440..42ae8d9b2a2 100644
--- a/cross/COMMON/cross.mk
+++ b/cross/COMMON/cross.mk
@@ -1,4 +1,4 @@
-# $NetBSD: cross.mk,v 1.32 2005/05/19 01:30:48 jlam Exp $
+# $NetBSD: cross.mk,v 1.33 2005/05/22 20:07:44 jlam Exp $
# Shared definitions for building a cross-compile environment.
@@ -157,7 +157,7 @@ PLIST_PRE+= ${COMMON_DIR}/PLIST-egcs
CROSS_DISTFILES+= ${EGCS_DISTNAME}.tar.gz ${EGCS_PATCHBUNDLE}
SITES_${EGCS_DISTNAME}.tar.gz= # no known-good site; fall back to distfiles mirrors
SITES_${EGCS_PATCHBUNDLE}= ${MASTER_SITE_LOCAL}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CC_FOR_TARGET= ${EGCS_WRKSRC}/gcc/xgcc -B${EGCS_WRKSRC}/gcc/ ${CFLAGS_FOR_TARGET}
CXX_FOR_TARGET= ${CC_FOR_TARGET}
diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index 0c0197a993b..b82551ee872 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:44 jlam Exp $
DISTNAME= binutils-2.13.2.1
PKGNAME= avr-binutils-2.13.2.1
@@ -10,7 +10,7 @@ MAINTAINER= karlj@mdstud.chalmers.se
COMMENT= GNU binutils for Atmel AVR 8-bit RISC microcontrollers
USE_BZIP2= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_MAKEINFO= YES
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 40cddc6c28f..52b1243c376 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:44 jlam Exp $
DISTNAME= gcc-3.3.2003.05.11
PKGNAME= avr-gcc-3.3.2003.05.11
@@ -23,7 +23,7 @@ EXTRACT_ONLY= gcc-core+g++-3.3.2003.05.11${EXTRACT_SUFX}
GNU_CONFIGURE= yes
USE_PERL5= build
USE_BZIP2= yes
-USE_GNU_TOOLS+= lex make yacc
+USE_TOOLS+= bison gmake lex
PKGSRC_USE_TOOLS+= tar
USE_PKGLOCALEDIR= yes
diff --git a/cross/avr-gdb/Makefile b/cross/avr-gdb/Makefile
index 60ab5d39113..763d97db6de 100644
--- a/cross/avr-gdb/Makefile
+++ b/cross/avr-gdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:44 jlam Exp $
DISTNAME= gdb-5.3
PKGNAME= avr-gdb-5.3
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_GNU:=gdb/}
MAINTAINER= karlj@mdstud.chalmers.se
COMMENT= GNU gdb for Atmel AVR 8-bit RISC microcontrollers
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --target=avr --program-prefix=avr
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index 8be8c729cb0..3232e72a012 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:44 jlam Exp $
#
# GNU binutils configured to hold `as many targets as the cross system is
# capable of using'. Configures and builds everything except gas, which
@@ -15,7 +15,7 @@ HOMEPAGE= http://www.gnu.org/
COMMENT= Unified GNU binutils for cross build environments
USE_CROSSBASE= yes
-USE_GNU_TOOLS+= m4
+USE_TOOLS+= gm4
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile
index 4e085db91a6..c16ab021464 100644
--- a/cross/h8300-hms-binutils/Makefile
+++ b/cross/h8300-hms-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:45 jlam Exp $
DISTNAME= binutils-2.12.1
PKGNAME= cross-h8300-hms-binutils-2.12.1
@@ -13,7 +13,7 @@ COMMENT= h8300-hms cross utility
H8300_PREFIX= ${PREFIX}/libexec/cross-h8300-hms
WRKSRC= ${WRKDIR}/objdir
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${H8300_PREFIX}
diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile
index 9604274bcc0..ac9655f5ca1 100644
--- a/cross/h8300-hms-gcc/Makefile
+++ b/cross/h8300-hms-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:10 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:45 jlam Exp $
DISTNAME= gcc-core-3.1
PKGNAME= cross-h8300-hms-gcc-3.1
@@ -20,7 +20,7 @@ DEPENDS+= cross-h8300-hms-binutils-[0-9]*:../../cross/h8300-hms-binutils
H8300_PREFIX= ${LOCALBASE}/libexec/cross-h8300-hms
WRKSRC= ${WRKDIR}/objdir
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${H8300_PREFIX}
CONFIGURE_ARGS+= --infodir=${H8300_PREFIX}/gcc
diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile
index dd6a9ae3711..d79dd03b70f 100644
--- a/cross/i386-mingw32/Makefile
+++ b/cross/i386-mingw32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/16 01:32:22 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:45 jlam Exp $
DISTNAME= cross-${TARGET_ARCH}-3.2
CROSS_DISTFILES=
@@ -26,7 +26,7 @@ CROSS_DISTFILES+= mingw-runtime-3.2.tar.gz
MINGW_WRKSRC= ${WRKDIR}/mingw-runtime-3.2
CROSS_DISTFILES+= w32api-2.5.tar.gz
W32_WRKSRC= ${WRKDIR}/w32api-2.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGSRC_USE_TOOLS+= tar
USE_PERL5= build
diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile
index 1d34d7b6e59..741a82dbe34 100644
--- a/cross/mipsEEel-netbsd/Makefile
+++ b/cross/mipsEEel-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/03/02 20:49:04 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:45 jlam Exp $
DISTNAME= cross-${TARGET_ARCH}-${DISTVERSION}
TARGET_ARCH= mipsEEel-netbsd
@@ -8,7 +8,7 @@ CATEGORIES+= cross lang
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Cross-compiler for NetBSD/PlayStation2 kernel
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= yes
.if exists(/usr/bin/bzcat)
diff --git a/databases/db/Makefile b/databases/db/Makefile
index a7b1de2b77e..83e38eed572 100644
--- a/databases/db/Makefile
+++ b/databases/db/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:45 jlam Exp $
DISTNAME= db-2.7.7
PKGREVISION= 2
@@ -21,7 +21,7 @@ GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../dist/configure
CONFIGURE_ARGS+= --enable-compat185
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
INSTALLATION_DIRS= bin include/db2 lib share/doc/html
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 6ae8ccda649..6acc2e6377d 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:45 jlam Exp $
DISTNAME= freetds-0.61.2
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/freetds
diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile
index 5b9643692d8..ec406785165 100644
--- a/databases/geneweb/Makefile
+++ b/databases/geneweb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/05 11:07:35 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= geneweb-4.10
@@ -10,7 +10,7 @@ HOMEPAGE= http://cristal.inria.fr/~ddr/GeneWeb/
COMMENT= GeneWeb is a comprehensive genealogy database application
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
RCD_SCRIPTS= geneweb
diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile
index 8f67fb498a6..b8be5917e70 100644
--- a/databases/gnats/Makefile
+++ b/databases/gnats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= gnats-4.0.1
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnu.org/software/gnats/
COMMENT= GNATS bug tracking system
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= m4 make
+USE_TOOLS+= gm4 gmake
USE_BISON= yes
USE_MAKEINFO= yes
TEXINFO_REQD= 4.6
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index e3ca6c41293..165b146d405 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= guile-pg-0.23
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.glug.org/people/ttn/software/guile-pg/
COMMENT= PostgreSQL interface for Guile
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
TEST_TARGET= check
diff --git a/databases/jdbc-postgresql/Makefile b/databases/jdbc-postgresql/Makefile
index 7249c2c5e8d..376d6efd439 100644
--- a/databases/jdbc-postgresql/Makefile
+++ b/databases/jdbc-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/10/25 17:40:01 jdolecek Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= postgresql-${DIST_VERS}
@@ -24,7 +24,7 @@ BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
EXTRACT_ELEMENTS= ${DISTNAME}/src/interfaces/jdbc
WRKSRC= ${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
EXAMPLEDIR= ${PREFIX}/share/examples/java/jdbc-postgresql
DOCDIR= ${PREFIX}/share/doc/java/jdbc-postgresql
diff --git a/databases/jdbc-postgresql74/Makefile b/databases/jdbc-postgresql74/Makefile
index f0e836f8c29..c7fab419ca8 100644
--- a/databases/jdbc-postgresql74/Makefile
+++ b/databases/jdbc-postgresql74/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/10/25 17:12:10 jdolecek Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:45 jlam Exp $
#
DIST_VERS= 7.4.6
@@ -25,7 +25,7 @@ BUILD_DEPENDS+= apache-ant-[0-9]*:../../devel/apache-ant
EXTRACT_ELEMENTS= ${DISTNAME}/src/interfaces/jdbc
WRKSRC= ${WRKDIR}/${DISTNAME}/src/interfaces/jdbc
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
EXAMPLEDIR= ${PREFIX}/share/examples/java/jdbc-postgresql
DOCDIR= ${PREFIX}/share/doc/java/jdbc-postgresql
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index c5b83ea8cd3..d9081d95f6f 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/03/25 21:39:11 kim Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:45 jlam Exp $
DISTNAME= ${PKGNAME:S/-/_/}
PKGNAME= lbdb-0.29
@@ -12,7 +12,7 @@ COMMENT= The little brother's database
DEPENDS+= p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
USE_PKGINSTALL= yes
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index b6b30a84a3c..746e3963c50 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/05/20 22:09:39 jlam Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= libgda-1.2.1
@@ -14,7 +14,7 @@ DISTINFO_FILE= ${.CURDIR}/../../databases/libgda/distinfo
PATCHDIR= ${.CURDIR}/../../databases/libgda/patches
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index 42ad8b15e97..800f1e9ae83 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/18 18:01:48 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= libgnomedb-1.2.1
@@ -13,7 +13,7 @@ COMMENT= GNOME2 database library
BUILD_USES_MSGFMT= yes
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index ebceb27e844..3659c0980cb 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= mergeant-0.52
@@ -13,7 +13,7 @@ COMMENT= GNOME2 GNOME-DB database front-end
USE_PERL5= build
USE_DIRS+= gnome2-1.5
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --disable-gtk-doc
diff --git a/databases/myodbc/Makefile b/databases/myodbc/Makefile
index d4042124152..06adbd095c7 100644
--- a/databases/myodbc/Makefile
+++ b/databases/myodbc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:21 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:45 jlam Exp $
#
DISTNAME= MyODBC-2.50.36
@@ -24,7 +24,7 @@ CONFIGURE_ARGS+= --with-odbc-ini=${LOCALBASE}/etc/odbc.ini
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/myodbc
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index 08d68454916..e93d2c43f1e 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2005/05/18 15:00:35 sketch Exp $
+# $NetBSD: Makefile.common,v 1.43 2005/05/22 20:07:46 jlam Exp $
DISTNAME= mysql-4.0.24
CATEGORIES= databases
@@ -81,7 +81,7 @@ CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
.endif
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 25fa660fb3f..fe29d6fc7b1 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2005/05/18 15:08:24 sketch Exp $
+# $NetBSD: Makefile.common,v 1.39 2005/05/22 20:07:46 jlam Exp $
DISTNAME= mysql-4.1.11
CATEGORIES= databases
@@ -87,7 +87,7 @@ CONFIGURE_ENV+= ac_cv_func_pthread_attr_setschedparam=no
.endif
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
diff --git a/databases/odbc-postgresql/Makefile.common b/databases/odbc-postgresql/Makefile.common
index 87f4e58000b..f58668a3f70 100644
--- a/databases/odbc-postgresql/Makefile.common
+++ b/databases/odbc-postgresql/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:46 jlam Exp $
DISTNAME= postgresql-${DIST_VERS}
CATEGORIES= databases
@@ -29,7 +29,7 @@ PATCHDIR?= ${.CURDIR}/../odbc-postgresql/patches
DIST_VERS?= 7.2.3
BASE_VERS?= ${DIST_VERS}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
GNU_CONFIGURE= YES
diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common
index 3fd9d369c0e..6ab332ec62c 100644
--- a/databases/postgresql73/Makefile.common
+++ b/databases/postgresql73/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/02/07 04:27:27 dan Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:07:46 jlam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -39,7 +39,7 @@ BASE_VERS?= ${DIST_VERS}
BUILDLINK_DEPENDS.postgresql73-lib?= postgresql73-lib>=${BASE_VERS}
BUILDLINK_DEPENDS.tcl-postgresql73?= tcl-postgresql73>=${BASE_VERS}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
PKG_SYSCONFSUBDIR= postgresql
diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common
index a0acab788d8..849bce12d7d 100644
--- a/databases/postgresql74/Makefile.common
+++ b/databases/postgresql74/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/04/11 21:45:14 tv Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/05/22 20:07:46 jlam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -44,7 +44,7 @@ BUILDLINK_DEPENDS.postgresql74-lib?= postgresql74-lib>=${BASE_VERS}
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= lex make yacc
+USE_TOOLS+= bison gmake lex
PKG_SYSCONFSUBDIR= postgresql
# in 7.4.2, this is done by autoconf stuff which has leading whitespace
diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common
index 63cf119887d..e560b7e71e6 100644
--- a/databases/postgresql80/Makefile.common
+++ b/databases/postgresql80/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/15 12:31:57 recht Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:07:46 jlam Exp $
#
# This Makefile fragment is included by all PostgreSQL packages built from
# the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -43,7 +43,7 @@ BUILDLINK_DEPENDS.postgresql80-client?= postgresql80-client>=${BASE_VERS}
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= lex make yacc
+USE_TOOLS+= bison gmake lex
PKG_SYSCONFSUBDIR= postgresql
# in 7.4.x/8.0.x, this is done by autoconf stuff which has leading whitespace
diff --git a/databases/pxtools/Makefile b/databases/pxtools/Makefile
index 69858fdc957..ed54dd1263d 100644
--- a/databases/pxtools/Makefile
+++ b/databases/pxtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:46 jlam Exp $
#
DISTNAME= pxtools-0.0.20
@@ -11,7 +11,7 @@ HOMEPAGE= http://jan.kneschke.de/projects/pxtools/
COMMENT= Paradox database export/info utilities
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
diff --git a/databases/py-gdbm/Makefile b/databases/py-gdbm/Makefile
index 84cb97c65f3..9060f081b51 100644
--- a/databases/py-gdbm/Makefile
+++ b/databases/py-gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/03/30 19:11:29 darcy Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:46 jlam Exp $
#
PKGNAME= ${PYPKGPREFIX}-gdbm-0
@@ -11,7 +11,7 @@ COMMENT= Python interface to gdbm - GNU database manager
EVAL_PREFIX+= GDBMDIR=gdbm
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
EXTRACT_ELEMENTS= ${PYSUBDIR}/Modules/gdbmmodule.c
PYDISTUTILSPKG= yes
diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile
index 0efab4e31c7..b31d8a38abf 100644
--- a/databases/py-pgnotify/Makefile
+++ b/databases/py-pgnotify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $
#
DISTNAME= pgnotify-0.1
@@ -15,7 +15,7 @@ DEPENDS+= ${PYPKGPREFIX}-postgresql-[0-9]*:../../databases/py-postgresql
MAKE_ENV+= MANDIR=${PREFIX}/man
MAKE_ENV+= BINDIR=${PREFIX}/bin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile
index b76c35ba971..228145b2eea 100644
--- a/databases/py-postgresql/Makefile
+++ b/databases/py-postgresql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:07:46 jlam Exp $
DISTNAME= PyGreSQL-3.6.2
PKGNAME= ${PYPKGPREFIX}-postgresql-3.6.2
@@ -12,7 +12,7 @@ COMMENT= Python interface to PostgreSQL
MAKE_ENV+= MANDIR=${LOCALBASE}/man
MAKE_ENV+= BINDIR=${LOCALBASE}/bin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
MAKE_ENV+= INSTALLED_LIBPQ=1
diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile
index e0e7f389553..f3a7ddd53b1 100644
--- a/databases/py-table/Makefile
+++ b/databases/py-table/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:15 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $
#
DISTNAME= pytable-0.8.3a
@@ -14,7 +14,7 @@ DEPENDS+= ${PYPKGPREFIX}-basicproperty-[0-9]*:../../lang/py-basicproperty
MAKE_ENV+= MANDIR=${PREFIX}/man
MAKE_ENV+= BINDIR=${PREFIX}/bin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 236ae21ca2a..321c5230a4a 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 05:35:32 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:07:46 jlam Exp $
#
DISTNAME= rrdtool-1.0.40
@@ -15,7 +15,7 @@ NOT_FOR_PLATFORM= NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
NetBSD-1.5.*-alpha NetBSD-1.5[A-U]-alpha
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index b32ca894bb6..2d480191575 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:07:46 jlam Exp $
DISTNAME= sqlite-2.8.16
CATEGORIES= databases
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.hwaci.com/sw/sqlite/
COMMENT= SQL Database Engine in a C Library
WRKSRC= ${WRKDIR}/sqlite-build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/databases/sqlite3/Makefile.common b/databases/sqlite3/Makefile.common
index 7a03b94ac87..6dab28d40b3 100644
--- a/databases/sqlite3/Makefile.common
+++ b/databases/sqlite3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/04/14 05:45:51 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/05/22 20:07:46 jlam Exp $
DISTNAME= sqlite-3.2.1
PKGNAME= ${DISTNAME:S/-/3-/}
@@ -14,7 +14,7 @@ DISTINFO_FILE= ${.CURDIR}/../../databases/sqlite3/distinfo
PATCHDIR= ${.CURDIR}/../../databases/sqlite3/patches
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= sqlite3.pc.in
diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile
index bd251ee074d..c16793bd66d 100644
--- a/databases/sqlrelay/Makefile
+++ b/databases/sqlrelay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:46 jlam Exp $
DISTNAME= sqlrelay-0.33.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Enables pooling and sharing of database connections
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
#SQLRELAY_DATABASES+= mysql postgresql
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 96e5b4b4a2d..937b13ee42a 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/15 11:45:16 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:46 jlam Exp $
#
DISTNAME= tdb-1.0.6
@@ -14,7 +14,7 @@ COMMENT= Small database system which uses files to store data
CONFLICTS+= samba-[0-9]*
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
.include "../../mk/bsd.pkg.mk"
diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile
index b400c69d1e6..6ee19bf3ddf 100644
--- a/databases/xsqlmenu/Makefile
+++ b/databases/xsqlmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:16 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:47 jlam Exp $
#
DISTNAME= xsqlmenu-2.10
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.jlab.org/~saw/xsqlmenu/
COMMENT= X based GUI for MySQL
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= MAKE=${MAKE_PROGRAM}
do-install:
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
diff --git a/editors/TeXmacs/Makefile b/editors/TeXmacs/Makefile
index 3df06b809ed..257869d403e 100644
--- a/editors/TeXmacs/Makefile
+++ b/editors/TeXmacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/05/18 15:37:46 drochner Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:55 jlam Exp $
DISTNAME= TeXmacs-1.0.5.1-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -13,7 +13,7 @@ DEPENDS+= teTeX>=1.0:../../print/teTeX
BUILD_TARGET= TEXMACS
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/editors/abiword/Makefile.common b/editors/abiword/Makefile.common
index db5dae6ba99..4f3e984f7dd 100644
--- a/editors/abiword/Makefile.common
+++ b/editors/abiword/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/04/18 13:20:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:07:55 jlam Exp $
# Be sure to update PLIST and distinfo for editors/abiword-plugins when updating
ABIWORD_VERSION= 2.2.7
@@ -18,7 +18,7 @@ MAKEFILE= GNUmakefile
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
CONFIGURE_ARGS+= --with-libpng=${BUILDLINK_PREFIX.png}
diff --git a/editors/biew/Makefile b/editors/biew/Makefile
index 107864939a1..f5f58939d6b 100644
--- a/editors/biew/Makefile
+++ b/editors/biew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= biew562
@@ -13,7 +13,7 @@ COMMENT= Binary viewer/editor
ONLY_FOR_PLATFORM= *-*-i386
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
WRKSRC= ${WRKDIR}/biew-562
diff --git a/editors/conglomerate/Makefile b/editors/conglomerate/Makefile
index 17e196b32cd..cd26aac9e07 100644
--- a/editors/conglomerate/Makefile
+++ b/editors/conglomerate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= conglomerate-0.9.0
@@ -16,7 +16,7 @@ DEPENDS+= docbook-xml>=4.2nb6:../../textproc/docbook-xml
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
USE_PKGLOCALEDIR= yes
diff --git a/editors/cooledit/Makefile b/editors/cooledit/Makefile
index 01aef899ce0..747bdafba65 100644
--- a/editors/cooledit/Makefile
+++ b/editors/cooledit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:55 jlam Exp $
DISTNAME= cooledit-3.17.14
CATEGORIES= editors
@@ -10,7 +10,7 @@ COMMENT= Full-featured text editor
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/editors/dasher/Makefile b/editors/dasher/Makefile
index 409eae2d748..59416891235 100644
--- a/editors/dasher/Makefile
+++ b/editors/dasher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:07:55 jlam Exp $
#
DISTNAME= dasher-3.2.15
@@ -12,7 +12,7 @@ COMMENT= Easy typing without using keyboard
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/editors/emacs-nox11/Makefile b/editors/emacs-nox11/Makefile
index 763f1f4add8..1d6bc305ac4 100644
--- a/editors/emacs-nox11/Makefile
+++ b/editors/emacs-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:56 jlam Exp $
DISTNAME= emacs-21.4a
PKGNAME= emacs-nox11-21.4a
@@ -14,7 +14,7 @@ CONFLICTS= mule-[0-9]*
CONFLICTS+= emacs-[0-9]*
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PATCHDIR= ${.CURDIR}/../emacs/patches
FILESDIR= ${.CURDIR}/../emacs/files
diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile
index 67a31bb9e83..2a7c6155360 100644
--- a/editors/emacs/Makefile
+++ b/editors/emacs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2005/05/09 05:23:40 minskim Exp $
+# $NetBSD: Makefile,v 1.84 2005/05/22 20:07:56 jlam Exp $
DISTNAME= emacs-21.4a
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= GNU editing macros (editor)
CONFLICTS= mule-[0-9]*
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
# needed for 21.4a, can probably go away on next update
diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile
index ae5e68a206a..2fe57db903b 100644
--- a/editors/emacs20/Makefile
+++ b/editors/emacs20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/16 21:05:27 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:07:56 jlam Exp $
DISTNAME= emacs-20.7
PKGREVISION= 5
@@ -25,7 +25,7 @@ NOT_FOR_PLATFORM= Darwin-*-*
CONFLICTS= mule-[0-9]*
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_ARCH.mipsbe= mips
BUILD_DEFS+= USE_INET6 EMACS_USE_POP
diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile
index 714b4193a35..5557887842b 100644
--- a/editors/gconf-editor/Makefile
+++ b/editors/gconf-editor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:56 jlam Exp $
#
DISTNAME= gconf-editor-2.10.0
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1 gnome2-1.5
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE}
diff --git a/editors/gedit/Makefile b/editors/gedit/Makefile
index d84bc114547..f94a7cfaaa4 100644
--- a/editors/gedit/Makefile
+++ b/editors/gedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/05/19 21:08:57 jmmv Exp $
+# $NetBSD: Makefile,v 1.46 2005/05/22 20:07:56 jlam Exp $
#
DISTNAME= gedit-2.10.2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
USE_PERL5= build
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/editors/gice/Makefile b/editors/gice/Makefile
index 430615f9cfe..127da75128e 100644
--- a/editors/gice/Makefile
+++ b/editors/gice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:56 jlam Exp $
#
DISTNAME= gice-0.6.2
@@ -12,7 +12,7 @@ COMMENT= Powerful C text editor with advanced features
WRKSRC= ${WRKDIR}/gice
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
BUILD_TARGET= gice
diff --git a/editors/gtranslator/Makefile b/editors/gtranslator/Makefile
index 88b0f9a2b35..a9748a464fa 100644
--- a/editors/gtranslator/Makefile
+++ b/editors/gtranslator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:56 jlam Exp $
DISTNAME= gtranslator-1.0.2
CATEGORIES= editors
@@ -11,7 +11,7 @@ COMMENT= Gettext po file editor for the GNOME2 desktop environment
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/editors/hnb/Makefile b/editors/hnb/Makefile
index f6836d24e67..766684e9f98 100644
--- a/editors/hnb/Makefile
+++ b/editors/hnb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:56 jlam Exp $
#
DISTNAME= hnb-1.9.17
@@ -11,7 +11,7 @@ COMMENT= Hierarchical data organizer
INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-U]-*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_DIRS= ${WRKSRC}/src
BUILD_TARGET= hnb
diff --git a/editors/joe/Makefile b/editors/joe/Makefile
index 8e1c56d37a8..207c399ae6c 100644
--- a/editors/joe/Makefile
+++ b/editors/joe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:40 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:56 jlam Exp $
DISTNAME= joe-3.2
CATEGORIES= editors
@@ -8,7 +8,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://joe-editor.sourceforge.net/
COMMENT= Joe's own editor
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --sysconfdir="${PREFIX}/share/examples"
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 6bfe527f530..8a8df6a6911 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:56 jlam Exp $
DISTNAME= kile-1.7.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ HOMEPAGE= http://kile.sourceforge.net/
COMMENT= LaTeX source editor - TeX shell - Gnuplot front end
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PERL5= build
diff --git a/editors/leim/Makefile b/editors/leim/Makefile
index 6373abe13b1..a1674ab4a56 100644
--- a/editors/leim/Makefile
+++ b/editors/leim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/02/26 16:26:30 wiz Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:56 jlam Exp $
DISTNAME= leim-${VERSION}
CATEGORIES= editors
@@ -11,7 +11,7 @@ COMMENT= Libraries of Emacs Input Methods (for emacs21)
WRKSRC= ${WRKDIR}/emacs-${VERSION}/leim
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
VERSION= 21.4
diff --git a/editors/leim20/Makefile b/editors/leim20/Makefile
index 2e25af4b458..5bca1c08fe1 100644
--- a/editors/leim20/Makefile
+++ b/editors/leim20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/02/17 00:42:10 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:56 jlam Exp $
DISTNAME= leim-${VERSION}
PKGREVISION= 5
@@ -14,7 +14,7 @@ DEPENDS+= emacs-${VERSION}nb5:../emacs20
WRKSRC= ${WRKDIR}/emacs-20.7/leim
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
VERSION= 20.7
diff --git a/editors/lpe/Makefile b/editors/lpe/Makefile
index be316065b97..052d2fd42b3 100644
--- a/editors/lpe/Makefile
+++ b/editors/lpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:56 jlam Exp $
#
DISTNAME= lpe-1.2.6
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= YES
USE_PKGLOCALEDIR= YES
USE_PKGINSTALL= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
SHLIBTOOL_OVERRIDE= libtool
diff --git a/editors/lyx-qt/Makefile.common b/editors/lyx-qt/Makefile.common
index 039ddbdfde3..6cc924dd8ca 100644
--- a/editors/lyx-qt/Makefile.common
+++ b/editors/lyx-qt/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/05/22 20:07:56 jlam Exp $
#
DISTNAME= lyx-1.3.5
@@ -25,7 +25,7 @@ UNLIMIT_RESOURCES+= datasize
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PERL5= YES
USE_PKGLOCALEDIR= YES
diff --git a/editors/mlview/Makefile b/editors/mlview/Makefile
index 8098424468d..fbc63de5a28 100644
--- a/editors/mlview/Makefile
+++ b/editors/mlview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:07:56 jlam Exp $
#
DISTNAME= mlview-0.7.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/editors/mule/Makefile b/editors/mule/Makefile
index 18b0f2e33cd..6134eebe836 100644
--- a/editors/mule/Makefile
+++ b/editors/mule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:56 jlam Exp $
DISTNAME= mule-2.3
PKGREVISION= 2
@@ -22,7 +22,7 @@ CONFLICTS= emacs-[0-9]*
WRKSRC= ${WRKDIR}/mule
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
CONFIGURE_ARGS+= ${MACHINE_ARCH}--netbsd --with-x --with-x-toolkit=lucid
diff --git a/editors/poedit/Makefile b/editors/poedit/Makefile
index 67d5be0528a..67521e08b27 100644
--- a/editors/poedit/Makefile
+++ b/editors/poedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:41 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= poedit-1.2.5
@@ -14,7 +14,7 @@ DEPENDS+= zip-[0-9]*:../../archivers/zip
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
.include "../../databases/db4/buildlink3.mk"
diff --git a/editors/speedbar/Makefile b/editors/speedbar/Makefile
index 9bea37528a8..85cbbf7920f 100644
--- a/editors/speedbar/Makefile
+++ b/editors/speedbar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/22 08:30:30 grant Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= speedbar-0.14beta4
@@ -15,7 +15,7 @@ COMMENT= Directory and code browser for emacs
BUILD_ENV+= EMACS=${EMACS}
NO_CONFIGURE= # set
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INFO_FILES= speedbar.info
diff --git a/editors/xwpe/Makefile b/editors/xwpe/Makefile
index e2e89fa8f4b..28c0fa91a5a 100644
--- a/editors/xwpe/Makefile
+++ b/editors/xwpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= xwpe-1.5.29a
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.identicalsoftware.com/xwpe/
COMMENT= Programming environment for UNIX systems
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_NCURSES= # tigetstr()
USE_X11= yes
diff --git a/editors/yudit/Makefile b/editors/yudit/Makefile
index 0f4d55cd986..31ba2bd9be3 100644
--- a/editors/yudit/Makefile
+++ b/editors/yudit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= yudit-2.7.6
@@ -10,7 +10,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://yudit.org/
COMMENT= Unicode Text Editor
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/emulators/BasiliskII/Makefile b/emulators/BasiliskII/Makefile
index 108a2b352f5..7e4c9fe69f8 100644
--- a/emulators/BasiliskII/Makefile
+++ b/emulators/BasiliskII/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:57 jlam Exp $
DISTNAME= BasiliskII_src_14032003
PKGNAME= BasiliskII-1.0.20030314
@@ -14,7 +14,7 @@ NOT_FOR_PLATFORM+= Darwin-*-*
WRKSRC= ${WRKDIR}/BasiliskII-1.0/src/Unix
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
diff --git a/emulators/DatLib/Makefile b/emulators/DatLib/Makefile
index 0b408924268..3b5f0a2e146 100644
--- a/emulators/DatLib/Makefile
+++ b/emulators/DatLib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/20 15:30:18 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= datlib25
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.logiqx.com/Tools/DatLib/DatLib.shtml
COMMENT= Data file library for some emulation tools
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= datlib
diff --git a/emulators/DatUtil/Makefile b/emulators/DatUtil/Makefile
index e919994dfb2..7ac122e538c 100644
--- a/emulators/DatUtil/Makefile
+++ b/emulators/DatUtil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/20 15:30:29 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= dutil217
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.logiqx.com/Tools/DatUtil/DatUtil.shtml
COMMENT= Create and convert emulator rom checksum files
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= datutil
diff --git a/emulators/MAMEDiff/Makefile b/emulators/MAMEDiff/Makefile
index 630aad3f9ea..6a882bf3d6a 100644
--- a/emulators/MAMEDiff/Makefile
+++ b/emulators/MAMEDiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= mdiff216
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.logiqx.com/Tools/MAMEDiff/MAMEDiff.shtml
COMMENT= Compare MAME rom sets of different releases
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= mamediff
diff --git a/emulators/ROMBuild/Makefile b/emulators/ROMBuild/Makefile
index d7991f3aa79..96bfdd69c10 100644
--- a/emulators/ROMBuild/Makefile
+++ b/emulators/ROMBuild/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= rbuild26
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.logiqx.com/Tools/ROMBuild/ROMBuild.shtml
COMMENT= Arcade ROM manipulation tool
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= rombuild
diff --git a/emulators/ROMInfo/Makefile b/emulators/ROMInfo/Makefile
index ab439b75454..cdb3c636ea3 100644
--- a/emulators/ROMInfo/Makefile
+++ b/emulators/ROMInfo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= rinfo23
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.logiqx.com/Tools/ROMInfo/ROMInfo.shtml
COMMENT= Identify arcade ROM sets
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= rominfo
diff --git a/emulators/ZIPIdent/Makefile b/emulators/ZIPIdent/Makefile
index 8c4435eb6d6..00bc902d4f7 100644
--- a/emulators/ZIPIdent/Makefile
+++ b/emulators/ZIPIdent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= zident24
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.logiqx.com/Tools/ZIPIdent/ZIPIdent.shtml
COMMENT= Identify arcade ROM sets
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}
MAKEFILE= makefile
BUILD_TARGET= zipident
diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile
index a9d4fad3bca..e9a338d2182 100644
--- a/emulators/aranym/Makefile
+++ b/emulators/aranym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/20 02:04:35 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= aranym-0.8.9beta
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://aranym.sourceforge.net/
COMMENT= Atari Running on Any Machine
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/emulators/arcem/Makefile b/emulators/arcem/Makefile
index 64de6414a1b..d2ceb11d003 100644
--- a/emulators/arcem/Makefile
+++ b/emulators/arcem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:42 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= arcem-1.00-src
@@ -25,7 +25,7 @@ COMMENT= Dave Gilbert's Acorn Archimedes emulator
WRKSRC= ${WRKDIR}/arcem
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= SYSTEM=X
diff --git a/emulators/atari800/Makefile b/emulators/atari800/Makefile
index 136532da8e8..532459080e5 100644
--- a/emulators/atari800/Makefile
+++ b/emulators/atari800/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/17 15:08:57 adam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:07:57 jlam Exp $
DISTNAME= atari800-1.3.6
CATEGORIES= emulators
@@ -16,7 +16,7 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
WRKSRC= ${WRKDIR}/${DISTNAME}/src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
.include "options.mk"
diff --git a/emulators/bochs/Makefile b/emulators/bochs/Makefile
index 2134caea4a0..05992b1ee8c 100644
--- a/emulators/bochs/Makefile
+++ b/emulators/bochs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/16 18:22:57 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:07:57 jlam Exp $
DISTNAME= bochs-2.1.1
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://bochs.sourceforge.net/
COMMENT= i386 machine emulator capable of running DOS/Windows
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_TOOLS+= gunzip gzip
USE_LANGUAGES= c c++
diff --git a/emulators/darcnes/Makefile.common b/emulators/darcnes/Makefile.common
index c565f001062..9588b2ac132 100644
--- a/emulators/darcnes/Makefile.common
+++ b/emulators/darcnes/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:57 jlam Exp $
DISTNAME= dn9b0401
CATEGORIES= emulators
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.dridus.com/~nyef/darcnes/
LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}/darcnes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PATCHDIR= ${.CURDIR}/../../emulators/darcnes/patches
DISTINFO_FILE= ${.CURDIR}/../../emulators/darcnes/distinfo
diff --git a/emulators/dega/Makefile b/emulators/dega/Makefile
index fa4782b5de6..976d4c7d229 100644
--- a/emulators/dega/Makefile
+++ b/emulators/dega/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= dega-1.07
@@ -12,7 +12,7 @@ COMMENT= Sega Game Gear, Sega Mark III and Sega Master System emulator
BUILD_DEPENDS= nasm>=0.98:../../devel/nasm
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
# Uses i386 assembly code
diff --git a/emulators/dgen/Makefile b/emulators/dgen/Makefile
index c2d13cef31a..db39b764bae 100644
--- a/emulators/dgen/Makefile
+++ b/emulators/dgen/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= dgen-sdl-1.23
@@ -14,7 +14,7 @@ COMMENT= Genesis/Megadrive emulator for Unix platforms
DEPENDS+= nasm-[0-9]*:../../devel/nasm
.endif
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_X11= yes
diff --git a/emulators/gcube/Makefile b/emulators/gcube/Makefile
index 6792f2e2fe8..82e42b76c7d 100644
--- a/emulators/gcube/Makefile
+++ b/emulators/gcube/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= gcube-v0.2-src
@@ -14,7 +14,7 @@ COMMENT= Opensource Nintendo GameCube(TM) emulator
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
WRKSRC= ${WRKDIR}
diff --git a/emulators/gens/Makefile b/emulators/gens/Makefile
index b0459681ff8..8a56b156a74 100644
--- a/emulators/gens/Makefile
+++ b/emulators/gens/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:07:57 jlam Exp $
#
DISTNAME= gens-rc3
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= *-i386
WRKSRC= ${WRKDIR}/GensForLinux
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/SDL/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/emulators/gpsim-devel/Makefile b/emulators/gpsim-devel/Makefile
index f5df976048a..908a4caf582 100644
--- a/emulators/gpsim-devel/Makefile
+++ b/emulators/gpsim-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= gpsim-20040826
@@ -12,7 +12,7 @@ COMMENT= PIC emulator with X interface
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make lex yacc
+USE_TOOLS+= bison gmake lex
USE_LIBTOOL= YES
USE_GNU_READLINE= # rl_callback_read_char, rl_copy_text,
diff --git a/emulators/gpsim/Makefile b/emulators/gpsim/Makefile
index 3b571856d04..c23ba7233be 100644
--- a/emulators/gpsim/Makefile
+++ b/emulators/gpsim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= gpsim-0.21.2
@@ -13,7 +13,7 @@ COMMENT= PIC emulator with X interface
GNU_CONFIGURE= YES
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_GNU_READLINE= # rl_callback_read_char, rl_copy_text,
diff --git a/emulators/hatari/Makefile b/emulators/hatari/Makefile
index 1cc0476ca95..b97d134714e 100644
--- a/emulators/hatari/Makefile
+++ b/emulators/hatari/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $
DISTNAME= hatari-0.60
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= cjep@NetBSD.org
HOMEPAGE= http://hatari.sourceforge.net/
COMMENT= Atari ST emulator
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/emulators/hercules/Makefile b/emulators/hercules/Makefile
index eaab7d604db..28880c92266 100644
--- a/emulators/hercules/Makefile
+++ b/emulators/hercules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:43 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $
DISTNAME= hercules-2.11
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= S370 emulator
DEPENDS+= hercules-images-[0-9]*:../../emulators/hercules-images
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
MAKE_ENV+= HOST_ARCH=${MACHINE_ARCH}
diff --git a/emulators/ia64sim/Makefile b/emulators/ia64sim/Makefile
index 73661ce2670..3576eb74e56 100644
--- a/emulators/ia64sim/Makefile
+++ b/emulators/ia64sim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/22 08:36:04 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
DISTNAME= ia64sim
PKGNAME= ia64sim-0.3
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.glue.umd.edu/~jasonp/
COMMENT= IA64 simulator (Intel(R) Architecture 64)
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
DIST_SUBDIR= ${PKGNAME}
MAKEFILE= makefile.unx
diff --git a/emulators/openmsx/Makefile b/emulators/openmsx/Makefile
index fcc1e8d610b..9e556e4b06d 100644
--- a/emulators/openmsx/Makefile
+++ b/emulators/openmsx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= openmsx-0.5.0
@@ -10,7 +10,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://openmsx.sourceforge.net/
COMMENT= MSX emulator that aims for perfection
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile
index af20ac09784..0a16cb8dc4e 100644
--- a/emulators/p11/Makefile
+++ b/emulators/p11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/05 11:14:15 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= p11-2.10a
@@ -11,7 +11,7 @@ COMMENT= PDP11 emulator
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-begemot=${PREFIX}
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# override MAKEFLAGS in the build and install stages
do-build:
diff --git a/emulators/palmosemulator/Makefile b/emulators/palmosemulator/Makefile
index 049a442d3c8..0c67878c750 100644
--- a/emulators/palmosemulator/Makefile
+++ b/emulators/palmosemulator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= emulator_src_${POSE_VERSION}
@@ -34,7 +34,7 @@ BUILD_DIRS= ${POSE_BUILD_DIR}
USE_PERL5= build
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-fltk=${BUILDLINK_PREFIX.fltk}
diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile
index 3e12a04156b..5c6f3dd2a34 100644
--- a/emulators/qemu/Makefile
+++ b/emulators/qemu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/18 13:07:32 xtraeme Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= qemu-0.7.0
@@ -12,7 +12,7 @@ COMMENT= CPU emulator using dynamic translation
CONFLICTS+= qemu-bin-*
NOT_FOR_PLATFORM= NetBSD-1.[0-6]*-*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/emulators/raine/Makefile b/emulators/raine/Makefile
index e0de5a77302..73e899d04f4 100644
--- a/emulators/raine/Makefile
+++ b/emulators/raine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= raines-0.40.2
@@ -15,7 +15,7 @@ COMMENT= 680x0 Arcade Emulator
BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
WRKSRC= ${WRKDIR}/raine
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
MAKEFILE= makefile
MAKE_ENV+= OSTYPE=linux
diff --git a/emulators/snes9x/Makefile b/emulators/snes9x/Makefile
index 6eb403b75ae..2b2e1749282 100644
--- a/emulators/snes9x/Makefile
+++ b/emulators/snes9x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:58 jlam Exp $
DISTNAME= s9xs139
PKGNAME= snes9x-1.39
@@ -14,7 +14,7 @@ COMMENT= Super Nintendo Entertainment System (SNES) emulator
BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
WRKSRC= ${WRKDIR}/release
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
PTHREAD_OPTS= require
diff --git a/emulators/spim/Makefile b/emulators/spim/Makefile
index 6eb46bdb2ca..de9cc649a27 100644
--- a/emulators/spim/Makefile
+++ b/emulators/spim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/15 22:02:26 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:07:58 jlam Exp $
DISTNAME= spim
PKGNAME= spim-6.5
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
HAS_CONFIGURE= yes
CONFIGURE_SCRIPT= ./Configure
USE_IMAKE= yes
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
XMKMF= ${X11BASE}/bin/xmkmf # don't specify -a option
PKGSRC_USE_TOOLS+= gzip
diff --git a/emulators/stella/Makefile b/emulators/stella/Makefile
index e98c14f84dd..538ba1dd3a2 100644
--- a/emulators/stella/Makefile
+++ b/emulators/stella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:44 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:07:58 jlam Exp $
STELLA_VERSION= 1.4.1
DISTNAME= stella-${STELLA_VERSION}-src
@@ -16,7 +16,7 @@ DISTINFO_FILE= ${.CURDIR}/../stella/distinfo
WRKSRC= ${WRKDIR}/stella-${STELLA_VERSION}/src/build
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_INSTALL= YES
UNLIMIT_RESOURCES=datasize
diff --git a/emulators/tme/Makefile b/emulators/tme/Makefile
index 94a801418b4..12fc7a230dd 100644
--- a/emulators/tme/Makefile
+++ b/emulators/tme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= tme-0.2
@@ -13,7 +13,7 @@ COMMENT= The Machine Emulator
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --disable-debug
diff --git a/emulators/tuxnes/Makefile b/emulators/tuxnes/Makefile
index 22d15e73618..4e969c6551c 100644
--- a/emulators/tuxnes/Makefile
+++ b/emulators/tuxnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= tuxnes-0.75
@@ -12,7 +12,7 @@ COMMENT= NES emulator
ONLY_FOR_PLATFORM= *-*-i386
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/emulators/twin/Makefile b/emulators/twin/Makefile
index 7a290271b9a..dfc1823ef09 100644
--- a/emulators/twin/Makefile
+++ b/emulators/twin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/02/27 22:30:43 veego Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= twin-src-3.1.14
@@ -13,7 +13,7 @@ COMMENT= Cross-platform implementation of the win32 api
WRKSRC= ${WRKDIR}/twin
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
BUILD_TARGET= depend world
AUTOCONF_REQD= 2.13
diff --git a/emulators/uae/Makefile b/emulators/uae/Makefile
index a1ae3dad593..bd1c8403435 100644
--- a/emulators/uae/Makefile
+++ b/emulators/uae/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:07:58 jlam Exp $
DISTNAME= uae-0.8.22
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= The UAE Amiga Emulator
DEPENDS= unzip>=5.40:../../archivers/unzip
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/emulators/vba/Makefile b/emulators/vba/Makefile
index e3865710f18..fa6bf5c3225 100644
--- a/emulators/vba/Makefile
+++ b/emulators/vba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:58 jlam Exp $
DISTNAME= VisualBoyAdvance-src-1.6a
PKGNAME= vba-1.6.0.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://vboy.emuhq.com/
COMMENT= Gameboy advance emulator
WRKSRC= ${WRKDIR}/VisualBoyAdvance-1.6a
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-c-core
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 7fd3f09368b..0bc063d49d2 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:07:58 jlam Exp $
#
DISTNAME= vice-1.16
@@ -22,7 +22,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES+= c c++
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-fullscreen
diff --git a/emulators/wine/Makefile b/emulators/wine/Makefile
index e5428d56575..f21642f8057 100644
--- a/emulators/wine/Makefile
+++ b/emulators/wine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.83 2005/05/22 20:07:59 jlam Exp $
DISTNAME= Wine-20050310
PKGNAME= ${DISTNAME:S/W/w/}
@@ -22,7 +22,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.5Z*-i386 NetBSD-1.6*-i386 NetBSD-[2-9]*-i386
ONLY_FOR_PLATFORM+= FreeBSD*-i386 Linux*-i386 SunOS*-i386 Darwin*-i386
WRKSRC= ${WRKDIR}/${DISTNAME:S/W/w/}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/emulators/winelib/Makefile b/emulators/winelib/Makefile
index 9ad410e79e6..ef5b393ea53 100644
--- a/emulators/winelib/Makefile
+++ b/emulators/winelib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= winelib-0.3
@@ -12,7 +12,7 @@ COMMENT= Library to bind Wine as shared library
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-wine=${BUILDLINK_PREFIX.wine}
.include "../../emulators/wine/buildlink3.mk"
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index 80649f9b3fd..2325007e91b 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.128 2005/05/12 22:35:18 kristerw Exp $
+# $NetBSD: Makefile,v 1.129 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= xmame-0.96
@@ -16,7 +16,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
USE_PKGINSTALL= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile.unix
TARGET= ${PKGBASE}
UNLIMIT_RESOURCES= datasize
diff --git a/emulators/xmess/Makefile b/emulators/xmess/Makefile
index 945b3ad07a8..f8ebce328c6 100644
--- a/emulators/xmess/Makefile
+++ b/emulators/xmess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/05/12 22:34:53 kristerw Exp $
+# $NetBSD: Makefile,v 1.69 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= xmame-0.96
@@ -17,7 +17,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED}
USE_PKGINSTALL= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile.unix
TARGET= ${PKGBASE}
UNLIMIT_RESOURCES= datasize
diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile
index 18e292ee510..033ac4f1720 100644
--- a/emulators/zsnes/Makefile
+++ b/emulators/zsnes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= zsnes142src
@@ -19,7 +19,7 @@ BUILD_TARGET= zsnes
WRKSRC= ${WRKDIR}/zsnes_1_42/src
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
.include "../../devel/SDL/buildlink3.mk"
diff --git a/finance/emma/Makefile b/finance/emma/Makefile
index 198e997e9f7..90a695c7583 100644
--- a/finance/emma/Makefile
+++ b/finance/emma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:59 jlam Exp $
DISTNAME= emma-0.8.2
PKGREVISION= 4
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
USE_X11BASE= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
CONFIGURE_ENV+= PYTHONBIN=${PYTHONBIN}
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index c37ea600b3f..b2fb37aa832 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= gnofin-0.8.4
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/finance/gnucash-docs/Makefile b/finance/gnucash-docs/Makefile
index b67a67c0e2f..8eba2ba22a3 100644
--- a/finance/gnucash-docs/Makefile
+++ b/finance/gnucash-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:59 jlam Exp $
DISTNAME= gnucash-docs-1.8.5
CATEGORIES= finance
@@ -15,7 +15,7 @@ BUILDLINK_DEPMETHOD.libxml2= build
BUILDLINK_DEPMETHOD.libxslt= build
USE_DIRS+= gnome1-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/finance/gnucash/Makefile b/finance/gnucash/Makefile
index 6e7f8330b2f..3231f3b121b 100644
--- a/finance/gnucash/Makefile
+++ b/finance/gnucash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.84 2005/04/18 15:13:55 wiz Exp $
+# $NetBSD: Makefile,v 1.85 2005/05/22 20:07:59 jlam Exp $
DISTNAME= gnucash-1.8.11
PKGREVISION= 2
@@ -17,7 +17,7 @@ DEPENDS+= p5-finance-quote>=1.06:../../finance/p5-finance-quote
BUILD_DEPENDS+= bison>=1.28:../../devel/bison
USE_DIRS+= gnome1-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index cebe84c484e..6ef92146f53 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:46 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:07:59 jlam Exp $
DISTNAME= kmymoney2-0.6.2
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= jnr@cwru.edu
HOMEPAGE= http://kmymoney2.sourceforge.net/
COMMENT= Personal finance manager for kde3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/fonts/Xft2/Makefile b/fonts/Xft2/Makefile
index ad0d1516a1b..1716f1e9992 100644
--- a/fonts/Xft2/Makefile
+++ b/fonts/Xft2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:07:59 jlam Exp $
DISTNAME= libXft-2.1.6
PKGNAME= Xft2-2.1.6
@@ -15,9 +15,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
USE_X11= YES
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk gmake
PKGCONFIG_OVERRIDE= xft.pc.in
MAKE_ENV+= EGREP="${EGREP}"
diff --git a/fonts/chkfontpath/Makefile b/fonts/chkfontpath/Makefile
index 4e19a12bfe8..0c58d7ebc23 100644
--- a/fonts/chkfontpath/Makefile
+++ b/fonts/chkfontpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= chkfontpath-1.9.7
@@ -13,7 +13,7 @@ COMMENT= Command line tool to manage X server's font path
BUILD_DEPENDS+= rpm2cpio>=1.1:../../converters/rpm2cpio
MAKE_ENV+= VERSION=${PKGVERSION}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGSRC_USE_TOOLS+= gtar
diff --git a/fonts/ec-fonts-mftraced/Makefile b/fonts/ec-fonts-mftraced/Makefile
index 123875e52c1..2823495c5c1 100644
--- a/fonts/ec-fonts-mftraced/Makefile
+++ b/fonts/ec-fonts-mftraced/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= ec-fonts-mftraced-1.0.8
@@ -13,7 +13,7 @@ DEPENDS+= teTeX>=2.0.2:../../print/teTeX
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
post-install:
diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile
index 74c15dd255b..8518b928b56 100644
--- a/fonts/fontconfig/Makefile
+++ b/fonts/fontconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/12 12:38:40 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= fontconfig-2.3.1
@@ -19,7 +19,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGCONFIG_OVERRIDE= fontconfig.pc.in
diff --git a/fonts/fontforge/Makefile b/fonts/fontforge/Makefile
index fc4a807ba7b..7a551dff652 100644
--- a/fonts/fontforge/Makefile
+++ b/fonts/fontforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:59 jlam Exp $
DISTNAME= fontforge_full-${VERSION}
PKGNAME= fontforge-${VERSION}
@@ -12,7 +12,7 @@ COMMENT= Postscript font editor
VERSION= 20050310
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/fonts/gucharmap/Makefile b/fonts/gucharmap/Makefile
index aa65956e938..955a5f5be11 100644
--- a/fonts/gucharmap/Makefile
+++ b/fonts/gucharmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:07:59 jlam Exp $
#
DISTNAME= gucharmap-1.4.3
@@ -13,7 +13,7 @@ COMMENT= Unicode/ISO10646 character map and font viewer
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/fonts/ja-elisau/Makefile b/fonts/ja-elisau/Makefile
index 82c7d875950..78bd964e281 100644
--- a/fonts/ja-elisau/Makefile
+++ b/fonts/ja-elisau/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:07:59 jlam Exp $
DISTNAME= elisau10
PKGNAME= ja-elisau-1.0
@@ -18,7 +18,7 @@ SITES_elisau10${EXTRACT_SUFX}= \
SITES_clR5x8.bdf= ftp://ftp.jp.NetBSD.org/pub/NetBSD-jp/tut-jp/fonts/
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
PKGSRC_USE_TOOLS+= gzip
USE_X11BASE= YES
DOCDIR= ${PREFIX}/share/doc/elisau
diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile
index 0cd61442049..4cf932756ce 100644
--- a/fonts/ja-shinonome/Makefile
+++ b/fonts/ja-shinonome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/06/15 13:41:53 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= shinonome-0.9.10-src
@@ -15,7 +15,7 @@ COMMENT= 12, 14, 16 dots bitmap fonts for Japanese, iso8859-1
GNU_CONFIGURE= YES
USE_PERL5= build
USE_X11BASE= YES
-USE_GNU_TOOLS+= awk make
+USE_TOOLS+= gawk gmake
FONTDIR= ${PREFIX}/lib/X11/fonts/local
FOUNDRY= Misc
ALIAS_SHINONOME= ${PREFIX}/share/examples/fonts.alias.shinonome
diff --git a/fonts/mftrace/Makefile b/fonts/mftrace/Makefile
index b2fce2ef757..a002b0f3ae3 100644
--- a/fonts/mftrace/Makefile
+++ b/fonts/mftrace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/02/02 13:05:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $
DISTNAME= mftrace-1.1.1
PKGREVISION= 1
@@ -15,7 +15,7 @@ DEPENDS+= fontforge>=20041115:../../fonts/fontforge
DEPENDS+= t1utils>=1.27:../../fonts/t1utils
DEPENDS+= teTeX>=2.0.2:../../print/teTeX
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
MAKEFILE= GNUmakefile
diff --git a/fonts/oto/Makefile b/fonts/oto/Makefile
index 44f8d5a4f2c..4264a511984 100644
--- a/fonts/oto/Makefile
+++ b/fonts/oto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= oto-0.4
@@ -11,7 +11,7 @@ HOMEPAGE= http://sourceforge.net/projects/oto/
COMMENT= List and modify OpenType font files
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/oto
diff --git a/fonts/pcf2bdf/Makefile b/fonts/pcf2bdf/Makefile
index 5438546a356..6df9b05b0e8 100644
--- a/fonts/pcf2bdf/Makefile
+++ b/fonts/pcf2bdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/06/15 13:35:02 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= pcf2bdf-1.04
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.tsg.ne.jp/GANA/S/pcf2bdf/
COMMENT= Convert X font from PCF to BDF
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
MAKEFILE= Makefile.gcc
diff --git a/fonts/t1lib/Makefile b/fonts/t1lib/Makefile
index 7ca79196c37..568e4a07386 100644
--- a/fonts/t1lib/Makefile
+++ b/fonts/t1lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:47 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= t1lib-5.0.2
@@ -13,7 +13,7 @@ COMMENT= Library for generating bitmaps from Adobe Type 1 fonts
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_X11= YES
diff --git a/fonts/ttmkfdir2/Makefile b/fonts/ttmkfdir2/Makefile
index 30312324981..0d14a69bf7c 100644
--- a/fonts/ttmkfdir2/Makefile
+++ b/fonts/ttmkfdir2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/12 14:27:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= ttmkfdir2.20021109
@@ -16,7 +16,7 @@ CONFLICTS= ttmkfdir-[0-9]*
WRKSRC= ${WRKDIR}/${PKGBASE}
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= lex make
+USE_TOOLS+= gmake lex
USE_LANGUAGES= c c++
MAKE_ENV+= FREETYPE_CONFIG=${FREETYPE_CONFIG}
diff --git a/games/KoboDeluxe/Makefile b/games/KoboDeluxe/Makefile
index f43aad35bec..2171c11d5cf 100644
--- a/games/KoboDeluxe/Makefile
+++ b/games/KoboDeluxe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:00 jlam Exp $
DISTNAME= KoboDeluxe-0.4pre8
PKGNAME= ${DISTNAME:S/pre/rc/}
@@ -11,7 +11,7 @@ HOMEPAGE= http://olofson.net/kobodl/
COMMENT= Multi-way scrolling shoot 'em up game for X
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
.include "../../devel/SDL/buildlink3.mk"
diff --git a/games/abuse/Makefile b/games/abuse/Makefile
index 2a67de93d90..f790feef3dc 100644
--- a/games/abuse/Makefile
+++ b/games/abuse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:00 jlam Exp $
DISTNAME= abuse_pd
PKGNAME= abuse-2.0
@@ -14,7 +14,7 @@ COMMENT= Full color 320x200 arcade quality platform shooter
USE_X11BASE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= LDFLAGS="${X11_LDFLAGS}"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES+= c c++
PKGSRC_USE_TOOLS+= gtar
diff --git a/games/asc/Makefile b/games/asc/Makefile
index 13f842b09b1..464966fa821 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= asc-source-1.15.3.0
@@ -18,7 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CPPFLAGS.NetBSD+= -D_UNICODE_BROKEN_
diff --git a/games/boson/Makefile b/games/boson/Makefile
index 9653a073e6b..e356941f096 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= boson-all-0.8
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --disable-debug
diff --git a/games/bzflag/Makefile b/games/bzflag/Makefile
index fd4cb4c8e5d..2c4a1fd2f4f 100644
--- a/games/bzflag/Makefile
+++ b/games/bzflag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:48 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:00 jlam Exp $
DISTNAME= bzflag-1.10.6.20040515
PKGNAME= ${DISTNAME:S/.20040515//}
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.bzflag.org/
COMMENT= OpenGL tank game
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_NCURSES= # resize_term()
USE_PERL5= build
diff --git a/games/cbzone/Makefile b/games/cbzone/Makefile
index 17faad754f6..91207105fc2 100644
--- a/games/cbzone/Makefile
+++ b/games/cbzone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 13:30:55 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:00 jlam Exp $
DISTNAME= cbzone-sound
PKGNAME= cbzone-2.0c
@@ -9,7 +9,7 @@ MAINTAINER= root@garbled.net
COMMENT= Simple classic game of 3D tank warfare
WRKSRC= ${WRKDIR}/cbzone
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_IMAKE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/games/copter-commander/Makefile b/games/copter-commander/Makefile
index 53ac8b279c2..07f229df5df 100644
--- a/games/copter-commander/Makefile
+++ b/games/copter-commander/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= copter-commander-1.8
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.speakeasy.org/~morse/copter-commander/
COMMENT= Armor Alley/Rescue Raiders clone
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= X11PREFIX=${X11PREFIX}
MAKE_ENV+= GTKGLAREADIR=${BUILDLINK_PREFIX.gtkglarea}
MAKE_ENV+= OPENGLDIR=${BUILDLINK_PREFIX.MesaLib}
diff --git a/games/corewars/Makefile b/games/corewars/Makefile
index 576030639fc..c87664954f8 100644
--- a/games/corewars/Makefile
+++ b/games/corewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:00 jlam Exp $
DISTNAME= corewars-0.9.13
CATEGORIES= games
@@ -8,7 +8,7 @@ MAINTAINER= rh@NetBSD.org
HOMEPAGE= http://corewars.sourceforge.net/
COMMENT= Programs on a virtual machine, fighting each other
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
.include "../../x11/gtk/buildlink3.mk"
diff --git a/games/craft/Makefile b/games/craft/Makefile
index 98b46e4c97b..c933431dfaf 100644
--- a/games/craft/Makefile
+++ b/games/craft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:00 jlam Exp $
DISTNAME= craftcc35
PKGNAME= craft-3.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://set.gmd.de/~hua/
COMMENT= Warcraft-like game for X11
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11BASE= yes
post-extract:
diff --git a/games/crimsonfields/Makefile b/games/crimsonfields/Makefile
index 6cb41d3ea74..020e675f8cc 100644
--- a/games/crimsonfields/Makefile
+++ b/games/crimsonfields/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= crimson-0.4.7
@@ -13,7 +13,7 @@ HOMEPAGE= http://crimson.seul.org/
COMMENT= Tactical war game in the tradition of Battle Isle
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# not standard locale files
#USE_PKGLOCALEDIR= no
GNU_CONFIGURE= yes
diff --git a/games/criticalmass/Makefile b/games/criticalmass/Makefile
index 924430642ad..633f4a3fe10 100644
--- a/games/criticalmass/Makefile
+++ b/games/criticalmass/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= CriticalMass-0.9.10
@@ -13,7 +13,7 @@ HOMEPAGE= http://criticalmass.sourceforge.net/
COMMENT= SDL/OpenGL space shoot'em up game
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
.include "../../devel/SDL/buildlink3.mk"
diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index 3fb4d8cbd0e..dd8ef0ac5f6 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= crossfire-client-1.0.0
@@ -19,7 +19,7 @@ CF_RAW= client-0.95.2-raw-sounds.tgz
USE_PERL5= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-sound-dir=${LOCALBASE}/share/cfclient/sounds
PKGSRC_USE_TOOLS+= gtar
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index 3b18ad19fc8..872b497274c 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/16 01:15:31 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= crossfire-1.0.0
@@ -18,7 +18,7 @@ CF_SRC= crossfire-1.0.0.tar.bz2
CF_MAPS= crossfire-1.0.0-maps.tar.bz2
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_PERL5= yes
CONFIGURE_ARGS+= --with-includes=-I${LOCALBASE}/include
diff --git a/games/cube/Makefile b/games/cube/Makefile
index 558944fb076..96948bf26bc 100644
--- a/games/cube/Makefile
+++ b/games/cube/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:00 jlam Exp $
DISTNAME= cube_2004_05_22
PKGNAME= cube-20040522
@@ -17,7 +17,7 @@ CUBE_SRC= ${WRKSRC}/source/src
CUBE_DATA= ${PREFIX}/share/cube
NO_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-extract:
@unzip -q -a -o ${WRKSRC}/source/${DISTNAME}_src.zip -d ${WRKSRC}/source/
diff --git a/games/d2x/Makefile b/games/d2x/Makefile
index 22c613de9f2..d378d58a69b 100644
--- a/games/d2x/Makefile
+++ b/games/d2x/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:00 jlam Exp $
#
DISTNAME= d2x-0.2.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://icculus.org/d2x/
COMMENT= Descent II port
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
D2X_DATA= ${PREFIX}/share/games/${PKGBASE}
diff --git a/games/defendguin/Makefile b/games/defendguin/Makefile
index a17ea25dcd5..9959e47fad0 100644
--- a/games/defendguin/Makefile
+++ b/games/defendguin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:01 jlam Exp $
DISTNAME= defendguin-0.0.10
PKGREVISION= 4
@@ -11,7 +11,7 @@ COMMENT= Clone of the arcade game Defender
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../audio/SDL_mixer/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/games/digger/Makefile b/games/digger/Makefile
index b8ab0b3151a..78024a8c91b 100644
--- a/games/digger/Makefile
+++ b/games/digger/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= digger-20020314
@@ -15,7 +15,7 @@ COMMENT= Digger Remastered
.if ${OPSYS:MLinux}
MAKEFILE= Makefile.sdl
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.else
MAKEFILE= Makefile.fbsd
MAKE_FLAGS+= -DSDL
diff --git a/games/dopewars/Makefile b/games/dopewars/Makefile
index 5df8f740f00..d8183466bf9 100644
--- a/games/dopewars/Makefile
+++ b/games/dopewars/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:01 jlam Exp $
DISTNAME= dopewars-1.5.10
CATEGORIES= games
@@ -11,7 +11,7 @@ COMMENT= Make a fortune dealing drugs on the streets of New York
USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-ncurses
diff --git a/games/enigma/Makefile b/games/enigma/Makefile
index 9ba53e41c3d..f2c083eabe0 100644
--- a/games/enigma/Makefile
+++ b/games/enigma/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/20 00:58:08 heinz Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= enigma-0.81
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GCC_REQD+= 2.95
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
SUBST_CLASSES+= enigma
diff --git a/games/falcons-eye/Makefile b/games/falcons-eye/Makefile
index 0ec31430fdc..b318d5e12c5 100644
--- a/games/falcons-eye/Makefile
+++ b/games/falcons-eye/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/13 16:54:13 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= nethack_source_331_jtp_193
@@ -18,7 +18,7 @@ CONFIGURE_SCRIPT= ./sys/unix/setup.sh
DIST_SUBDIR= ${PKGNAME_NOREV}-20050216-2
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= lex yacc
+USE_TOOLS+= bison lex
MAKE_ENV+= YACC=${TOOLS_YACC:Q}
USE_X11= yes
diff --git a/games/fkiss/Makefile b/games/fkiss/Makefile
index e3d42d151f3..f18ba659ee2 100644
--- a/games/fkiss/Makefile
+++ b/games/fkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= fkiss-0.33
@@ -17,7 +17,7 @@ PATCH_DIST_STRIP= -p1
DEPENDS+= lha-[0-9]*:../../archivers/lha
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CFLAGS+= -DUSE_STDARG -DHAVE_STDARG_H
CFLAGS+= -DDEV_SOUND="\"${DEVOSSSOUND}\""
diff --git a/games/foobillard/Makefile b/games/foobillard/Makefile
index 78998db3045..88c572fb7c9 100644
--- a/games/foobillard/Makefile
+++ b/games/foobillard/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:49 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= foobillard-3.0a
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://foobillard.sunsite.dk/
COMMENT= Free OpenGL-billard game
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index 7cc60366c01..f6021969489 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= frozen-bubble-1.0.0
@@ -14,7 +14,7 @@ COMMENT= Pop the frozen bubbles
DEPENDS+= p5-SDL>=1.19.2:../../devel/p5-SDL
USE_PERL5= run
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= PERL5="${PERL5}" CP="${CP}"
diff --git a/games/gemdropx/Makefile b/games/gemdropx/Makefile
index 7d268eb057e..dbfaa220660 100644
--- a/games/gemdropx/Makefile
+++ b/games/gemdropx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= gemdropx-0.9
@@ -10,7 +10,7 @@ MAINTAINER= root@garbled.net
HOMEPAGE= http://www.newbreedsoftware.com/gemdropx/
COMMENT= Color puzzle game for X11 similar to Gem Drop
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/SDL/buildlink3.mk"
.include "../../audio/SDL_mixer/buildlink3.mk"
diff --git a/games/glaxium/Makefile b/games/glaxium/Makefile
index 5bb387c4fa7..bca548a264e 100644
--- a/games/glaxium/Makefile
+++ b/games/glaxium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= glaxium_0.5
@@ -13,7 +13,7 @@ COMMENT= Space-ship OpenGL shoot them up
GNU_CONFIGURE= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
BUILD_TARGET= glaxium
diff --git a/games/gnocatan/Makefile b/games/gnocatan/Makefile
index 4a64d37f720..49813fcd5e1 100644
--- a/games/gnocatan/Makefile
+++ b/games/gnocatan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= gnocatan-0.8.1.16
@@ -12,7 +12,7 @@ COMMENT= GNOME version of the Settlers of Catan board game
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile
index 170c5b2a49e..c4fb4ed0538 100644
--- a/games/gnome2-games/Makefile
+++ b/games/gnome2-games/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/05/19 21:11:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:01 jlam Exp $
DISTNAME= gnome-games-2.10.1
CATEGORIES= games gnome
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_CONFIG_WRAPPER= yes
USE_LANGUAGES= c c++
diff --git a/games/gnuchess/Makefile b/games/gnuchess/Makefile
index 54f3b767a48..af92730bf3c 100644
--- a/games/gnuchess/Makefile
+++ b/games/gnuchess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/16 00:22:55 reed Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:01 jlam Exp $
DISTNAME= gnuchess-5.07
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= GNU chess engine
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BOOKDIR= ${PREFIX}/lib/gnuchess
DOCDIR= ${PREFIX}/share/doc/gnuchess
diff --git a/games/gnugo/Makefile b/games/gnugo/Makefile
index 2edb6f48cd7..51b13d3f9ac 100644
--- a/games/gnugo/Makefile
+++ b/games/gnugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:01 jlam Exp $
DISTNAME= gnugo-3.6
CATEGORIES= games
@@ -8,7 +8,7 @@ MAINTAINER= bad@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/gnugo/
COMMENT= Go playing program
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
INFO_FILES= gnugo.info
diff --git a/games/gtetrinet/Makefile b/games/gtetrinet/Makefile
index 364d1cbf987..23ca2a78ef3 100644
--- a/games/gtetrinet/Makefile
+++ b/games/gtetrinet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= gtetrinet-0.7.7
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
BUILD_DEFS+= USE_INET6
diff --git a/games/gtkballs/Makefile b/games/gtkballs/Makefile
index b1e2f0cec81..345805b60e4 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:45:50 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:01 jlam Exp $
DISTNAME= gtkballs-3.1.5
CATEGORIES= games
@@ -12,7 +12,7 @@ COMMENT= GTK+ clone of "Color Lines"
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-included-gettext
CONFIGURE_ARGS+= --localstatedir=${VARBASE}/games
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
PLIST_SUBST+= VARBASE=${VARBASE}
diff --git a/games/gtkmagnetic/Makefile b/games/gtkmagnetic/Makefile
index 0e0e2361f3c..fba88cbae30 100644
--- a/games/gtkmagnetic/Makefile
+++ b/games/gtkmagnetic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:01 jlam Exp $
#
DISTNAME= Magnetic22Src
@@ -12,7 +12,7 @@ MAINTAINER= dillo@NetBSD.org
HOMEPAGE= http://www.if-legends.org/~msmemorial/magnetic.htm
COMMENT= Interpreter for text adventures from Magnetic Scrolls
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= gtkmagnetic
WRKSRC= ${WRKDIR}/Gtk
diff --git a/games/gturing/Makefile b/games/gturing/Makefile
index 34a31b96169..a33b4376393 100644
--- a/games/gturing/Makefile
+++ b/games/gturing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 09:09:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= gturing-0.1.1
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
BUILDLINK_TRANSFORM+= rm:-D.*_DISABLE_DEPRECATED
diff --git a/games/hugo/Makefile b/games/hugo/Makefile
index c9205b50f6e..fc05bbb12c7 100644
--- a/games/hugo/Makefile
+++ b/games/hugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/19 15:59:02 dillo Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= hugov31_unix_source
@@ -14,7 +14,7 @@ COMMENT= Interactive fiction design system and interpreter
SITES_hugolib.zip=${MASTER_SITE_IFARCHIVE:=programming/hugo/library/}
DIST_SUBDIR= ${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# uses halfkey (present since 1.6M)
INCOMPAT_CURSES+= NetBSD-1.4[Y-Z]* NetBSD-1.5* NetBSD-1.6 NetBSD-1.6.*
INCOMPAT_CURSES+= NetBSD-1.6[A-L]*
diff --git a/games/icebreaker/Makefile b/games/icebreaker/Makefile
index c9248d59db6..164d83b9d8a 100644
--- a/games/icebreaker/Makefile
+++ b/games/icebreaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= icebreaker-1.9.7
@@ -11,7 +11,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://www.mattdm.org/icebreaker/
COMMENT= Penguin capturing simulation
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
MAKE_ENV+= mandir="${PREFIX}/man" highscoredir="/var/games"
MAKE_ENV+= prefix="${PREFIX}"
diff --git a/games/kajaani-kombat/Makefile b/games/kajaani-kombat/Makefile
index acae97dc95b..b1d9b73d21d 100644
--- a/games/kajaani-kombat/Makefile
+++ b/games/kajaani-kombat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= kajaani-kombat-0.6
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://kombat.kajaani.net/
COMMENT= Rampart-like multiplayer game set in space
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/kajaani-kombat ${PREFIX}/bin
diff --git a/games/kapooka/Makefile b/games/kapooka/Makefile
index 7cf8ff24412..ac5040b4e4c 100644
--- a/games/kapooka/Makefile
+++ b/games/kapooka/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= kapooka_0.2
@@ -13,7 +13,7 @@ HOMEPAGE= http://kapooka.sourceforge.net/
COMMENT= Puzzle game
WRKSRC= ${WRKDIR}/kapooka
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
SUBST_CLASSES+= kapooka
SUBST_STAGE.kapooka= pre-build
diff --git a/games/ketm/Makefile b/games/ketm/Makefile
index 1baadb231f0..44eb9186475 100644
--- a/games/ketm/Makefile
+++ b/games/ketm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= ketm-0.0.6
@@ -14,7 +14,7 @@ COMMENT= Old-school 2d-scrolling shooter
BUILD_TARGET= ketm
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-patch:
cd ${WRKSRC} && \
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 49f90a4d59f..f979809b6e2 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $
DISTNAME= knights-0.6
CATEGORIES= games kde
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://knights.sourceforge.net/
COMMENT= Chess interface for KDE
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/games/lincity/Makefile b/games/lincity/Makefile
index 529d94efbb1..1eb56840f2b 100644
--- a/games/lincity/Makefile
+++ b/games/lincity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:51 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:02 jlam Exp $
DISTNAME= lincity-1.12.1
CATEGORIES= games x11
@@ -11,7 +11,7 @@ COMMENT= Free clone of SimCity for X11
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/games/mirrormagic-sdl/Makefile b/games/mirrormagic-sdl/Makefile
index aaac4671c68..785adcb9513 100644
--- a/games/mirrormagic-sdl/Makefile
+++ b/games/mirrormagic-sdl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:45:55 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= mirrormagic-2.0.2
@@ -13,7 +13,7 @@ COMMENT= Nice little puzzle game with color graphics and sound
CONFLICTS= mirrormagic-[1-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PLIST_SRC= ${WRKDIR}/PLIST PLIST
# if you change SCORE_PATH, don't forget to change patch-aa, too
diff --git a/games/mirrormagic/Makefile b/games/mirrormagic/Makefile
index a4acd760064..74c850677bd 100644
--- a/games/mirrormagic/Makefile
+++ b/games/mirrormagic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:55 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= mirrormagic-2.0.2
@@ -11,7 +11,7 @@ COMMENT= Nice little puzzle game with color graphics and sound
CONFLICTS= mirrormagic-sdl-[1-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
PLIST_SRC= ${WRKDIR}/PLIST PLIST
diff --git a/games/nagi/Makefile b/games/nagi/Makefile
index 083358ebe69..435659233af 100644
--- a/games/nagi/Makefile
+++ b/games/nagi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:55 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= nagi_src_-_2002-11-14
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.agidev.com/projects/nagi/
COMMENT= Clone of Sierra's AGI
WRKSRC= ${WRKDIR}/src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= Makefile.linux
NAGILIB= ${PREFIX}/lib/nagi
diff --git a/games/netris/Makefile b/games/netris/Makefile
index 96ca6b0e43f..3123acd8989 100644
--- a/games/netris/Makefile
+++ b/games/netris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 13:30:56 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= netris-0.52
@@ -14,7 +14,7 @@ MAINTAINER= uebs@gmx.at
HOMEPAGE= http://www.netris.org/
COMMENT= Everybody's darling T*tris in a networked version
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ./Configure
diff --git a/games/neverball/Makefile b/games/neverball/Makefile
index 0a26609d804..4420d1e7f36 100644
--- a/games/neverball/Makefile
+++ b/games/neverball/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= neverball-1.2.2
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.icculus.org/neverball/
COMMENT= Part puzzle game, part action game and with SDL graphics
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
# Avoiding multiples patches...
diff --git a/games/nighthawk/Makefile b/games/nighthawk/Makefile
index 9c120a8a534..39ebd6683fa 100644
--- a/games/nighthawk/Makefile
+++ b/games/nighthawk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= nighthawk-2.1
@@ -15,7 +15,7 @@ HOMEPAGE= http://jsno.arafuraconnect.com.au/proj_linux/nighthawk.html
COMMENT= C64 Paradroid clone
WRKSRC= ${WRKDIR}/nighthawk
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= YES
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index 86d647b36ea..6d8ac3bebae 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= openmortal-0.7
@@ -12,7 +12,7 @@ HOMEPAGE= http://apocalypse.rulez.org/~upi/Mortal/
COMMENT= Parody of Mortal Kombat with real characters
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
USE_X11= yes
diff --git a/games/openttd/Makefile b/games/openttd/Makefile
index 006ac98b32f..a76ac3c7fea 100644
--- a/games/openttd/Makefile
+++ b/games/openttd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:02 jlam Exp $
DISTNAME= openttd-0.3.6-source
PKGNAME= openttd-0.3.6
@@ -9,7 +9,7 @@ MAINTAINER= froz@icix.org
HOMEPAGE= http://www.openttd.com/
COMMENT= Open source clone of Transport Tycoon Deluxe
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
DATA_DIR= ${PREFIX}/share/games/openttd
diff --git a/games/pag/Makefile b/games/pag/Makefile
index f5937e780c0..4b6f29e2544 100644
--- a/games/pag/Makefile
+++ b/games/pag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= pag-0.91
@@ -10,7 +10,7 @@ MAINTAINER= pancake@phreaker.net
HOMEPAGE= http://pancake.host.sk/
COMMENT= Platform Arcade Game
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_NCURSES= yes # missing function stdscr
BUILD_TARGET= compile
diff --git a/games/powwow/Makefile b/games/powwow/Makefile
index 850802d718f..4731c0b0ff0 100644
--- a/games/powwow/Makefile
+++ b/games/powwow/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/02/04 09:38:43 adam Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:02 jlam Exp $
DISTNAME= powwow-1.2.5
CATEGORIES= games
@@ -8,7 +8,7 @@ MAINTAINER= jdolecek@NetBSD.org
HOMEPAGE= http://linuz.sns.it/~max/powwow.html
COMMENT= Client to play MUDs
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
POWWOW_DIR= ${PREFIX}/share/powwow
do-build:
diff --git a/games/qnetwalk/Makefile b/games/qnetwalk/Makefile
index 446420b0089..f9cc193b389 100644
--- a/games/qnetwalk/Makefile
+++ b/games/qnetwalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= qnetwalk-1.1
@@ -12,7 +12,7 @@ COMMENT= QNetwalk is a Qt-version of the popular NetWalk game
# We need qmake to build package's Makefile
BUILD_DEPENDS+= qt3-tools>=3.3:../../x11/qt3-tools
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/games/quake/Makefile b/games/quake/Makefile
index 2fbd43034d7..f6722a74bc5 100644
--- a/games/quake/Makefile
+++ b/games/quake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:02 jlam Exp $
DISTNAME= q1source
PKGNAME= quake-2.30
@@ -17,7 +17,7 @@ DEPENDS+= quakedata-[0-9]*:../../games/quakedata
ONLY_FOR_PLATFORM= *-*-i386
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= MAINDIR=${WRKSRC}
USE_X11= yes
diff --git a/games/quake2forge/Makefile b/games/quake2forge/Makefile
index 27308f7b61f..eea986ffa77 100644
--- a/games/quake2forge/Makefile
+++ b/games/quake2forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:02 jlam Exp $
#
DISTNAME= quake2-0.2.1
@@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.quakeforge.net/
COMMENT= Enhanced Quake II engine
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/games/quake6/Makefile b/games/quake6/Makefile
index a351631c31a..7e7da59524c 100644
--- a/games/quake6/Makefile
+++ b/games/quake6/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:02 jlam Exp $
DISTNAME= quake-v6-bsd-kame
PKGNAME= quake6-0.0
@@ -19,7 +19,7 @@ post-extract:
cd ${WRKSRC}; ${FIND} . -name \*.o -exec ${RM} {} \;
cd ${WRKSRC}; ${RM} config.cache
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
# This pkg can be built on USE_INET6 platform only
diff --git a/games/quakeforge/Makefile b/games/quakeforge/Makefile
index 2ec69ebf4f3..3d6dd179b68 100644
--- a/games/quakeforge/Makefile
+++ b/games/quakeforge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:03 jlam Exp $
DISTNAME= quakeforge-0.5.5
PKGREVISION= 2
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --with-cpp="${CPP} %d %i %o"
CONFIGURE_ARGS+= --disable-ogg
CONFIGURE_ARGS+= --disable-xmms
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_X11= YES
YACC= ${LOCALBASE}/bin/bison
diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common
index 6795c3e40d8..2fe692e3968 100644
--- a/games/rocksndiamonds/Makefile.common
+++ b/games/rocksndiamonds/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile.common,v 1.13 2005/05/22 20:08:03 jlam Exp $
DISTNAME= rocksndiamonds-3.1.0
CATEGORIES= games x11
@@ -7,7 +7,7 @@ MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
MAINTAINER= heinz@NetBSD.org
HOMEPAGE= http://www.artsoft.org/rocksndiamonds/
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
USE_X11= YES
diff --git a/games/sarien/Makefile b/games/sarien/Makefile
index e683b367016..7977f817249 100644
--- a/games/sarien/Makefile
+++ b/games/sarien/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= sarien-0.7.0
@@ -12,7 +12,7 @@ COMMENT= Adventure Game Interpreter (AGI) for Sierra On-Line Titles
GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS= --with-sdl
diff --git a/games/scid/Makefile b/games/scid/Makefile
index 9c9604cf4b2..dea0a821e7b 100644
--- a/games/scid/Makefile
+++ b/games/scid/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:56 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= scid-3.6.1
@@ -11,7 +11,7 @@ COMMENT= Shane's Chess Information Database
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ENV+= TCLCONFIG_SH=${TCLCONFIG_SH:Q}
CONFIGURE_ARGS+= BINDIR=${PREFIX}/bin SHAREDIR=${PREFIX}/share/scid
diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile
index afb5c559682..d889793d4d7 100644
--- a/games/scummvm/Makefile
+++ b/games/scummvm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:03 jlam Exp $
DISTNAME= scummvm-0.7.1
CATEGORIES= games
@@ -10,7 +10,7 @@ HOMEPAGE= http://scummvm.sourceforge.net/
COMMENT= LucasArts Script Creation Utility for Maniac Mansion
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= --prefix=${LOCALBASE}
diff --git a/games/sirius/Makefile b/games/sirius/Makefile
index 66a18654590..203d7040863 100644
--- a/games/sirius/Makefile
+++ b/games/sirius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= sirius-0.8.0
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/games/starfighter/Makefile b/games/starfighter/Makefile
index 7d2e081ff7a..e549abaef63 100644
--- a/games/starfighter/Makefile
+++ b/games/starfighter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= starfighter-1.1-1
@@ -11,7 +11,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.parallelrealities.co.uk/starfighter.php
COMMENT= Old school 2D shoot them up
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES+= c++
USE_X11= yes
WRKSRC= ${WRKDIR}/${DISTNAME:S/-1$//}
diff --git a/games/stratagus/Makefile b/games/stratagus/Makefile
index 512a6fa399a..f207b5f7244 100644
--- a/games/stratagus/Makefile
+++ b/games/stratagus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= stratagus-2.1-src
@@ -12,7 +12,7 @@ HOMEPAGE= http://stratagus.sourceforge.net/
COMMENT= Real-time strategy engine
WRKSRC= ${WRKDIR}/stratagus-040702
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/games/tileworld/Makefile b/games/tileworld/Makefile
index 323d7058d24..35077c73507 100644
--- a/games/tileworld/Makefile
+++ b/games/tileworld/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/16 04:45:40 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:03 jlam Exp $
DISTNAME= tworld-1.2.1
PKGNAME= ${DISTNAME:S/^t/tile/}
@@ -10,8 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.muppetlabs.com/~breadbox/software/tworld/
COMMENT= "Game based on Chip's Challenge"
-USE_GNU_TOOLS+= make
-USE_TOOLS+= date
+USE_TOOLS+= date gmake
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/games/tuxmath/Makefile b/games/tuxmath/Makefile
index b73bbe7f7f3..89345b2c018 100644
--- a/games/tuxmath/Makefile
+++ b/games/tuxmath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= tuxmath-2001.09.07-0102
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.newbreedsoftware.com/tuxmath/
COMMENT= Educational math arcade game
WRKSRC= ${WRKDIR}/tuxmath
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE= # defined
pre-install:
diff --git a/games/wormz/Makefile b/games/wormz/Makefile
index bc49c94d80d..635eabebf96 100644
--- a/games/wormz/Makefile
+++ b/games/wormz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= Wormz-1.0b5
@@ -12,7 +12,7 @@ COMMENT= Networked game for X11
WRKSRC= ${WRKDIR}/Wormz
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-extract:
${MKDIR} ${WRKSRC}/NetBSD
diff --git a/games/wxhugo/Makefile b/games/wxhugo/Makefile
index d0a261de15d..a74264b2d75 100644
--- a/games/wxhugo/Makefile
+++ b/games/wxhugo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/07 23:04:17 dillo Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= hugov31_unix_source
@@ -15,7 +15,7 @@ DISTFILE_WX= hugov31_wxwin_source${EXTRACT_SUFX}
#EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
DIST_SUBDIR= hugo-3.1.02
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/hugov3.1.02/hewx
.include "../../audio/libmikmod/buildlink3.mk"
diff --git a/games/xarchon/Makefile b/games/xarchon/Makefile
index c7d6a27c57f..69caaaa9ffe 100644
--- a/games/xarchon/Makefile
+++ b/games/xarchon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:45:57 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= xarchon-0.60
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://xarchon.seul.org/
COMMENT= Chess-like strategy game with battle options
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_X11= YES
USE_LANGUAGES= c c++
diff --git a/games/xbomb/Makefile b/games/xbomb/Makefile
index 3a28f81d6e5..b87cbfc06ad 100644
--- a/games/xbomb/Makefile
+++ b/games/xbomb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:03 jlam Exp $
DISTNAME= xbomb-2.1a
CATEGORIES= games x11
@@ -11,7 +11,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.gedanken.demon.co.uk/xbomb/
COMMENT= Square, hexagonal, and triangual minesweeper clone
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
BUILD_TARGET= xbomb
MAKE_ENV+= SCORE_PATH="${SCORE_PATH}"
diff --git a/games/xconq/Makefile b/games/xconq/Makefile
index 26bbeac3266..71a344f3c63 100644
--- a/games/xconq/Makefile
+++ b/games/xconq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:03 jlam Exp $
DISTNAME= xconq-7.4.1
PKGREVISION= 4
@@ -10,7 +10,7 @@ HOMEPAGE= http://sources.redhat.com/xconq/
COMMENT= Xconq is a general strategy game system
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-alternate-scoresdir=${VARBASE}/games/xconq/scores
CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
diff --git a/games/xdoom/Makefile b/games/xdoom/Makefile
index 713812e40f9..0e0f20ffbc9 100644
--- a/games/xdoom/Makefile
+++ b/games/xdoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/16 01:15:32 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:03 jlam Exp $
DISTNAME= linuxdoom-1.10
PKGNAME= xdoom-1.10
@@ -20,7 +20,7 @@ WRKSRC= ${WRKDIR}
EXTRACT_ONLY= doomsrc.zip
EXTRACT_CMD= unzip -qo ${DISTDIR}/${EXTRACT_ONLY}
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= X11BASE=${X11BASE} INSTALL_PREFIX=${X11PREFIX}
PKGSRC_USE_TOOLS+= gtar gunzip
diff --git a/games/xfreecell/Makefile b/games/xfreecell/Makefile
index 8422a291aa0..568695d4e89 100644
--- a/games/xfreecell/Makefile
+++ b/games/xfreecell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/02/22 13:44:13 minskim Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:03 jlam Exp $
DISTNAME= xfreecell-1.0.5b
CATEGORIES= games
@@ -10,7 +10,7 @@ HOMEPAGE= http://www2.giganet.net/~nakayama/
COMMENT= Popular freecell card game for X
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
WRKSRC= ${WRKDIR}/xfreecell
diff --git a/games/xfrisk/Makefile b/games/xfrisk/Makefile
index c493cc31afc..0467497e3fa 100644
--- a/games/xfrisk/Makefile
+++ b/games/xfrisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= xfrisk-1.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.tuxick.net/xfrisk/
COMMENT= X11 version of the classic Risk board game
WRKSRC= ${WRKDIR}/XFrisk
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
RESTRICTED= "Possible trademark infringement"
diff --git a/games/xnibbles/Makefile b/games/xnibbles/Makefile
index 6485cd93df8..0a4dc3c01f5 100644
--- a/games/xnibbles/Makefile
+++ b/games/xnibbles/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:03 jlam Exp $
#
DISTNAME= xnibbles-1.0BETA4
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.tjhsst.edu/xnibbles/
COMMENT= Winding snakes game for X11
WRKSRC= ${WRKDIR}/xnibbles
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= YES
diff --git a/games/xpuyopuyo/Makefile b/games/xpuyopuyo/Makefile
index 81c535327cd..cc9f8f497fb 100644
--- a/games/xpuyopuyo/Makefile
+++ b/games/xpuyopuyo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:04 jlam Exp $
DISTNAME= xpuyopuyo-0.9.1
PKGREVISION= 5
@@ -12,7 +12,7 @@ COMMENT= Tetris-like puzzle game
AUTOMAKE_REQD= 1.4
USE_DIRS+= gnome1-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11BASE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index 7a448f1d504..ed79821a0f2 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:45:58 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= xracer-0.96.9
@@ -13,7 +13,7 @@ COMMENT= XRacer is a clone of the popular Psygnosis game Wipeout
BUILD_USES_MSGFMT= # defined
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= # defined
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/XRacer/.packlist
diff --git a/games/xrick/Makefile b/games/xrick/Makefile
index b941b8feec3..06521f11379 100644
--- a/games/xrick/Makefile
+++ b/games/xrick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/15 22:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= xrick-021212
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_FTP= ${RESTRICTED}
NO_SRC_ON_FTP= ${RESTRICTED}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGSRC_USE_TOOLS+= gunzip
USE_X11= YES
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index 4a28a558d54..a2755deb97c 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= zoom-1.0.1
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
.if ${MACHINE_ARCH} == "alpha"
diff --git a/graphics/3DKit/Makefile.common b/graphics/3DKit/Makefile.common
index c552c62148f..2f48048ce1f 100644
--- a/graphics/3DKit/Makefile.common
+++ b/graphics/3DKit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/04/11 21:45:59 tv Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= 3DKit-0.3.1r2
@@ -14,6 +14,6 @@ DISTINFO_FILE?= ${.CURDIR}/../../graphics/3DKit/distinfo
DESCR_SRC?= ${.CURDIR}/../../graphics/3DKit/DESCR
NO_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
MAKEFILE= GNUmakefile
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index 5f8a18a9b2f..bb3232dc30d 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.126 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.127 2005/05/22 20:08:04 jlam Exp $
.include "Makefile.common"
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGCONFIG_OVERRIDE= Magick++/lib/ImageMagick++.pc.in
PKGCONFIG_OVERRIDE+= magick/ImageMagick.pc.in
diff --git a/graphics/Ngraph/Makefile b/graphics/Ngraph/Makefile
index a8dbfd145ad..f49cae88380 100644
--- a/graphics/Ngraph/Makefile
+++ b/graphics/Ngraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/16 01:15:32 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= Ngraph-6.3.30-src
@@ -16,7 +16,7 @@ COMMENT= The 2D graph and data analysis program
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGSRC_USE_TOOLS+= gtar
post-extract:
diff --git a/graphics/aqsis/Makefile b/graphics/aqsis/Makefile
index b967d3977b5..78cdec18de8 100644
--- a/graphics/aqsis/Makefile
+++ b/graphics/aqsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:00 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= aqsis-0.6.4
@@ -13,7 +13,7 @@ COMMENT= Renderman clone
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GCC_REQD+= 2.95.3
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 25fed3950db..13ca63d9e75 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 23:01:21 reinoud Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= blender-2.36
@@ -16,7 +16,7 @@ BUILD_DEPENDS+= scons>=0.96:../../devel/scons
WRKSRC= ${WRKDIR}/blender
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
LDFLAGS+= -lcrypto
diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile
index a8d670cf6fb..abd87b2c5f5 100644
--- a/graphics/camlimages/Makefile
+++ b/graphics/camlimages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:04 jlam Exp $
DISTNAME= camlimages-2.2.0
CATEGORIES= graphics
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.0.6
WRKSRC= ${WRKDIR}/camlimages-2.2
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/compface/Makefile b/graphics/compface/Makefile
index 992057410b4..a4ee2626e97 100644
--- a/graphics/compface/Makefile
+++ b/graphics/compface/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:04 jlam Exp $
DISTNAME= compface-1.5.1
CATEGORIES= graphics
@@ -10,7 +10,7 @@ COMMENT= 48x48x1 image compression and decompression (X-face utility)
CONFLICTS= faces-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
SUBST_CLASSES+= perlpath
diff --git a/graphics/dia/Makefile.common b/graphics/dia/Makefile.common
index 4df1cb8d097..9334362ffe3 100644
--- a/graphics/dia/Makefile.common
+++ b/graphics/dia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/21 04:10:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= dia-0.94
@@ -14,7 +14,7 @@ DISTINFO_FILE= ${.CURDIR}/../../graphics/dia/distinfo
PATCHDIR= ${.CURDIR}/../../graphics/dia/patches
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/graphics/digikam/Makefile b/graphics/digikam/Makefile
index e5cdec5f0f5..9af5662c15d 100644
--- a/graphics/digikam/Makefile
+++ b/graphics/digikam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:04 jlam Exp $
DISTNAME= digikam-0.7.2
CATEGORIES= graphics kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://digikam.sourceforge.net/
COMMENT= KDE frontend to gphoto2
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/graphics/digikamimageplugins/Makefile b/graphics/digikamimageplugins/Makefile
index a2a50c78af6..4a0acfa1ab8 100644
--- a/graphics/digikamimageplugins/Makefile
+++ b/graphics/digikamimageplugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:01 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:04 jlam Exp $
DISTNAME= digikamimageplugins-0.7.2
CATEGORIES= graphics kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://digikam.sourceforge.net/
COMMENT= Plugins for Digikam's ImageEditor
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
MANCOMPRESSED= yes
diff --git a/graphics/dvdview/Makefile b/graphics/dvdview/Makefile
index f6e5c446e32..02b23609333 100644
--- a/graphics/dvdview/Makefile
+++ b/graphics/dvdview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:02 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:04 jlam Exp $
DISTNAME= dvdview-1.2.2
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://rachmaninoff.informatik.uni-mannheim.de/dvdview/
COMMENT= Software only MPEG-1/2 video decoder
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/dx/Makefile b/graphics/dx/Makefile
index cbd823f5df5..6a4a6558e91 100644
--- a/graphics/dx/Makefile
+++ b/graphics/dx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/22 03:04:29 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:04 jlam Exp $
DISTNAME= dx-4.3.2
PKGREVISION= 2
@@ -10,8 +10,7 @@ HOMEPAGE= http://www.opendx.org/
COMMENT= Open Visualization Data Explorer
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
-USE_TOOLS+= lex
+USE_TOOLS+= gmake lex
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-javadx
diff --git a/graphics/dxsamples/Makefile b/graphics/dxsamples/Makefile
index c05812a37ae..1e3ac8fe592 100644
--- a/graphics/dxsamples/Makefile
+++ b/graphics/dxsamples/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/04/20 22:11:48 drochner Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:04 jlam Exp $
DISTNAME= dxsamples-4.3.2
CATEGORIES= graphics
@@ -11,7 +11,7 @@ COMMENT= Sample data for Open Visualization Data Explorer
DEPENDS+= dx-[0-9]*:../../graphics/dx
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11BASE= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/eog2/Makefile b/graphics/eog2/Makefile
index d35df2b2693..9fae5073de7 100644
--- a/graphics/eog2/Makefile
+++ b/graphics/eog2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/20 16:15:16 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:04 jlam Exp $
#
DISTNAME= eog-2.10.0
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
diff --git a/graphics/exiv2/Makefile b/graphics/exiv2/Makefile
index e59d10347d2..0b2b408ef11 100644
--- a/graphics/exiv2/Makefile
+++ b/graphics/exiv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= exiv2-0.6.1
@@ -13,6 +13,6 @@ USE_LANGUAGES= c c++
GCC_REQD= 3.3
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/freetype2/Makefile b/graphics/freetype2/Makefile
index ea39e30bab8..9b658e4b5d5 100644
--- a/graphics/freetype2/Makefile
+++ b/graphics/freetype2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:02 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:05 jlam Exp $
DISTNAME= freetype-2.1.9
PKGNAME= freetype2-2.1.9
@@ -19,7 +19,7 @@ COMMENT= Font rendering engine and library API
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= grep make
+USE_TOOLS+= grep gmake
GNU_CONFIGURE= yes
CONFIGURE_DIRS= ${WRKSRC}/builds/unix
CONFIGURE_ARGS+= --includedir=${PREFIX}/include
diff --git a/graphics/g3d/Makefile b/graphics/g3d/Makefile
index 49e854f71f2..87242ee21a4 100644
--- a/graphics/g3d/Makefile
+++ b/graphics/g3d/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:02 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= g3d-0.0.2
@@ -13,7 +13,7 @@ COMMENT= 3D modeller with a view of 3D modelling
WRKSRC= ${WRKDIR}/g3d
USE_DIRS+= xdg-1.1
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11BASE= YES
GNU_CONFIGURE= YES
diff --git a/graphics/gdk-pixbuf/Makefile.common b/graphics/gdk-pixbuf/Makefile.common
index 00045645795..a4acfc2a50b 100644
--- a/graphics/gdk-pixbuf/Makefile.common
+++ b/graphics/gdk-pixbuf/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile.common,v 1.41 2005/05/22 20:08:05 jlam Exp $
DISTNAME= gdk-pixbuf-${VER}.0
CATEGORIES= graphics devel
@@ -12,7 +12,7 @@ VER= 0.22
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
diff --git a/graphics/gfract/Makefile b/graphics/gfract/Makefile
index 1373c6f379d..a424485c49d 100644
--- a/graphics/gfract/Makefile
+++ b/graphics/gfract/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= gfract-0.30
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.cs.Helsinki.FI/u/salerma/gfract/
COMMENT= Gtk-based fractal program
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= gfract
PKG_INSTALLATION_TYPES= overwrite pkgviews
diff --git a/graphics/gimageview/Makefile b/graphics/gimageview/Makefile
index 9940f5f5267..1bb4c0a99ba 100644
--- a/graphics/gimageview/Makefile
+++ b/graphics/gimageview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.37 2005/05/22 20:08:05 jlam Exp $
DISTNAME= gimageview-0.2.27
CATEGORIES= graphics
@@ -13,7 +13,7 @@ USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
CONFIGURE_ARGS+= --disable-xinetest
diff --git a/graphics/gimp-docs/Makefile b/graphics/gimp-docs/Makefile
index 100dc7af9ac..facc614f982 100644
--- a/graphics/gimp-docs/Makefile
+++ b/graphics/gimp-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/07 12:36:52 adam Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:05 jlam Exp $
DISTNAME= gimp-help-2-0.7
PKGNAME= gimp-docs-2.0.7
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gimp.org/
COMMENT= Documentation package for The Gimp image manipulation software
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --without-gimp
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gimp-ufraw/Makefile b/graphics/gimp-ufraw/Makefile
index a3dd65f8da8..71d3c1ebceb 100644
--- a/graphics/gimp-ufraw/Makefile
+++ b/graphics/gimp-ufraw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/13 16:49:57 rillig Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= ufraw-0.4
@@ -10,7 +10,7 @@ MAINTAINER= gdt@ir.bbn.com
HOMEPAGE= http://ufraw.sourceforge.net/
COMMENT= GIMP plug-in for raw digicam import
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= build
INSTALL_TARGET= install-admin
diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile
index 47d8310a54f..692f1442671 100644
--- a/graphics/gimp/Makefile
+++ b/graphics/gimp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.118 2005/05/13 15:34:12 drochner Exp $
+# $NetBSD: Makefile,v 1.119 2005/05/22 20:08:05 jlam Exp $
DISTNAME= gimp-2.2.7
CATEGORIES= graphics
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= gimp<=1.2.3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile
index 2c12286763a..86e195a3d62 100644
--- a/graphics/gimp1-base/Makefile
+++ b/graphics/gimp1-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= gimp-1.2.5
@@ -21,7 +21,7 @@ CONFLICTS+= gimp<=1.2.3 gimp>=2.0.0
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/graphics/gimp1-wideangle/Makefile b/graphics/gimp1-wideangle/Makefile
index 89b23cff06e..55292c56e54 100644
--- a/graphics/gimp1-wideangle/Makefile
+++ b/graphics/gimp1-wideangle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= wideangleFeb03
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.ozemail.com.au/~hodsond/
COMMENT= GIMP plugin for wideangle lens distortions
WRKSRC= ${WRKDIR}/wideangle
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= wideangle
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 2dfbccce6f9..45b40535a30 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= giram-0.3.5
@@ -16,7 +16,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
USE_PKGLOCALEDIR= YES
USE_PKGINSTALL= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/graphics/gliv/Makefile b/graphics/gliv/Makefile
index 7459652182c..cc03f08de18 100644
--- a/graphics/gliv/Makefile
+++ b/graphics/gliv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:05 jlam Exp $
DISTNAME= gliv-1.9.1
CATEGORIES= graphics
@@ -11,7 +11,7 @@ COMMENT= OpenGL image viewer
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/graphics/gnome-backgrounds/Makefile b/graphics/gnome-backgrounds/Makefile
index 1d82068fee4..7d795a76fbf 100644
--- a/graphics/gnome-backgrounds/Makefile
+++ b/graphics/gnome-backgrounds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/19 21:08:00 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= gnome-backgrounds-2.10.1
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= # empty
USE_PKGLOCALEDIR= YES
diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index f80c0681e25..7be88adfb96 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/18 16:22:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= gnome-icon-theme-2.10.1
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
USE_PKGLOCALEDIR= yes
diff --git a/graphics/gnome-iconedit/Makefile b/graphics/gnome-iconedit/Makefile
index 86c75bc9a17..008d1bee11b 100644
--- a/graphics/gnome-iconedit/Makefile
+++ b/graphics/gnome-iconedit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:03 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= gnome-iconedit-1.2.0
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome1-1.5
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
post-configure:
diff --git a/graphics/gpaint/Makefile b/graphics/gpaint/Makefile
index 2464c8f9009..ce52a57c85f 100644
--- a/graphics/gpaint/Makefile
+++ b/graphics/gpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:05 jlam Exp $
#
DISTNAME= gpaint-0.2
@@ -12,7 +12,7 @@ COMMENT= Simple, easy-to-use paint program for GNOME
USE_DIRS+= xdg-1.1
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_GETTEXT= YES
USE_X11BASE= YES
diff --git a/graphics/gri/Makefile b/graphics/gri/Makefile
index b65059236cb..9fbb5a3383f 100644
--- a/graphics/gri/Makefile
+++ b/graphics/gri/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:06 jlam Exp $
DISTNAME= gri-2.12.5
PKGREVISION= 1
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= ImageMagick-[0-9]*:../../graphics/ImageMagick
GNU_CONFIGURE= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
REPLACE_PERL= gri_merge gri_unpage
diff --git a/graphics/gtkglext/Makefile b/graphics/gtkglext/Makefile
index ae34d74a2f9..97e6d1938f0 100644
--- a/graphics/gtkglext/Makefile
+++ b/graphics/gtkglext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:06 jlam Exp $
DISTNAME= gtkglext-1.0.6
CATEGORIES= graphics
@@ -10,7 +10,7 @@ HOMEPAGE= http://gtkglext.sourceforge.net/
COMMENT= OpenGL extension to GTK
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PERL5= build
USE_X11= yes
diff --git a/graphics/gtksee/Makefile b/graphics/gtksee/Makefile
index 291e0b39c1f..5c0af15277c 100644
--- a/graphics/gtksee/Makefile
+++ b/graphics/gtksee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= gtksee-0.5.6
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
post-install:
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 89faaf684c6..cdba5889b54 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= gwenview-1.2.0
@@ -10,7 +10,7 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://gwenview.sourceforge.net/
COMMENT= Image viewer for KDE whose aims are ease of use and speed
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/graphics/hermes/Makefile b/graphics/hermes/Makefile
index 9012c3e42e9..9327c55e04c 100644
--- a/graphics/hermes/Makefile
+++ b/graphics/hermes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:06 jlam Exp $
DISTNAME= Hermes-1.3.3
PKGREVISION= 1
@@ -13,6 +13,6 @@ COMMENT= Library for conversion of pixel graphics
WRKSRC= ${WRKDIR}/Hermes-1.3.3
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/hicolor-icon-theme/Makefile b/graphics/hicolor-icon-theme/Makefile
index 2bea9661d0c..d815c3be957 100644
--- a/graphics/hicolor-icon-theme/Makefile
+++ b/graphics/hicolor-icon-theme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= hicolor-icon-theme-0.5
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
NO_BUILD= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= # empty
.include "../../mk/bsd.pkg.mk"
diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile
index 046adc4f1ed..8001e51213b 100644
--- a/graphics/imlib/Makefile
+++ b/graphics/imlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.92 2005/04/11 21:46:04 tv Exp $
+# $NetBSD: Makefile,v 1.93 2005/05/22 20:08:06 jlam Exp $
DISTNAME= imlib-1.9.15
PKGREVISION= 2
@@ -12,7 +12,7 @@ COMMENT= Image manipulation library for X11
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/graphics/inkscape/Makefile b/graphics/inkscape/Makefile
index d767ac1c7d3..138bfac6f6e 100644
--- a/graphics/inkscape/Makefile
+++ b/graphics/inkscape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/10 18:58:27 reed Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= inkscape-0.41
@@ -20,7 +20,7 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILDLINK_DEPENDS.boehm-gc+= boehm-gc>=6.4
.include "../../devel/boehm-gc/buildlink3.mk"
diff --git a/graphics/kbarcode/Makefile b/graphics/kbarcode/Makefile
index 3243fe6c951..96c32f54c0e 100644
--- a/graphics/kbarcode/Makefile
+++ b/graphics/kbarcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:06 jlam Exp $
DISTNAME= kbarcode-1.8.1
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.kbarcode.net/
COMMENT= KDE barcode and label printing application
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= yes
diff --git a/graphics/kipi-plugins/Makefile b/graphics/kipi-plugins/Makefile
index 498aa0c4a0d..2d403115837 100644
--- a/graphics/kipi-plugins/Makefile
+++ b/graphics/kipi-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/04 16:50:34 drochner Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:06 jlam Exp $
DISTNAME= kipi-plugins-0.1.0-beta2
PKGNAME= kipi-plugins-0.1.0beta2
@@ -14,7 +14,7 @@ DEPENDS+= dcraw-[0-9]*:../../graphics/dcraw
DEPENDS+= bash-[0-9]*:../../shells/bash2
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/graphics/kphotobook/Makefile b/graphics/kphotobook/Makefile
index 3a79968b6a7..251b7c5b356 100644
--- a/graphics/kphotobook/Makefile
+++ b/graphics/kphotobook/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= kphotobook-0.0.6
@@ -10,7 +10,7 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://kphotobook.sourceforge.net/
COMMENT= Powerful, intuitive KDE application to manage and organize your photos
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/graphics/kphotools/Makefile b/graphics/kphotools/Makefile
index 25811e9d1f2..2224711d7c9 100644
--- a/graphics/kphotools/Makefile
+++ b/graphics/kphotools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= kphotools-0.2.1
@@ -11,7 +11,7 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://kphotools.sourceforge.net/
COMMENT= KDE app which helps you creating fast online photo galleries in HTML
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/graphics/libgdiplus/Makefile b/graphics/libgdiplus/Makefile
index 44e13949e32..6d6e680ddbb 100644
--- a/graphics/libgdiplus/Makefile
+++ b/graphics/libgdiplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:05 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= libgdiplus-1.1.5
@@ -11,7 +11,7 @@ COMMENT= Implementation of the GDI+ API
USE_X11= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= libgdiplus.pc.in
GNU_CONFIGURE= yes
diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index ee4205d82d9..32d9fa3aa87 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= libgnomecanvas-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_X11= yes
USE_LIBTOOL= yes
diff --git a/graphics/libgnomecanvasmm20/Makefile b/graphics/libgnomecanvasmm20/Makefile
index 5919f7c4e18..d477eb75472 100644
--- a/graphics/libgnomecanvasmm20/Makefile
+++ b/graphics/libgnomecanvasmm20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= libgnomecanvasmm-2.0.2
@@ -15,7 +15,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomecanvas/libgnomecanvasmm-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/graphics/libgnomecanvasmm26/Makefile b/graphics/libgnomecanvasmm26/Makefile
index c4e7b7e0009..fc714e3852a 100644
--- a/graphics/libgnomecanvasmm26/Makefile
+++ b/graphics/libgnomecanvasmm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= libgnomecanvasmm-2.6.1
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomecanvas/libgnomecanvasmm-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/graphics/libkexif/Makefile b/graphics/libkexif/Makefile
index cc3cc9b9be6..75aa23fc11b 100644
--- a/graphics/libkexif/Makefile
+++ b/graphics/libkexif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:06 jlam Exp $
DISTNAME= libkexif-0.2.1
CATEGORIES= graphics
@@ -10,7 +10,7 @@ HOMEPAGE= http://digikam.sourceforge.net/
COMMENT= Image EXIF information library manipulation
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/graphics/libkipi/Makefile b/graphics/libkipi/Makefile
index bc3421a5edd..8c25e12171e 100644
--- a/graphics/libkipi/Makefile
+++ b/graphics/libkipi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/04 16:47:18 drochner Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:06 jlam Exp $
DISTNAME= libkipi-0.1.1
CATEGORIES= graphics
@@ -10,7 +10,7 @@ HOMEPAGE= http://extragear.kde.org/apps/kipi/
COMMENT= KDE Image Plugin Interface
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/graphics/metacam/Makefile b/graphics/metacam/Makefile
index e752760b9f0..180df84f3cd 100644
--- a/graphics/metacam/Makefile
+++ b/graphics/metacam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/03/10 14:27:20 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= metacam-1.2
@@ -9,7 +9,7 @@ MAINTAINER= simonb@NetBSD.org
HOMEPAGE= http://www.cheeseplant.org/~daniel/pages/metacam.html
COMMENT= Digital camera image meta-information reader
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= default
do-install:
diff --git a/graphics/mgl/Makefile b/graphics/mgl/Makefile
index a27e2993908..7d84eced5af 100644
--- a/graphics/mgl/Makefile
+++ b/graphics/mgl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:06 jlam Exp $
#
DISTNAME= mgl2-alpha-020
@@ -13,7 +13,7 @@ COMMENT= Graphics library for NEC Mobilegear/PocketBSD, NetBSD/hpcmips
DEPENDS+= mglfonts>=0.1:../../fonts/mglfonts
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
MGLDOCS= im.doc mgl1.doc shlib.doc
diff --git a/graphics/netpbm/Makefile b/graphics/netpbm/Makefile
index a96402f33f5..b1b140fd854 100644
--- a/graphics/netpbm/Makefile
+++ b/graphics/netpbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2005/04/11 21:46:06 tv Exp $
+# $NetBSD: Makefile,v 1.110 2005/05/22 20:08:06 jlam Exp $
DISTNAME= netpbm-10.26.7
CATEGORIES= graphics
@@ -11,7 +11,7 @@ COMMENT= Toolkit for conversion of images between different formats
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= lex make
+USE_TOOLS+= gmake lex
USE_PERL5= yes
INSTALL_TARGET= install-dev install-run
diff --git a/graphics/openexr/Makefile b/graphics/openexr/Makefile
index 3ac7f5b346a..7e8e0d6799c 100644
--- a/graphics/openexr/Makefile
+++ b/graphics/openexr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:07 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:07 jlam Exp $
DISTNAME= OpenEXR-1.2.2
PKGNAME= openexr-1.2.2
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.openexr.com/
COMMENT= High dynamic-range (HDR) image file format library and tools
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes # for exrdisplay FLTK application
GNU_CONFIGURE= yes
diff --git a/graphics/pixieplus/Makefile b/graphics/pixieplus/Makefile
index 02addd46d14..6e0d58c288e 100644
--- a/graphics/pixieplus/Makefile
+++ b/graphics/pixieplus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= pixieplus-0.5.4
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.mosfet.org/pixie/
COMMENT= Free, fast, and feature packed image browser for KDE
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/graphics/plotutils-nox11/Makefile b/graphics/plotutils-nox11/Makefile
index b9201eca7b4..ffbb1a449ee 100644
--- a/graphics/plotutils-nox11/Makefile
+++ b/graphics/plotutils-nox11/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= plotutils-2.4.1
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-libplotter
CONFIGURE_ARGS+= --without-x
OPSYSVARS+= USE_GNU_TOOLS
-USE_GNU_TOOLS.IRIX+= awk
+USE_TOOLS.IRIX+= gawk
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/libxmi/ltconfig
diff --git a/graphics/py-gdchart/Makefile b/graphics/py-gdchart/Makefile
index b8bb683c6e0..4924df83c0b 100644
--- a/graphics/py-gdchart/Makefile
+++ b/graphics/py-gdchart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:08 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= gdchart-py-0.6
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://athani.pair.com/msteed/software/gdchart/
COMMENT= Python interface to GDChart
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV= GD_INCLUDE=${LOCALBASE}/include \
GDCHART_INCLUDE=${LOCALBASE}/include \
PYTHON_INCLUDE=${LOCALBASE}/${PYINC} \
diff --git a/graphics/qiv/Makefile b/graphics/qiv/Makefile
index 28c28c1f0c6..5cf31dfc205 100644
--- a/graphics/qiv/Makefile
+++ b/graphics/qiv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:09 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:07 jlam Exp $
DISTNAME= qiv-2.0-src
PKGNAME= ${DISTNAME:S/-src//}
@@ -13,7 +13,7 @@ COMMENT= Quick image viewer
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
diff --git a/graphics/resize_image/Makefile b/graphics/resize_image/Makefile
index e06265052fa..4814319387e 100644
--- a/graphics/resize_image/Makefile
+++ b/graphics/resize_image/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:09 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= resize_image-0.6
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://lab.erasme.org/resize_image/
COMMENT= Fast image resizing tool
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CFLAGS+= -DUNIX
do-install:
diff --git a/graphics/sane-backends/Makefile.common b/graphics/sane-backends/Makefile.common
index d5871d68327..1487fd1387f 100644
--- a/graphics/sane-backends/Makefile.common
+++ b/graphics/sane-backends/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/04/11 21:46:09 tv Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/05/22 20:08:07 jlam Exp $
CATEGORIES?= graphics
MASTER_SITES?= ftp://ftp.mostang.com/pub/sane/${DISTNAME}/ \
@@ -21,7 +21,7 @@ PLIST_SUBST+= SANE_VERSION=${SANE_VERSION}
CONFLICTS+= sane<=1.0.3
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
CONFIGURE_ENV+= ac_cv_path_LATEX="no"
diff --git a/graphics/scigraphica/Makefile b/graphics/scigraphica/Makefile
index e3746a99ab4..62653efc092 100644
--- a/graphics/scigraphica/Makefile
+++ b/graphics/scigraphica/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:46:09 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= scigraphica-0.8.0
@@ -12,7 +12,7 @@ COMMENT= Data analysis and technical graphics
USE_DIRS+= gnome1-1.5
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_READLINE= YES
GNU_CONFIGURE= YES
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 8012c77b4a1..70c7d85fe55 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/04 17:00:06 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= showimg-0.9.4-1
@@ -11,7 +11,7 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://www.jalix.org/projects/showimg/
COMMENT= Feature-rich image viewer for KDE including an image management system
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGE= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/graphics/sodipodi/Makefile b/graphics/sodipodi/Makefile
index cc1e7d3277c..e7f9a6d0842 100644
--- a/graphics/sodipodi/Makefile
+++ b/graphics/sodipodi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:09 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= sodipodi-0.34
@@ -13,7 +13,7 @@ COMMENT= Open source vector graphics drawing program using SVG as native format
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_X11= YES
diff --git a/graphics/tuxpaint-config/Makefile b/graphics/tuxpaint-config/Makefile
index d0d26cf1d03..5525aa62e2b 100644
--- a/graphics/tuxpaint-config/Makefile
+++ b/graphics/tuxpaint-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:09 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= tuxpaint-config-0.0.5
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= ftp://ftp.sonic.net/pub/users/nbs/unix/x/tuxpaint/config/
COMMENT= Configuration program for tuxpaint
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
post-install:
diff --git a/graphics/tuxpaint/Makefile b/graphics/tuxpaint/Makefile
index 29cd3c60272..48feae0b918 100644
--- a/graphics/tuxpaint/Makefile
+++ b/graphics/tuxpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:46:09 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= tuxpaint-0.9.14
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.newbreedsoftware.com/tuxpaint/
COMMENT= Drawing program for small children
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
MANCOMPRESSED= YES
diff --git a/graphics/wmphoto/Makefile b/graphics/wmphoto/Makefile
index 44ad4aec9e9..d7a6f85c2a6 100644
--- a/graphics/wmphoto/Makefile
+++ b/graphics/wmphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:07 jlam Exp $
#
DISTNAME= wmphoto-0.3a
@@ -11,7 +11,7 @@ COMMENT= Dock-app that can show you a photo
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/wmphoto
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= X11PREFIX=${X11PREFIX} X11BASE=${X11BASE}
post-install:
diff --git a/graphics/xbmbrowser/Makefile b/graphics/xbmbrowser/Makefile
index 7eb8c04916a..f575437e403 100644
--- a/graphics/xbmbrowser/Makefile
+++ b/graphics/xbmbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:07 jlam Exp $
DISTNAME= xbmbrowser5.1
PKGNAME= xbmbrowser-5.1
@@ -9,7 +9,7 @@ MASTER_SITES= ${MASTER_SITE_XCONTRIB:=utilities/}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= View complete directories of X bitmaps and X pixmaps
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_IMAKE= YES
.include "../../graphics/xpm/buildlink3.mk"
diff --git a/graphics/xpaint/Makefile b/graphics/xpaint/Makefile
index c90d531200d..39f513b76b5 100644
--- a/graphics/xpaint/Makefile
+++ b/graphics/xpaint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.49 2005/05/22 20:08:07 jlam Exp $
DISTNAME= xpaint-2.7.6
CATEGORIES= graphics x11
@@ -10,7 +10,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://sf-xpaint.sourceforge.net/
COMMENT= Simple paint program
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_IMAKE= yes
BUILD_TARGET= xaw95
diff --git a/graphics/xsane/Makefile b/graphics/xsane/Makefile
index 5da8f3b4fda..2ef2620c31d 100644
--- a/graphics/xsane/Makefile
+++ b/graphics/xsane/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:08 jlam Exp $
DISTNAME= xsane-0.96
PKGREVISION= 1
@@ -19,7 +19,7 @@ COMMENT= New improved frontend for SANE
BUILD_USES_MSGFMT= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/graphics/xzgv/Makefile b/graphics/xzgv/Makefile
index 5b29d416b8c..db84dc9dc05 100644
--- a/graphics/xzgv/Makefile
+++ b/graphics/xzgv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:08 jlam Exp $
DISTNAME= xzgv-0.8
PKGNAME= xzgv-0.8.0.1
@@ -17,7 +17,7 @@ USE_MAKEINFO= YES
INFO_FILES= xzgv
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/xzgv ${PREFIX}/bin
diff --git a/ham/7plus/Makefile b/ham/7plus/Makefile
index 4b2a1f8566b..16b8fdec916 100644
--- a/ham/7plus/Makefile
+++ b/ham/7plus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 13:40:43 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= 7pl225sr
@@ -16,7 +16,7 @@ LICENSE= no-commercial-use
WRKSRC= ${WRKDIR}/7plsrc.225
MAKEFILE= netbsd.mak
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/7plus && \
diff --git a/ham/cwtext/Makefile b/ham/cwtext/Makefile
index e792644a3df..03c7872894d 100644
--- a/ham/cwtext/Makefile
+++ b/ham/cwtext/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:15:00 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $
DISTNAME= cwtext-0.91
CATEGORIES= ham
@@ -9,7 +9,7 @@ HOMEPAGE= http://cwtext.sourceforge.net/
COMMENT= Morse Code Generator
MAKEFILE= makefile
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= ALL
post-patch:
diff --git a/ham/dpbox/Makefile b/ham/dpbox/Makefile
index 85b25767e71..5af83e35b3f 100644
--- a/ham/dpbox/Makefile
+++ b/ham/dpbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 13:40:43 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= dpbox-60000
@@ -11,7 +11,7 @@ HOMEPAGE= http://home.snafu.de/wahlm/dl8hbs/dpbox.html
COMMENT= Multi-Protocol Amateur Packet Radio BBS
WRKSRC= ${WRKDIR}/dpbox-6.00.00/source
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= Makefile.netbsd
MAKE_ENV+= prefix="${PREFIX}"
diff --git a/ham/gmfsk/Makefile b/ham/gmfsk/Makefile
index 8228d70e75c..6988903cf76 100644
--- a/ham/gmfsk/Makefile
+++ b/ham/gmfsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/22 12:50:25 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= gmfsk-0.6
@@ -9,7 +9,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://gmfsk.connect.fi/
COMMENT= Multimode HF terminal program
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
GCONF2_SCHEMAS+=gmfsk.schemas
diff --git a/ham/grig/Makefile b/ham/grig/Makefile
index 97234faaa95..3289d8873d6 100644
--- a/ham/grig/Makefile
+++ b/ham/grig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= grig-0.2.2
@@ -10,7 +10,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://groundstation.sourceforge.net/
COMMENT= Graphical user interface to the Hamlib libraries
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT= YES
diff --git a/ham/hamlib/Makefile b/ham/hamlib/Makefile
index 4931d46fc2a..4b05b60bb22 100644
--- a/ham/hamlib/Makefile
+++ b/ham/hamlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/13 23:24:43 wulf Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= hamlib-1.2.4
@@ -10,7 +10,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://hamlib.sourceforge.net/
COMMENT= API for digital communications equipment
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/ham/linpsk/Makefile b/ham/linpsk/Makefile
index cba36cfa514..6c62e0c0ed5 100644
--- a/ham/linpsk/Makefile
+++ b/ham/linpsk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= linpsk-0.8.0.4
@@ -12,7 +12,7 @@ COMMENT= PSK31 terminal program using QT3
BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNUMAKE= yes
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
diff --git a/ham/tfkiss/Makefile b/ham/tfkiss/Makefile
index 56d88126cf3..db725a521a6 100644
--- a/ham/tfkiss/Makefile
+++ b/ham/tfkiss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/24 13:40:43 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= tfkiss-1.2.4
@@ -9,7 +9,7 @@ MAINTAINER= wulf@ping.net.au
HOMEPAGE= http://www.bfl.at/mayer/ham/
COMMENT= Software implementation of TheFirmware for use with TNT
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-xpid --enable-flexnet --enable-axip
diff --git a/ham/tlf/Makefile b/ham/tlf/Makefile
index 65039cc023c..de61ccbd6dc 100644
--- a/ham/tlf/Makefile
+++ b/ham/tlf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= tlf-0.9.20
@@ -11,7 +11,7 @@ HOMEPAGE= http://home.iae.nl/users/reinc/TLF-0.2.html
COMMENT= Advanced hamradio logging and contest program
USE_NCURSES= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
BUILD_USES_MSGFMT=yes
PTHREAD_OPTS+= require
diff --git a/ham/tnt/Makefile b/ham/tnt/Makefile
index b2a2ed54451..f8030dd19c0 100644
--- a/ham/tnt/Makefile
+++ b/ham/tnt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= tnt-1.9.1
@@ -15,7 +15,7 @@ DEPENDS+= dialog>=0.6z:../../misc/dialog
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/ham/xdx/Makefile b/ham/xdx/Makefile
index ffae81ec9bd..163d858a914 100644
--- a/ham/xdx/Makefile
+++ b/ham/xdx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:10 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= xdx-1.2
@@ -9,7 +9,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://www.qsl.net/pg4i/linux/xdx.html
COMMENT= Amateur Radio tcp/ip DX-cluster client
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
diff --git a/ham/xlog/Makefile b/ham/xlog/Makefile
index 71c4f7122b6..602fac691e5 100644
--- a/ham/xlog/Makefile
+++ b/ham/xlog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= xlog-1.0
@@ -11,7 +11,7 @@ COMMENT= Amateur Radio logging program
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR=yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS= --enable-hamlib
diff --git a/inputmethod/anthy/Makefile b/inputmethod/anthy/Makefile
index 654946e73c6..706ae65bf93 100644
--- a/inputmethod/anthy/Makefile
+++ b/inputmethod/anthy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 15:02:23 taya Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:08 jlam Exp $
.include "../../inputmethod/anthy/Makefile.common"
@@ -9,7 +9,7 @@ COMMENT= Kana Kanji conversion system
USE_LIBTOOL= yes
USE_LANGUAGES= c
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= EMACS=no
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index b537ff1ea8c..3a30486416d 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= imhangul_status_applet-0.2
@@ -15,7 +15,7 @@ DEPENDS= imhangul>=0.9.6:../../inputmethod/imhangul
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GCONF2_SCHEMAS= imhangul_status.schemas
diff --git a/inputmethod/tc/Makefile b/inputmethod/tc/Makefile
index 3627259fd7b..eebb3ba5168 100644
--- a/inputmethod/tc/Makefile
+++ b/inputmethod/tc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/11/27 17:54:31 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= tc-2.3.1
@@ -16,7 +16,7 @@ CONFIGURE_ARGS+=--with-emacs=xemacs
CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX}/tc
.endif
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
INFO_FILES= tc.info
diff --git a/inputmethod/uim/Makefile b/inputmethod/uim/Makefile
index 48172ae7ca8..b8df405a376 100644
--- a/inputmethod/uim/Makefile
+++ b/inputmethod/uim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= uim-0.4.6
@@ -12,7 +12,7 @@ COMMENT= Uim is a multilingual input method library
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
USE_NCURSES= # clear_screen, clr_eos
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGCONFIG_OVERRIDE+= ${WRKSRC}/uim.pc.in
GNU_CONFIGURE= YES
USE_X11= YES
diff --git a/lang/ccsh/Makefile b/lang/ccsh/Makefile
index 364247f9a71..1583ccf20cd 100644
--- a/lang/ccsh/Makefile
+++ b/lang/ccsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:12 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:08 jlam Exp $
#
DISTNAME= ccsh-0.0.4
@@ -11,7 +11,7 @@ COMMENT= C-like syntax scripting
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
SUBST_CLASSES+= options
SUBST_MESSAGE.options= "Preventing CFLAGS from being overridden."
diff --git a/lang/cdl3/Makefile b/lang/cdl3/Makefile
index 961027f49a1..1faf9ca84ee 100644
--- a/lang/cdl3/Makefile
+++ b/lang/cdl3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:12 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:08 jlam Exp $
DISTNAME= cdl3-1.2.5
CATEGORIES= lang
@@ -10,7 +10,7 @@ COMMENT= Programming language for the development of compilers
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index bcc762f6c31..e35d0927c75 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:12 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:09 jlam Exp $
#
DISTNAME= chicken-1.89
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.call-with-current-continuation.org/chicken.html
COMMENT= Scheme to C compiler, handling R5RS
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
TEST_TARGET= test
diff --git a/lang/classpath/Makefile.common b/lang/classpath/Makefile.common
index cee3ec0595b..5c9fa7631e6 100644
--- a/lang/classpath/Makefile.common
+++ b/lang/classpath/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:12 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:09 jlam Exp $
DISTNAME= classpath-0.12
CATEGORIES= devel
@@ -13,7 +13,7 @@ DEPENDS+= jikes>=1.18:../../lang/jikes
DISTINFO_FILE= ${.CURDIR}/../../lang/classpath/distinfo
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --with-jikes
diff --git a/lang/coq/Makefile b/lang/coq/Makefile
index afb9f190f6f..d5a5f9b1b87 100644
--- a/lang/coq/Makefile
+++ b/lang/coq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:09 jlam Exp $
#
DISTNAME= coq-8.0pl2
@@ -9,7 +9,7 @@ MAINTAINER= richards+netbsd@CS.Princeton.EDU
HOMEPAGE= http://coq.inria.fr/
COMMENT= Theorem prover which extracts programs from proofs
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= -prefix ${PREFIX}
CONFIGURE_ARGS+= -emacslib ${PREFIX}/share/emacs/site-lisp
diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index b327cb6b6cf..a077c522168 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:09 jlam Exp $
#
DISTNAME= plt-${DRSCHEME_VERSION}-src-unix
@@ -24,7 +24,7 @@ CONFLICTS+= mzscheme-[0-9]*:../../lang/mzscheme
WRKSRC= ${WRKDIR}/plt/src
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
GNU_CONFIGURE= yes
diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index 85b2580c6d9..5f97f2cbce4 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:08:09 jlam Exp $
#
DISTNAME= gwydion-dylan-${DYLAN_VERSION}
@@ -16,7 +16,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gwydiondylan.org/
COMMENT= Functional language
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MAKEFILE= GNUmakefile
BUILD_TARGET= default
diff --git a/lang/eieio/Makefile b/lang/eieio/Makefile
index 8ab98053f76..fb3554aec94 100644
--- a/lang/eieio/Makefile
+++ b/lang/eieio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/04/05 22:13:44 reed Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:09 jlam Exp $
#
DISTNAME= eieio-0.17
@@ -19,7 +19,7 @@ DEPENDS+= xemacs-packages:../../editors/xemacs-packages
MAKEFLAGS+= EMACS=${EMACS_BIN}
NO_CONFIGURE= # set
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INFO_FILES= eieio.info
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index 7edb5e176a9..2b9b3d60bd9 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:09 jlam Exp $
DISTNAME= otp_src_R9C-0
PKGNAME= erlang-9.2
@@ -15,7 +15,7 @@ DIST_SUBDIR= erlang
USE_X11= yes
USE_PERL5= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_JAVA= yes
USE_JAVA2= yes
diff --git a/lang/ezm3/Makefile b/lang/ezm3/Makefile
index dc293ec64a1..39fbed3eff7 100644
--- a/lang/ezm3/Makefile
+++ b/lang/ezm3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/09 12:23:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:09 jlam Exp $
DISTNAME= ezm3-1.1
PKGREVISION= 1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.polstra.com/projects/freeware/ezm3/
COMMENT= Easier, more portable Modula-3 distribution for building CVSup
DIST_SUBDIR= ezm3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALL_TARGET= all
MAKE_ARGS+= M3OPTIONS="-DBUILD_ALL -DSHIP_ALL"
PLIST_SUBST+= TARGET=${TARGET} TARGETDIR=${TARGETDIR}
diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile
index 711dc5fab93..5f286015318 100644
--- a/lang/gcc-ssp/Makefile
+++ b/lang/gcc-ssp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:09 jlam Exp $
DISTNAME= gcc-2.95.3
PKGNAME= gcc-ssp-2.95.3.13
@@ -30,7 +30,7 @@ GCC_FILESDIR= ${.CURDIR}/../gcc/files
NOT_FOR_PLATFORM= *-*-x86_64
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= YES
CONFIGURE_SCRIPT= ${WRKSRC}/configure
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index d20e6044db5..754cab603f8 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.80 2005/05/22 20:08:09 jlam Exp $
DISTNAME= gcc-2.95.3
PKGREVISION= 5
@@ -18,7 +18,7 @@ COMMENT= GNU Compiler Collection, version 2
NOT_FOR_PLATFORM= Darwin-*-* *-*-x86_64
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFLAGS+= GMAKE_LOCALE=no
HAS_CONFIGURE= YES
diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common
index 52d97e7e326..518dd9a980a 100644
--- a/lang/gcc3/Makefile.common
+++ b/lang/gcc3/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:09 jlam Exp $
GCC_VERSION= 3.3.5
DISTNAME= gcc-${GCC_VERSION}
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnu.org/software/gcc/gcc.html
NOT_FOR_PLATFORM= Darwin-*-* Interix-*-*
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFLAGS+= GMAKE_LOCALE=no
HAS_CONFIGURE= yes
diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile
index f50caec8870..59db26c8a58 100644
--- a/lang/gcc34-ada/Makefile
+++ b/lang/gcc34-ada/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:09 jlam Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= YES
GCC_VERSION= 3.4.3
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-languages="c,ada"
PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC
diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 6f6ee3b54b7..aaa1744429e 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/20 19:25:21 shannonjr Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:09 jlam Exp $
#
DISTNAME= gcc-${GCC_VERSION}
@@ -105,7 +105,7 @@ CONFIGURE_ARGS+= --disable-threads
.endif
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= YES # no GNU_CONFIGURE!
CONFIG_SHELL?= ${SH}
CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 15629062889..217c07f9c2c 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/21 20:22:21 kristerw Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:09 jlam Exp $
DISTNAME= ghc-6.4
CATEGORIES= lang
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-ghc=${WRKDIR}/bootstrap/bin/ghc
CONFIGURE_ENV+= PerlCmd=${PERL5}
USE_GNU_READLINE= yes # uses the UNDO_ constants
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
pre-configure:
${MV} ${WRKDIR}/ghc-6.2.1/mk/bootstrap.mk \
diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile
index df670fd6b1e..508ec9d4bd4 100644
--- a/lang/gpc/Makefile
+++ b/lang/gpc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:09 jlam Exp $
DISTNAME= gpc-2.1
PKGREVISION= 3
@@ -19,7 +19,7 @@ PATCHFILES= gcc-2.95.3-diff-2002-08-29.gz
BUILD_DEPENDS+= gsed-[0-9]*:../../textproc/gsed
WRKSRC= ${WRKDIR}/gcc-2.95.3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_NCURSES= # defined
PLIST_SRC= PLIST
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index dd8571a67cc..eada7b834be 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/04/11 21:46:13 tv Exp $
+# $NetBSD: Makefile,v 1.65 2005/05/22 20:08:09 jlam Exp $
DISTNAME= guile-1.6.7
CATEGORIES= lang
@@ -11,7 +11,7 @@ COMMENT= GNU's Ubiquitous Intelligent Language for Extension
CONFLICTS= guile14<1.4.1nb1 guile-oops-[0-9]*
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_GNU_READLINE= YES
PTHREAD_AUTO_VARS= YES
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index 858835ea02f..7a9985ba49b 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:09 jlam Exp $
DISTNAME= guile-1.4.1
PKGNAME= guile14-1.4.1
@@ -12,7 +12,7 @@ COMMENT= GNU's Ubiquitous Intelligent Language for Extension
GNU_CONFIGURE= YES
GNU_CONFIGURE_PREFIX= ${LOCALBASE}/guile/1.4
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_GNU_READLINE= YES
PTHREAD_AUTO_VARS= YES
diff --git a/lang/inform/Makefile b/lang/inform/Makefile
index 6259a11da6f..25051cf6b40 100644
--- a/lang/inform/Makefile
+++ b/lang/inform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/06 17:47:11 nathanw Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:10 jlam Exp $
DISTNAME= inform-6.30.2
CATEGORIES= lang
@@ -11,6 +11,6 @@ COMMENT= Interactive fiction compiler (Z-Machine and Glulx)
LICENSE= no-profit
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/japhar/Makefile b/lang/japhar/Makefile
index e312a13fd10..bf45cb0a878 100644
--- a/lang/japhar/Makefile
+++ b/lang/japhar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/17 20:56:51 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:10 jlam Exp $
#
DISTNAME= japhar-0.08
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= SunOS-*-* # untested on NetBSD
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/lib/libffi/ltconfig
diff --git a/lang/jdk-openjit/Makefile.common b/lang/jdk-openjit/Makefile.common
index e77e6730872..48d08d787d7 100644
--- a/lang/jdk-openjit/Makefile.common
+++ b/lang/jdk-openjit/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:10 jlam Exp $
OPENJIT_VERSION=1.1.16
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.openjit.org/
COMMENT= Reflective JIT compiler for Java
GNU_CONFIGURE= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
.include "../../mk/java-vm.mk"
diff --git a/lang/jikes/Makefile b/lang/jikes/Makefile
index 58b16153eb3..b88c06c0b84 100644
--- a/lang/jikes/Makefile
+++ b/lang/jikes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:10 jlam Exp $
#
DISTNAME= jikes-1.22
@@ -18,6 +18,6 @@ UNLIMIT_RESOURCES= datasize
# enable "-source 1.5" -- not complete, but does not break normal compiles
CONFIGURE_ARGS+= --enable-source15
-USE_GNU_TOOLS+= make # uses multi-line comments with \ (naughty hack!)
+USE_TOOLS+= gmake # uses multi-line comments with \ (naughty hack!)
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/kaffe/Makefile.common b/lang/kaffe/Makefile.common
index c4610537ef7..f39e19f0b56 100644
--- a/lang/kaffe/Makefile.common
+++ b/lang/kaffe/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:10 jlam Exp $
DISTNAME= kaffe-1.1.4
CATEGORIES= lang java
@@ -14,7 +14,7 @@ JAVA_NAME= kaffe
NO_MTREE= yes
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
TEST_TARGET= check
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index da200f4dd84..b88124b50c8 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:10 jlam Exp $
#
DISTNAME= librep-0.17
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://librep.sourceforge.net/
COMMENT= Emacs Lisp-like runtime library, interpreter, compiler and VM
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_READLINE= # uses rl_basic_quote_characters
USE_LIBTOOL= yes
diff --git a/lang/mercury/Makefile b/lang/mercury/Makefile
index 8fd0b97898f..b8d39ac9394 100644
--- a/lang/mercury/Makefile
+++ b/lang/mercury/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:10 jlam Exp $
DISTNAME= mercury-compiler-0.11.0
PKGNAME= mercury-0.11.0
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.cs.mu.oz.au/mercury/
COMMENT= Modern logic/functional programming language
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_GNU_READLINE= yes # rl_prep_term_function
INFO_FILES= mercury.info mercury_faq.info mercury_library.info
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 5992634e9ea..5d45110c6b8 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:46:14 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:10 jlam Exp $
DISTNAME= mono-1.1.6
CATEGORIES= lang
@@ -22,7 +22,7 @@ NOT_FOR_PLATFORM+= NetBSD-2.9*-* NetBSD-3.*-*
# LP64 problems
NOT_FOR_PLATFORM+= *-*-alpha *-*-sparc64
-USE_GNU_TOOLS+= make yacc
+USE_TOOLS+= bison gmake
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile
index ccaaf47ce30..faaef23f9e5 100644
--- a/lang/nhc98/Makefile
+++ b/lang/nhc98/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/05/12 17:53:29 kristerw Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:10 jlam Exp $
DISTNAME= nhc98src-1.18.tar.gz
PKGNAME= nhc98-1.18
@@ -24,7 +24,7 @@ HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --buildwith=gcc --installdir=${PREFIX} \
+docs --docdir=${PREFIX}/share/doc/nhc98
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= default
HARCH= `${WRKSRC}/script/harch`
diff --git a/lang/objc/Makefile b/lang/objc/Makefile
index 28cfd83f86a..fdabdc04b2f 100644
--- a/lang/objc/Makefile
+++ b/lang/objc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:10 jlam Exp $
DISTNAME= objc-3.2.6
CATEGORIES= lang
@@ -16,8 +16,7 @@ CONFIGURE_DIRS= ${WRKSRC_BS} ${WRKSRC}
PREPEND_PATH+= ${WRKSRC_BS}
BUILD_TARGET= default
-USE_GNU_TOOLS+= lex
-USE_TOOLS+= yacc
+USE_TOOLS+= lex yacc
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 5656d7ca9ce..3ee29be2ea2 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/05/21 22:35:46 minskim Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:08:10 jlam Exp $
DISTNAME= ocaml-3.08.3
CATEGORIES= lang
@@ -12,7 +12,7 @@ COMMENT= The latest implementation of the Caml dialect of ML
DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= yes
CONFIGURE_ARGS+= -prefix ${PREFIX}
CONFIGURE_ARGS+= -libs "${LDFLAGS}"
diff --git a/lang/oo2c/Makefile b/lang/oo2c/Makefile
index 9be1e639130..3964a64161a 100644
--- a/lang/oo2c/Makefile
+++ b/lang/oo2c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:10 jlam Exp $
DISTNAME= oo2c_${BITS}-2.0.11
PKGNAME= oo2c-2.0.11
@@ -22,7 +22,7 @@ BITS=32
.endif
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
EVAL_PREFIX+= LIBTOOL_PREFIX=libtool-base
diff --git a/lang/perl58/Makefile b/lang/perl58/Makefile
index 11b559b5a8a..baa595e6969 100644
--- a/lang/perl58/Makefile
+++ b/lang/perl58/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.81 2005/05/11 16:15:50 jlam Exp $
+# $NetBSD: Makefile,v 1.82 2005/05/22 20:08:10 jlam Exp $
# The following two variables should have empty values unless we're
# building a perl snapshot or release candidate.
@@ -89,7 +89,7 @@ CONFIGURE_ARGS+= -Dsiteman1dir="${VIEWBASE}/man/man1"
# The perl build attempts to work around case-insensitivity problems on
# HFS filesystems by using GNUmakefiles, so we need to use GNU make.
#
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.endif
# Nail down the needed libraries for each platform here to avoid hidden
diff --git a/lang/pforth/Makefile b/lang/pforth/Makefile
index 0fb31cdbeab..0f3e50a4088 100644
--- a/lang/pforth/Makefile
+++ b/lang/pforth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:10 jlam Exp $
DISTNAME= pfthpc21
PKGNAME= pforth-21
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.softsynth.com/pforth/
COMMENT= Portable ANS-like Forth
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= ${WRKSRC}/makefile
NOT_FOR_PLATFORM= *-*-alpha #segfaults when running ./pforth during build
diff --git a/lang/php5/Makefile b/lang/php5/Makefile
index 88fde48838f..cefb0525992 100644
--- a/lang/php5/Makefile
+++ b/lang/php5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:10 jlam Exp $
#
PKGNAME= php-${PHP_BASE_VERS}
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.php.net/
COMMENT= PHP Hypertext Preprocessor version 5
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
LIBTOOL_OVERRIDE= # empty
.include "Makefile.php"
diff --git a/lang/pnet/Makefile b/lang/pnet/Makefile
index 4dabc2d21f8..68aebe0a873 100644
--- a/lang/pnet/Makefile
+++ b/lang/pnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:10 jlam Exp $
DISTNAME= pnet-0.6.6
PKGREVISION= 1
@@ -13,7 +13,7 @@ BUILD_DEPENDS= treecc>=0.2.6:../../devel/treecc
CONFLICTS= mono-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_MAKEINFO= yes
GNU_CONFIGURE= yes
diff --git a/lang/pnetC/Makefile b/lang/pnetC/Makefile
index 791f3ebb9bf..6e9f8dd7961 100644
--- a/lang/pnetC/Makefile
+++ b/lang/pnetC/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:10 jlam Exp $
#
DISTNAME= pnetC-0.6.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.dotgnu.org/
COMMENT= C language binding for DotGNU Portable .NET
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
.include "../../lang/pnet/buildlink3.mk"
diff --git a/lang/pnetlib/Makefile.common b/lang/pnetlib/Makefile.common
index 5d386ee6d01..682008737a1 100644
--- a/lang/pnetlib/Makefile.common
+++ b/lang/pnetlib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/05/22 20:08:10 jlam Exp $
#
DISTNAME= pnetlib-0.6.6
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.dotgnu.org/
COMMENT= DotGNU Portable .NET C SHARP class libraries
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
DESCR_SRC= ${.CURDIR}/../pnetlib/DESCR
diff --git a/lang/py-basicproperty/Makefile b/lang/py-basicproperty/Makefile
index d280862345f..23ed6dcdc64 100644
--- a/lang/py-basicproperty/Makefile
+++ b/lang/py-basicproperty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:15 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= basicproperty-0.6.3a
@@ -12,7 +12,7 @@ COMMENT= Python RDBMS wrapper for various databases
MAKE_ENV+= MANDIR=${PREFIX}/man
MAKE_ENV+= BINDIR=${PREFIX}/bin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX}
diff --git a/lang/rexx-regina/Makefile b/lang/rexx-regina/Makefile
index 0f64f0d741b..2cd37886d83 100644
--- a/lang/rexx-regina/Makefile
+++ b/lang/rexx-regina/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 13:51:15 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= regina301
@@ -13,7 +13,7 @@ COMMENT= Implementation of the REXX language
WRKSRC= ${WRKDIR}
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFLICTS= rexx-imc-[0-9]*
diff --git a/lang/sablevm-classpath/Makefile.common b/lang/sablevm-classpath/Makefile.common
index 954adec9a16..2996b203f5c 100644
--- a/lang/sablevm-classpath/Makefile.common
+++ b/lang/sablevm-classpath/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= sablevm-classpath-1.1.3
@@ -17,7 +17,7 @@ DISTINFO_FILE= ${.CURDIR}/../../lang/sablevm-classpath/distinfo
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/java/sablevm
NO_MTREE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
CONFIGURE_ARGS+= --without-zip
diff --git a/lang/sablevm/Makefile b/lang/sablevm/Makefile
index 2105acefe89..fea461c700c 100644
--- a/lang/sablevm/Makefile
+++ b/lang/sablevm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= sablevm-1.1.3
@@ -17,7 +17,7 @@ DEPENDS+= sablevm-classpath-1.1.3nb2:../../lang/sablevm-classpath
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${JAVA_HOME}
NO_MTREE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
JAVA_NAME= sablevm
diff --git a/lang/sather/Makefile b/lang/sather/Makefile
index 06a72c1116a..367c40b06a6 100644
--- a/lang/sather/Makefile
+++ b/lang/sather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:11 jlam Exp $
DISTNAME= sather-1.2.1
PKGREVISION= 5
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.gnu.org/directory/devel/prog/sather.html
COMMENT= Compiler for the Sather object oriented programming language
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= full optional
diff --git a/lang/scm/Makefile b/lang/scm/Makefile
index 4866311bdbd..ca9967234ae 100644
--- a/lang/scm/Makefile
+++ b/lang/scm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/24 22:18:28 perry Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= scm5d9
@@ -13,7 +13,7 @@ COMMENT= Portable scheme interpreter
DEPENDS+= slib>=3.1.1:../../devel/slib
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= # defined
WRKSRC= ${WRKDIR}/scm
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 6129b634bd6..7413bef9292 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:11 jlam Exp $
DISTNAME= smalltalk-2.1.9
CATEGORIES= lang
@@ -11,7 +11,7 @@ COMMENT= GNU Smalltalk: A smalltalk-80 implementation
ONLY_FOR_PLATFORM= *-*-i386 *-*-sparc *-*-powerpc
LIBTOOLIZE_PLIST= NO # Manually created libc.la breaks PLIST.
-USE_GNU_TOOLS+= awk make
+USE_TOOLS+= gawk gmake
USE_GNU_READLINE= YES
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/lang/smlnj/Makefile b/lang/smlnj/Makefile
index 008f208fcb9..03a43f2d413 100644
--- a/lang/smlnj/Makefile
+++ b/lang/smlnj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= boot.${BOX}-unix
@@ -37,7 +37,7 @@ SML_VERSION= 110.42
WRKSRC= ${WRKDIR}
DIST_SUBDIR= smlnj-${SML_VERSION}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# previous versions of the package had an additional '-'
CONFLICTS= sml-nj-[0-9]*
diff --git a/lang/swi-prolog-packages/Makefile b/lang/swi-prolog-packages/Makefile
index cdf0eead407..7c3c696bb2b 100644
--- a/lang/swi-prolog-packages/Makefile
+++ b/lang/swi-prolog-packages/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:16 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:11 jlam Exp $
.include "../swi-prolog-lite/Makefile.common"
@@ -10,7 +10,7 @@ COMMENT= Packages for SWI Prolog
GNU_CONFIGURE= yes
USE_GNU_READLINE= yes # uses rl_event_hook() interface
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
CONFIGURE_ENV+= PL=swi-prolog
diff --git a/lang/vscm/Makefile b/lang/vscm/Makefile
index 559f5593d8d..d2727a7453d 100644
--- a/lang/vscm/Makefile
+++ b/lang/vscm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/24 13:51:15 grant Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:11 jlam Exp $
DISTNAME= vscmV0r4
PKGNAME= vscm-0.4
@@ -13,7 +13,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.cs.princeton.edu/~blume/vscm/
COMMENT= Portable scheme implementation
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-patch:
${SED} -e "s,@PREFIX@,${PREFIX}," ${FILESDIR}/path.h >${WRKSRC}/path.h
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index f43195fe029..1f5611cbef5 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/05/22 08:29:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:11 jlam Exp $
DISTNAME= balsa-2.2.6
PKGREVISION= 1
@@ -20,7 +20,7 @@ USE_PKGINSTALL= yes
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
CONFIGURE_ARGS+= --disable-more-warnings
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 95b02db902a..7a5b1cfe07b 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:08:11 jlam Exp $
DISTNAME= courier-imap-4.0.2
PKGBASE= ${DISTNAME:C/-[^-]*$//}
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.courier-mta.org/imap/
DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PERL5= build
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index 250bdec25e9..af06995adb0 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:11 jlam Exp $
DISTNAME= courier-0.49.0
PKGNAME= ${DISTNAME:S/-/-maildir-/}
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.courier-mta.org/
CONFLICTS= courier-maildirmake-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_PERL5= yes
PERL5_REQD+= 5.8.0
diff --git a/mail/dbmail/Makefile b/mail/dbmail/Makefile
index 06b68a6d336..160abaa3c30 100644
--- a/mail/dbmail/Makefile
+++ b/mail/dbmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= dbmail-2.0.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.dbmail.org/
COMMENT= Store and retrieve mail messages in a database
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 606abc8fd1c..711737e2c83 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/21 14:45:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:11 jlam Exp $
#
DISTNAME= evolution-data-server-1.2.2
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.libsoup-devel+= libsoup-devel>=2.2.3
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make yacc
+USE_TOOLS+= bison gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
YACC= ${LOCALBASE}/bin/bison # XXX
diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index 43b085ee557..cbc02e373f9 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.80 2005/05/19 21:06:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.81 2005/05/22 20:08:11 jlam Exp $
DISTNAME= evolution-2.2.2
CATEGORIES= mail time gnome
@@ -27,7 +27,7 @@ PKG_FAIL_REASON= "Kerberos support conflicts with SSL"
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make yacc
+USE_TOOLS+= bison gmake
USE_X11= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/mail/evolution12/Makefile b/mail/evolution12/Makefile
index b3c003ef952..d6a322926d7 100644
--- a/mail/evolution12/Makefile
+++ b/mail/evolution12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:11 jlam Exp $
DISTNAME= evolution-1.2.4
PKGNAME= ${DISTNAME:S/evolution/evolution12/}
@@ -33,7 +33,7 @@ BUILDLINK_DEPENDS.db3= db3-3.11.2{,nb*}
BUILDLINK_DEPENDS.libxml= libxml>=1.8.17
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11BASE= YES
USE_LIBTOOL= YES
USE_DIRS+= gnome1-1.5
diff --git a/mail/evolution14/Makefile b/mail/evolution14/Makefile
index 5a3962a51b6..301d8829f94 100644
--- a/mail/evolution14/Makefile
+++ b/mail/evolution14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:18 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:11 jlam Exp $
DISTNAME= evolution-1.4.6
PKGNAME= ${DISTNAME:S/evolution/evolution14/}
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+= --enable-ipv6=no
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make yacc
+USE_TOOLS+= bison gmake
USE_X11= YES
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/mail/gmime/Makefile b/mail/gmime/Makefile
index 52b89d5ac88..de25f8ac42b 100644
--- a/mail/gmime/Makefile
+++ b/mail/gmime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $
#
DISTNAME= gmime-2.1.9
@@ -11,7 +11,7 @@ COMMENT= Library for the creation and parsing of MIME messages
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-gtk-doc=no
CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc
diff --git a/mail/ifile/Makefile b/mail/ifile/Makefile
index 364306d3a29..62ad1bc494d 100644
--- a/mail/ifile/Makefile
+++ b/mail/ifile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:12 jlam Exp $
#
DISTNAME= ifile-1.3.4
@@ -11,6 +11,6 @@ HOMEPAGE= http://www.nongnu.org/ifile/
COMMENT= Intelligent mail filtering system
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 236876b1a38..8858371ffa8 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:12 jlam Exp $
DISTNAME= kbiff-3.7.1
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://www.granroth.org/kbiff/index.html
COMMENT= A new mail notification utility for KDE
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/mail/libesmtp/Makefile b/mail/libesmtp/Makefile
index 8c9db6a32eb..7990123ae41 100644
--- a/mail/libesmtp/Makefile
+++ b/mail/libesmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:12 jlam Exp $
DISTNAME= libesmtp-1.0.3r1
PKGNAME= ${DISTNAME:S/r1//}
@@ -13,7 +13,7 @@ MAINTAINER= dolemite@wuli.nu
HOMEPAGE= http://www.stafford.uklinux.net/libesmtp/
COMMENT= Library to manage posting of electronic mail
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile
index 916dd4d432c..55b7e703c6f 100644
--- a/mail/mail-notification/Makefile
+++ b/mail/mail-notification/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:12 jlam Exp $
#
DISTNAME= mail-notification-1.0
@@ -12,7 +12,7 @@ COMMENT= Status icon that provides new mail notifications
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile
index e4dcfef2149..6c7fb1b180e 100644
--- a/mail/maildrop/Makefile
+++ b/mail/maildrop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:12 jlam Exp $
DISTNAME= maildrop-1.8.0
PKGBASE= ${DISTNAME:C/-[^-]*$//}
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.courier-mta.org/maildrop/
DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/mail/mailsync/Makefile b/mail/mailsync/Makefile
index fd4c197310a..70b07112a0c 100644
--- a/mail/mailsync/Makefile
+++ b/mail/mailsync/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:20 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:12 jlam Exp $
#
DISTNAME= mailsync_5.2.1.orig
@@ -11,7 +11,7 @@ HOMEPAGE= http://mailsync.sourceforge.net/
COMMENT= Mailsync is a way of synchronizing a collection of mailboxes
WRKSRC= ${WRKDIR}/${PKGNAME}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES+= c c++
GNU_CONFIGURE= yes
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index 85a164935f4..d9939f21d77 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:12 jlam Exp $
#
DISTNAME= prayer-1.0.12
@@ -10,7 +10,7 @@ HOMEPAGE= http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
COMMENT= Small, fast, web mail interface
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
PRAYER_USER= prayer
PRAYER_GROUP= prayer
diff --git a/mail/pulsar/Makefile b/mail/pulsar/Makefile
index 029e735f4ce..09711b158bd 100644
--- a/mail/pulsar/Makefile
+++ b/mail/pulsar/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:22 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:12 jlam Exp $
#
DISTNAME= pulsar-0.1.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://pulsar.sourceforge.net/
COMMENT= Small, secure POP3 daemon, featuring native SSL support
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MANCOMPRESSED= yes
diff --git a/mail/qmail/options.mk b/mail/qmail/options.mk
index 8cf870e9b7d..da28931d456 100644
--- a/mail/qmail/options.mk
+++ b/mail/qmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.11 2005/05/19 22:08:55 schmonz Exp $
+# $NetBSD: options.mk,v 1.12 2005/05/22 20:08:12 jlam Exp $
.if ${OPSYS} == "Darwin"
PKG_DEFAULT_OPTIONS+= darwin
@@ -103,7 +103,7 @@ SITES_${TLSSASL_PATCH}= http://shupp.org/patches/
. if !empty(PKG_OPTIONS:Mtls)
CFLAGS+= -DTLS=20040419 # from the patch
DJB_INSTALL_TARGETS= cert tmprsadh
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PLIST_SRC+= ${PKGDIR}/PLIST.tls
. endif
.endif
diff --git a/mail/sendmail/Makefile.common b/mail/sendmail/Makefile.common
index 94c30a83b85..f4b60b433c3 100644
--- a/mail/sendmail/Makefile.common
+++ b/mail/sendmail/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/05/13 16:54:13 jlam Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:08:12 jlam Exp $
#
# Makefile fragment shared with libmilter
#
@@ -28,7 +28,7 @@ SITECONFIG= ${WRKSRC}/devtools/Site/site.config.m4
BUILD_DEFS+= SMRSH_CMDDIR
WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
-USE_GNU_TOOLS+= m4
+USE_TOOLS+= gm4
MAKE_ENV+= M4=${TOOLS_M4:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/sendmail812/Makefile.common b/mail/sendmail812/Makefile.common
index 59ed6a9498b..11d406bed68 100644
--- a/mail/sendmail812/Makefile.common
+++ b/mail/sendmail812/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/13 16:54:13 jlam Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/05/22 20:08:12 jlam Exp $
#
# Makefile fragment shared with libmilter
#
@@ -30,7 +30,7 @@ BUILD_DEFS+= USE_INET6 USE_TCPWRAPPERS USE_OPENLDAP USE_DB2 \
DESCR_SRC= ${WRKDIR}/.DESCR_SRC
WRKSRC= ${WRKDIR}/sendmail-${DIST_VERS}
-USE_GNU_TOOLS+= m4
+USE_TOOLS+= gm4
MAKE_ENV+= M4=${TOOLS_M4:Q}
.include "../../mk/bsd.prefs.mk"
diff --git a/mail/sigrot/Makefile b/mail/sigrot/Makefile
index 85f0c3cd462..97d5f742563 100644
--- a/mail/sigrot/Makefile
+++ b/mail/sigrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $
DISTNAME= sigrot_1.2-1
PKGNAME= sigrot-1.2
@@ -10,7 +10,7 @@ HOMEPAGE= http://packages.debian.org/stable/mail/sigrot.html
COMMENT= Signature file rotation program
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
DOCDIR= ${PREFIX}/share/doc/sigrot
EGDIR= ${PREFIX}/share/examples/sigrot
diff --git a/mail/spruce/Makefile b/mail/spruce/Makefile
index 7592967364e..4fac3aafcf5 100644
--- a/mail/spruce/Makefile
+++ b/mail/spruce/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:12 jlam Exp $
#
DISTNAME= spruce-0.5.17
@@ -12,7 +12,7 @@ COMMENT= MIME-aware, GNOME-based email program
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
.include "../../x11/gnome-libs/buildlink3.mk"
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index b78712fc778..24bdfdd6ed4 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:12 jlam Exp $
DISTNAME= sqwebmail-5.0.1
PKGBASE= ${DISTNAME:C/-[^-]*$//}
@@ -13,11 +13,10 @@ HOMEPAGE= http://www.courier-mta.org/sqwebmail/
DEPENDS+= courier-maildir>=0.48.2:../../mail/courier-maildir
DEPENDS+= maildrop>=1.8.0:../../mail/maildrop
-USE_GNU_TOOLS+= make
+USE_TOOLS+= env gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PERL5= yes
-USE_TOOLS+= env
.include "../../mail/courier-maildir/Makefile.common"
.include "../../security/courier-authlib/Makefile.common"
diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile
index 35e9f858020..64c61ca5085 100644
--- a/mail/ssmtp/Makefile
+++ b/mail/ssmtp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:12 jlam Exp $
#
# TLS functionality needs testing. Please let me know the result,
# and preferably info about your system.
@@ -16,7 +16,7 @@ HOMEPAGE= http://packages.debian.org/testing/mail/ssmtp.html
COMMENT= Extremely simple MTA to forward mail to a mail hub
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.orig$//}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
diff --git a/mail/sylpheed-claws/Makefile.common b/mail/sylpheed-claws/Makefile.common
index 502c90a2ad2..cd5f5c30154 100644
--- a/mail/sylpheed-claws/Makefile.common
+++ b/mail/sylpheed-claws/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/05/22 20:08:12 jlam Exp $
DISTNAME= sylpheed-claws-${SYLPHEED_VERSION}
CATEGORIES= mail news x11
@@ -10,7 +10,7 @@ HOMEPAGE= http://sylpheed-claws.sourceforge.net/
DISTINFO_FILE= ${.CURDIR}/../../mail/sylpheed-claws/distinfo
PATCHDIR= ${.CURDIR}/../../mail/sylpheed-claws/patches
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile
index d1c80845695..977e96dd49a 100644
--- a/mail/sylpheed-devel/Makefile
+++ b/mail/sylpheed-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/18 22:42:21 chris Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:12 jlam Exp $
DISTNAME= sylpheed-1.9.11
CATEGORIES= mail news x11
@@ -19,7 +19,7 @@ USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-nls
diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile
index 0a0fd5e8a92..34c2c4eabcd 100644
--- a/mail/sylpheed/Makefile
+++ b/mail/sylpheed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/04/11 21:46:27 tv Exp $
+# $NetBSD: Makefile,v 1.76 2005/05/22 20:08:12 jlam Exp $
DISTNAME= sylpheed-1.0.4
CATEGORIES= mail news x11
@@ -17,7 +17,7 @@ CONFLICTS= sylpheed-claws-[0-9]* sylpheed-gtk2-[0-9]*
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-nls
diff --git a/mail/wmbiff/Makefile b/mail/wmbiff/Makefile
index deae22b01af..a9205a5de82 100644
--- a/mail/wmbiff/Makefile
+++ b/mail/wmbiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:13 jlam Exp $
DISTNAME= wmbiff-0.4.25
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= xbuffy like "mail-checker" for WindowMaker
GNU_CONFIGURE= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
EX_DIR= ${PREFIX}/share/examples/wmbiff
diff --git a/mail/wmmail/Makefile b/mail/wmmail/Makefile
index f6d06202079..9e4c966ee7a 100644
--- a/mail/wmmail/Makefile
+++ b/mail/wmmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/03/30 19:48:14 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:13 jlam Exp $
DISTNAME= WMMail.app-0.64
PKGNAME= wmmail-0.64
@@ -13,7 +13,7 @@ COMMENT= xbiff like "mail-checker" for WindowMaker
DEPENDS+= windowmaker>=0.80.0nb1:../../wm/windowmaker
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-PL-incs="-I${LOCALBASE}/include" \
--with-PL-libs="-L${LOCALBASE}/lib"
diff --git a/mail/ximian-connector/Makefile b/mail/ximian-connector/Makefile
index 5d8041f93b3..62f6e0350cf 100644
--- a/mail/ximian-connector/Makefile
+++ b/mail/ximian-connector/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/19 21:07:04 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:13 jlam Exp $
#
DISTNAME= ximian-connector-2.2.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.novell.com/products/evolution/
COMMENT= Adds support for Microsoft Exchange 2000 and 2003 to Evolution
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGLOCALEDIR= YES
diff --git a/math/R/Makefile b/math/R/Makefile
index 7cecd8931a0..2c3aa55a21d 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/05/22 20:08:13 jlam Exp $
DISTNAME= R-2.1.0
CATEGORIES= math
@@ -17,8 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
TEST_TARGET= check
USE_X11= # defined
USE_PERL5= # defined
-USE_GNU_TOOLS+= make
-USE_TOOLS+= xmkmf
+USE_TOOLS+= gmake xmkmf
USE_GNU_READLINE= # uses callback interface
USE_MAKEINFO= # defined
TEXINFO_REQD= 4.5
diff --git a/math/blitz++/Makefile b/math/blitz++/Makefile
index 4ad6750c01c..9c90c229b13 100644
--- a/math/blitz++/Makefile
+++ b/math/blitz++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:13 jlam Exp $
DISTNAME= blitz-0.6
PKGNAME= blitz++-0.6
@@ -11,7 +11,7 @@ COMMENT= C++ template class library providing array objects
CONFIGURE_ARGS+= --with-cxx=gcc
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/blitz
diff --git a/math/capc-calc/Makefile b/math/capc-calc/Makefile
index 05a058b5afb..5064be527db 100644
--- a/math/capc-calc/Makefile
+++ b/math/capc-calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:13 jlam Exp $
#
DISTNAME= calc-2.11.10.1
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.isthe.com/chongo/tech/comp/calc/
COMMENT= C arbitrary precision calculator
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/math/cln/Makefile b/math/cln/Makefile
index 052900f825d..a57cf183b2a 100644
--- a/math/cln/Makefile
+++ b/math/cln/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:28 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:13 jlam Exp $
DISTNAME= cln-1.1.9
CATEGORIES= math
@@ -11,7 +11,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.ginac.de/CLN/
COMMENT= CLN Class Library for Numbers
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/math/eukleides/Makefile b/math/eukleides/Makefile
index 58d225506e7..16e0ebe8650 100644
--- a/math/eukleides/Makefile
+++ b/math/eukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:13 jlam Exp $
DISTNAME= eukleides.1.0.1
PKGNAME= eukleides-1.0.1
@@ -13,7 +13,7 @@ BUILD_DEPENDS+= bison>=1.35:../../devel/bison
DEPENDS+= pstoedit>=3.31:../../graphics/pstoedit
BUILD_TARGET= eukleides
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= YES
INFO_FILES= eukleides.info
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 6d3750c5184..b79acd6383f 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/02/23 04:21:33 minskim Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:13 jlam Exp $
.if (${MACHINE_ARCH} == "powerpc")
DISTNAME= fftw-3.0.1-fma
@@ -22,7 +22,7 @@ PKGCONFIG_OVERRIDE+= fftw.pc.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared
USE_LANGUAGES= fortran
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INFO_FILES= fftw3.info
TEST_TARGET= check
diff --git a/math/fftw2/Makefile b/math/fftw2/Makefile
index 1bfdc7d8aeb..28ff7dc9c16 100644
--- a/math/fftw2/Makefile
+++ b/math/fftw2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:13 jlam Exp $
DISTNAME= fftw-2.1.5
PKGNAME= fftw2-2.1.5
@@ -19,7 +19,7 @@ CONFIGURE_ARGS= --enable-shared
CONFIGURE_ARGS+= --enable-i386-hacks
.endif
USE_LANGUAGES= fortran
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= yes
INFO_FILES= fftw.info
diff --git a/math/galculator/Makefile b/math/galculator/Makefile
index f44b1297ea9..fe123b25d37 100644
--- a/math/galculator/Makefile
+++ b/math/galculator/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/18 15:45:04 drochner Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:13 jlam Exp $
#
DISTNAME= galculator-1.2.5
@@ -11,7 +11,7 @@ COMMENT= Desktop calculator with scientific / RPN modes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../x11/gtk2/buildlink3.mk"
diff --git a/math/gcalctool/Makefile b/math/gcalctool/Makefile
index cd13f7af487..205b973d91c 100644
--- a/math/gcalctool/Makefile
+++ b/math/gcalctool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/20 15:48:27 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:13 jlam Exp $
#
DISTNAME= gcalctool-5.5.42
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_PKGLOCALEDIR= yes
diff --git a/math/glpk/Makefile b/math/glpk/Makefile
index 1d6e75b1173..8969c39087f 100644
--- a/math/glpk/Makefile
+++ b/math/glpk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/03/30 15:23:53 adam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:13 jlam Exp $
DISTNAME= glpk-4.8
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/glpk/glpk.html
COMMENT= Library for solving linear programming problems
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 49e587e2aa9..b9d63b180d8 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2005/04/26 11:36:55 drochner Exp $
+# $NetBSD: Makefile,v 1.94 2005/05/22 20:08:13 jlam Exp $
#
DISTNAME= gnumeric-1.2.13
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_LIBTOOL= YES
diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 7b1cb6f6751..a00397370d3 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/19 17:10:40 drochner Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:13 jlam Exp $
#
DISTNAME= gnumeric-1.4.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_LIBTOOL= YES
diff --git a/math/grace/Makefile b/math/grace/Makefile
index 05547c50d40..98d722a796b 100644
--- a/math/grace/Makefile
+++ b/math/grace/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:13 jlam Exp $
#
DISTNAME= grace-5.1.14
@@ -17,7 +17,7 @@ HOMEPAGE= http://plasma-gate.weizmann.ac.il/Grace/
COMMENT= GRaphing, Advanced Computation and Exploration of data
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= fortran
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-grace-home=${PREFIX}/grace
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 222b287e737..19e73596005 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:13 jlam Exp $
DISTNAME= Guppi-0.40.3
PKGNAME= ${DISTNAME:S/G/g/}
@@ -21,7 +21,7 @@ CONFIGURE_ARGS= --disable-gnumeric
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/math/libffm/Makefile b/math/libffm/Makefile
index 57ec9005b10..3c392cb5375 100644
--- a/math/libffm/Makefile
+++ b/math/libffm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:29 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:13 jlam Exp $
DISTNAME= libffm.0.28
PKGNAME= libffm-0.28
@@ -10,7 +10,7 @@ COMMENT= Fast alpha-optimized replacement for some libm routines
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
ONLY_FOR_PLATFORM= NetBSD-*-alpha
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile
index ec5669d1056..a93f9eba6b9 100644
--- a/math/octave-current/Makefile
+++ b/math/octave-current/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/04/27 14:31:05 adam Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:08:13 jlam Exp $
DISTNAME= octave-${OCTAVE_VER}
PKGNAME= octave-current-${OCTAVE_VER}
@@ -25,7 +25,7 @@ BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3)
.endif
USE_GNU_READLINE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_MAKEINFO= yes
USE_PERL5= build
diff --git a/math/octave-forge/Makefile b/math/octave-forge/Makefile
index 0844d3b500f..26fed8af060 100644
--- a/math/octave-forge/Makefile
+++ b/math/octave-forge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 01:42:11 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:14 jlam Exp $
DISTNAME= octave-forge-2004.11.16
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= Extensions to Octave
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/math/octave/Makefile b/math/octave/Makefile
index c4b85d4c770..72e58473f4b 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2005/05/18 15:42:22 adam Exp $
+# $NetBSD: Makefile,v 1.55 2005/05/22 20:08:14 jlam Exp $
DISTNAME= octave-${OCTAVE_VER}
CATEGORIES= math
@@ -24,7 +24,7 @@ BROKEN= Internal compiler error occurs on arm32 (even with gcc-2.95.3)
.endif
USE_GNU_READLINE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_MAKEINFO= yes
USE_PERL5= build
diff --git a/math/qalculate/Makefile b/math/qalculate/Makefile
index e93034849e2..3ca572197e0 100644
--- a/math/qalculate/Makefile
+++ b/math/qalculate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:14 jlam Exp $
DISTNAME= qalculate-0.7.2
CATEGORIES= math
@@ -11,7 +11,7 @@ COMMENT= Qalculate is a modern multi-purpose desktop calculator
DEPENDS+= gnuplot>=3.7:../../graphics/gnuplot
DEPENDS+= wget>=1.8:../../net/wget
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_GNU_READLINE= yes
diff --git a/math/vista/Makefile b/math/vista/Makefile
index 7f3cf5f1c6f..717e0048d5e 100644
--- a/math/vista/Makefile
+++ b/math/vista/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 13:58:23 grant Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= vista
@@ -14,6 +14,6 @@ DEPENDS+= xlispstat>=3.52.9:../../math/xlispstat
WRKSRC= ${WRKDIR}/vista-5.0.5
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/math/xeukleides/Makefile b/math/xeukleides/Makefile
index eb76ee70fed..87e2f8cc9e9 100644
--- a/math/xeukleides/Makefile
+++ b/math/xeukleides/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:14 jlam Exp $
DISTNAME= xeukleides.1.0.0
PKGNAME= xeukleides-1.0.0
@@ -14,7 +14,7 @@ DEPENDS+= eukleides>=1.0.1:../../math/eukleides
USE_X11BASE= yes
BUILD_TARGET= xeukleides
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../x11/gtk/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index a4d8f374ac3..bf721e96d24 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:31 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= yacas-1.0.57
@@ -11,7 +11,7 @@ COMMENT= Yet Another Computer Algebra System
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_X11= YES
USE_PERL5= build
diff --git a/mbone/mdp/Makefile b/mbone/mdp/Makefile
index 5b4c6eb4191..6cddf4105b8 100644
--- a/mbone/mdp/Makefile
+++ b/mbone/mdp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:32 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= src-mdp-1.9a5
@@ -12,7 +12,7 @@ HOMEPAGE= http://manimac.itd.nrl.navy.mil/MDP/
COMMENT= Multicast file transfer
WRKSRC= ${WRKDIR}/mdp/unix
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= mdp
pre-build:
diff --git a/mbone/nte/Makefile b/mbone/nte/Makefile
index 1461f679f32..3b43e3dcae9 100644
--- a/mbone/nte/Makefile
+++ b/mbone/nte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/05 10:51:21 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= nt.1.5a23
@@ -12,7 +12,7 @@ COMMENT= Multicast Network Text Editor
WRKSRC= ${WRKDIR}
CRYPTO= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# Pass this on to our child
do-configure:
diff --git a/mbone/rat/Makefile b/mbone/rat/Makefile
index b3ac987d082..8fdedc23ab4 100644
--- a/mbone/rat/Makefile
+++ b/mbone/rat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:32 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= rat-3.0.28
@@ -11,7 +11,7 @@ HOMEPAGE= http://www-mice.cs.ucl.ac.uk/multimedia/software/rat/
COMMENT= Robust Audio Tool - multicast audioconferencing
CRYPTO= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11BASE= yes
USER= build
diff --git a/mbone/sdr/Makefile b/mbone/sdr/Makefile
index b8e2adcecf3..44233a6d508 100644
--- a/mbone/sdr/Makefile
+++ b/mbone/sdr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/05 10:34:19 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= sdr-3.0
@@ -11,7 +11,7 @@ COMMENT= MBone Session Directory
WRKSRC= ${WRKDIR}/sdr/${SYSDIR}
CRYPTO= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_DEFS+= USE_INET6
diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common
index 26fd1d9709f..7636bc358a8 100644
--- a/meta-pkgs/XFree86/Makefile.common
+++ b/meta-pkgs/XFree86/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/02/09 20:11:22 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:14 jlam Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -68,7 +68,7 @@ MISCMAN_SUFFIX= 7
.elif ${OPSYS} == "Linux"
XF86RUSH=
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
IMAKE_MANTOOLS=
LIBDRI=
MANSOURCEPATH= man/man
diff --git a/meta-pkgs/kde3/Makefile.kde3 b/meta-pkgs/kde3/Makefile.kde3
index 3c10ec01221..4fe5a83d36b 100644
--- a/meta-pkgs/kde3/Makefile.kde3
+++ b/meta-pkgs/kde3/Makefile.kde3
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.kde3,v 1.23 2005/03/23 21:28:33 markd Exp $
+# $NetBSD: Makefile.kde3,v 1.24 2005/05/22 20:08:14 jlam Exp $
#
# This Makefile fragment is included at the top of package Makefiles for
# KDE3-distributed packages (they all share common configure and build
@@ -29,7 +29,7 @@ EXTRACT_SUFX?= .tar.bz2
MAINTAINER?= markd@NetBSD.org
HOMEPAGE?= http://www.kde.org/
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/meta-pkgs/xfce4/Makefile.common b/meta-pkgs/xfce4/Makefile.common
index 31eaaf6e1e7..3c426d416aa 100644
--- a/meta-pkgs/xfce4/Makefile.common
+++ b/meta-pkgs/xfce4/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/05/18 06:10:30 martti Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:14 jlam Exp $
MASTER_SITES= http://www.xfce.org/archive/xfce-4.2.2/src/ \
http://hannelore.f1.fhtw-berlin.de/mirrors/xfce4/xfce-4.2.2/src/ \
@@ -15,7 +15,7 @@ USE_X11= # defined
USE_PKGLOCALEDIR= # defined
USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.if ${MACHINE_ARCH} == "alpha"
GCC_REQD+= 3.0
diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common
index 4e82536484d..99c304590d0 100644
--- a/meta-pkgs/xorg/Makefile.common
+++ b/meta-pkgs/xorg/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.29 2005/05/16 01:32:23 jlam Exp $
+# $NetBSD: Makefile.common,v 1.30 2005/05/22 20:08:14 jlam Exp $
#
# XBUILD_DIRS is the group of directories under ${WRKSRC} that will
# be built in.
@@ -88,7 +88,7 @@ MISCMAN_SUFFIX= 7
.elif ${OPSYS} == "Linux"
XF86RUSH=
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
IMAKE_MANTOOLS=
LIBDRI=
MANSOURCEPATH= man/man
diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile
index d844b07e202..5e2cb5fc2df 100644
--- a/misc/bottlerocket/Makefile
+++ b/misc/bottlerocket/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/24 21:12:57 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:14 jlam Exp $
DISTNAME= bottlerocket-0.04c
CATEGORIES= misc
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://mlug.missouri.edu/~tymm/
COMMENT= Home Automation Software for the X10 FireCracker kit
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
BUILD_TARGET= br
diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common
index 6e6d6a5aa0c..4d60666239c 100644
--- a/misc/celestia/Makefile.common
+++ b/misc/celestia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/04/11 21:46:33 tv Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:14 jlam Exp $
DISTNAME= celestia-${CELESTIA_VERS}
CATEGORIES= misc x11
@@ -12,7 +12,7 @@ PATCHDIR= ${.CURDIR}/../../misc/celestia/patches
CELESTIA_VERS= 1.3.2
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/misc/cuecat/Makefile b/misc/cuecat/Makefile
index 7475ce76625..2bf11569045 100644
--- a/misc/cuecat/Makefile
+++ b/misc/cuecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/24 14:11:09 grant Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= cuecat-0.2.1
@@ -15,7 +15,7 @@ NO_SOURCE_ON_CDROM= ${NO_SOURCE_ON_FTP}
NO_BIN_ON_FTP= ${NO_SOURCE_ON_FTP}
NO_BIN_ON_CDROM= ${NO_SOURCE_ON_FTP}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/read_cuecat ${PREFIX}/bin
diff --git a/misc/cuetools/Makefile b/misc/cuetools/Makefile
index f04270d5a6f..09aa45e218f 100644
--- a/misc/cuetools/Makefile
+++ b/misc/cuetools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:14 jlam Exp $
#
DISTNAME= cuetools-1.2
@@ -11,7 +11,7 @@ COMMENT= Set of utilities to manipulate cue and toc files
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
diff --git a/misc/dialog/Makefile b/misc/dialog/Makefile
index c066a6be1ae..532c4d1a910 100644
--- a/misc/dialog/Makefile
+++ b/misc/dialog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:14 jlam Exp $
DISTNAME= dialog-0.6z
PKGREVISION= 3
@@ -8,7 +8,7 @@ MASTER_SITES= ${MASTER_SITE_SUNSITE:=utils/shell/}
MAINTAINER= tech-pkg@NetBSD.org
COMMENT= Display dialog boxes from shell scripts
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-P]-*
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index c79971120d5..293aaa4a53b 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= ${PKGNAME:S,-,_,}
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME}
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_NCURSES= # tigetstr()
USE_PERL5= build
USE_PKGINSTALL= yes
diff --git a/misc/elizatalk/Makefile b/misc/elizatalk/Makefile
index f3fe2da2f6f..4c866d552f7 100644
--- a/misc/elizatalk/Makefile
+++ b/misc/elizatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:15 jlam Exp $
DISTNAME= elizatalk-0.4
CATEGORIES= misc
@@ -9,6 +9,6 @@ HOMEPAGE= http://elizatalk.sourceforge.net/
COMMENT= Eliza talkback program
WRKSRC= ${WRKDIR}/elizatalk-src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/getopt/Makefile b/misc/getopt/Makefile
index 001e4d1852a..d94ecff1c3d 100644
--- a/misc/getopt/Makefile
+++ b/misc/getopt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= getopt-1.1.3
@@ -11,7 +11,7 @@ COMMENT= Program to help shell scripts parse command-line parameters
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS= bin man/man1
diff --git a/misc/gkrellm-flynn/Makefile b/misc/gkrellm-flynn/Makefile
index 1f1005da0ef..f8f920657bf 100644
--- a/misc/gkrellm-flynn/Makefile
+++ b/misc/gkrellm-flynn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= gkrellflynn-0.8
@@ -11,7 +11,7 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://horus.comlab.uni-rostock.de/flynn/
COMMENT= GKrellM2 plugin that shows system load with a DooM marine
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= gkrellm2
INSTALL_TARGET= installgkrellm2
diff --git a/misc/gkrellm-weather/Makefile b/misc/gkrellm-weather/Makefile
index ba9be26f597..1974c2352b7 100644
--- a/misc/gkrellm-weather/Makefile
+++ b/misc/gkrellm-weather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:15 jlam Exp $
DISTNAME= gkrellweather-2.0.6
PKGNAME= gkrellm-weather-2.0.6
@@ -14,7 +14,7 @@ COMMENT= Gkrellm2 weather plugin
DEPENDS+= wget>=1.8:../../net/wget
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
BUILD_TARGET= gkrellweather.so
diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile
index c0aed3062c9..f8f0b035c46 100644
--- a/misc/gnome2-user-docs/Makefile
+++ b/misc/gnome2-user-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:34 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= gnome2-user-docs-2.8.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= The GNOME 2 users guide
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 719ba63ce38..ae4f6ebcf77 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/05/19 21:12:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= gnome-utils-2.10.1
@@ -13,7 +13,7 @@ COMMENT= Set of useful GNOME2 utilities and applications
BUILD_USES_MSGFMT= yes
USE_PERL5= build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 04d3e7aef13..68f9f97f0cd 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/19 21:09:25 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= gok-1.0.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME On-Screen Keyboard
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/misc/gperiodic/Makefile b/misc/gperiodic/Makefile
index a323691d2ed..78eb9fd4403 100644
--- a/misc/gperiodic/Makefile
+++ b/misc/gperiodic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/26 14:53:02 drochner Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:15 jlam Exp $
DISTNAME= gperiodic-2.0.8
CATEGORIES= misc x11
@@ -13,7 +13,7 @@ BUILD_USES_MSGFMT= # defined
USE_DIRS+= gnome1-1.5
USE_PKGLOCALEDIR= # defined
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
BUILDLINK_TRANSFORM+= rm:-DGDK_DISABLE_DEPRECATED
diff --git a/misc/gxmame/Makefile b/misc/gxmame/Makefile
index b7930eaa6ec..6f8bfa0b64a 100644
--- a/misc/gxmame/Makefile
+++ b/misc/gxmame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= gxmame-0.35beta1
@@ -15,7 +15,7 @@ DEPENDS+= p5-XML-Parser>=2.34:../../textproc/p5-XML-Parser
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index f0d968e1a88..887eb97e962 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:15 jlam Exp $
#
DISTNAME= kanjipad-2.0.0
@@ -10,7 +10,7 @@ MAINTAINER= wiz@NetBSD.org
HOMEPAGE= http://fishsoup.net/software/kanjipad/
COMMENT= Japanese handwriting recognition
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
.include "../../devel/pkgconfig/buildlink3.mk"
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index e3b10e6f794..01719910d6f 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/11 21:46:35 tv Exp $
+# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:15 jlam Exp $
DISTNAME= kdepim-${_KDE_VERSION}
CATEGORIES= misc
@@ -8,7 +8,7 @@ COMMENT= Personal Information Management tools for the KDE desktop
USE_DIRS+= xdg-1.1
USE_PERL= run
-USE_GNU_TOOLS+= awk yacc
+USE_TOOLS+= bison gawk
PKG_DEFAULT_OPTIONS+= sasl
PKG_OPTIONS_VAR= PKG_OPTIONS.kdepim
diff --git a/misc/koffice-i18n-af/Makefile b/misc/koffice-i18n-af/Makefile
index d9c6cb5073b..dcd8246515c 100644
--- a/misc/koffice-i18n-af/Makefile
+++ b/misc/koffice-i18n-af/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-af-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Afrikaans language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-bg/Makefile b/misc/koffice-i18n-bg/Makefile
index 4a8e6236ef1..7ee6024bdd7 100644
--- a/misc/koffice-i18n-bg/Makefile
+++ b/misc/koffice-i18n-bg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-bg-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Bulgarian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-br/Makefile b/misc/koffice-i18n-br/Makefile
index 533d82d7c73..ea390769802 100644
--- a/misc/koffice-i18n-br/Makefile
+++ b/misc/koffice-i18n-br/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-br-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Breton language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-ca/Makefile b/misc/koffice-i18n-ca/Makefile
index eb02c6637e1..2879b47d47d 100644
--- a/misc/koffice-i18n-ca/Makefile
+++ b/misc/koffice-i18n-ca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-ca-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Catalan language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-cs/Makefile b/misc/koffice-i18n-cs/Makefile
index 015be4e76cd..b7b127a78a5 100644
--- a/misc/koffice-i18n-cs/Makefile
+++ b/misc/koffice-i18n-cs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-cs-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Czech language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-cy/Makefile b/misc/koffice-i18n-cy/Makefile
index e2ac6e5e4b2..4cce1c90e9f 100644
--- a/misc/koffice-i18n-cy/Makefile
+++ b/misc/koffice-i18n-cy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-cy-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Welsh language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-da/Makefile b/misc/koffice-i18n-da/Makefile
index 3307bb33327..24f4ae96e5e 100644
--- a/misc/koffice-i18n-da/Makefile
+++ b/misc/koffice-i18n-da/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-da-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Danish language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-de/Makefile b/misc/koffice-i18n-de/Makefile
index 3934c7b5520..309bb1dcbd6 100644
--- a/misc/koffice-i18n-de/Makefile
+++ b/misc/koffice-i18n-de/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
DISTNAME= koffice-i18n-de-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= German language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-el/Makefile b/misc/koffice-i18n-el/Makefile
index 721b73d5743..1fdba51156f 100644
--- a/misc/koffice-i18n-el/Makefile
+++ b/misc/koffice-i18n-el/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-el-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Greek language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-en_GB/Makefile b/misc/koffice-i18n-en_GB/Makefile
index 78f1a644c79..f1011d7a801 100644
--- a/misc/koffice-i18n-en_GB/Makefile
+++ b/misc/koffice-i18n-en_GB/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-en_GB-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= English (Great Britain) language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-eo/Makefile b/misc/koffice-i18n-eo/Makefile
index faf4ce2ef76..5be2eaa829a 100644
--- a/misc/koffice-i18n-eo/Makefile
+++ b/misc/koffice-i18n-eo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-eo-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Esperanto language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-es/Makefile b/misc/koffice-i18n-es/Makefile
index d6fc9b78e83..c77b8818758 100644
--- a/misc/koffice-i18n-es/Makefile
+++ b/misc/koffice-i18n-es/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-es-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= es language pack for Koffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-et/Makefile b/misc/koffice-i18n-et/Makefile
index 7c1bb350955..0ddf19f6d28 100644
--- a/misc/koffice-i18n-et/Makefile
+++ b/misc/koffice-i18n-et/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-et-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Estonian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-fa/Makefile b/misc/koffice-i18n-fa/Makefile
index e40fb856191..5b7b85adac9 100644
--- a/misc/koffice-i18n-fa/Makefile
+++ b/misc/koffice-i18n-fa/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-fa-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Persian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-fi/Makefile b/misc/koffice-i18n-fi/Makefile
index 72131d8e0bf..64e86659f47 100644
--- a/misc/koffice-i18n-fi/Makefile
+++ b/misc/koffice-i18n-fi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-fi-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Finnish language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-fr/Makefile b/misc/koffice-i18n-fr/Makefile
index 1cfb5c7e155..3d979b61b49 100644
--- a/misc/koffice-i18n-fr/Makefile
+++ b/misc/koffice-i18n-fr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-fr-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= French language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-he/Makefile b/misc/koffice-i18n-he/Makefile
index 5b13fc1915b..d21552bafcd 100644
--- a/misc/koffice-i18n-he/Makefile
+++ b/misc/koffice-i18n-he/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-he-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Hebrew language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-hsb/Makefile b/misc/koffice-i18n-hsb/Makefile
index 9b016abd768..11ddca3496c 100644
--- a/misc/koffice-i18n-hsb/Makefile
+++ b/misc/koffice-i18n-hsb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-hsb-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Upper Sorbian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-hu/Makefile b/misc/koffice-i18n-hu/Makefile
index b5ca6eee633..27412379670 100644
--- a/misc/koffice-i18n-hu/Makefile
+++ b/misc/koffice-i18n-hu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-hu-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Hungarian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-it/Makefile b/misc/koffice-i18n-it/Makefile
index da11069adbb..84095ceeb7c 100644
--- a/misc/koffice-i18n-it/Makefile
+++ b/misc/koffice-i18n-it/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-it-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Italian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-ja/Makefile b/misc/koffice-i18n-ja/Makefile
index 9e4972a964c..1b147f48503 100644
--- a/misc/koffice-i18n-ja/Makefile
+++ b/misc/koffice-i18n-ja/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:36 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-ja-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Japanese language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-lo/Makefile b/misc/koffice-i18n-lo/Makefile
index 0040a69484f..8905c9dde49 100644
--- a/misc/koffice-i18n-lo/Makefile
+++ b/misc/koffice-i18n-lo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-lo-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Lao language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-mt/Makefile b/misc/koffice-i18n-mt/Makefile
index 0f7eddc6fa0..13e4f899d33 100644
--- a/misc/koffice-i18n-mt/Makefile
+++ b/misc/koffice-i18n-mt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-mt-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Maltese language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-nb/Makefile b/misc/koffice-i18n-nb/Makefile
index af1b24507cd..5181625aecb 100644
--- a/misc/koffice-i18n-nb/Makefile
+++ b/misc/koffice-i18n-nb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-nb-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Norwegian Bokmal language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-nl/Makefile b/misc/koffice-i18n-nl/Makefile
index bb2f7732f19..26f2356552e 100644
--- a/misc/koffice-i18n-nl/Makefile
+++ b/misc/koffice-i18n-nl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-nl-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Dutch language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-nn/Makefile b/misc/koffice-i18n-nn/Makefile
index dc0684de60b..18dcea955a8 100644
--- a/misc/koffice-i18n-nn/Makefile
+++ b/misc/koffice-i18n-nn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-nn-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Norwegian Nynorsk language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-pl/Makefile b/misc/koffice-i18n-pl/Makefile
index 1153dd4565d..4d0a6073276 100644
--- a/misc/koffice-i18n-pl/Makefile
+++ b/misc/koffice-i18n-pl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-pl-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Polish language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-pt/Makefile b/misc/koffice-i18n-pt/Makefile
index 074145471cc..2054084cc6a 100644
--- a/misc/koffice-i18n-pt/Makefile
+++ b/misc/koffice-i18n-pt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-pt-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Portuguese language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-pt_BR/Makefile b/misc/koffice-i18n-pt_BR/Makefile
index 6e31a11dc69..dc43c3e9134 100644
--- a/misc/koffice-i18n-pt_BR/Makefile
+++ b/misc/koffice-i18n-pt_BR/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-pt_BR-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Portuguese BR language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-ru/Makefile b/misc/koffice-i18n-ru/Makefile
index 5bdbdbcdf13..d1ae50422c3 100644
--- a/misc/koffice-i18n-ru/Makefile
+++ b/misc/koffice-i18n-ru/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-ru-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Russian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-se/Makefile b/misc/koffice-i18n-se/Makefile
index 61788caa44c..da1fa33c512 100644
--- a/misc/koffice-i18n-se/Makefile
+++ b/misc/koffice-i18n-se/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-se-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= se language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-sk/Makefile b/misc/koffice-i18n-sk/Makefile
index cbdc5559e6a..e20b0a45142 100644
--- a/misc/koffice-i18n-sk/Makefile
+++ b/misc/koffice-i18n-sk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:16 jlam Exp $
DISTNAME= koffice-i18n-sk-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Slovak language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-sl/Makefile b/misc/koffice-i18n-sl/Makefile
index 123310ef2e0..27858bfc9d7 100644
--- a/misc/koffice-i18n-sl/Makefile
+++ b/misc/koffice-i18n-sl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-sl-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Slovenian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-sr/Makefile b/misc/koffice-i18n-sr/Makefile
index dbc399d3311..457413fb120 100644
--- a/misc/koffice-i18n-sr/Makefile
+++ b/misc/koffice-i18n-sr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-sr-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Serbian language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-sv/Makefile b/misc/koffice-i18n-sv/Makefile
index ff32abbfeb7..03a818ae7e5 100644
--- a/misc/koffice-i18n-sv/Makefile
+++ b/misc/koffice-i18n-sv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-sv-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Swedish language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-tg/Makefile b/misc/koffice-i18n-tg/Makefile
index 9c64dbe6edc..3cc0a7ca430 100644
--- a/misc/koffice-i18n-tg/Makefile
+++ b/misc/koffice-i18n-tg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-tg-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Tajik language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-th/Makefile b/misc/koffice-i18n-th/Makefile
index 74e1cb4d030..ce5b846a9dd 100644
--- a/misc/koffice-i18n-th/Makefile
+++ b/misc/koffice-i18n-th/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-th-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Thai language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-tr/Makefile b/misc/koffice-i18n-tr/Makefile
index 44362d1c481..c29f939e394 100644
--- a/misc/koffice-i18n-tr/Makefile
+++ b/misc/koffice-i18n-tr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-tr-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Turkish language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-ven/Makefile b/misc/koffice-i18n-ven/Makefile
index 588b06f9c21..0ecfa91e2c2 100644
--- a/misc/koffice-i18n-ven/Makefile
+++ b/misc/koffice-i18n-ven/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-ven-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Venda language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-xh/Makefile b/misc/koffice-i18n-xh/Makefile
index 05a71cff8b6..98afa8b1acb 100644
--- a/misc/koffice-i18n-xh/Makefile
+++ b/misc/koffice-i18n-xh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-xh-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Xhosa language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-zh_CN/Makefile b/misc/koffice-i18n-zh_CN/Makefile
index 92dc174eb15..ea69e76479f 100644
--- a/misc/koffice-i18n-zh_CN/Makefile
+++ b/misc/koffice-i18n-zh_CN/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-zh_CN-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Chinese language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-zh_TW/Makefile b/misc/koffice-i18n-zh_TW/Makefile
index f46ad5d7f4a..76cf14c17f7 100644
--- a/misc/koffice-i18n-zh_TW/Makefile
+++ b/misc/koffice-i18n-zh_TW/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-zh_TW-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Taiwan language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice-i18n-zu/Makefile b/misc/koffice-i18n-zu/Makefile
index e33d1d89bcc..e1957ca8610 100644
--- a/misc/koffice-i18n-zu/Makefile
+++ b/misc/koffice-i18n-zu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:37 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-i18n-zu-1.3.5
CATEGORIES= misc kde
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.koffice.org/
COMMENT= Zulu language pack for KOffice
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../misc/koffice/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index 2e86f906d7a..9646ea1002b 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/05/18 22:35:04 reed Exp $
+# $NetBSD: Makefile,v 1.58 2005/05/22 20:08:17 jlam Exp $
DISTNAME= koffice-1.3.5
PKGREVISION= 4
@@ -14,7 +14,7 @@ COMMENT= KDE Office Suite
CONFLICTS+= koffice3-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index 73e97a7fcb5..f11a9fa8b1c 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/04/25 17:30:11 magick Exp $
+# $NetBSD: Makefile,v 1.45 2005/05/22 20:08:17 jlam Exp $
DISTNAME= nxtvepg-2.7.5
CATEGORIES= misc
@@ -13,7 +13,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
NetBSD-[2-9]*-*
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
PTHREAD_AUTO_VARS= yes
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index 90163b5cf9a..bc230019e92 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.63 2005/04/14 20:48:58 mrauch Exp $
+# $NetBSD: Makefile,v 1.64 2005/05/22 20:08:17 jlam Exp $
DISTNAME= openoffice-1.1.4
PKGREVISION= 2
@@ -28,7 +28,7 @@ USE_LANGUAGES+= c c++
.include "../../mk/bsd.prefs.mk"
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
PTHREAD_OPTS+= require
PTHREAD_AUTO_VARS= yes
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index dacfbb8cee4..23587640675 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:17 jlam Exp $
#
DISTNAME= pdmenu_1.2.65
@@ -13,7 +13,7 @@ COMMENT= Simple console menu program
WRKSRC= ${WRKDIR}/pdmenu
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
REPLACE_PERL= examples/showdir.pl
diff --git a/misc/proj/Makefile b/misc/proj/Makefile
index 2fab0fa702f..801117a7c6c 100644
--- a/misc/proj/Makefile
+++ b/misc/proj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:17 jlam Exp $
DISTNAME= proj-4.4.7
PKGREVISION= 1
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.remotesensing.org/proj/
COMMENT= Cartographic projection software
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
NAD27_FILES=FL.lla MD.lla README.NADUS TN.lla WI.lla WO.lla alaska.lla \
diff --git a/misc/qbrew/Makefile b/misc/qbrew/Makefile
index 1c00243f2c5..871aad325ba 100644
--- a/misc/qbrew/Makefile
+++ b/misc/qbrew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:17 jlam Exp $
DISTNAME= qbrew-0.3.4
CATEGORIES= misc
@@ -8,7 +8,7 @@ MAINTAINER= wulf@NetBSD.org
HOMEPAGE= http://www.usermode.org/code.html
COMMENT= Homebrewer's recipe calculator
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
diff --git a/misc/root/Makefile b/misc/root/Makefile
index 71ca8ab4c02..f9f33cb393a 100644
--- a/misc/root/Makefile
+++ b/misc/root/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:17 jlam Exp $
DISTNAME= root_v2.23.08.source
PKGNAME= root-2.23
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= cint-5.14.40:../../lang/cint
WRKSRC= ${WRKDIR}
BUILDLINK_PASSTHRU_DIRS=${PREFIX}/root/lib
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= netbsd
MAKE_ENV= LD_LIBRARY_PATH=${WRKDIR}/lib ROOTSYS=${WRKDIR}
diff --git a/misc/rpm/Makefile b/misc/rpm/Makefile
index 2ceb76815b1..e325789a279 100644
--- a/misc/rpm/Makefile
+++ b/misc/rpm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:46:39 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:18 jlam Exp $
DISTNAME= rpm-2.5.4
PKGREVISION= 3
@@ -15,7 +15,7 @@ CONFLICTS+= rpm2cpio<1.0nb1
NOT_FOR_PLATFORM+= Interix-*-* # getmntent() is nonpublic; needs porting
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_PKGINSTALL= yes
diff --git a/misc/siag/Makefile b/misc/siag/Makefile
index 825adda793f..6e570b66a4c 100644
--- a/misc/siag/Makefile
+++ b/misc/siag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= siag-3.5.7
@@ -19,7 +19,7 @@ CONFIGURE_ARGS+=--with-x
CONFIGURE_ARGS+=--with-guile
CONFIGURE_ARGS+=--with-docdir=${PREFIX}/share/doc/siag
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/misc/stellarium/Makefile b/misc/stellarium/Makefile
index 5f082b2f133..a3fe890e4fb 100644
--- a/misc/stellarium/Makefile
+++ b/misc/stellarium/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= stellarium-0.6.0
@@ -10,7 +10,7 @@ MAINTAINER= dotz@irc.pl
HOMEPAGE= http://stellarium.free.fr/
COMMENT= Generate photorealistic skys with OpenGL
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 8b43a12a044..3cead80b67c 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:46:40 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= yelp-2.6.5
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= yes
BUILDLINK_DEPENDS.libxslt+= libxslt>=1.1.4
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk
index 44ca01113ce..dbee02ae0db 100644
--- a/mk/tools/replace.mk
+++ b/mk/tools/replace.mk
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.91 2005/05/22 01:56:27 jlam Exp $
+# $NetBSD: replace.mk,v 1.92 2005/05/22 20:08:52 jlam Exp $
#
# Copyright (c) 2005 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -79,12 +79,9 @@
# TOOLS_DEPMETHOD.tbl= DEPENDS
#
-# Continue to allow USE_GNU_TOOLS, USE_TBL, and USE_PERL5 until packages
-# have been taught to use the new syntax.
+# Continue to allow USE_TBL and USE_PERL5 until packages have been taught
+# to use the new syntax.
#
-.if defined(USE_GNU_TOOLS) && !empty(USE_GNU_TOOLS)
-USE_TOOLS+= ${USE_GNU_TOOLS:S/^awk$/gawk/:S/^m4$/gm4/:S/^make$/gmake/:S/^sed$/gsed/:S/^yacc$/bison/}
-.endif
.if defined(USE_TBL) && !empty(USE_TBL:M[yY][eE][sS])
USE_TOOLS+= tbl
.endif
diff --git a/multimedia/alevt/Makefile b/multimedia/alevt/Makefile
index f8c8f7cd9b2..d462dd12da8 100644
--- a/multimedia/alevt/Makefile
+++ b/multimedia/alevt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/29 16:10:22 magick Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:18 jlam Exp $
DISTNAME= alevt-1.6.0
PKGREVISION= 2
@@ -17,7 +17,7 @@ ONLY_FOR_PLATFORM= NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
USE_DIRS+= xdg-1.1
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/pixmaps
diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index a5c68d87cf9..4111cbe7ae3 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/21 21:43:45 jmmv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= avidemux-2.0.18
@@ -13,7 +13,7 @@ COMMENT= Graphical video editing program
BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
CFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index f526ba4e84b..7bdcc598189 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $
DISTNAME= dvdauthor-0.6.10
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://dvdauthor.sourceforge.net/
COMMENT= Tools to assist DVD authoring
GNU_CONFIGURE= YES
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
.include "../../graphics/ImageMagick/buildlink3.mk"
.include "../../converters/fribidi/buildlink3.mk"
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 2fbbc30197a..7b1c2653eef 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:18 jlam Exp $
DISTNAME= ffmpeg-0.4.8
PKGREVISION= 3
@@ -10,7 +10,7 @@ HOMEPAGE= http://ffmpeg.sourceforge.net/
COMMENT= MPEG decoding, encoding and streaming software
HAS_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
diff --git a/multimedia/fxtv/Makefile b/multimedia/fxtv/Makefile
index 600109a63a4..6fda0d36354 100644
--- a/multimedia/fxtv/Makefile
+++ b/multimedia/fxtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:18 jlam Exp $
DISTNAME= fxtv-1.03
PKGREVISION= 8
@@ -11,7 +11,7 @@ HOMEPAGE= http://people.freebsd.org/~rhh/fxtv/
COMMENT= TV display application for Brooktree 848 compatible TV cards
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
XAW_TYPE?= 3d
SUBST_CLASSES+= ossaudio
diff --git a/multimedia/gmencoder/Makefile b/multimedia/gmencoder/Makefile
index 6a1ec25fdfe..ad812ec2bbf 100644
--- a/multimedia/gmencoder/Makefile
+++ b/multimedia/gmencoder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= gmencoder-0.1.0
@@ -17,7 +17,7 @@ DEPENDS+= mplayer>=0.90:../../multimedia/mplayer
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index b5d2aed5c75..ac129c532fd 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 11:56:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:18 jlam Exp $
DISTNAME= gnome-media-2.10.2
CATEGORIES= multimedia gnome
@@ -19,7 +19,7 @@ USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
CONFIGURE_ARGS+= --enable-gtk-doc=no
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index 7a2aa073ff9..d7897020c22 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile.common,v 1.18 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= gst-plugins-0.8.8
@@ -18,7 +18,7 @@ PATCHDIR= ${.CURDIR}/../../multimedia/gst-plugins/patches
BUILD_DEPENDS+= nasm>=0.98.38:../../devel/nasm
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 7e24cddc0b7..fb76e188cfa 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/04 16:27:08 drochner Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= gstreamer-0.8.10
@@ -17,7 +17,7 @@ USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
CONFIGURE_ARGS+= --disable-plugin-builddir
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 80c6625a289..135d10d80ac 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= kmplayer-0.8.4b
@@ -16,7 +16,7 @@ DEPENDS+= mencoder>=1.0rc3:../../multimedia/mencoder
DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PERL5= build
diff --git a/multimedia/libassetml/Makefile b/multimedia/libassetml/Makefile
index 33ec72746ae..ce4412c6ba3 100644
--- a/multimedia/libassetml/Makefile
+++ b/multimedia/libassetml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:18 jlam Exp $
#
DISTNAME= libassetml-1.2.1
@@ -12,7 +12,7 @@ COMMENT= Library for sharing image and audio files between projects
BUILD_DEPENDS+= texi2html-[0-9]*:../../textproc/texi2html
USE_DIRS+= gnome2-1.5 # share/gnome/help
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
diff --git a/multimedia/libdvbpsi/Makefile b/multimedia/libdvbpsi/Makefile
index a5661ba7c3f..7444dc6e4d5 100644
--- a/multimedia/libdvbpsi/Makefile
+++ b/multimedia/libdvbpsi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:20 jlam Exp $
DISTNAME= libdvbpsi-0.1.3
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.videolan.org/
COMMENT= PSI decoder and generator library for MPEG2 and DVB streams
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index 092f4b27866..323b6752a8e 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:41 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:20 jlam Exp $
DISTNAME= libdvdplay-1.0.1
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://developers.videolan.org/libdvdplay/
COMMENT= Simple API library designed for DVD navigation
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
.include "../../multimedia/libdvdread/buildlink3.mk"
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index d6f3425f254..431c141322b 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:20 jlam Exp $
DISTNAME= libdvdread-0.9.4
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= DVD access library, primarily used in Ogle
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MESSAGE_SUBST+= PKGBASE=${PKGBASE}
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index b77ca2115b1..49ef42801df 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/18 00:57:21 salo Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:20 jlam Exp $
#
DISTNAME= libmatroska-0.7.6
@@ -12,7 +12,7 @@ COMMENT= Extensible open standard Audio/Video container format
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
NO_CONFIGURE= yes
diff --git a/multimedia/libmpeg2/Makefile b/multimedia/libmpeg2/Makefile
index 3ec655edae4..6e92d3b9fd8 100644
--- a/multimedia/libmpeg2/Makefile
+++ b/multimedia/libmpeg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:21 jlam Exp $
DISTNAME= mpeg2dec-0.4.0b
PKGNAME= libmpeg2-0.4.0b
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/mpeg2dec-0.4.0
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= libmpeg2/convert/libmpeg2convert.pc.in
diff --git a/multimedia/libmpeg3/Makefile b/multimedia/libmpeg3/Makefile
index 5fb5da39607..0266247ab52 100644
--- a/multimedia/libmpeg3/Makefile
+++ b/multimedia/libmpeg3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:21 jlam Exp $
#
DISTNAME= libmpeg3-1.3
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+= --no-mmx --no-css
.endif
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
ONLY_FOR_COMPILER= gcc
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 4e84c582faf..8e9e0b70d82 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:21 jlam Exp $
DISTNAME= mjpegtools-1.6.2
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= Programs for compressing video streams
DEPENDS+= toolame>=02l:../../audio/toolame
BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= libtool
diff --git a/multimedia/mkvtoolnix/Makefile b/multimedia/mkvtoolnix/Makefile
index e1da3a975e8..74f1e8eb976 100644
--- a/multimedia/mkvtoolnix/Makefile
+++ b/multimedia/mkvtoolnix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:22 jlam Exp $
#
.include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -8,7 +8,7 @@ HOMEPAGE= http://www.bunkus.org/videotools/mkvtoolnix/
COMMENT= Set of tools to create, alter and inspect Matroska files
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --disable-gui
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 39797a41adc..7ff63b8ea0f 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:22 jlam Exp $
#
.include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -11,7 +11,7 @@ COMMENT= MKVtoolnix mkvmerge GUI
DEPENDS+= ${DISTNAME}:../../multimedia/mkvtoolnix
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
USE_X11= yes
diff --git a/multimedia/mpeg_encode/Makefile b/multimedia/mpeg_encode/Makefile
index ba5b3300c62..b6420b9b234 100644
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:22 jlam Exp $
#
DISTNAME= mpeg_encode-1.5b-src
@@ -12,7 +12,7 @@ HOMEPAGE= http://bmrc.berkeley.edu/frame/research/mpeg/mpeg_encode.html
COMMENT= The Parallel Berkeley MPEG Encoder
WRKSRC= ${WRKDIR}/mpeg_encode
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-build:
@cd ${WRKSRC}/convert && \
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index 229dea927e0..f44af88baf4 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/19 15:12:24 wiz Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $
#
DISTNAME= mplayerplug-in-2.70
@@ -14,7 +14,7 @@ DEPENDS+= mplayer>=0.92:../../multimedia/mplayer
WRKSRC= ${WRKDIR}/mplayerplug-in
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES+= c++
USE_PKGINSTALL= yes
USE_X11= yes
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 5e9b440f0ee..e5d7de6945d 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/04/18 17:49:41 drochner Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:22 jlam Exp $
MPLAYER_DIST_VERSION= 1.0pre7
@@ -32,7 +32,7 @@ NO_BIN_ON_CD= "a dependency is restricted"
NO_BIN_ON_FTP= "a dependency is restricted"
NO_SRC_ON_FTP= "prohibited by USAs DMCA"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= YES
PTHREAD_OPTS+= require
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 7661c007cf0..a910d8acf5b 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:22 jlam Exp $
DISTNAME= mjpegtools-1.6.2
PKGNAME= mplex-1.6.2
@@ -13,7 +13,7 @@ COMMENT= Multiplexes MPEG component streams into system layers
BUILD_DEPENDS+= nasm>=0.98:../../devel/nasm
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index d26992bdc70..3ad1678bbaa 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $
DISTNAME= ogle-0.9.2
PKGREVISION= 2
@@ -19,7 +19,7 @@ ONLY_FOR_PLATFORM+= NetBSD-*-x86_64
ONLY_FOR_PLATFORM+= Linux-*-*
ONLY_FOR_PLATFORM+= SunOS-*-*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index c58545fa898..61cb3f8293a 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:22 jlam Exp $
DISTNAME= ogle_gui-0.9.2
PKGREVISION= 4
@@ -11,7 +11,7 @@ COMMENT= GUI for the Ogle DVD player
USE_PKGLOCALEDIR= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/openquicktime/Makefile b/multimedia/openquicktime/Makefile
index 75c4cdcfd5b..be5f7314499 100644
--- a/multimedia/openquicktime/Makefile
+++ b/multimedia/openquicktime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:22 jlam Exp $
#
DISTNAME= ${PKGNAME_NOREV}-src
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.openquicktime.org/
COMMENT= Portable library for handling QuickTime(TM) media files
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= my_cv_comment=""
diff --git a/multimedia/smpeg-xmms/Makefile b/multimedia/smpeg-xmms/Makefile
index 20962848ead..a2af77c4b06 100644
--- a/multimedia/smpeg-xmms/Makefile
+++ b/multimedia/smpeg-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:22 jlam Exp $
#
DISTNAME= smpeg-xmms-0.3.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.xmms.org/
COMMENT= MPEG video plugin using SDL/smpeg as the backend
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
.include "../../multimedia/smpeg/buildlink3.mk"
diff --git a/multimedia/smpeg/Makefile b/multimedia/smpeg/Makefile
index 021eab5b87c..bb873351564 100644
--- a/multimedia/smpeg/Makefile
+++ b/multimedia/smpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:22 jlam Exp $
#
DISTNAME= smpeg-0.4.4
@@ -13,7 +13,7 @@ COMMENT= SDL MPEG Player Library
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LANGUAGES= c c++
USE_X11= yes
diff --git a/multimedia/totem/Makefile.common b/multimedia/totem/Makefile.common
index fbd38802e83..520ca1602be 100644
--- a/multimedia/totem/Makefile.common
+++ b/multimedia/totem/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/05/08 15:14:28 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:22 jlam Exp $
#
DISTNAME= totem-1.0.2
@@ -15,7 +15,7 @@ PLIST_SRC= ${.CURDIR}/../../multimedia/totem/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/multimedia/transcode/Makefile b/multimedia/transcode/Makefile
index a8f21eae153..98341ad2941 100644
--- a/multimedia/transcode/Makefile
+++ b/multimedia/transcode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:22 jlam Exp $
DISTNAME= transcode-0.6.12
PKGREVISION= 6
@@ -12,7 +12,7 @@ COMMENT= Command line video-stream processing tool
BUILD_DEPENDS+= nasm>=0.98.36:../../devel/nasm
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
SHLIBTOOL_OVERRIDE= libtool
diff --git a/multimedia/vlc/Makefile b/multimedia/vlc/Makefile
index 952516421c3..502215ec539 100644
--- a/multimedia/vlc/Makefile
+++ b/multimedia/vlc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= vlc-${VLC_VER}
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.videolan.org/
COMMENT= VideoLAN Client
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/vls/Makefile b/multimedia/vls/Makefile
index ddf25579419..86b053e80d6 100644
--- a/multimedia/vls/Makefile
+++ b/multimedia/vls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= vls-0.5.6
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.videolan.org/
COMMENT= VideoLAN Server
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index e92f8789760..19a0ae78856 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:46:43 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= xawtv_3.90
@@ -13,7 +13,7 @@ COMMENT= TV application for Brooktree 848 compatible cards
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_PERL5= build
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index d0d65a3300e..26aa6d059b3 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/05/10 00:16:42 reed Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= xine-lib-1.0.1
@@ -21,7 +21,7 @@ USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
LIBTOOL_OVERRIDE= libtool libtool-nofpic
PKGCONFIG_OVERRIDE= misc/libxine.pc.in
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-w32-path='${PREFIX}/lib/win32'
CONFIGURE_ARGS+= --without-external-ffmpeg --disable-ffmpegtest
diff --git a/net/ORBit/Makefile b/net/ORBit/Makefile
index ba9691b4f3a..bcbeb4b4c98 100644
--- a/net/ORBit/Makefile
+++ b/net/ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2005/04/11 21:46:44 tv Exp $
+# $NetBSD: Makefile,v 1.114 2005/05/22 20:08:23 jlam Exp $
DISTNAME= ORBit-0.5.17
CATEGORIES= net
@@ -12,7 +12,7 @@ COMMENT= High-performance CORBA ORB with support for the C language
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= lex make yacc
+USE_TOOLS+= bison gmake lex
USE_LIBTOOL= YES
PTHREAD_AUTO_VARS= YES
diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile
index 9aa3f12f3b7..9e1922b6bd3 100644
--- a/net/ORBit2/Makefile
+++ b/net/ORBit2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.38 2005/04/26 17:57:56 drochner Exp $
+# $NetBSD: Makefile,v 1.39 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= ORBit2-2.12.2
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
CONFLICTS= linc>=1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/net/adns/Makefile b/net/adns/Makefile
index e13cd8b1be9..7ea2e99977b 100644
--- a/net/adns/Makefile
+++ b/net/adns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:44 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= adns-1.1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.chiark.greenend.org.uk/~ian/adns/
COMMENT= Asynchronous-capable DNS client library and utilities
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/net/amule/Makefile b/net/amule/Makefile
index 34535049457..2ad8cc019af 100644
--- a/net/amule/Makefile
+++ b/net/amule/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:46:44 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= aMule-1.2.8
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS= xmule-[0-9]*
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/net/bmon/Makefile b/net/bmon/Makefile
index ea5ae5a0af2..277379a29c2 100644
--- a/net/bmon/Makefile
+++ b/net/bmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= bmon-2.0.1
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
MAKEFILE= GNUmakefile
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
# In NetBSD 1.6.x the native curses implementation has problems with bmon.
diff --git a/net/boinc3-seti/Makefile b/net/boinc3-seti/Makefile
index d1e7ceb5b36..17b29bd9733 100644
--- a/net/boinc3-seti/Makefile
+++ b/net/boinc3-seti/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= seti_boinc-client-cvs-2004-07-15
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ENV+= BOINCDIR=${BUILDLINK_DIR}/boinc3
# XXX don't know why MySQL is needed here
#CONFIGURE_ENV+= MYSQL_CONFIG=true
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CLIENTBINNAME= setiathome-3.10.${MACHINE_GNU_PLATFORM}
CLIENTVERSION= 310
diff --git a/net/bug-buddy/Makefile b/net/bug-buddy/Makefile
index 5844b79ec12..a2f73bceafd 100644
--- a/net/bug-buddy/Makefile
+++ b/net/bug-buddy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= bug-buddy-2.10.0
@@ -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/net/chrony/Makefile b/net/chrony/Makefile
index d85053ae7f7..845b0af6610 100644
--- a/net/chrony/Makefile
+++ b/net/chrony/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:23 jlam Exp $
DISTNAME= chrony-1.20
PKGREVISION= 1
@@ -10,7 +10,7 @@ HOMEPAGE= http://chrony.sunsite.dk/index.php
COMMENT= Daemon for maintaining the accuracy of computer clocks
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
HAS_CONFIGURE= YES
CONFIGURE_ARGS+= --prefix=${PREFIX}
diff --git a/net/dc_gui2/Makefile b/net/dc_gui2/Makefile
index 672aa81278a..d7519463dc8 100644
--- a/net/dc_gui2/Makefile
+++ b/net/dc_gui2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= dc_gui2-0.75
@@ -17,7 +17,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= YES
CONFIGURE_ARGS+= --enable-manual-db-detect
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
UNLIMIT_RESOURCES+= datasize
diff --git a/net/dctc/Makefile b/net/dctc/Makefile
index 52a563c5a06..ac462ce70a3 100644
--- a/net/dctc/Makefile
+++ b/net/dctc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= dctc-0.85.4
@@ -14,7 +14,7 @@ COMMENT= Direct Connect clone (Direct Connect Text Client)
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-manual-db-detect
USE_PERL5= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CPPFLAGS+= -I${BUILDLINK_PREFIX.db4}/include/db4
diff --git a/net/docsis/Makefile b/net/docsis/Makefile
index 80f288403fa..b745b798bfc 100644
--- a/net/docsis/Makefile
+++ b/net/docsis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:45 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= docsis-0.9.2
@@ -12,7 +12,7 @@ COMMENT= Utility for manipulating DOCSIS-compliant cable modems
BUILD_DEPENDS+= bison>=1.25:../../devel/bison
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= m4
+USE_TOOLS+= gm4
.include "../../net/net-snmp/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/net/entropy/Makefile b/net/entropy/Makefile
index d8817a41636..d6993c92eb4 100644
--- a/net/entropy/Makefile
+++ b/net/entropy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= entropy-${ENTROPY_VERSION}
@@ -14,7 +14,7 @@ HOMEPAGE= http://entropy.stop1984.com/
COMMENT= Anonymous peer-to-peer networking node (similar to Freenet)
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
ENTROPY_VERSION= 0.8.2-418
diff --git a/net/etherape/Makefile b/net/etherape/Makefile
index 1f26e0dbc36..f618d6634e1 100644
--- a/net/etherape/Makefile
+++ b/net/etherape/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:23 jlam Exp $
DISTNAME= etherape-0.9.1
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= damon@NetBSD.org
HOMEPAGE= http://etherape.sourceforge.net/
COMMENT= Graphical network monitor
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_DIRS+= xdg-1.1
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
diff --git a/net/flan/Makefile b/net/flan/Makefile
index 988231daadb..0324d25e122 100644
--- a/net/flan/Makefile
+++ b/net/flan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= Flan
@@ -13,7 +13,7 @@ COMMENT= Simulator for IP networks written in Java
WRKSRC= ${WRKDIR}/src
USE_JAVA= yes
PKG_JVMS_ACCEPTED= sun-jdk13 sun-jdk14 jdk13 jdk14
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-build:
cd ${WRKSRC} ; ${PKG_JAVA_HOME}/bin/jar cf flan.jar flan/ graphic/
diff --git a/net/freenet-tools/Makefile b/net/freenet-tools/Makefile
index 47ac0284f53..549ea9f26ae 100644
--- a/net/freenet-tools/Makefile
+++ b/net/freenet-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:23 jlam Exp $
#
DISTNAME= ft-0.2.23
@@ -12,7 +12,7 @@ MAINTAINER= tv@duh.org
HOMEPAGE= http://entropy.stop1984.com/
COMMENT= Freenet Tools, freesite manipulation tools for Freenet and Entropy
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_FLAGS+= CC=${CC:Q} LD=${CC:Q} CFLAGS=${CFLAGS:Q} LDFLAGS=${LDFLAGS:Q}
CFLAGS+= -DFT_BIN=\"${PREFIX}/bin\"
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index a687ef11e1b..beed546cfbd 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/05/18 21:58:45 adrianp Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:23 jlam Exp $
DISTNAME= freeradius-1.0.2
PKGREVISION= 2
@@ -13,7 +13,7 @@ COMMENT= Free RADIUS server implementation
.include "../../mk/bsd.prefs.mk"
CONFLICTS+= radiusd-cistron*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_PKGINSTALL= YES
USE_PERL5= YES
diff --git a/net/ftplibpp/Makefile b/net/ftplibpp/Makefile
index bc20e4785aa..f4f5e2f8334 100644
--- a/net/ftplibpp/Makefile
+++ b/net/ftplibpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:46 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= ftplibpp-1.0.1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://home.arcor.de/breitscheid/ftplibpp/ftplibpp.html
COMMENT= C++ class providing ftp client functionality
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${PREFIX}/share/doc/ftplibpp
diff --git a/net/gini/Makefile b/net/gini/Makefile
index 94b93ac0877..fc32ee8b54f 100644
--- a/net/gini/Makefile
+++ b/net/gini/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= gini-0.5.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://gini.sourceforge.net/
COMMENT= Free streaming media server
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/net/gkrellm-ping/Makefile b/net/gkrellm-ping/Makefile
index d9e5880ceec..6579f9d884a 100644
--- a/net/gkrellm-ping/Makefile
+++ b/net/gkrellm-ping/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:24 jlam Exp $
DISTNAME= gkrellmPing-0.2-3
PKGNAME= gkrellm-ping-0.2.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://gkrellmping.dweb.ro/
COMMENT= gkrellm ping plugin
WRKSRC= ${WRKDIR}/gkrellmPing
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/net/gkrellm-wireless/Makefile b/net/gkrellm-wireless/Makefile
index 95478f7477e..ef7dce3a5c5 100644
--- a/net/gkrellm-wireless/Makefile
+++ b/net/gkrellm-wireless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:24 jlam Exp $
DISTNAME= gkrellmwireless-2.0.3
PKGNAME= ${DISTNAME:S/gkrellm/gkrellm-/}
@@ -13,7 +13,7 @@ COMMENT= Wavelan signal strength monitor for gkrellm
ONLY_FOR_PLATFORM= *BSD-*-* Linux-*-*
WRKSRC= ${WRKDIR}/gkrellmwireless
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/pkgconfig/buildlink3.mk"
.include "../../sysutils/gkrellm/buildlink3.mk"
diff --git a/net/gkrellm1-snmp/Makefile b/net/gkrellm1-snmp/Makefile
index 893cd031eb4..326fe9d1fc8 100644
--- a/net/gkrellm1-snmp/Makefile
+++ b/net/gkrellm1-snmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:24 jlam Exp $
DISTNAME= gkrellm_snmp-0.18
PKGNAME= gkrellm-snmp-0.18
@@ -10,7 +10,7 @@ MAINTAINER= jasper@pointless.net
HOMEPAGE= http://triq.net/gkrellm.html
COMMENT= Simple SNMP monitor for gkrellm
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/net/gkrellm1-wireless/Makefile b/net/gkrellm1-wireless/Makefile
index 38cb413eb78..a9afb265ae7 100644
--- a/net/gkrellm1-wireless/Makefile
+++ b/net/gkrellm1-wireless/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:24 jlam Exp $
DISTNAME= gkrellmwireless-0.2.2
PKGNAME= gkrellm-wireless-0.2.2
@@ -12,7 +12,7 @@ COMMENT= Wavelan signal strength monitor for gkrellm
ONLY_FOR_PLATFORM= *BSD-*-* Linux-*-*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/net/gnome-netstatus/Makefile b/net/gnome-netstatus/Makefile
index 639ab773b80..9a349466849 100644
--- a/net/gnome-netstatus/Makefile
+++ b/net/gnome-netstatus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= gnome-netstatus-2.10.0
@@ -12,7 +12,7 @@ COMMENT= Network status applet for the GNOME panel
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/net/gnugk/Makefile b/net/gnugk/Makefile
index 2d75f7d4222..d978b23ab2f 100644
--- a/net/gnugk/Makefile
+++ b/net/gnugk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:24 jlam Exp $
DISTNAME= gnugk-2.2.0
PKGREVISION= 1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnugk.org/
COMMENT= H.323 Gatekeeper
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV+= ac_cv_path_PTLIB_CONFIG=${PREFIX}/bin/ptlib-config
diff --git a/net/gopher/Makefile b/net/gopher/Makefile
index 97ce4b61c48..233c632f8bd 100644
--- a/net/gopher/Makefile
+++ b/net/gopher/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= gopher_3.0.6
@@ -12,7 +12,7 @@ COMMENT= Distributed document delivery client and server
WRKSRC= ${WRKDIR}/gopher
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+=--disable-auth
.include "../../mk/bsd.pkg.mk"
diff --git a/net/gtk-gnutella/Makefile b/net/gtk-gnutella/Makefile
index ba7c22e7f6d..d5666872a79 100644
--- a/net/gtk-gnutella/Makefile
+++ b/net/gtk-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/05/11 09:50:11 adam Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:24 jlam Exp $
DISTNAME= gtk-gnutella-0.95.2
CATEGORIES= net
@@ -9,7 +9,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://gtk-gnutella.sourceforge.net/
COMMENT= GTK-based gnutella client
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/net/gtk_wicontrol/Makefile b/net/gtk_wicontrol/Makefile
index 11075e7424d..939c0e5a6b6 100644
--- a/net/gtk_wicontrol/Makefile
+++ b/net/gtk_wicontrol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:47 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:24 jlam Exp $
DISTNAME= gtk_wicontrol-0.17
PKGREVISION= 3
@@ -14,7 +14,7 @@ ONLY_FOR_PLATFORM= *BSD-*-*
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/gettext-lib/buildlink3.mk"
.include "../../x11/gtk/buildlink3.mk"
diff --git a/net/hobbitmon/Makefile b/net/hobbitmon/Makefile
index 41455b55c33..5ee8a0e04e7 100644
--- a/net/hobbitmon/Makefile
+++ b/net/hobbitmon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= hobbit-4.0-beta6
@@ -14,7 +14,7 @@ COMMENT= Network services monitor a la Big Brother
DEPENDS+= fping>2:../../net/fping
HAS_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL=YES
.include "../../mk/bsd.prefs.mk"
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 399d2d732ca..5dafc5bb23e 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= iplog-2.2.3
@@ -10,7 +10,7 @@ MAINTAINER= gremlin@portal-to-web.de
HOMEPAGE= http://ojnk.sourceforge.net/
COMMENT= Iplog is a tool using pcap to log IP traffic
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
diff --git a/net/ipv6calc/Makefile b/net/ipv6calc/Makefile
index f91aad10f9c..423eea6aa2e 100644
--- a/net/ipv6calc/Makefile
+++ b/net/ipv6calc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= ipv6calc-0.48
@@ -13,7 +13,7 @@ COMMENT= Manipulates IPv6 addresses
# be listed in README-IPv6.html. Leave this comment here to make it so!
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= root=${PREFIX}
INSTALL_TARGET= installonly
diff --git a/net/ishell/Makefile b/net/ishell/Makefile
index 429404c3d8c..0b31e03d185 100644
--- a/net/ishell/Makefile
+++ b/net/ishell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:48 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= ish-v${VERSION}
@@ -15,7 +15,7 @@ VERSION= 0.2
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE= yes
MAKE_ENV+= LIBS="${LIBS}"
diff --git a/net/kphone/Makefile b/net/kphone/Makefile
index 79dd972f95b..d8f84ed6a88 100644
--- a/net/kphone/Makefile
+++ b/net/kphone/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/25 19:01:32 schwarz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:24 jlam Exp $
DISTNAME= kphone-4.1.0
CATEGORIES= net comms
@@ -13,7 +13,7 @@ WRKSRC= ${WRKDIR}/kphone
USE_X11BASE= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ENV+= QTDIR="${QTDIR}"
PTHREAD_OPTS+= require
diff --git a/net/libIDL/Makefile b/net/libIDL/Makefile
index a30e6f849b5..4074572ddcb 100644
--- a/net/libIDL/Makefile
+++ b/net/libIDL/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:46:49 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= libIDL-0.8.5
@@ -13,7 +13,7 @@ COMMENT= CORBA Interface Definition Language parser
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= lex yacc
+USE_TOOLS+= bison lex
CONFIGURE_ENV+= HAVE_YACC=yes
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libIDL-2.0.pc.in
diff --git a/net/libdnet/Makefile b/net/libdnet/Makefile
index 4299dce4206..833d3ff9c52 100644
--- a/net/libdnet/Makefile
+++ b/net/libdnet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:49 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:24 jlam Exp $
#
DISTNAME= libdnet-1.10
@@ -10,7 +10,7 @@ HOMEPAGE= http://libdnet.sourceforge.net/
COMMENT= C interface to several low-level networking routines
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
BUILD_DEFS+= USE_INET6
diff --git a/net/libpcap/Makefile b/net/libpcap/Makefile
index ff937765902..289d2deb1c1 100644
--- a/net/libpcap/Makefile
+++ b/net/libpcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:49 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:25 jlam Exp $
DISTNAME= libpcap-0.8.3
SVR4_PKGNAME= lpcap
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
EXTRACT_ELEMENTS= libpcap-0.8.3/./*
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= lex yacc m4
+USE_TOOLS+= bison gm4 lex
.include "../../mk/bsd.prefs.mk"
diff --git a/net/lopster/Makefile b/net/lopster/Makefile
index f4f1e84ec86..0c07ce8fb2a 100644
--- a/net/lopster/Makefile
+++ b/net/lopster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:49 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:25 jlam Exp $
#
DISTNAME= lopster-1.2.0
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://lopster.sourceforge.net/
COMMENT= Yet another Gtk+ Napster clone
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
post-extract:
diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile
index 241fd2d446c..5be7cb250aa 100644
--- a/net/mDNSResponder/Makefile
+++ b/net/mDNSResponder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/01/13 08:22:58 itojun Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:25 jlam Exp $
DISTNAME= mDNSResponder-62
CATEGORIES= net
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://developer.apple.com/darwin/projects/rendezvous/
COMMENT= Apple's mDNS repsonder
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
MAKE_ARGS+= os=netbsd
WRKSRC= ${WRKDIR}/${DISTNAME}/mDNSPosix
diff --git a/net/md-whois/Makefile b/net/md-whois/Makefile
index 5293d7e79df..afc2d63e585 100644
--- a/net/md-whois/Makefile
+++ b/net/md-whois/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 17:41:09 reed Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:25 jlam Exp $
#
# todo: set location of [md-]whois.conf and fix in man page too
# todo: build and install the po/ files and add to PLIST
@@ -18,7 +18,7 @@ VERSION= 4.7.2
WRKSRC= ${WRKDIR}/whois-${VERSION}
USE_PERL5= build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALLATION_DIRS+= bin man/man1
do-install:
diff --git a/net/mldonkey/Makefile.common b/net/mldonkey/Makefile.common
index 81b0d675746..822317db5ba 100644
--- a/net/mldonkey/Makefile.common
+++ b/net/mldonkey/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:46:49 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:25 jlam Exp $
#
DISTNAME= mldonkey-2.5.28
@@ -14,7 +14,7 @@ DISTINFO_FILE= ${.CURDIR}/../../net/mldonkey/distinfo
PATCHDIR= ${.CURDIR}/../../net/mldonkey/patches
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
CONFIGURE_ENV+= WGET=""
diff --git a/net/mtr-gtk/Makefile b/net/mtr-gtk/Makefile
index 89b55b99e22..3e05cab2694 100644
--- a/net/mtr-gtk/Makefile
+++ b/net/mtr-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:50 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:25 jlam Exp $
#
DISTNAME= mtr-0.69
@@ -13,7 +13,7 @@ COMMENT= Traceroute and ping in a single graphical network diagnostic tool
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
INSTALLATION_DIRS= man/man8 sbin
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index acc0f2c488d..0af9d6298cb 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:46:50 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:25 jlam Exp $
#
DISTNAME= mtr-0.69
@@ -12,7 +12,7 @@ COMMENT= Traceroute and ping in a single graphical network diagnostic tool
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --without-gtk
INSTALLATION_DIRS= man/man8 sbin
diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile
index 750a5d46dac..a291942d384 100644
--- a/net/netatalk/Makefile
+++ b/net/netatalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/11 21:46:51 tv Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:25 jlam Exp $
DISTNAME= netatalk-2.0.2
PKGREVISION= 1
@@ -11,7 +11,7 @@ HOMEPAGE= http://netatalk.sourceforge.net/
COMMENT= Netatalk appletalk file and print services
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_LIBTOOL= YES
USE_OLD_DES_API=YES
diff --git a/net/netatalk1/Makefile b/net/netatalk1/Makefile
index 04e1c8df5a9..7e7751844a9 100644
--- a/net/netatalk1/Makefile
+++ b/net/netatalk1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:51 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:25 jlam Exp $
DISTNAME= netatalk-1.6.2
PKGREVISION= 2
@@ -11,7 +11,7 @@ HOMEPAGE= http://sourceforge.net/projects/netatalk/
COMMENT= Netatalk appletalk file and print services
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_LIBTOOL= YES
diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common
index da5bff74f75..7028666c4cb 100644
--- a/net/netsaint-base/Makefile.common
+++ b/net/netsaint-base/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile.common,v 1.7 2005/05/22 20:08:25 jlam Exp $
#
CATEGORIES= net sysutils
@@ -17,7 +17,7 @@ PKG_USERS+= ${NETSTADM_USER}:${NETSTADM_GROUP}::NetSaint\\ Administrator:${PREFI
USE_X11= YES
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
diff --git a/net/nprobe/Makefile b/net/nprobe/Makefile
index 9f6f3a87632..f8bae5c6ac6 100644
--- a/net/nprobe/Makefile
+++ b/net/nprobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:46:52 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:25 jlam Exp $
DISTNAME= nProbe-source-1.3.1
PKGREVISION= 2
@@ -13,7 +13,7 @@ COMMENT= Monitor a network interface and generate NetFlow data
WRKSRC= ${WRKDIR}/nProbe
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= nprobe
INTERACTIVE_STAGE= fetch
diff --git a/net/ntop/Makefile b/net/ntop/Makefile
index ec9d30b0600..ff3d9877720 100644
--- a/net/ntop/Makefile
+++ b/net/ntop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/05/14 02:13:09 reed Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:25 jlam Exp $
DISTNAME= ntop-3.1
PKGREVISION= 3
@@ -14,7 +14,7 @@ CONFLICTS= ntop-[0-9]*
WRKSRC= ${WRKDIR}/ntop
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/net/openh323/Makefile b/net/openh323/Makefile
index f060f43e0ba..e91daffe833 100644
--- a/net/openh323/Makefile
+++ b/net/openh323/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/16 01:32:23 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:25 jlam Exp $
DISTNAME= openh323-v1_15_2-src
PKGNAME= openh323-1.15.2
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.openh323.org/
COMMENT= Open H.323 library
WRKSRC= ${WRKDIR}/openh323
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGSRC_USE_TOOLS+= tar
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
diff --git a/net/openslp/Makefile b/net/openslp/Makefile
index bed0f02878a..8a761aae561 100644
--- a/net/openslp/Makefile
+++ b/net/openslp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:46:53 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:25 jlam Exp $
DISTNAME= openslp-1.2.0
PKGREVISION= 1
@@ -12,7 +12,7 @@ COMMENT= Open-source implementation of the Service Location Protocol
# Needs pkgviews-enabled automake
# PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= yacc lex
+USE_TOOLS+= bison lex
USE_PKGINSTALL= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/net/polsms/Makefile b/net/polsms/Makefile
index 6de911d7154..fb70acadda3 100644
--- a/net/polsms/Makefile
+++ b/net/polsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:46:57 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:25 jlam Exp $
#
DISTNAME= sms-2.0.2
@@ -10,7 +10,7 @@ MAINTAINER= zuntum@NetBSD.org
HOMEPAGE= http://www.ceti.pl/~miki/komputery/sms.html
COMMENT= Send SMS to cellular phones in Poland (Plus, Idea, Era)
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/sms ${PREFIX}/bin
diff --git a/net/poptop/Makefile b/net/poptop/Makefile
index e4415f87b8b..a99224c34fc 100644
--- a/net/poptop/Makefile
+++ b/net/poptop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:57 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:25 jlam Exp $
#
DISTNAME= pptpd-1.2.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.poptop.org/
COMMENT= PPTP server with support for Microsoft VPN clients
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
CONFIGURE_ARGS+= --with-libwrap
diff --git a/net/pppd/Makefile b/net/pppd/Makefile
index 12f86cab342..e326e45b873 100644
--- a/net/pppd/Makefile
+++ b/net/pppd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:58 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:25 jlam Exp $
DISTNAME= ppp-${PPPD_VERSION}
PKGNAME= ${DISTNAME:S/ppp/&d/}
@@ -11,7 +11,7 @@ COMMENT= PPP Daemon
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
ONLY_FOR_PLATFORM+= NetBSD-*-* Linux-*-*
diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile
index 93c453307b5..c61409173fe 100644
--- a/net/proftpd/Makefile
+++ b/net/proftpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:25 jlam Exp $
DISTNAME= proftpd-1.2.10
PKGREVISION= 1
@@ -16,7 +16,7 @@ COMMENT= FTP server with Apache like configuration
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
GNU_CONFIGURE= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/net/py-ORBit/Makefile b/net/py-ORBit/Makefile
index c7380167402..81f1b0db5a0 100644
--- a/net/py-ORBit/Makefile
+++ b/net/py-ORBit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:46:58 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:25 jlam Exp $
#
DISTNAME= pyorbit-2.0.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Python bindings for ORBit2
PY_PATCHPLIST= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pyorbit-2.pc.in
GNU_CONFIGURE= YES
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 3f47992e278..981d4c1e12f 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:46:59 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:26 jlam Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
#
@@ -13,7 +13,7 @@ COMMENT= Free multithreaded routing daemon software (fork of zebra)
.include "../../mk/bsd.prefs.mk"
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PERL5= build
diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile
index bec6063344b..2c61bebb11d 100644
--- a/net/rp-l2tp/Makefile
+++ b/net/rp-l2tp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/24 14:50:06 grant Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= rp-l2tp-0.3
@@ -11,7 +11,7 @@ COMMENT= User-space implementation of layer 2 tunnelling protocol
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-patch:
for f in l2tp.conf.5 l2tpd.8; do \
diff --git a/net/socket++/Makefile b/net/socket++/Makefile
index 009ef31a09f..4f8f6c71202 100644
--- a/net/socket++/Makefile
+++ b/net/socket++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:00 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= socket++-1.12.10
@@ -13,7 +13,7 @@ USE_LIBTOOL= YES
AUTOMAKE_REQD= 1.4
AUTOCONF_REQD= 2.50
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
TEST_DIRS= ${WRKSRC}/test
TEST_TARGET= check
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 3c0c2e8817b..df3bbca4c92 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/18 13:22:36 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= tightvnc-1.2.9
@@ -19,7 +19,7 @@ USE_IMAKE= yes
NO_INSTALL_MANPAGES= yes
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= World
diff --git a/net/torrentutils/Makefile b/net/torrentutils/Makefile
index c1d2e9292df..dc2f06604da 100644
--- a/net/torrentutils/Makefile
+++ b/net/torrentutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:01 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= torrentutils-0.3.0
@@ -14,7 +14,7 @@ DEPENDS+= bash-[0-9]*:../../shells/bash
DEPENDS+= p5-Digest-SHA1-[0-9]*:../../security/p5-Digest-SHA1
DEPENDS+= p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_PERL5= yes
REPLACE_PERL= torrenttool.in
diff --git a/net/tsclient/Makefile b/net/tsclient/Makefile
index 402f7b70fee..7d49b2fb24a 100644
--- a/net/tsclient/Makefile
+++ b/net/tsclient/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:01 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= tsclient-0.132
@@ -15,7 +15,7 @@ DEPENDS+= vncviewer-[0-9]*:../../net/vncviewer
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_PERL5= run
USE_X11= yes
diff --git a/net/tsocks/Makefile b/net/tsocks/Makefile
index f9906f173ae..226e1261dd1 100644
--- a/net/tsocks/Makefile
+++ b/net/tsocks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:01 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= tsocks-1.7
@@ -10,7 +10,7 @@ HOMEPAGE= http://tsocks.sourceforge.net/
COMMENT= Transparent SOCKS proxying library
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-conf=${PKG_SYSCONFDIR}/tsocks.conf
diff --git a/net/unison-devel/Makefile b/net/unison-devel/Makefile
index d84bf4c4d47..511398f84bf 100644
--- a/net/unison-devel/Makefile
+++ b/net/unison-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/24 13:06:03 adrianp Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:26 jlam Exp $
DISTNAME= unison-2.12.0
CATEGORIES= net
@@ -15,7 +15,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2
# docs: unison-manual.pdf/html/ps/dvi
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_FLAGS+= CFLAGS="" UISTYLE=text
MAKE_ENV+= HOME=${WRKDIR}
diff --git a/net/unison/Makefile b/net/unison/Makefile
index 1bd1556de78..383c70fc889 100644
--- a/net/unison/Makefile
+++ b/net/unison/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/24 12:48:43 adrianp Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:26 jlam Exp $
DISTNAME= unison-2.10.2
CATEGORIES= net
@@ -15,7 +15,7 @@ BUILDLINK_DEPENDS.ocaml+= ocaml>=3.08.2
# docs: unison-manual.pdf/html/ps/dvi
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_FLAGS+= CFLAGS="" UISTYLE=text
MAKE_ENV+= HOME=${WRKDIR}
diff --git a/net/vino/Makefile b/net/vino/Makefile
index 73e62bbaecd..3e07d170b55 100644
--- a/net/vino/Makefile
+++ b/net/vino/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= vino-2.10.0
@@ -12,7 +12,7 @@ COMMENT= VNC server for GNOME
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_PERL5= build
diff --git a/net/vpnc/Makefile b/net/vpnc/Makefile
index e106a674050..a446fd39fdb 100644
--- a/net/vpnc/Makefile
+++ b/net/vpnc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= vpnc-0.3.2
@@ -9,7 +9,7 @@ MAINTAINER= hubertf@NetBSD.org
HOMEPAGE= http://www.unix-ag.uni-kl.de/~massar/vpnc/
COMMENT= Client for Cisco3000 VPN Concentrator
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= vpnc
do-install:
diff --git a/net/wol/Makefile b/net/wol/Makefile
index a3083c9b357..1f930471800 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:26 jlam Exp $
DISTNAME= wol-0.7.1
CATEGORIES= net
@@ -9,7 +9,7 @@ HOMEPAGE= http://ahh.sourceforge.net/wol/
COMMENT= Small Wake On Lan client
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
INFO_FILES= wol.info
USE_PERL5= build
diff --git a/net/xmftp/Makefile b/net/xmftp/Makefile
index d1bb016a95b..bafb53592ee 100644
--- a/net/xmftp/Makefile
+++ b/net/xmftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= xmftp-1.0.4
@@ -12,7 +12,7 @@ COMMENT= X/Motif FTP client
WRKSRC= ${WRKDIR}/xmftp/source
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/xmftp ${PREFIX}/bin
diff --git a/net/xorp/Makefile b/net/xorp/Makefile
index 11550b2f3e9..7ab426189cb 100644
--- a/net/xorp/Makefile
+++ b/net/xorp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:02 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= xorp-1.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.xorp.org/
COMMENT= The eXtensible Open Router Platform
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
# The xorp people insist on their own PREFIX.
diff --git a/net/zebra/Makefile b/net/zebra/Makefile
index 58e435e6a1f..2cf6431b842 100644
--- a/net/zebra/Makefile
+++ b/net/zebra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/04/11 21:47:03 tv Exp $
+# $NetBSD: Makefile,v 1.66 2005/05/22 20:08:26 jlam Exp $
# Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp
#
@@ -48,7 +48,7 @@ CONF_FILES+= ${EGDIR}/vtysh.conf.sample ${PKG_SYSCONFDIR}/vtysh.conf
CONFIGURE_ARGS+= --disable-vtysh
.endif
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= # defined
.include "../../devel/readline/buildlink3.mk"
diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile
index b6c8549a6dc..4dc422c8c09 100644
--- a/news/leafnode/Makefile
+++ b/news/leafnode/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/13 15:08:04 kim Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:26 jlam Exp $
DISTNAME= leafnode-1.11.2.rel
PKGNAME= ${DISTNAME:S/.rel//}
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --with-lockfile=${LEAFNODE_LOCKDIR}/fetchnews.lck
CONFIGURE_ARGS+= --sysconfdir=${LEAFNODE_CONFDIR}
CONFIGURE_ARGS+= --with-user=${LEAFNODE_USER}
CONFIGURE_ARGS+= --with-group=${LEAFNODE_GROUP}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/news/nget/Makefile b/news/nget/Makefile
index 85f68af87ff..6464c266d30 100644
--- a/news/nget/Makefile
+++ b/news/nget/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/26 00:44:09 reed Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:26 jlam Exp $
#
DISTNAME= nget-0.27.1
@@ -11,7 +11,7 @@ COMMENT= Command line nntp file grabber
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --with-pcre
diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile
index ff4a05440fc..6c609383123 100644
--- a/news/nntpcache/Makefile
+++ b/news/nntpcache/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:26 jlam Exp $
DISTNAME= nntpcache-3.0.1
CATEGORIES= news
@@ -27,7 +27,7 @@ BUILD_DEFS+= USE_OPENLDAP NNTP_USE_PGP
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --localstatedir=${VARBASE}/spool
CONFIGURE_ENV+= INSTALL_SCRIPT="${INSTALL_SCRIPT}"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALL_TARGET= SUBDIRS="cf src filters http doc pgp contrib/newshound contrib/perlnewshound innreport scripts unixauth" \
install
diff --git a/parallel/glunix/Makefile b/parallel/glunix/Makefile
index 6efca32b6cd..04502a77f98 100644
--- a/parallel/glunix/Makefile
+++ b/parallel/glunix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/05/31 22:13:16 kristerw Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:26 jlam Exp $
DISTNAME= glunix-release-1-0a
PKGNAME= glunix-1.0a
@@ -20,7 +20,7 @@ SSH= ${LOCALBASE}/bin/ssh
.endif
WRKSRC= ${WRKDIR}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
INTERACTIVE_STAGE= fetch
NO_MTREE= yes
diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile
index 4ea7728fc67..d0e1243fbbb 100644
--- a/parallel/sge/Makefile
+++ b/parallel/sge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/28 23:17:53 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:27 jlam Exp $
#
DISTNAME= sge-5.3p6
@@ -13,7 +13,7 @@ COMMENT= Sun Grid Engine distributed resource management system
BUILD_DEPENDS+= {standalone-tcsh,tcsh}-[0-9]*:../../shells/tcsh
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_PERL5= YES
diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile
index ab487876670..46fb6622942 100644
--- a/print/LPRng-core/Makefile
+++ b/print/LPRng-core/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/03/24 21:12:59 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:27 jlam Exp $
DISTNAME= LPRng-3.8.28
PKGNAME= LPRng-core-3.8.28
@@ -14,7 +14,7 @@ COMMENT= Enhanced Printer Spooler
CONFLICTS+= cups-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig
GNU_CONFIGURE= yes
diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 1026d45a16a..8a4c2da4e02 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:27 jlam Exp $
DISTNAME= a2ps-4.13b
PKGNAME= a2ps-4.13.0.2
@@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/a2ps-4.13
STRIP= # empty
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= YES
diff --git a/print/advi/Makefile b/print/advi/Makefile
index 99c268d9776..e6cd1aea21a 100644
--- a/print/advi/Makefile
+++ b/print/advi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:27 jlam Exp $
DISTNAME= advi-1.6.0
CATEGORIES= print
@@ -14,7 +14,7 @@ BUILD_DEPENDS+= ocaml>=3.04:../../lang/ocaml
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
post-extract:
diff --git a/print/auctex/Makefile b/print/auctex/Makefile
index 065c6e86a0e..6f55a517554 100644
--- a/print/auctex/Makefile
+++ b/print/auctex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 14:58:00 grant Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:27 jlam Exp $
DISTNAME= auctex-11.13
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.nongnu.org/auctex/
COMMENT= Enhanced LaTeX mode for Emacs
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
TEX_PREFIX_DEFAULT= ${LOCALBASE}
diff --git a/print/chktex/Makefile b/print/chktex/Makefile
index a569cfbf239..0e9665e50e5 100644
--- a/print/chktex/Makefile
+++ b/print/chktex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:27 jlam Exp $
#
DISTNAME= chktex-1.6.1
@@ -12,7 +12,7 @@ COMMENT= LaTeX semantic checker
DEPENDS+= lynx-[0-9]*:../../www/lynx
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
GNU_CONFIGURE= YES
CFLAGS+= -D__unix__
diff --git a/print/cups/Makefile b/print/cups/Makefile
index 139c29abf00..d485ae53450 100644
--- a/print/cups/Makefile
+++ b/print/cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.92 2005/05/22 20:08:27 jlam Exp $
#
# The CUPS author is very good about taking back changes into the main
# CUPS distribution. The correct place to send patches or bug-fixes is:
@@ -33,7 +33,7 @@ UNLIMIT_RESOURCES= datasize memorysize
USE_LANGUAGES= c c++ # pdftops is a C++ application
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
INSTALL_TARGET= installcups
diff --git a/print/enscript/Makefile b/print/enscript/Makefile
index 853a6dfa064..4fd155644af 100644
--- a/print/enscript/Makefile
+++ b/print/enscript/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:27 jlam Exp $
#
DISTNAME= enscript-1.6.3
@@ -15,7 +15,7 @@ DEPENDS+= papersize-[0-9]*:../../print/papersize
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}"
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 9422f5e353e..50b86c61c2c 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/04/28 22:29:43 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:27 jlam Exp $
DISTNAME= foomatic-filters-3.0.2
CATEGORIES= print
@@ -25,7 +25,7 @@ CONFIGURE_ENV+= CUPS=${LOCALBASE}/share/cups
CONFIGURE_ENV+= CUPS_FILTERS=${LOCALBASE}/lib/cups/filter
CONFIGURE_ENV+= PRINTCAP=/etc/printcap
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
USE_PKGINSTALL= yes
PERL5_REQD= 5.6
diff --git a/print/ggv2/Makefile b/print/ggv2/Makefile
index 1e670cb8e7c..1068dc52cc6 100644
--- a/print/ggv2/Makefile
+++ b/print/ggv2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:27 jlam Exp $
#
DISTNAME= ggv-2.8.4
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
GCONF2_SCHEMAS= ggv.schemas
diff --git a/print/ghostscript-esp/Makefile.common b/print/ghostscript-esp/Makefile.common
index 12478726188..1801f73863a 100644
--- a/print/ghostscript-esp/Makefile.common
+++ b/print/ghostscript-esp/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/05/22 20:08:27 jlam Exp $
DISTNAME= espgs-${GS_VERS}-source
BASEGS_VERS= 7.07
@@ -23,7 +23,7 @@ DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ijs
CONFIGURE_ARGS+= --with-gimp-print
diff --git a/print/ghostscript-gnu/Makefile.common b/print/ghostscript-gnu/Makefile.common
index 9b35094b439..b807f07f03a 100644
--- a/print/ghostscript-gnu/Makefile.common
+++ b/print/ghostscript-gnu/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.19 2005/05/22 20:08:27 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 7.07
@@ -16,7 +16,7 @@ CONFLICTS+= ghostscript-gnu{,-nox11,-x11}-[0-9]*
DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-ijs
diff --git a/print/ghostscript-nox11/Makefile.common b/print/ghostscript-nox11/Makefile.common
index 99e74f1c64e..facd4c34b81 100644
--- a/print/ghostscript-nox11/Makefile.common
+++ b/print/ghostscript-nox11/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.57 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile.common,v 1.58 2005/05/22 20:08:27 jlam Exp $
DISTNAME= ghostscript-${GS_VERS}
GS_VERS= 6.01
@@ -19,7 +19,7 @@ DEPENDS+= ghostscript-fonts-6.0:../../fonts/ghostscript-fonts
DEPENDS+= watanabe-vfont-19930318:../../fonts/watanabe_vfont
WRKSRC= ${WRKDIR}/gs${GS_VERS}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
GS_SRCS= ${DISTNAME}${EXTRACT_SUFX}
diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile
index f1ba04afc79..9c877cd2e3d 100644
--- a/print/gimp-print-cups/Makefile
+++ b/print/gimp-print-cups/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:27 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGNAME= gimp-print-cups-4.2.7
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= GIMP print plugin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/print/gimp-print-escputil/Makefile b/print/gimp-print-escputil/Makefile
index f90fe14c1be..baae1e28615 100644
--- a/print/gimp-print-escputil/Makefile
+++ b/print/gimp-print-escputil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGNAME= gimp-print-escputil-4.2.7
@@ -13,7 +13,7 @@ COMMENT= Epson Stylus inkjet printer tool
BUILDLINK_DEPMETHOD.gimp-print-lib= build
CONFLICTS+= gimp<=1.2.3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --enable-libgimpprint=no
diff --git a/print/gimp-print-ijs/Makefile b/print/gimp-print-ijs/Makefile
index 1b4261a1b03..4410c7cbcd2 100644
--- a/print/gimp-print-ijs/Makefile
+++ b/print/gimp-print-ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.6
PKGNAME= gimp-print-ijs-4.2.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= GIMP print IJS server
USE_LIBTOOL= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
CONFIGURE_ARGS+= --with-ijs
diff --git a/print/gimp-print-lib/Makefile b/print/gimp-print-lib/Makefile
index cf0559adb26..63823713be0 100644
--- a/print/gimp-print-lib/Makefile
+++ b/print/gimp-print-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGNAME= gimp-print-lib-4.2.7
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://gimp-print.sourceforge.net/
COMMENT= Drivers for Canon, Epson, Lexmark, and PCL printers
-USE_GNU_TOOLS+= make lex
+USE_TOOLS+= gmake lex
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
INFO_FILES= gimpprint.info
diff --git a/print/gimp-print/Makefile b/print/gimp-print/Makefile
index 6f998a0cff4..052be3c6711 100644
--- a/print/gimp-print/Makefile
+++ b/print/gimp-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gimp-print-4.2.7
PKGREVISION= 1
@@ -11,7 +11,7 @@ COMMENT= GIMP print plugin
CONFLICTS+= gimp<=1.2.3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/print/glabels/Makefile b/print/glabels/Makefile
index 4ec01a12467..cb26cd65efe 100644
--- a/print/glabels/Makefile
+++ b/print/glabels/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/29 04:48:24 reed Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= glabels-2.0.2
@@ -13,7 +13,7 @@ USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_DIRS+= gnome2-1.5
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../databases/shared-mime-info/mimedb.mk"
.include "../../devel/libgnomeui/buildlink3.mk"
diff --git a/print/gpdf/Makefile b/print/gpdf/Makefile
index faf10157f7c..8c19d8a7b74 100644
--- a/print/gpdf/Makefile
+++ b/print/gpdf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= gpdf-2.10.0
@@ -13,7 +13,7 @@ COMMENT= GNOME 2 version of xpdf
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/print/gv/Makefile b/print/gv/Makefile
index 9c206946a74..5690dcbce63 100644
--- a/print/gv/Makefile
+++ b/print/gv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/18 13:20:57 wiz Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:28 jlam Exp $
DISTNAME= gv-3.6.1
CATEGORIES= print
@@ -9,7 +9,7 @@ HOMEPAGE= http://www.gnu.org/software/gv/
COMMENT= PostScript and PDF previewer
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_MAKEINFO= yes
diff --git a/print/ijs/Makefile b/print/ijs/Makefile
index 6744a45deed..7179935fa79 100644
--- a/print/ijs/Makefile
+++ b/print/ijs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:07 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:28 jlam Exp $
DISTNAME= ijs-0.34
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.linuxprinting.org/ijs/
COMMENT= Protocol library for raster page transmission
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= # defined
GNU_CONFIGURE= # defined
diff --git a/print/imposter/Makefile b/print/imposter/Makefile
index 00d9d8e93d6..bf1d8fb9bc2 100644
--- a/print/imposter/Makefile
+++ b/print/imposter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= imposter-0.2
@@ -13,7 +13,7 @@ COMMENT= Standalone OpenOffice presentations viewer using GTK2
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/print/ja-vfxdvik/Makefile b/print/ja-vfxdvik/Makefile
index 1185341cc5e..ef8e1c9999c 100644
--- a/print/ja-vfxdvik/Makefile
+++ b/print/ja-vfxdvik/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:28 jlam Exp $
DISTNAME= xdvik-${XDVIK_ORIGINAL_VERS}
PKGNAME= ja-vfxdvik-${XDVIK_ORIGINAL_VERS}.${XDVIK_JP_PATCH_VERS}
@@ -25,7 +25,7 @@ DEPENDS+= ja-ptex-bin>=3.1.2:../../print/ja-ptex-bin
XDVI_DIR= ${WRKDIR}/${DISTNAME}/texk/xdvik
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/config/config
diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 2a4786fda11..6f201ede7d6 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/04/26 18:07:49 drochner Exp $
+# $NetBSD: Makefile,v 1.41 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= libgnomeprint-2.10.3
@@ -12,7 +12,7 @@ COMMENT= Library for the GNOME2 Printing Architecture
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
USE_X11= YES
USE_LIBTOOL= YES
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 77db554e966..6bee92b222a 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/18 16:07:31 jmmv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= libgnomeprintui-2.10.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
diff --git a/print/lilypond/Makefile b/print/lilypond/Makefile
index 7bdd2dd5885..d7d70706bcb 100644
--- a/print/lilypond/Makefile
+++ b/print/lilypond/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/22 12:54:18 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= lilypond-2.4.3
@@ -18,7 +18,7 @@ BUILDLINK_DEPENDS.mftrace+= mftrace>=1.1.0
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
USE_MAKEINFO= YES
diff --git a/print/magicfilter/Makefile b/print/magicfilter/Makefile
index e5118bea8c9..75b2dca4ded 100644
--- a/print/magicfilter/Makefile
+++ b/print/magicfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2004/03/26 02:27:51 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:08:28 jlam Exp $
DISTNAME= magicfilter-1.2
PKGREVISION= 3
@@ -15,7 +15,7 @@ DEPENDS+= netpbm-[0-9]*:../../graphics/netpbm
DEPENDS+= teTeX-bin-[0-9]*:../../print/teTeX-bin
DEPENDS+= papersize-[0-9]*:../../print/papersize
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= GHOSTSCRIPT=${LOCALBASE}/bin/gs
diff --git a/print/pdflib/Makefile.common b/print/pdflib/Makefile.common
index 07ff62f4d42..78f51946610 100644
--- a/print/pdflib/Makefile.common
+++ b/print/pdflib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/04/11 21:47:08 tv Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/05/22 20:08:28 jlam Exp $
DISTNAME= pdflib-${PDFLIB_DIST_VERS}
PKGREVISION= 1
@@ -20,7 +20,7 @@ DISTINFO_FILE= ${.CURDIR}/../pdflib/distinfo
PATCHDIR= ${.CURDIR}/../pdflib/patches
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-pnglib
CONFIGURE_ARGS+= --with-tifflib
diff --git a/print/psify/Makefile b/print/psify/Makefile
index c18cc9f2b06..0e741d7ba00 100644
--- a/print/psify/Makefile
+++ b/print/psify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:28 jlam Exp $
#
DISTNAME= psify-19980216
@@ -15,7 +15,7 @@ DIST_SUBDIR= psify
EXTRACT_ONLY= #empty
NO_CONFIGURE= yes
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
INSTALL_TARGET= install prefix=${PREFIX}
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 7c371a945f4..a7f0f23e60c 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:28 jlam Exp $
DISTNAME= scribus-1.2.1
CATEGORIES= print
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.scribus.net/
COMMENT= Publishing layout with graphical interface
USE_X11= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PTHREAD_OPTS+= require
USE_LIBTOOL= YES
diff --git a/print/teTeX-bin/Makefile.common b/print/teTeX-bin/Makefile.common
index 29cd6d52e36..7fc8e6103b4 100644
--- a/print/teTeX-bin/Makefile.common
+++ b/print/teTeX-bin/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.7 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile.common,v 1.8 2005/05/22 20:08:29 jlam Exp $
TETEX_BIN_VERS= 2.0.2
DIST_SUBDIR= teTeX
BUILD_TARGET= all
INSTALL_TARGET= install strip
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_PKGINSTALL= yes
USE_X11= yes
diff --git a/print/teTeX-share/Makefile b/print/teTeX-share/Makefile
index 764d99370d9..eb61548bea1 100644
--- a/print/teTeX-share/Makefile
+++ b/print/teTeX-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/17 22:00:13 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= tetex-texmf-2.0.2
@@ -24,7 +24,7 @@ EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
.include "../../mk/bsd.prefs.mk"
diff --git a/print/teTeX1-bin/Makefile b/print/teTeX1-bin/Makefile
index 07570a696e5..e4735f41e62 100644
--- a/print/teTeX1-bin/Makefile
+++ b/print/teTeX1-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:29 jlam Exp $
DISTNAME= teTeX-src-1.0.7
PKGNAME= teTeX-bin-1.0.7
@@ -23,7 +23,7 @@ BUILD_TARGET= all
INSTALL_TARGET= install strip
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_X11= yes
CFLAGS+= -Dunix
diff --git a/print/teTeX1-share/Makefile b/print/teTeX1-share/Makefile
index c1d9086a504..14a93470768 100644
--- a/print/teTeX1-share/Makefile
+++ b/print/teTeX1-share/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= teTeX-texmf-1.0.2
@@ -19,7 +19,7 @@ EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
NO_MTREE= yes
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
EXTRA_PATCH= ${FILESDIR}/latex.ltx.diff
diff --git a/print/teTeX3-bin/Makefile.common b/print/teTeX3-bin/Makefile.common
index f789a7d69f8..5ee64ca05a7 100644
--- a/print/teTeX3-bin/Makefile.common
+++ b/print/teTeX3-bin/Makefile.common
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile.common,v 1.3 2005/05/22 20:08:29 jlam Exp $
TETEX_BIN_VERS= 3.0
DIST_SUBDIR= teTeX
BUILD_TARGET= all
INSTALL_TARGET= install strip
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_PKGINSTALL= yes
USE_X11= yes
diff --git a/print/teTeX3-texmf/Makefile b/print/teTeX3-texmf/Makefile
index 7c055c0fb6c..4a78080de90 100644
--- a/print/teTeX3-texmf/Makefile
+++ b/print/teTeX3-texmf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/18 15:11:13 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= tetex-texmf-3.0
@@ -19,7 +19,7 @@ DIST_SUBDIR= teTeX
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
NO_BUILD= yes
-USE_GNU_TOOLS+= patch
+USE_TOOLS+= patch
.include "../../mk/bsd.prefs.mk"
diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile
index 8791d3ed38a..36edb9d9274 100644
--- a/print/texfamily/Makefile
+++ b/print/texfamily/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/16 01:15:33 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:29 jlam Exp $
DISTNAME= TeXfamily-1.2.1
PKGREVISION= 5
@@ -39,7 +39,7 @@ PKGSRC_USE_TOOLS+= gtar
BUILD_TARGET= all
INSTALL_TARGET= install strip
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
PLIST_SUBST+= MV="${MV}"
CFLAGS+= -Dunix
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 05b8c3bd995..7817ecea6c2 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= transfig.3.2.4
@@ -21,7 +21,7 @@ MAKE_ENV+= DDA4="-DA4"
# We must use GNU make on Linux
.if ${OPSYS} == "Linux"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.endif
.include "../../graphics/png/buildlink3.mk"
diff --git a/print/xpp/Makefile b/print/xpp/Makefile
index a6112f5e405..36aa5e7906b 100644
--- a/print/xpp/Makefile
+++ b/print/xpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:29 jlam Exp $
DISTNAME= xpp-1.1
PKGREVISION= 5
@@ -10,7 +10,7 @@ HOMEPAGE= http://cups.sourceforge.net/xpp/index.html
COMMENT= X Printing Panel
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
USE_LANGUAGES= c++
diff --git a/regress/ignore-tools/Makefile b/regress/ignore-tools/Makefile
index 2ccf41a389e..efcfbf483e0 100644
--- a/regress/ignore-tools/Makefile
+++ b/regress/ignore-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1 2005/02/12 14:45:53 gavan Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= regress-ignore-tools-0.0
@@ -8,7 +8,7 @@ DISTFILES= #empty
MAINTAINER= gavan@NetBSD.org
COMMENT= Test circular dependency avoidance logic in tools.mk
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
# Force dependencies
_TOOLS_OPSYS_INCOMPAT.lex+= *-*-*
diff --git a/security/MyPasswordSafe/Makefile b/security/MyPasswordSafe/Makefile
index ec094e9766f..bf8252eda8c 100644
--- a/security/MyPasswordSafe/Makefile
+++ b/security/MyPasswordSafe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= MyPasswordSafe-20041004.src
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.semanticgap.com/myps/
COMMENT= Easy-to-use password manager
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_FLAGS+= QMAKE=${QTDIR:Q}/bin/qmake
.include "../../x11/qt3-libs/buildlink3.mk"
diff --git a/security/PAM/Makefile b/security/PAM/Makefile
index ae546679a09..7539647fb6b 100644
--- a/security/PAM/Makefile
+++ b/security/PAM/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= Linux-PAM-0.77
@@ -19,7 +19,7 @@ CONFLICTS+= openpam-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/security/aide/Makefile b/security/aide/Makefile
index fdbf1c65e64..9ddb1c26704 100644
--- a/security/aide/Makefile
+++ b/security/aide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= aide-0.10
@@ -13,7 +13,7 @@ BUILDLINK_DEPENDS.mhash?= mhash>=0.8.17
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= lex make yacc
+USE_TOOLS+= bison gmake lex
USE_TOOLS+= bison
.include "../../security/mhash/buildlink3.mk"
diff --git a/security/aide06/Makefile b/security/aide06/Makefile
index 5b836668e56..5cfa510ec84 100644
--- a/security/aide06/Makefile
+++ b/security/aide06/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 19:11:12 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= aide-0.6
@@ -13,7 +13,7 @@ COMMENT= Older intrusion detection system for checking file integrity
#BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= yacc lex
+USE_TOOLS+= bison lex
USE_TOOLS+= bison
.include "../../mk/bsd.pkg.mk"
diff --git a/security/avcheck/Makefile b/security/avcheck/Makefile
index 02bb50b506d..4caff54f8e9 100644
--- a/security/avcheck/Makefile
+++ b/security/avcheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:29 jlam Exp $
DISTNAME= avcheck-0.9
CATEGORIES= security mail
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.corpit.ru/avcheck/
COMMENT= Mail content filter for SMTP servers
-USE_GNU_TOOLS+= sed
+USE_TOOLS+= gsed
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/avcheck ${PREFIX}/bin
diff --git a/security/chkrootkit/Makefile b/security/chkrootkit/Makefile
index 60ad2bd9940..7a85558d9fa 100644
--- a/security/chkrootkit/Makefile
+++ b/security/chkrootkit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:10 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= chkrootkit-0.44
@@ -11,7 +11,7 @@ COMMENT= Locally checks for signs of a rootkit
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE= yes
PROGRAMS= chkdirs chklastlog chkproc chkwtmp ifpromisc strings-static
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index a4de7cdb3ab..6d9bd313cf9 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/05/13 03:26:44 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:29 jlam Exp $
.include "Makefile.common"
@@ -16,7 +16,7 @@ CONFLICTS+= courier-authldap-[0-9]*
CONFLICTS+= courier-authmysql-[0-9]*
CONFLICTS+= courier-authpgsql-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKG_SYSCONFSUBDIR= authlib
diff --git a/security/crypto++/Makefile b/security/crypto++/Makefile
index 2d325d9ede9..cb6bacc6745 100644
--- a/security/crypto++/Makefile
+++ b/security/crypto++/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/19 16:48:21 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= cryptopp521
@@ -16,7 +16,7 @@ COMMENT= Free C++ class library of Cryptographic Primitives
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
WRKSRC= ${WRKDIR}
USE_LANGUAGES= c++
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index a9d2c387c95..e2a263f5d99 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:08:29 jlam Exp $
#
# This file is currently included by:
#
@@ -42,7 +42,7 @@ DEFAULT_VIEW.${PKGBASE}= ${DEFAULT_VIEW.cyrus-sasl}
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MAKE_ENV+= SHLIBTOOL=${SHLIBTOOL:Q}
diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile
index cd1f3942a7c..4818a38866c 100644
--- a/security/dirmngr/Makefile
+++ b/security/dirmngr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/02 22:33:37 shannonjr Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:29 jlam Exp $
#
DISTNAME= dirmngr-0.9.1
@@ -19,7 +19,7 @@ PKG_GROUPS= ${DIRMNGR_GROUP}
PKG_USERS= ${DIRMNGR_USER}:${DIRMNGR_GROUP}::pseudo\\ user:${VARBASE}/dirmngr:
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
RCD_SCRIPTS= dirmngr
diff --git a/security/dropbear/Makefile b/security/dropbear/Makefile
index 2292d083322..ed8d781abcf 100644
--- a/security/dropbear/Makefile
+++ b/security/dropbear/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/29 16:14:41 drochner Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:29 jlam Exp $
DISTNAME= dropbear-0.45
CATEGORIES= security
@@ -10,7 +10,7 @@ HOMEPAGE= http://matt.ucc.asn.au/dropbear/dropbear.html
COMMENT= SSH2 server, aimed at embedded market
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFLAGS+= ROOT_USER=${ROOT_USER} ROOT_GROUP=${ROOT_GROUP}
diff --git a/security/fwbuilder/Makefile b/security/fwbuilder/Makefile
index 6d69d36485e..71e8c1d75dc 100644
--- a/security/fwbuilder/Makefile
+++ b/security/fwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:30 jlam Exp $
DISTNAME= fwbuilder-2.0.6
CATEGORIES= security net
@@ -10,7 +10,7 @@ COMMENT= Firewall Builder GUI
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
UNLIMIT_RESOURCES+= datasize
diff --git a/security/gnupg-devel/Makefile b/security/gnupg-devel/Makefile
index c8c1f7af9dd..d199d1acca2 100644
--- a/security/gnupg-devel/Makefile
+++ b/security/gnupg-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/23 12:38:05 shannonjr Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= gnupg-1.9.16
@@ -18,7 +18,7 @@ COMMENT= Utility programs that come with GnuPG 1.9 (experimental branch)
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
diff --git a/security/gnupg/Makefile b/security/gnupg/Makefile
index 4dce230f6c2..9b174a6b9cc 100644
--- a/security/gnupg/Makefile
+++ b/security/gnupg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.76 2005/05/22 20:08:30 jlam Exp $
DISTNAME= gnupg-1.4.1
CATEGORIES= security
@@ -23,7 +23,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
CRYPTO= yes
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-static-rnd=auto
CONFIGURE_ARGS+= --with-mailprog=/usr/sbin/sendmail
TEST_TARGET= check
diff --git a/security/gnustep-ssl/Makefile b/security/gnustep-ssl/Makefile
index 942777bd082..d6302a8492b 100644
--- a/security/gnustep-ssl/Makefile
+++ b/security/gnustep-ssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:11 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= gnustep-base-1.10.1
@@ -17,7 +17,7 @@ PTHREAD_LIBS= -lpthread
CONFIGURE_DIRS= ${WRKDIR}/${DISTNAME}
WRKSRC= ${CONFIGURE_DIRS}/SSL
MAKEFILE= GNUmakefile
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
GNU_CONFIGURE_PREFIX= ${PREFIX}/share/GNUstep
CONFIGURE_ARGS+= --exec-prefix=${PREFIX}/libexec/GNUstep
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index 79293633261..6f69dfd2a20 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/21 14:35:47 lha Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:30 jlam Exp $
DISTNAME= heimdal-0.6.4
CATEGORIES= security
@@ -14,7 +14,7 @@ CONFLICTS+= mit-krb5-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= yacc
+USE_TOOLS+= bison
HEIMDAL_STATEDIR?= ${VARBASE}/heimdal
diff --git a/security/jessie/Makefile b/security/jessie/Makefile
index 4a6f9a2dc94..cb93fa08979 100644
--- a/security/jessie/Makefile
+++ b/security/jessie/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:12 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= jessie-0.9.7
@@ -11,7 +11,7 @@ COMMENT= GPL implementation of the Java Secure Sockets Extension
DEPENDS+= gnu-crypto>=2.0:../../security/gnu-crypto
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_JAVA2= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/security/kssh/Makefile b/security/kssh/Makefile
index 42deff4f0ad..5ce1152947d 100644
--- a/security/kssh/Makefile
+++ b/security/kssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:12 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= kssh-0.7
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://kssh.sourceforge.net/
COMMENT= KDE Front-end to SSH
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/security/libfwbuilder/Makefile b/security/libfwbuilder/Makefile
index f8352c1a9ec..835f187a21f 100644
--- a/security/libfwbuilder/Makefile
+++ b/security/libfwbuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:30 jlam Exp $
DISTNAME= libfwbuilder-2.0.6
CATEGORIES= security net
@@ -10,7 +10,7 @@ COMMENT= Firewall Builder API
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
post-install:
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 73300eaf2ef..d7c709d1daf 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/15 22:22:48 jschauma Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= libgpg-error-1.0
@@ -19,7 +19,7 @@ USE_PKGLOCALEDIR= YES
# XXX See HACKS
.if ${OPSYS} != IRIX
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
.endif
MAKE_ENV+= LC_ALL="C"
diff --git a/security/lsh/Makefile b/security/lsh/Makefile
index 76df29bca41..ad0b94369ba 100644
--- a/security/lsh/Makefile
+++ b/security/lsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/30 12:23:42 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= lsh-1.4.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.lysator.liu.se/~nisse/lsh/
COMMENT= ssh2 client/server
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/gmp/buildlink3.mk"
.include "../../devel/liboop/buildlink3.mk"
diff --git a/security/lsh2/Makefile b/security/lsh2/Makefile
index 7419a2cd6bb..7965fcdeac7 100644
--- a/security/lsh2/Makefile
+++ b/security/lsh2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/02 11:10:38 drochner Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= lsh-2.0.1
@@ -10,7 +10,7 @@ HOMEPAGE= http://www.lysator.liu.se/~nisse/lsh/
COMMENT= SSH2 client/server
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --disable-openssl --disable-pam
# man/man8/sftp-server.8
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 284abefda9f..60f5e55af32 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:13 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:30 jlam Exp $
DISTNAME= mhash-0.9.2
CATEGORIES= security devel
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://mhash.sourceforge.net/
COMMENT= Hash algorithms library
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PERL5= build
GNU_CONFIGURE= yes
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index 77e61d37352..63589735257 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.104 2005/05/22 20:08:30 jlam Exp $
OPENSSL_SNAPSHOT?= # empty
OPENSSL_STABLE?= # empty
@@ -41,7 +41,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PERL5= build # perl is used throughout the build
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
TEST_TARGET= tests
HAS_CONFIGURE= yes
diff --git a/security/otpcalc/Makefile b/security/otpcalc/Makefile
index 6ff764bc312..374f81ae695 100644
--- a/security/otpcalc/Makefile
+++ b/security/otpcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:14 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= otpCalc-0.96
@@ -11,7 +11,7 @@ HOMEPAGE= http://original.killa.net/infosec/otpCalc/
COMMENT= OTP and S/Key calculator for X
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= otpCalc otpCalc.1
diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile
index 2c2902b10b0..5617d2722e0 100644
--- a/security/pam-ldap/Makefile
+++ b/security/pam-ldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= pam_ldap-176
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.padl.com/pam_ldap.html
COMMENT= Pluggable authentication module for LDAP directories
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-ldap-lib=openldap
CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap}
diff --git a/security/pinentry/Makefile b/security/pinentry/Makefile
index 8ee0e9be2a5..23e565f8156 100644
--- a/security/pinentry/Makefile
+++ b/security/pinentry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:17 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= pinentry-0.7.1
@@ -31,7 +31,7 @@ PLIST_SUBST+= USE_GTK='@comment '
.endif
.if !empty(PKG_OPTIONS:Mqt)
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PLIST_SUBST+= USE_QT=
. include "../../x11/qt3-libs/buildlink3.mk"
.else
diff --git a/security/putty/Makefile b/security/putty/Makefile
index d54d2849f3e..2e8583d6bb9 100644
--- a/security/putty/Makefile
+++ b/security/putty/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/13 16:45:46 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= putty-0.58
@@ -9,7 +9,7 @@ MAINTAINER= xtraeme@NetBSD.org
HOMEPAGE= http://www.chiark.greenend.org.uk/~sgtatham/putty/
COMMENT= Free implementation of Telnet and SSH for Win32 and Unix platforms
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
BUILD_DIRS= ${WRKSRC}/unix
diff --git a/security/py-crack/Makefile b/security/py-crack/Makefile
index ae90a11f65c..3aabab8bfd3 100644
--- a/security/py-crack/Makefile
+++ b/security/py-crack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:30 jlam Exp $
#
DISTNAME= pycrack-0.01
@@ -14,7 +14,7 @@ DEPENDS+= crack>=5.0:../../security/crack
MAKE_ENV+= MANDIR=${LOCALBASE}/man
MAKE_ENV+= BINDIR=${LOCALBASE}/bin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PYDISTUTILSPKG= yes
PYBINMODULE= yes
diff --git a/security/qca-tls/Makefile b/security/qca-tls/Makefile
index 8fc8ba58b7f..7041f8f915b 100644
--- a/security/qca-tls/Makefile
+++ b/security/qca-tls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:31 jlam Exp $
DISTNAME= qca-tls-1.0
PKGREVISION= # empty
@@ -10,7 +10,7 @@ MAINTAINER= jdolecek@NetBSD.org
HOMEPAGE= http://delta.affinix.com/qca/
COMMENT= Cross-platform crypto API for QT - TLS plugin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/security/qca/Makefile b/security/qca/Makefile
index 3f84c0a1391..d2325185e12 100644
--- a/security/qca/Makefile
+++ b/security/qca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:18 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:31 jlam Exp $
DISTNAME= qca-1.0
PKGREVISION= # empty
@@ -10,7 +10,7 @@ MAINTAINER= jdolecek@NetBSD.org
HOMEPAGE= http://delta.affinix.com/qca/
COMMENT= Cross-platform crypto API for QT
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
HAS_CONFIGURE= yes
diff --git a/security/seahorse/Makefile b/security/seahorse/Makefile
index 8f12a144469..3caed767863 100644
--- a/security/seahorse/Makefile
+++ b/security/seahorse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/19 21:14:11 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2005/05/22 20:08:31 jlam Exp $
DISTNAME= seahorse-0.7.8
CATEGORIES= security
@@ -14,7 +14,7 @@ DEPENDS+= gnupg>=1.2.1:../../security/gnupg
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/security/sign/Makefile b/security/sign/Makefile
index ad0e22f58dc..6c76f5e8538 100644
--- a/security/sign/Makefile
+++ b/security/sign/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:19 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:31 jlam Exp $
#
DISTNAME= sign-1.0.4
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://swapped.cc/sign/
COMMENT= File signing and signature verification utility
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/src/sign ${PREFIX}/bin
diff --git a/security/skey/Makefile b/security/skey/Makefile
index 186ca8f8b0a..d6d4498f1a7 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/27 20:48:32 hira Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:31 jlam Exp $
#
DISTNAME= skey-1.1.5
@@ -11,7 +11,7 @@ HOMEPAGE= ${MASTER_SITES}
COMMENT= Port of OpenBSD s/key implementation
USE_PERL5= build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/security/ssldump/Makefile b/security/ssldump/Makefile
index a9d3a901eef..382f535dd33 100644
--- a/security/ssldump/Makefile
+++ b/security/ssldump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:20 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:31 jlam Exp $
#
DISTNAME= ssldump-0.9b3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.rtfm.com/ssldump/
COMMENT= SSLv3/TLS network protocol analyzer
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+=--with-pcap-inc=${BUILDLINK_PREFIX.libpcap}/include \
--with-pcap-lib=${BUILDLINK_PREFIX.libpcap}/lib \
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 83f1cb3b2e6..2002582a532 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:31 jlam Exp $
DISTNAME= zebedee-2.5.2
CATEGORIES= security
@@ -10,7 +10,7 @@ COMMENT= Simple tunneling program for TCP or UDP with encryption
DEPENDS+= tcl-[0-9]*:../../lang/tcl
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
MAKE_ENV+= PERL5=${PERL5}
diff --git a/shells/xsh/Makefile b/shells/xsh/Makefile
index 89156cf6cc4..8f7150eb092 100644
--- a/shells/xsh/Makefile
+++ b/shells/xsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:21 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:31 jlam Exp $
DISTNAME= XML-XSH-1.8.2
PKGNAME= ${DISTNAME:S/XML-XSH/xsh/}
@@ -17,7 +17,7 @@ DEPENDS+= p5-XML-NodeFilter-[0-9]*:../../textproc/p5-XML-NodeFilter
DEPENDS+= p5-XML-LibXML-XPathContext-[0-9]*:../../textproc/p5-XML-LibXML-XPathContext
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKG_SHELL= ${PREFIX}/bin/xsh
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/XML/XSH/.packlist
diff --git a/sysutils/acpi-iasl/Makefile b/sysutils/acpi-iasl/Makefile
index 53beb7d0708..17d0b9d91d2 100644
--- a/sysutils/acpi-iasl/Makefile
+++ b/sysutils/acpi-iasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:31 jlam Exp $
#
DISTNAME= acpica-unix-${ACPI_IASL_VERSION}
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
INSTALLATION_DIRS= bin share/doc/acpi-iasl
-USE_GNU_TOOLS+= m4 make yacc
+USE_TOOLS+= bison gm4 gmake
do-build:
@cd ${WRKSRC}/compiler && ${MAKE_PROGRAM}
diff --git a/sysutils/acpidump/Makefile b/sysutils/acpidump/Makefile
index 6ff20f0571d..73d61454672 100644
--- a/sysutils/acpidump/Makefile
+++ b/sysutils/acpidump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:31 jlam Exp $
#
DISTNAME= pacpidump
@@ -10,7 +10,7 @@ MAINTAINER= uebayasi@NetBSD.org
HOMEPAGE= ${MASTER_SITES} # Just a directory list. :-)
COMMENT= Portable ACPI table dumper
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= # null
do-install:
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index b1a0688f7fc..eec25c600ba 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:31 jlam Exp $
PKGNAME= amanda-server-${VERS}
# PKGREVISION= 1
@@ -7,7 +7,7 @@ SVR4_PKGNAME= amase
COMMENT= Server part of Amanda, a network backup system
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
.include "../../sysutils/amanda-common/Makefile.common"
diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile
index 5558a0a6825..8a8ba4df172 100644
--- a/sysutils/apcupsd/Makefile
+++ b/sysutils/apcupsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.35 2005/05/22 20:08:31 jlam Exp $
DISTNAME= apcupsd-3.8.6
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= UPS power management for APCC Products
BUILD_USES_MSGFMT= yes
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
diff --git a/sysutils/burn/Makefile b/sysutils/burn/Makefile
index 0889689e2c0..988799ff533 100644
--- a/sysutils/burn/Makefile
+++ b/sysutils/burn/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/05/16 10:51:17 rh Exp $
+# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:31 jlam Exp $
#
DISTNAME= burn-0.4.0
@@ -17,7 +17,7 @@ DEPENDS+= gworkspace-[0-9]*:../../sysutils/gworkspace
NO_CONFIGURE= YES
USE_X11= YES
MAKEFILE= GNUmakefile
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/${PKGBASE}
MAKE_ENV+= ADDITIONAL_CPPFLAGS=-D_POSIX_SOURCE
MAKE_ENV+= ADDITIONAL_LDFLAGS=-lutil
diff --git a/sysutils/ccze/Makefile b/sysutils/ccze/Makefile
index 81eb42ab205..113b59f20ac 100644
--- a/sysutils/ccze/Makefile
+++ b/sysutils/ccze/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:31 jlam Exp $
DISTNAME= ccze-0.2.1
CATEGORIES= sysutils
@@ -13,7 +13,7 @@ INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6*
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../devel/ncurses/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
diff --git a/sysutils/cdrdao/Makefile b/sysutils/cdrdao/Makefile
index af8204e4c62..16360248f6c 100644
--- a/sysutils/cdrdao/Makefile
+++ b/sysutils/cdrdao/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:31 jlam Exp $
#
DISTNAME= cdrdao-1.1.9
@@ -12,7 +12,7 @@ COMMENT= Records audio or data CD-Rs in disk-at-once (DAO) mode
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS+= --with-pcctsbin=${PREFIX}/bin
CONFIGURE_ARGS+= --with-pcctsinc=${PREFIX}/include/pccts
diff --git a/sysutils/cdrecord-xcdroast/Makefile b/sysutils/cdrecord-xcdroast/Makefile
index 8efc7e948c4..7eccc45e19f 100644
--- a/sysutils/cdrecord-xcdroast/Makefile
+++ b/sysutils/cdrecord-xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:31 jlam Exp $
DISTNAME= cdrtools-2.01a21
PKGNAME= cdrecord-xcdroast-0.98a15.2.01a21
@@ -16,7 +16,7 @@ CONFLICTS+= cdrecord-xcdroast098a13-*
.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/${DISTNAME:C/a.*//}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.if ${LOCALBASE} != "/opt/schily"
BUILDLINK_TRANSFORM= rmdir:/opt/schily
diff --git a/sysutils/cdrecord/Makefile b/sysutils/cdrecord/Makefile
index f7a4390dedd..0b26a8755a7 100644
--- a/sysutils/cdrecord/Makefile
+++ b/sysutils/cdrecord/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.65 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.66 2005/05/22 20:08:31 jlam Exp $
DISTNAME= cdrtools-2.00.3
PKGNAME= cdrecord-2.00.3
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/bsd.prefs.mk"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_TBL= yes
# avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/cdrtools-ossdvd/Makefile b/sysutils/cdrtools-ossdvd/Makefile
index aff39eac992..de5fcbd23c3 100644
--- a/sysutils/cdrtools-ossdvd/Makefile
+++ b/sysutils/cdrtools-ossdvd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:22 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:31 jlam Exp $
DISTNAME= cdrtools-2.01a32
PKGNAME= cdrtools-ossdvd-2.01.1.32
@@ -20,7 +20,7 @@ CONFLICTS= mkisofs-[0-9]* cdrecord-[0-9]* cdrtools-*
.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/cdrtools-2.01
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_TBL= yes
.if ${LOCALBASE} != "/opt/schily"
diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common
index 2dfefec6aee..b62b59f5bfc 100644
--- a/sysutils/dbus/Makefile.common
+++ b/sysutils/dbus/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2005/05/08 12:55:45 kristerw Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/05/22 20:08:31 jlam Exp $
#
# XXX Do not update to 0.30 or above yet. The API in the 0.2x series is
@@ -18,7 +18,7 @@ DISTINFO_FILE= ${.CURDIR}/../../sysutils/dbus/distinfo
PATCHDIR= ${.CURDIR}/../../sysutils/dbus/patches
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
diff --git a/sysutils/dog/Makefile b/sysutils/dog/Makefile
index 03c2d2043f9..bd81e4396e5 100644
--- a/sysutils/dog/Makefile
+++ b/sysutils/dog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/03/24 21:13:01 wiz Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:32 jlam Exp $
DISTNAME= dog-1.7
CATEGORIES= misc
@@ -8,7 +8,7 @@ MAINTAINER= zuntum@NetBSD.org
HOMEPAGE= http://jl.photodex.com/dog/
COMMENT= Dog writes the contents of each given file, URL, or stdin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= dog
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index 56e8d571ead..dee439cc739 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= extipl-5.04
@@ -12,6 +12,6 @@ COMMENT= IPL compatible OS boot selector
BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}/src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 29605d6db0a..288d41489f5 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/05/09 23:13:33 jschauma Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= fam-2.7.0
@@ -17,7 +17,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
# fam is bundled with IRIX
NOT_FOR_PLATFORM= IRIX-*-*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
diff --git a/sysutils/fsv/Makefile b/sysutils/fsv/Makefile
index cd98da598ad..f0ffc6edb36 100644
--- a/sysutils/fsv/Makefile
+++ b/sysutils/fsv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= fsv-0.9
@@ -11,7 +11,7 @@ HOMEPAGE= http://fsv.sourceforge.net/
COMMENT= 3D filesystem visualizer
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
.include "../../x11/gtkglarea/buildlink3.mk"
diff --git a/sysutils/fsviewer/Makefile b/sysutils/fsviewer/Makefile
index 407c7213b02..963a748c39c 100644
--- a/sysutils/fsviewer/Makefile
+++ b/sysutils/fsviewer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:32 jlam Exp $
DISTNAME= FSViewer.app-0.2.5
PKGNAME= FSViewer-0.2.5
@@ -13,7 +13,7 @@ MAINTAINER= johnam@mail.kemper.org
HOMEPAGE= http://www.bayernline.de/~gscholz/linux/fsviewer/
COMMENT= NextStep-like Filemanager for WindowMaker
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/gcdmaster/Makefile b/sysutils/gcdmaster/Makefile
index 24274ec026a..1bbb16450a4 100644
--- a/sysutils/gcdmaster/Makefile
+++ b/sysutils/gcdmaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= cdrdao-1.1.9
@@ -17,7 +17,7 @@ WRKSRC= ${WRKDIR}/cdrdao-1.1.9
USE_X11BASE= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome1-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --with-pcctsbin=${LOCALBASE}/bin
CONFIGURE_ARGS+= --with-pcctsinc=${LOCALBASE}/include/pccts
CONFIGURE_ARGS+= --without-posix-threads
diff --git a/sysutils/gkrellm/Makefile.common b/sysutils/gkrellm/Makefile.common
index 0c95f557016..89bea1d1a4b 100644
--- a/sysutils/gkrellm/Makefile.common
+++ b/sysutils/gkrellm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2005/03/22 15:14:41 cube Exp $
+# $NetBSD: Makefile.common,v 1.11 2005/05/22 20:08:32 jlam Exp $
DISTNAME= ${GKRELLM_DISTBASE}
PKGNAME= ${GKRELLM_PKGBASE}-${GKRELLM_VERSION}
@@ -11,7 +11,7 @@ HOMEPAGE= http://gkrellm.net/
CONFLICTS+= gkrellm-1*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale
diff --git a/sysutils/gkrellm1/Makefile b/sysutils/gkrellm1/Makefile
index 4b9fc68c9bf..f9d85ff50ff 100644
--- a/sysutils/gkrellm1/Makefile
+++ b/sysutils/gkrellm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= gkrellm-1.2.13
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
OSVERSION_SPECIFIC= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
CONFLICTS+= gkrellm-share>=2.0
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 5eb698afde1..36a7f23069e 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/19 11:00:57 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= gnome-menus-2.10.1
@@ -13,7 +13,7 @@ COMMENT= Implementation of the desktop menu specification for GNOME
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.2
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 9bd035354dc..856dcc6a6bf 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/04/15 02:09:26 rh Exp $
+# $NetBSD: Makefile,v 1.48 2005/05/22 20:08:32 jlam Exp $
DISTNAME= gnome-vfs-1.0.5
PKGREVISION= 8
@@ -14,7 +14,7 @@ BUILDLINK_DEPENDS.gnome-mime-data= gnome-mime-data>=2.0.1
USE_PKGLOCALEDIR= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common
index ed51e0046b0..9f022d7a429 100644
--- a/sysutils/gnome-vfs2/Makefile.common
+++ b/sysutils/gnome-vfs2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2005/05/18 16:08:17 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.17 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= gnome-vfs-2.10.1
@@ -19,7 +19,7 @@ PATCHDIR= ${.CURDIR}/../../sysutils/gnome-vfs2/patches
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
diff --git a/sysutils/gnome-vfsmm26/Makefile b/sysutils/gnome-vfsmm26/Makefile
index caefec252c5..ff4aab9f5f4 100644
--- a/sysutils/gnome-vfsmm26/Makefile
+++ b/sysutils/gnome-vfsmm26/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= gnome-vfsmm-2.6.1
@@ -16,7 +16,7 @@ USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
PKGCONFIG_OVERRIDE+= ${WRKSRC}/libgnomevfs/gnome-vfsmm-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/sysutils/gnome2-system-monitor/Makefile b/sysutils/gnome2-system-monitor/Makefile
index f4230575fe9..1d287771c1c 100644
--- a/sysutils/gnome2-system-monitor/Makefile
+++ b/sysutils/gnome2-system-monitor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/19 21:11:56 jmmv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= gnome-system-monitor-2.10.1
@@ -16,7 +16,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
LIBS+= -lutil
diff --git a/sysutils/gnometoaster/Makefile b/sysutils/gnometoaster/Makefile
index 06ada03e5d4..a102af5a195 100644
--- a/sysutils/gnometoaster/Makefile
+++ b/sysutils/gnometoaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= gtoaster1.0Beta5
@@ -14,7 +14,7 @@ COMMENT= CD recording frontend for X/GTK+
WRKSRC= ${WRKDIR}/gtoaster
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-oss --without-esd
diff --git a/sysutils/gpart/Makefile b/sysutils/gpart/Makefile
index b63db0b3a9b..dcf642f6605 100644
--- a/sysutils/gpart/Makefile
+++ b/sysutils/gpart/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/01/31 22:56:11 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:32 jlam Exp $
DISTNAME= gpart-0.1h
CATEGORIES= sysutils
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://home.pages.de/~michab/gpart/
COMMENT= Tool to show the partitions on a PC type harddisk
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# Doesn't work on 1.4.x due to problems with dlopen
NOT_FOR_PLATFORM= NetBSD-1.4*-*
diff --git a/sysutils/grub/Makefile b/sysutils/grub/Makefile
index 9cea9f87a21..e0022022121 100644
--- a/sysutils/grub/Makefile
+++ b/sysutils/grub/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/09 17:35:16 xtraeme Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= grub-0.97
@@ -12,7 +12,7 @@ COMMENT= GRand Unified Bootloader -- Boots *BSD, Linux, groks ffs, FAT, ext2
ONLY_FOR_PLATFORM= *-*-i386
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INFO_FILES= grub.info multiboot.info
diff --git a/sysutils/grun/Makefile b/sysutils/grun/Makefile
index ca0d78529b1..6244355cefa 100644
--- a/sysutils/grun/Makefile
+++ b/sysutils/grun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:24 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:32 jlam Exp $
DISTNAME= grun-0.9.2
PKGREVISION= 3
@@ -11,7 +11,7 @@ COMMENT= GTK+ based Run dialog
USE_X11= YES
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PTHREAD_OPTS+= require
post-install:
diff --git a/sysutils/idesk/Makefile b/sysutils/idesk/Makefile
index e50dfe345db..9da3820aab1 100644
--- a/sysutils/idesk/Makefile
+++ b/sysutils/idesk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:32 jlam Exp $
#
DISTNAME= idesk-0.3.5
@@ -10,7 +10,7 @@ MAINTAINER= pancake@phreaker.net
HOMEPAGE= http://sourceforge.net/projects/idesk/
COMMENT= Gives users of minimal WMs icons on their desktop
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
do-install:
diff --git a/sysutils/isapnptools/Makefile b/sysutils/isapnptools/Makefile
index 7534a1d4849..7c6164b0f8b 100644
--- a/sysutils/isapnptools/Makefile
+++ b/sysutils/isapnptools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/24 15:06:57 grant Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= isapnptools-1.26
@@ -14,7 +14,7 @@ COMMENT= Manually query and configure isapnp devices
ONLY_FOR_PLATFORM= NetBSD-*-i386
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS= --disable-realtime --disable-pci
diff --git a/sysutils/kdirstat/Makefile b/sysutils/kdirstat/Makefile
index 8eed943b53f..a201edfe27c 100644
--- a/sysutils/kdirstat/Makefile
+++ b/sysutils/kdirstat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:33 jlam Exp $
DISTNAME= kdirstat-2.4.0
PKGREVISION= 3
@@ -10,7 +10,7 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://kdirstat.sourceforge.net/
COMMENT= A graphical disk usage utility
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/krusader/Makefile b/sysutils/krusader/Makefile
index 40c983d3c1b..ab99460ef0e 100644
--- a/sysutils/krusader/Makefile
+++ b/sysutils/krusader/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= krusader-1.51
@@ -9,7 +9,7 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://krusader.sourceforge.net/
COMMENT= Advanced twin-panel (commander-style) file-manager for KDE 3.x
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index b1d76d4702b..ca1c79365d2 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:33 jlam Exp $
DISTNAME= libgtop-2.10.1
PKGNAME= ${DISTNAME:S/-/2-/}
@@ -17,7 +17,7 @@ USE_MSGFMT_PLURALS= YES
USE_PERL5= build
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libgtop-2.0.pc.in
PKGCONFIG_OVERRIDE+= support/gnome-support-2.0.pc.in
diff --git a/sysutils/mc/Makefile b/sysutils/mc/Makefile
index db7974b8bc0..7efeb283ff8 100644
--- a/sysutils/mc/Makefile
+++ b/sysutils/mc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/05/12 07:12:14 rillig Exp $
+# $NetBSD: Makefile,v 1.56 2005/05/22 20:08:33 jlam Exp $
DISTNAME= mc-4.6.1-pre4a
PKGNAME= mc-4.6.1rc4
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.ibiblio.org/mc/
COMMENT= User-friendly file manager and visual shell
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
# see options.mk for an explanation of these options
diff --git a/sysutils/memtest86/Makefile b/sysutils/memtest86/Makefile
index 0bc07b2c1f5..c3d889c9451 100644
--- a/sysutils/memtest86/Makefile
+++ b/sysutils/memtest86/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:25 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= memtest86-3.1a
@@ -11,7 +11,7 @@ COMMENT= Thorough, stand alone memory test for x86 arch
ONLY_FOR_PLATFORM= NetBSD-*-i386 Linux-*-i386
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_DATA_DIR} ${PREFIX}/mdec
diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index b9e857bb0f7..49a7d2eb806 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/04 08:56:18 adam Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:33 jlam Exp $
DISTNAME= mtools-3.9.10
CATEGORIES= sysutils
@@ -12,7 +12,7 @@ COMMENT= FAT (MS-DOS, Atari) disk access tools
NOT_FOR_PLATFORM = *-*-alpha *-*-sparc64 # LP64 problem
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= YES
INFO_FILES= mtools.info
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index 1cfc6e4b292..c255994b512 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/25 19:25:25 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= nautilus-cd-burner-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
USE_MSGFMT_PLURALS= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index d7b9f9c5ebe..f7f8b9c3550 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/05/18 17:23:05 jmmv Exp $
+# $NetBSD: Makefile,v 1.47 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= nautilus-2.10.1
@@ -13,7 +13,7 @@ COMMENT= Nautilus file manager for GNOME2
USE_PKGLOCALEDIR= yes
USE_DIRS+= xdg-1.1
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/pciutils/Makefile b/sysutils/pciutils/Makefile
index 33554d49bfe..461665ac5d5 100644
--- a/sysutils/pciutils/Makefile
+++ b/sysutils/pciutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:28 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:33 jlam Exp $
DISTNAME= pciutils-2.1.11
CATEGORIES= sysutils
@@ -10,7 +10,7 @@ MAINTAINER= cube@NetBSD.org
HOMEPAGE= http://atrey.karlin.mff.cuni.cz/~mj/pciutils.shtml
COMMENT= PCI bus manipulation utility similar to NetBSD pcictl(8)
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
ONLY_FOR_PLATFORM+= AIX-*-* FreeBSD-*-* Linux-*-* NetBSD-*-*
diff --git a/sysutils/pv/Makefile b/sysutils/pv/Makefile
index 2e1f0c238c4..3c1039c5ea6 100644
--- a/sysutils/pv/Makefile
+++ b/sysutils/pv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:28 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= pv-0.8.6
@@ -13,7 +13,7 @@ COMMENT= Monitor the progress of data through a pipeline
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
INFO_FILES= pv.info
diff --git a/sysutils/sformat/Makefile b/sysutils/sformat/Makefile
index e2dddb49565..eb8278ab6e5 100644
--- a/sysutils/sformat/Makefile
+++ b/sysutils/sformat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= sformat-3.5
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
.include "../../mk/bsd.prefs.mk"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
TBL?= tbl
# avoid picking up a bad ${ARCH} during the build
diff --git a/sysutils/smartmontools/Makefile b/sysutils/smartmontools/Makefile
index 60cdcbd373a..886a799553b 100644
--- a/sysutils/smartmontools/Makefile
+++ b/sysutils/smartmontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:33 jlam Exp $
DISTNAME= smartmontools-5.32
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= Control and monitor storage systems using SMART
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/swapd/Makefile b/sysutils/swapd/Makefile
index f36b64bfed8..51385e619f2 100644
--- a/sysutils/swapd/Makefile
+++ b/sysutils/swapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:29 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= swapd-1.0.3
@@ -11,7 +11,7 @@ COMMENT= Swap daemon for POSIX-compliant operating systems
ONLY_FOR_PLATFORM= NetBSD-*-* SunOS-*-* Linux-*-*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index 03b6e4b336c..830a413e986 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/05/18 18:48:37 drochner Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= vcdimager-0.7.22
@@ -9,7 +9,7 @@ MAINTAINER= ben@NetBSD.org
HOMEPAGE= http://www.vcdimager.org/
COMMENT= Mastering suite for Video CDs
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= yes
INFO_FILES= vcd-info.info vcdimager.info vcdxrip.info
diff --git a/sysutils/vcdimager/Makefile b/sysutils/vcdimager/Makefile
index 64f0141d7e5..ac8449e30f9 100644
--- a/sysutils/vcdimager/Makefile
+++ b/sysutils/vcdimager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:30 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= vcdimager-0.6.2
@@ -12,7 +12,7 @@ COMMENT= Mastering suite for Video CDs
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
INFO_FILES= vcdimager.info
diff --git a/sysutils/vifm/Makefile b/sysutils/vifm/Makefile
index 0332bbf1034..7abf75fa19c 100644
--- a/sysutils/vifm/Makefile
+++ b/sysutils/vifm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:30 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= vifm-0.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://vifm.sourceforge.net/
COMMENT= Ncurses based file manager with vi like keybindings
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*
diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile
index 3079418c64c..4312fe4b3dd 100644
--- a/sysutils/xcdroast/Makefile
+++ b/sysutils/xcdroast/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:33 jlam Exp $
DISTNAME= xcdroast-0.98alpha15
PKGNAME= xcdroast-0.98a15
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
DEPENDS+= cdrecord-xcdroast-0.98a15.*:../cdrecord-xcdroast
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/sysutils/xen12/Makefile b/sysutils/xen12/Makefile
index 60413a5a3dd..16f2c30ffc4 100644
--- a/sysutils/xen12/Makefile
+++ b/sysutils/xen12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/03/14 16:06:46 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= xeno-1.2-src-040418
@@ -20,7 +20,7 @@ BUILD_TARGET= default
USE_PKGINSTALL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/xentools12/Makefile b/sysutils/xentools12/Makefile
index 9daed2293b8..c191e0c5c32 100644
--- a/sysutils/xentools12/Makefile
+++ b/sysutils/xentools12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:33 jlam Exp $
#
DISTNAME= xeno-1.2-src-040418
@@ -24,7 +24,7 @@ CONF_FILES= ${EGDIR}/defaults ${PKG_SYSCONFDIR}/defaults
CONF_FILES+= ${EGDIR}/democd ${PKG_SYSCONFDIR}/democd
CONF_FILES+= ${EGDIR}/netbsd ${PKG_SYSCONFDIR}/netbsd
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= EGDIR="${EGDIR}"
MAKE_ENV+= MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}"
PYTHON_VERSIONS_ACCEPTED= 22 23
diff --git a/sysutils/xentools20/Makefile b/sysutils/xentools20/Makefile
index 68e8f9d79e5..035a66c005f 100644
--- a/sysutils/xentools20/Makefile
+++ b/sysutils/xentools20/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/16 13:35:29 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= xen-2.0.3-src
@@ -23,7 +23,7 @@ WRKSRC= ${WRKDIR}/xen-2.0/tools
EGDIR= ${PREFIX}/share/examples/${PKGNAME_NOREV}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKE_ENV+= EGDIR="${EGDIR}"
MAKE_ENV+= MV="${MV}" PYTHON="${PYTHONBIN}" SED="${SED}"
PYTHON_VERSIONS_ACCEPTED= 24 23 22
diff --git a/sysutils/xfe/Makefile b/sysutils/xfe/Makefile
index 949598115c3..4c8bb7b84d6 100644
--- a/sysutils/xfe/Makefile
+++ b/sysutils/xfe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= xfe-0.54.2
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_X11= yes
diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile
index d4c737a4c09..469bc889d34 100644
--- a/sysutils/xosview/Makefile
+++ b/sysutils/xosview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.52 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.53 2005/05/22 20:08:34 jlam Exp $
DISTNAME= xosview-1.8.2
CATEGORIES= sysutils
@@ -29,7 +29,7 @@ UVM= # defined
BUILD_DEFS= UVM
. endif
.elif ${OPSYS} == "SunOS"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CPPFLAGS+= -I${X11BASE}/include
LIBS+= -lsocket -lnsl
.endif
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index 69325711a0c..f548f933f4d 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:34 jlam Exp $
DISTNAME= xps-4.2
CATEGORIES= sysutils
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://motif-pstree.sourceforge.net/
COMMENT= Displays the Unix process list as a hierarchical tree
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
GNU_CONFIGURE= yes
diff --git a/textproc/GutenMark/Makefile b/textproc/GutenMark/Makefile
index 2d077432940..c84ec4ed4da 100644
--- a/textproc/GutenMark/Makefile
+++ b/textproc/GutenMark/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= GutenMark_source_${GVER}
@@ -15,7 +15,7 @@ DEPENDS+= GutenMark-words-[0-9]*:../../textproc/GutenMark-words
WRKSRC= ${WRKDIR}/GutenMark-source
GVER= 20020714
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= GutenMark
do-install:
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index b8453a7f7a0..2aefbb91d11 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:47:31 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= aspell-0.60.2
@@ -13,7 +13,7 @@ CONFLICTS= libpspell-[0-9]*
USE_PERL5= run # for bin/aspell-import
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile
index 8724ee42b53..4295b63505f 100644
--- a/textproc/dict-client/Makefile
+++ b/textproc/dict-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:34 jlam Exp $
DISTNAME= dictd-1.9.15
PKGNAME= dict-client-1.9.15
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@netbsd.org
HOMEPAGE= http://www.dict.org/
COMMENT= Dictionary Service Protocol client
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-cflags="${CFLAGS}"
CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}
diff --git a/textproc/dict-dictionaries/Makefile b/textproc/dict-dictionaries/Makefile
index 0cab138d7f2..3544900bab6 100644
--- a/textproc/dict-dictionaries/Makefile
+++ b/textproc/dict-dictionaries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:34 jlam Exp $
DISTNAME= #
PKGNAME= dict-data-1.8.0
@@ -17,7 +17,7 @@ COMMENT= Dictionary data for DICTD
DEPENDS= dict-server>=1.8.0nb1:../../textproc/dict-server
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# Strip '.gz', strip '.tar'.
DICTIONARIES= ${DISTFILES:R:R}
diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile
index c17a9783c86..723b6049c1e 100644
--- a/textproc/dict-server/Makefile
+++ b/textproc/dict-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:34 jlam Exp $
DISTNAME= dictd-1.9.15
PKGNAME= dict-server-1.9.15
@@ -10,7 +10,7 @@ MAINTAINER= mike@ethmoid.org
HOMEPAGE= http://www.dict.org/
COMMENT= Dictionary Service Protocol server
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-cflags="${CFLAGS}"
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index f47f9dcf7a0..d5a1e41633b 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/05/16 01:15:33 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:34 jlam Exp $
DISTNAME= eb-4.1.3
CATEGORIES= textproc japanese
@@ -52,7 +52,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV}
PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
USE_PERL5= build
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index 08d768886d4..598a0c09982 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= expat-1.95.8
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
DOCDIR= ${PREFIX}/share/doc/html/expat
diff --git a/textproc/expatobjc/Makefile b/textproc/expatobjc/Makefile
index 92461fb2de6..c518b1c7c08 100644
--- a/textproc/expatobjc/Makefile
+++ b/textproc/expatobjc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= expatobjc-1.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://expatobjc.sourceforge.net/
COMMENT= Objective-C Wrapper for Expat
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ENV+= objc_works=yes
diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile
index 1367a66f93e..d426657f675 100644
--- a/textproc/freepwing/Makefile
+++ b/textproc/freepwing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/06 03:25:13 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:34 jlam Exp $
DISTNAME= freepwing-1.4.4
PKGREVISION= 1
@@ -13,7 +13,7 @@ DEPENDS+= p5-Jcode-[0-9]*:../../converters/p5-Jcode
GNU_CONFIGURE= yes
CONFIGURE_ARGS+=--with-pkgdocdir=${PREFIX}/share/doc/freepwing
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= yes
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/glimpse/Makefile b/textproc/glimpse/Makefile
index eab67c69162..3b6c87445db 100644
--- a/textproc/glimpse/Makefile
+++ b/textproc/glimpse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/03/24 21:13:02 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:34 jlam Exp $
DISTNAME= glimpse-4.17.2
PKGREVISION= 1
@@ -14,7 +14,7 @@ RESTRICTED= "Restrictive copyright (don't sell for profit)"
NO_SRC_ON_CDROM= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
post-install:
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 57724cffdac..af720a8e557 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:34 jlam Exp $
DISTNAME= gnome-spell-1.0.6
CATEGORIES= textproc gnome
@@ -12,7 +12,7 @@ COMMENT= Spell checking as you type like gtkspell
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.3
USE_PKGLOCALEDIR= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
BUILDLINK_DEPENDS.libgnomeui+= libgnomeui>=2.8.0nb3
diff --git a/textproc/gocr/Makefile b/textproc/gocr/Makefile
index fa28fc7d5ec..a1619778745 100644
--- a/textproc/gocr/Makefile
+++ b/textproc/gocr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:34 jlam Exp $
DISTNAME= gocr-0.37
CATEGORIES= textproc
@@ -9,6 +9,6 @@ HOMEPAGE= http://sourceforge.net/projects/jocr
COMMENT= GOCR is a set of OCR tools
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.pkg.mk"
diff --git a/textproc/gsed/Makefile b/textproc/gsed/Makefile
index 4b20165bb40..4c670771e73 100644
--- a/textproc/gsed/Makefile
+++ b/textproc/gsed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:34 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= sed-4.1.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
CONFIG_STATUS_OVERRIDE= # empty
# at least Solaris-2.9 has issues with grep/egrep
-USE_GNU_TOOLS+= grep
+USE_TOOLS+= grep
INFO_FILES= sed.info
diff --git a/textproc/helpdeco/Makefile b/textproc/helpdeco/Makefile
index e6d5fef6565..5742302c606 100644
--- a/textproc/helpdeco/Makefile
+++ b/textproc/helpdeco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/19 18:34:34 ben Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= helpdeco-2.1.1
@@ -17,7 +17,7 @@ CFLAGS+= -DHAVE_STRLCPY
MAKE_ENV+= CFLAGS="${CFLAGS}"
BUILD_TARGET= build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
SUBST_CLASSES+= prefix
SUBST_MESSAGE.prefix= "Configuring to use PREFIX."
diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile
index 7f5954936a0..bb44ce1a5e6 100644
--- a/textproc/icu/Makefile
+++ b/textproc/icu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/04/11 21:47:35 tv Exp $
+# $NetBSD: Makefile,v 1.40 2005/05/22 20:08:34 jlam Exp $
#
DISTNAME= icu-3.2
@@ -12,7 +12,7 @@ HOMEPAGE= http://ibm.com/software/globalization/icu/
COMMENT= Robust and full-featured Unicode services
WRKSRC= ${WRKDIR}/${PKGBASE}/source
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= YES
USE_LANGUAGES= c c++
TEST_TARGET= check
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index bc2e4743b12..39b50060553 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/22 05:35:33 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= intltool-0.33
@@ -16,7 +16,7 @@ DEPENDS+= p5-XML-Parser>=2.31nb1:../../textproc/p5-XML-Parser
CONFLICTS= xml-i18n-tools-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
.include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/textproc/ispell-german/Makefile b/textproc/ispell-german/Makefile
index e7417bac4a1..cf3008ba988 100644
--- a/textproc/ispell-german/Makefile
+++ b/textproc/ispell-german/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:15:11 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= igerman98-20030222
@@ -14,7 +14,7 @@ COMMENT= German dictionary for interactive spelling checker
DEPENDS+= ispell-base>=3.1.20nb1:../../textproc/ispell-base
BUILD_TARGET= german.hash
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
REPLACE_PERL= bin/dic2iso.pl bin/grepl bin/sq.pl bin/myspellfixprefix.pl \
bin/clear_affix.pl bin/unsq.pl bin/uniqflag.pl
diff --git a/textproc/ja-groff/Makefile b/textproc/ja-groff/Makefile
index 41276c6210d..b58f978a5d9 100644
--- a/textproc/ja-groff/Makefile
+++ b/textproc/ja-groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/03/24 21:13:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:35 jlam Exp $
DISTNAME= groff-1.10
PKGNAME= ja-groff-0.99
@@ -14,7 +14,7 @@ MAINTAINER= sakamoto@NetBSD.org
HOMEPAGE= http://www.gnu.org/software/groff/groff.html
COMMENT= Japanese enhancement of GNU groff
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
#CONFIGURE_ENV+= CXXFLAGS="-fno-rtti -fno-exceptions -O"
diff --git a/textproc/ja-sed/Makefile b/textproc/ja-sed/Makefile
index 5112877bebf..8bf1316b651 100644
--- a/textproc/ja-sed/Makefile
+++ b/textproc/ja-sed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/03/24 21:13:02 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:35 jlam Exp $
DISTNAME= sed-3.02
PKGNAME= ja-sed-3.02
@@ -17,7 +17,7 @@ INFO_FILES= sed.info
CONFLICTS+= gsed-[0-9]*
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --program-transform-name='s,^,j,'
diff --git a/textproc/jade/Makefile b/textproc/jade/Makefile
index b99079521a2..52144646ff4 100644
--- a/textproc/jade/Makefile
+++ b/textproc/jade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:35 jlam Exp $
DISTNAME= jade-1.2.1
PKGREVISION= 9
@@ -18,7 +18,7 @@ PATCH_DIST_STRIP= -p1
CONFLICTS+= sp-[0-9]*
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
LTCONFIG_OVERRIDE= ${WRKSRC}/config/ltconfig
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index f5d74648dee..b9d3078cbaf 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:35 jlam Exp $
DISTNAME= kakasi-2.3.4
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://kakasi.namazu.org/
COMMENT= Kanji-Kana Simple Inverter, language filter for Japanese
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
post-install:
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 9b841cb5772..8e1d22681c7 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= libcroco-0.6.0
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.freespiders.org/projects/libcroco/
COMMENT= Toolkit to parse and manipulate CSS (Cascading Style Sheets)
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index baef3169108..7397d884e1c 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:35 jlam Exp $
DISTNAME= libpathan-1.2-2-src
PKGNAME= ${DISTNAME:S/-2-src/.2/}
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME:S/-2-src//}
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PERL5= build
USE_LANGUAGES= c++
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index aef40004d2d..7e50cdaf788 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.69 2005/05/22 20:08:35 jlam Exp $
DISTNAME= libxml2-2.6.19
CATEGORIES= textproc
@@ -12,7 +12,7 @@ COMMENT= XML parser library from the GNOME project
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= libxml-2.0.pc.in
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index fe55e2a1eaf..7f48fe020f0 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.57 2005/05/22 20:08:35 jlam Exp $
DISTNAME= libxslt-1.1.14
PKGNAME= ${DISTNAME}
@@ -12,7 +12,7 @@ COMMENT= XSLT parser library from the GNOME project
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PERL5= build
PKGCONFIG_OVERRIDE= libxslt.pc.in
diff --git a/textproc/lua-expat/Makefile b/textproc/lua-expat/Makefile
index 864b0f44467..2652a5a7b00 100644
--- a/textproc/lua-expat/Makefile
+++ b/textproc/lua-expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:36 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= luaexpat-1.0a
@@ -11,7 +11,7 @@ MAINTAINER= pancake@phreaker.net
HOMEPAGE= http://www.tecgraf.puc-rio.br/~diego/luasocket/new/
COMMENT= XML parser for LUA based on expat
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
do-install:
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index f8fbd7e6088..f31efc42ba5 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/05 05:50:23 hrs Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= openjade-1.3.2
@@ -10,7 +10,7 @@ MAINTAINER= kogule@mars.dti.ne.jp
HOMEPAGE= http://openjade.sourceforge.net/
COMMENT= SGML/XML parser toolkit and DSSSL engine, successor to "jade"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= build
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/textproc/p5-XML-Xerces/Makefile b/textproc/p5-XML-Xerces/Makefile
index ea8bee81f8c..5681dd8d370 100644
--- a/textproc/p5-XML-Xerces/Makefile
+++ b/textproc/p5-XML-Xerces/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= XML-Xerces-2.3.0-4
@@ -15,7 +15,7 @@ CONFLICTS+= XML-Xerces-[0-9]*
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PERL5_REQD+= 5.6.0
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/XML/Xerces/.packlist
diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile
index 433f769d8ee..6710d89ac22 100644
--- a/textproc/postgresql-autodoc/Makefile
+++ b/textproc/postgresql-autodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:47:41 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= postgresql_autodoc-1.24
@@ -15,7 +15,7 @@ DEPENDS+= p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
WRKSRC= ${WRKDIR}/postgresql_autodoc
USE_PERL5= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --datadir=${PREFIX}/share/${PKGBASE}
diff --git a/textproc/regexx/Makefile b/textproc/regexx/Makefile
index ca144938b7c..40e0c28871b 100644
--- a/textproc/regexx/Makefile
+++ b/textproc/regexx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= regexx-0.98.1
@@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://bazar.conectiva.com.br/~niemeyer/projects/regexx/
COMMENT= C++ regular expression library
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/textproc/robodoc/Makefile b/textproc/robodoc/Makefile
index 76ab19b1ae9..68c32409557 100644
--- a/textproc/robodoc/Makefile
+++ b/textproc/robodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= robodoc-3.2.3
@@ -10,7 +10,7 @@ HOMEPAGE= https://sourceforge.net/projects/robodoc/
COMMENT= Tool to support project documentation within source code
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= makefile
diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile
index 766ff45a364..e6c78df6af7 100644
--- a/textproc/rubber/Makefile
+++ b/textproc/rubber/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= rubber-0.99.8
@@ -14,7 +14,7 @@ DEPENDS+= teTeX-bin-[0-9]*:../../print/teTeX-bin
USE_PKGLOCALEDIR= yes
HAS_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_MAKEINFO= yes
INFO_FILES= rubber.info
TEXINFO_REQD= 4.6
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index 3c983a29b14..f3528dea466 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:35 jlam Exp $
DISTNAME= Sablot-1.0.1
PKGNAME= ${DISTNAME:S/Sablot/sablotron/}
@@ -13,7 +13,7 @@ COMMENT= XML toolkit implementing XSLT, DOM, and XPath
BUILD_DEPENDS+= p5-XML-Parser-[0-9]*:../../textproc/p5-XML-Parser
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index c2eb034e804..bf11bd7b7e7 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= scrollkeeper-0.3.14
@@ -17,7 +17,7 @@ BUILD_USES_MSGFMT= yes
DEPENDS= docbook-xml>=4.2nb7:../../textproc/docbook-xml
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
diff --git a/textproc/subtitleripper/Makefile b/textproc/subtitleripper/Makefile
index 1a22d7aa386..53dfd479b7c 100644
--- a/textproc/subtitleripper/Makefile
+++ b/textproc/subtitleripper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:42 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:35 jlam Exp $
#
DISTNAME= subtitleripper-0.3-1
@@ -13,7 +13,7 @@ COMMENT= Sub title ripping program
DEPENDS+= gocr-[0-9]*:../../textproc/gocr
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
WRKSRC= ${WRKDIR}/subtitleripper
do-install:
diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile
index fbc75f8ed85..5a427dfaa28 100644
--- a/textproc/xalan-c/Makefile
+++ b/textproc/xalan-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:36 jlam Exp $
#
DISTNAME= Xalan-C_1_6-src
@@ -12,7 +12,7 @@ HOMEPAGE= http://xml.apache.org/xalan-c/
COMMENT= XSLT processor of the Apache Project
WRKSRC= ${WRKDIR}/xml-xalan/c/src/xalanc
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../mk/bsd.prefs.mk"
diff --git a/textproc/xerces-c/Makefile b/textproc/xerces-c/Makefile
index 12632c042a7..87f1da9066b 100644
--- a/textproc/xerces-c/Makefile
+++ b/textproc/xerces-c/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:36 jlam Exp $
#
DISTNAME= xerces-c-src_2_3_0
@@ -14,7 +14,7 @@ COMMENT= Validating C++ XML parser with DOM and SAX support
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/${DISTNAME}/src/xercesc
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
.include "../../mk/bsd.prefs.mk"
diff --git a/textproc/xml2doc/Makefile b/textproc/xml2doc/Makefile
index 04d405c6e24..70f84ef902a 100644
--- a/textproc/xml2doc/Makefile
+++ b/textproc/xml2doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:42 jlam Exp $
#
DISTNAME= xml2doc-20030510
@@ -14,7 +14,7 @@ COMMENT= Xml to document formats converter
WRKSRC= ${WRKDIR}/xml2doc
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CFLAGS+= -I${BUILDLINK_PREFIX.libxml2}/include/libxml2
CFLAGS+= -I${BUILDLINK_PREFIX.pdflib}/include
diff --git a/textproc/xmlindent/Makefile b/textproc/xmlindent/Makefile
index 7ecfdf24417..297a7f465ba 100644
--- a/textproc/xmlindent/Makefile
+++ b/textproc/xmlindent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:42 jlam Exp $
#
DISTNAME= xmlindent-0.2.16
@@ -11,7 +11,7 @@ COMMENT= XML stream reformatter written in ANSI C
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS+= lex
+USE_TOOLS+= lex
GCC_REQD= 3.0
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index 295dc460123..d0c43bb10d5 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:43 jlam Exp $
DISTNAME= yodl-1.31.18
PKGREVISION= 3
@@ -12,7 +12,7 @@ COMMENT= High-level document preparation system
BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
do-build:
diff --git a/time/anacron/Makefile b/time/anacron/Makefile
index ab2d5d77cbc..fffe573d02f 100644
--- a/time/anacron/Makefile
+++ b/time/anacron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:43 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= anacron-2.3
@@ -10,7 +10,7 @@ MAINTAINER= jmmv@NetBSD.org
HOMEPAGE= http://anacron.sourceforge.net/
COMMENT= Periodic command scheduler
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
.include "../../mk/bsd.prefs.mk"
diff --git a/time/evolution-webcal/Makefile b/time/evolution-webcal/Makefile
index 80baa4a7a0d..2bf7e1f1263 100644
--- a/time/evolution-webcal/Makefile
+++ b/time/evolution-webcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/19 21:05:20 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= evolution-webcal-2.2.1
@@ -12,7 +12,7 @@ COMMENT= GNOME URL handler for web-published iCal calendar files
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= evolution-webcal.schemas
diff --git a/time/gnotime/Makefile b/time/gnotime/Makefile
index 0008cb6340a..c5019f7d4ad 100644
--- a/time/gnotime/Makefile
+++ b/time/gnotime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:47:44 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:43 jlam Exp $
DISTNAME= gnotime-2.2.1
PKGREVISION= # empty
@@ -11,7 +11,7 @@ COMMENT= Time tracker for GNOME2
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/time/gtodo/Makefile b/time/gtodo/Makefile
index 8c0c72b4a86..02088ba4fa5 100644
--- a/time/gtodo/Makefile
+++ b/time/gtodo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:44 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= gtodo-0.14
@@ -12,7 +12,7 @@ COMMENT= To-do list manager for the GNOME desktop
GNU_CONFIGURE= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= gtodo.schemas
diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile
index ba6624798f9..df195856d26 100644
--- a/time/ptimetracker/Makefile
+++ b/time/ptimetracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:43 jlam Exp $
DISTNAME= ptimetracker-1.7.3
PKGREVISION= # empty
@@ -11,7 +11,7 @@ COMMENT= Keep track of the time spent on projects
# USE_GNOME= gnomehack gnomeprefix libgtkhtml libgnomeui
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
do-configure:
diff --git a/time/wmcalclock/Makefile b/time/wmcalclock/Makefile
index da29206e304..96c1a857ea0 100644
--- a/time/wmcalclock/Makefile
+++ b/time/wmcalclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= wmCalClock-1.25
@@ -11,7 +11,7 @@ COMMENT= Another WindowMaker calendar/clock dockapp
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "../../mk/bsd.prefs.mk"
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index a295bbc01cc..eeab2ea69e6 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= wmMoonClock-1.27
@@ -10,7 +10,7 @@ HOMEPAGE= http://nis-www.lanl.gov/~mgh/WindowMaker/DockApps.shtml
COMMENT= Shows lunar ephemeris to fairly high accuracy
WRKSRC= ${WRKDIR}/${DISTNAME}/Src
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11BASE= YES
MAKE_FLAGS+= EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index dc2fa8cae80..be6ca59207a 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= AfterStep-2.00.01
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= run
USE_X11= YES
diff --git a/wm/bbrun/Makefile b/wm/bbrun/Makefile
index e61b712d5f3..af408471185 100644
--- a/wm/bbrun/Makefile
+++ b/wm/bbrun/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:46 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:43 jlam Exp $
DISTNAME= bbrun-1.3
PKGREVISION= 3
@@ -11,7 +11,7 @@ COMMENT= Run utility for BlackBox
WRKSRC= ${WRKDIR}/${DISTNAME}/bbrun
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_TARGET= bbrun
diff --git a/wm/econf/Makefile b/wm/econf/Makefile
index 95e1efb4547..86e246d6e13 100644
--- a/wm/econf/Makefile
+++ b/wm/econf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= enlightenment-conf-0.15
@@ -13,7 +13,7 @@ COMMENT= Configuration tool for easily setting up Enlightenment
USE_LANGUAGES= c c++
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index dccfd47786c..f05e08bc6fe 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:43 jlam Exp $
DISTNAME= enlightenment-0.16.7.2
CATEGORIES= x11 gnome wm
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.enlightenment.org/
COMMENT= Highly themeable and configurable window manager
-USE_GNU_TOOLS+= yacc
+USE_TOOLS+= bison
USE_PERL5= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index 21d123cb706..ab6e58ff89a 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/22 15:55:59 jmcneill Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= fluxbox-0.9.12
@@ -15,7 +15,7 @@ DEPENDS= bsetroot>=0.1nb1:../../wm/bsetroot
USE_X11= YES
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_LIBTOOL= YES
.include "../../mk/bsd.prefs.mk"
diff --git a/wm/golem/Makefile b/wm/golem/Makefile
index 00802e984fb..8e429b50b4a 100644
--- a/wm/golem/Makefile
+++ b/wm/golem/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= golem-0.0.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://golem.sourceforge.net/
COMMENT= Fast and lightweight yet customizable window manager
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common
index a82f2747225..1d394c0caa6 100644
--- a/wm/icewm/Makefile.common
+++ b/wm/icewm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.42 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile.common,v 1.43 2005/05/22 20:08:43 jlam Exp $
DISTNAME= icewm-1.2.20
CATEGORIES= x11 wm
@@ -9,7 +9,7 @@ HOMEPAGE= http://icewm.sourceforge.net/
GNU_CONFIGURE= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
BUILD_USES_MSGFMT= yes
diff --git a/wm/ion/Makefile b/wm/ion/Makefile
index 9789e20fed8..b51c8233ef8 100644
--- a/wm/ion/Makefile
+++ b/wm/ion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= ion-2-20040729
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile
index d723df2dea2..98ce4892493 100644
--- a/wm/ion3-devel/Makefile
+++ b/wm/ion3-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:47 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= ion-3ds-20040906
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_PKGINSTALL= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_PKGLOCALEDIR= YES
diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 0e11b8ad13e..1bb261d97c5 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/26 20:17:33 drochner Exp $
+# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= metacity-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome2-1.5 theme-1.0
USE_PKGLOCALEDIR= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/wm/novawm/Makefile b/wm/novawm/Makefile
index 40c097b640f..7e6667a1034 100644
--- a/wm/novawm/Makefile
+++ b/wm/novawm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:43 jlam Exp $
#
DISTNAME= NovaWM-0.8_alpha
@@ -11,7 +11,7 @@ HOMEPAGE= http://novawm.sourceforge.net/
COMMENT= Nova window manager
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
.include "../../graphics/xpm/buildlink3.mk"
diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile
index fe18df7156a..bd1e4192d63 100644
--- a/wm/openbox/Makefile
+++ b/wm/openbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:43 jlam Exp $
DISTNAME= openbox-3.2
PKGREVISION= 1
@@ -14,7 +14,7 @@ DEPENDS+= vera-ttf>=1.10:../../fonts/vera-ttf
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PKGINSTALL= YES
USE_PKGLOCALEDIR= YES
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index e14e9062f0a..5f2c103357c 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= pekwm-0.1.3
@@ -12,7 +12,7 @@ HOMEPAGE= http://pekwm.org/
COMMENT= Window manager based on aewm++
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_PERL5= run
USE_PKGINSTALL= YES
diff --git a/wm/pwm/Makefile b/wm/pwm/Makefile
index 7372f022123..32a889245db 100644
--- a/wm/pwm/Makefile
+++ b/wm/pwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= pwm-20030617
@@ -16,7 +16,7 @@ CONFLICTS+= ion<=20040729nb2
USE_PKGINSTALL= YES
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CFLAGS+= -DPKG_SYSCONFDIR="\"${PKG_SYSCONFDIR}\""
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index 43e4b7c6bbf..96edf7630dd 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:48 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= qvwm-1.1.12
@@ -12,7 +12,7 @@ COMMENT= Windows 95/98/NT like window manager for X11
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c++
post-install:
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index ff22b63a782..f3b98ab3b54 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/05/22 20:08:44 jlam Exp $
DISTNAME= sawfish-${SF_VERS}-gtk1
SF_VERS= 1.2
@@ -13,7 +13,7 @@ DEPENDS+= rep-gtk>=0.15nb2:../../x11/rep-gtk
USE_X11= # defined
USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
DISTINFO_FILE= ${.CURDIR}/../../wm/sawfish/distinfo
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 7990a21b01d..0f0d4e5ad15 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= waimea-0.4.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.waimea.org/
COMMENT= Fast and highly customizable virtual window manager
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= run
USE_X11= YES
diff --git a/wm/whiteBOX/Makefile b/wm/whiteBOX/Makefile
index da44560eb30..85f86a89780 100644
--- a/wm/whiteBOX/Makefile
+++ b/wm/whiteBOX/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= whiteBOX-0.5
@@ -11,7 +11,7 @@ HOMEPAGE= http://whitebox.sourceforge.net/
COMMENT= Multi-purpose configuration tool for Blackbox
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/wm/windowlab/Makefile b/wm/windowlab/Makefile
index 8179f2aefd8..739dd179ca1 100644
--- a/wm/windowlab/Makefile
+++ b/wm/windowlab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= windowlab-1.12
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.nickgravgaard.com/windowlab/
COMMENT= Small and simple window manager
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
PKG_SYSCONFSUBDIR= windowlab
diff --git a/wm/wmdrawer/Makefile b/wm/wmdrawer/Makefile
index e0c72f350df..c20e9002fbf 100644
--- a/wm/wmdrawer/Makefile
+++ b/wm/wmdrawer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= wmdrawer-0.10.5
@@ -9,7 +9,7 @@ MAINTAINER= joel@carnat.net
HOMEPAGE= http://people.easter-eggs.org/~valos/wmdrawer/
COMMENT= Drawer (retractable button bar) to launch applications
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/wmdrawer ${PREFIX}/bin
diff --git a/www/amaya/Makefile b/www/amaya/Makefile
index b18adc57778..6111eec6ab6 100644
--- a/www/amaya/Makefile
+++ b/www/amaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:47:49 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:44 jlam Exp $
DISTNAME= amaya-fullsrc-9.0
PKGNAME= ${DISTNAME:S/-fullsrc//}
@@ -15,7 +15,7 @@ COMMENT= Web browser/editor from the World Wide Web Consortium (W3C)
EXTRACT_ELEMENTS= Amaya libwww
WRKSRC= ${WRKDIR}/Amaya/work
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
CONFIGURE_SCRIPT= ../configure
diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile
index 0f895883e18..aceed98480f 100644
--- a/www/ap-jk/Makefile
+++ b/www/ap-jk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/04/11 21:47:50 tv Exp $
+# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:44 jlam Exp $
DISTNAME= jakarta-tomcat-connectors-${JK_VERSION}-src
PKGNAME= ap-jk-${JK_VERSION}
@@ -15,7 +15,7 @@ APACHE_MODULE= YES
BUILD_DEFS+= JK_ENABLE_JNI
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
SUBST_CLASSES+= jk-lt
SUBST_STAGE.jk-lt= post-configure
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index f3e4ca0b78f..14e4a3c5be2 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2004/12/29 15:42:38 minskim Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:44 jlam Exp $
DISTNAME= ApacheJServ-1.1.2
PKGNAME= ap-jserv-1.1.2
@@ -14,7 +14,7 @@ DEPENDS+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9]
DEPENDS+= jsdk-2.0:../../www/jsdk20
USE_PERL5= build # for "apxs"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
LTCONFIG_OVERRIDE= ${WRKSRC}/src/scripts/build/unix/ltconfig
GNU_CONFIGURE= yes
diff --git a/www/bluefish/Makefile b/www/bluefish/Makefile
index 3923c1d1b2f..62cc601ed2c 100644
--- a/www/bluefish/Makefile
+++ b/www/bluefish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:44 jlam Exp $
DISTNAME= bluefish-1.0
PKGREVISION= 1
@@ -18,7 +18,7 @@ DEPENDS+= weblint-[0-9]*:../../www/weblint
BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/www/cgicc/Makefile b/www/cgicc/Makefile
index 492969aec7d..4b2882f214f 100644
--- a/www/cgicc/Makefile
+++ b/www/cgicc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/10/03 00:18:25 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:44 jlam Exp $
DISTNAME= cgicc-3.1.5
PKGREVISION= 1
@@ -9,7 +9,7 @@ MAINTAINER= shell@shellhung.org
HOMEPAGE= http://www.gnu.org/software/cgicc/cgicc.html
COMMENT= C++ compliant CGI applications libraries
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/www/clearsilver/Makefile.common b/www/clearsilver/Makefile.common
index b7d3d5682ac..fc47cac0f3f 100644
--- a/www/clearsilver/Makefile.common
+++ b/www/clearsilver/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.4 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile.common,v 1.5 2005/05/22 20:08:44 jlam Exp $
DISTNAME= clearsilver-0.9.14
CLEARSILVER_BASE= ${DISTNAME:S/-/-base-/}
@@ -17,7 +17,7 @@ FILESDIR= ${.CURDIR}/../../www/clearsilver/files
PATCHDIR= ${.CURDIR}/../../www/clearsilver/patches
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --disable-apache
CONFIGURE_ARGS+= --disable-csharp
diff --git a/www/drivel/Makefile b/www/drivel/Makefile
index 43a0d4471f7..f42a6766ed9 100644
--- a/www/drivel/Makefile
+++ b/www/drivel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= drivel-1.2.4
@@ -12,7 +12,7 @@ COMMENT= LiveJournal client for the GNOME Desktop
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
GCONF2_SCHEMAS= drivel.schemas
diff --git a/www/elinks/Makefile b/www/elinks/Makefile
index 240e67aae8b..30a9da95db8 100644
--- a/www/elinks/Makefile
+++ b/www/elinks/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:44 jlam Exp $
DISTNAME= elinks-0.10.4
CATEGORIES= www
@@ -11,7 +11,7 @@ COMMENT= Extended/Enhanced Links
GNU_CONFIGURE= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
CONFIGURE_ARGS+= --without-x
CONFIGURE_ARGS+= --enable-256-colors
diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile
index d2d57bfdb8a..2f5372485d5 100644
--- a/www/epiphany-extensions/Makefile
+++ b/www/epiphany-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/02 16:10:12 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:44 jlam Exp $
#
DISTNAME= epiphany-extensions-1.6.3
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/projects/epiphany/extensions.html
COMMENT= Extensions for the Epiphany web browser
GNU_CONFIGURE= YES
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile
index ba745e1a5cc..1d4bf89e3c8 100644
--- a/www/epiphany/Makefile
+++ b/www/epiphany/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/05/19 20:39:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= epiphany-1.6.3
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_MSGFMT_PLURALS= YES
USE_PKGLOCALEDIR= YES
diff --git a/www/galeon/Makefile b/www/galeon/Makefile
index 383961d2198..3481ebe49c6 100644
--- a/www/galeon/Makefile
+++ b/www/galeon/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.76 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.77 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= galeon-1.3.20
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
CONFLICTS+= galeon-devel-[0-9]*
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile
index daf4979865b..d203c136d7e 100644
--- a/www/galeon12/Makefile
+++ b/www/galeon12/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:45 jlam Exp $
DISTNAME= galeon-1.2.14
PKGREVISION= 4
@@ -20,7 +20,7 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \
--with-mozilla-libs=${BUILDLINK_PREFIX.mozilla}/lib/mozilla \
diff --git a/www/gtkhtml/Makefile b/www/gtkhtml/Makefile
index 9d0bd6c00b5..cb6677d7cdb 100644
--- a/www/gtkhtml/Makefile
+++ b/www/gtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.43 2005/05/22 20:08:45 jlam Exp $
DISTNAME= gtkhtml-1.1.10
PKGREVISION= 5
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/www/gtkhtml3/Makefile b/www/gtkhtml3/Makefile
index 16a8249d918..a9b1e628a75 100644
--- a/www/gtkhtml3/Makefile
+++ b/www/gtkhtml3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/21 19:07:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= gtkhtml-3.2.5
@@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
diff --git a/www/gtkhtml30/Makefile b/www/gtkhtml30/Makefile
index f87c28591ef..273b6dc5eeb 100644
--- a/www/gtkhtml30/Makefile
+++ b/www/gtkhtml30/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:47:53 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= gtkhtml-3.0.10
@@ -12,7 +12,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
diff --git a/www/gtkhtml36/Makefile b/www/gtkhtml36/Makefile
index 41a121350a4..536d1e20d0a 100644
--- a/www/gtkhtml36/Makefile
+++ b/www/gtkhtml36/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/05/18 16:40:13 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= gtkhtml-3.6.2
@@ -11,7 +11,7 @@ MAINTAINER= recht@NetBSD.org
HOMEPAGE= http://www.gnome.org/
COMMENT= Lightweight HTML rendering/printing/editing engine
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE+= src/libgtkhtml.pc.in
diff --git a/www/jssi/Makefile b/www/jssi/Makefile
index fdb699d9eae..ed6a2e3ff1c 100644
--- a/www/jssi/Makefile
+++ b/www/jssi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:45 jlam Exp $
DISTNAME= ApacheJSSI-1.1.2
PKGNAME= jssi-1.1.2
@@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java
.include "../../mk/bsd.prefs.mk"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE=
MAKE_ENV+= CLASSPATH=${CLASSPATH}
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index cfbc92c024c..33df7601d23 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= gateway-${KANNEL_VER}
@@ -14,7 +14,7 @@ COMMENT= Open source WAP and SMS gateway
KANNEL_VER= 1.4.0
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
PTHREAD_OPTS+= require
diff --git a/www/libgtkhtml/Makefile b/www/libgtkhtml/Makefile
index ac91af2701c..b38a478b610 100644
--- a/www/libgtkhtml/Makefile
+++ b/www/libgtkhtml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= libgtkhtml-2.6.3
@@ -13,7 +13,7 @@ COMMENT= Lightweight HTML rendering GTK2 widget
BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/www/libwww/Makefile b/www/libwww/Makefile
index bf290c5ea7e..41cd61ccc42 100644
--- a/www/libwww/Makefile
+++ b/www/libwww/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.60 2005/05/22 20:08:45 jlam Exp $
DISTNAME= w3c-libwww-5.4.0
PKGNAME= libwww-5.4.0
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
SITES_libwww-configure-5.4.0nb1.gz= ${MASTER_SITE_LOCAL}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
USE_PERL5= build
diff --git a/www/liferea/Makefile b/www/liferea/Makefile
index f62deb2a6a7..58c21d5c7d7 100644
--- a/www/liferea/Makefile
+++ b/www/liferea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:45 jlam Exp $
DISTNAME= liferea-0.6.4
CATEGORIES= www
@@ -10,7 +10,7 @@ COMMENT= Simple FeedReader clone for reading RSS/RDF feeds
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/www/lynx/Makefile b/www/lynx/Makefile
index 523e4dd5af0..28e4fa390ff 100644
--- a/www/lynx/Makefile
+++ b/www/lynx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/04/11 21:47:54 tv Exp $
+# $NetBSD: Makefile,v 1.80 2005/05/22 20:08:45 jlam Exp $
#
DISTNAME= lynx2.8.5
@@ -27,7 +27,7 @@ DIST_SUBDIR= lynx
WRKSRC= ${WRKDIR}/${DISTNAME:S/./-/g}
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
INSTALL_TARGET= install-full install-lss
MAKEFILE= makefile
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 4c170b4b9c5..d00e9477e4e 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.54 2005/05/15 02:58:05 taya Exp $
+# $NetBSD: Makefile.common,v 1.55 2005/05/22 20:08:45 jlam Exp $
MOZ_DIST_VER?= ${MOZ_VER}
DISTNAME?= mozilla-${MOZ_DIST_VER}-source
@@ -16,7 +16,7 @@ BUILD_DEPENDS+= zip>=2.3:../../archivers/zip
WRKSRC= ${WRKDIR}/mozilla
USE_LANGUAGES= c c++
USE_PERL5= build
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index a98b0b4a8b9..75a09ad78b2 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/05/22 20:08:46 jlam Exp $
DISTNAME= libapreq2-2.04_03-dev
PKGNAME= p5-libapreq2-2.4.3
@@ -17,7 +17,7 @@ BUILDLINK_DEPENDS.apache+= apache>=2.0.48
BUILDLINK_DEPENDS.ap2-perl+= ap2-perl>=1.99.15
WRKSRC= ${WRKDIR}/libapreq2-2.04-dev
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
PERL5_PACKLIST= ${PERL5_SITEARCH}/auto/libapreq2/.packlist
PERL5_REQD+= 5.6.1
diff --git a/www/php4/Makefile b/www/php4/Makefile
index a826645e375..45b5c29bdbf 100644
--- a/www/php4/Makefile
+++ b/www/php4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:46 jlam Exp $
PKGNAME= php-${PHP_BASE_VERS}
CATEGORIES+= lang
@@ -10,7 +10,7 @@ USE_PKGINSTALL= YES
# PHP uses libtool inconsistently for CGI/CLI build; don't sanify for now
# LIBTOOL_OVERRIDE= libtool
LIBTOOL_OVERRIDE= # empty
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.include "Makefile.php"
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index af43d8cb3b0..078ff9848e5 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:01 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= ${PKGNAME_NOREV}-stable-src
@@ -31,7 +31,7 @@ CPPFLAGS+= -Dunix
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}-stable
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
USE_PERL5= build
diff --git a/www/sitecopy/Makefile b/www/sitecopy/Makefile
index 3d7d50f4b15..0d5569b1c0d 100644
--- a/www/sitecopy/Makefile
+++ b/www/sitecopy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/05/22 20:08:46 jlam Exp $
DISTNAME= sitecopy-0.13.4
PKGREVISION= 5
@@ -11,7 +11,7 @@ COMMENT= Utility for synchronizing remote and local web sites
BUILD_USES_MSGFMT= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= # defined
GNU_CONFIGURE= # defined
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index bf387d4cb52..0b31b3b31ac 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:46 jlam Exp $
DISTNAME= snownews-1.5.5.1
CATEGORIES= www
@@ -10,7 +10,7 @@ COMMENT= Small, curses based RSS feed reader
BUILD_USES_MSGFMT= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_NCURSES= # missing WA_BOLD, WA_REVERSE, KEY_RESIZE
USE_PKGLOCALEDIR= YES
diff --git a/www/spfc/Makefile b/www/spfc/Makefile
index 5adf420b010..cf13ffc1777 100644
--- a/www/spfc/Makefile
+++ b/www/spfc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 15:23:47 grant Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:46 jlam Exp $
DISTNAME= spfc-0.2.0
CATEGORIES= www java
@@ -14,7 +14,7 @@ DEPENDS+= jsdk-2.0:../../www/jsdk20
.include "../../mk/bsd.prefs.mk"
WRKSRC= ${WRKDIR}/spfc-0.2.0/src/
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
NO_CONFIGURE=
MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar
diff --git a/www/swiftsurf/Makefile b/www/swiftsurf/Makefile
index 9c5a3046e17..8915ae158ca 100644
--- a/www/swiftsurf/Makefile
+++ b/www/swiftsurf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:46 jlam Exp $
DISTNAME= swiftsurf-1.2.5
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://swiftsurf.sourceforge.net/
COMMENT= Web proxy that can handle http and https
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || (${MACHINE_ARCH} == "sparc")
BUILD_TARGET= nat
diff --git a/www/thy/Makefile b/www/thy/Makefile
index 5a856a7dbc7..ab5e6981485 100644
--- a/www/thy/Makefile
+++ b/www/thy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= thy-0.9.3
@@ -15,7 +15,7 @@ COMMENT= Tiny and fast HTTP daemon
BUILD_DEFS+= USE_INET6
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make lex yacc
+USE_TOOLS+= bison gmake lex
USE_PKGINSTALL= yes
PKG_SYSCONFSUBDIR= thy
diff --git a/www/tidy/Makefile b/www/tidy/Makefile
index 737e9e2716b..b547bee843a 100644
--- a/www/tidy/Makefile
+++ b/www/tidy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= tidy_src_040811
@@ -17,7 +17,7 @@ COMMENT= Fixes and tidies up HTML files
WRKSRC= ${WRKDIR}/tidy
NO_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILD_DIRS= ${WRKSRC}/build/gmake
OPSYSVARS+= MAKEFLAGS
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 0a959eaf4ff..cc0f945024d 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2005/05/05 20:50:49 kei Exp $
+# $NetBSD: Makefile.common,v 1.34 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= w3m-${W3M_VERS}
@@ -11,7 +11,7 @@ HOMEPAGE= http://w3m.sourceforge.net/
PKG_INSTALLATION_TYPES= overwrite pkgviews
GNU_CONFIGURE= # defined
-USE_GNU_TOOLS+= make # Needed for some combinations of options...
+USE_TOOLS+= gmake # Needed for some combinations of options...
W3M_VERS= 0.5.1
diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile
index 1b20bd97e31..812f210e438 100644
--- a/www/wwwoffle/Makefile
+++ b/www/wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/05/16 01:15:34 jlam Exp $
+# $NetBSD: Makefile,v 1.56 2005/05/22 20:08:46 jlam Exp $
DISTNAME= wwwoffle-2.8e
CATEGORIES= www
@@ -10,8 +10,7 @@ MAINTAINER= abs@NetBSD.org
HOMEPAGE= http://www.gedanken.demon.co.uk/wwwoffle/
COMMENT= WWW proxy with support for offline browsing
-USE_TOOLS+= gtar
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake gtar
USE_PKGINSTALL= yes
GNU_CONFIGURE= yes
diff --git a/x11/XaoS/Makefile b/x11/XaoS/Makefile
index a1f5cef82c7..71d95d25f83 100644
--- a/x11/XaoS/Makefile
+++ b/x11/XaoS/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= XaoS-3.1
@@ -11,7 +11,7 @@ HOMEPAGE= http://xaos.theory.org/
COMMENT= Zoomable fractal rendering doodad
PKG_INSTALLATION_TYPES= overwrite pkgviews
-USE_GNU_TOOLS= make
+USE_TOOLS= gmake
USE_PKGLOCALEDIR= YES
USE_X11= YES
GNU_CONFIGURE= YES
diff --git a/x11/XmHTML/Makefile b/x11/XmHTML/Makefile
index 6595e3cb3a6..c8146336fe7 100644
--- a/x11/XmHTML/Makefile
+++ b/x11/XmHTML/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.32 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= XmHTML-1.1.7
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.xs4all.nl/~ripley/XmHTML/
COMMENT= Motif Widget capable of displaying HTML 3.2 conforming text
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
do-install:
diff --git a/x11/controlcenter/Makefile b/x11/controlcenter/Makefile
index b2ed2a22f6e..792a29d5b2c 100644
--- a/x11/controlcenter/Makefile
+++ b/x11/controlcenter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/04/11 21:48:04 tv Exp $
+# $NetBSD: Makefile,v 1.68 2005/05/22 20:08:46 jlam Exp $
DISTNAME= control-center-1.4.0.4
PKGREVISION= 10
@@ -13,7 +13,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= xdg-1.1
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= YES
USE_LIBTOOL= YES
diff --git a/x11/ebuilder/Makefile b/x11/ebuilder/Makefile
index ef63d62280c..791e164cf99 100644
--- a/x11/ebuilder/Makefile
+++ b/x11/ebuilder/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:05 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:46 jlam Exp $
#
DISTNAME= ebuilder-0.56d
@@ -12,7 +12,7 @@ COMMENT= GUI builder for the Qt library
WRKSRC= ${WRKDIR}/${DISTNAME}
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
MAKEFILE= GNUmakefile
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile
index b8c18513fb7..574a49e0b33 100644
--- a/x11/fltk/Makefile
+++ b/x11/fltk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/04/11 21:48:05 tv Exp $
+# $NetBSD: Makefile,v 1.46 2005/05/22 20:08:46 jlam Exp $
DISTNAME= fltk-1.1.6-source
PKGNAME= ${DISTNAME:S/-source//}
@@ -19,7 +19,7 @@ COMMENT= Fast Light Tool Kit for graphical user interfaces
WRKSRC= ${WRKDIR}/${DISTNAME:S/-source//}
USE_LANGUAGES= c c++
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
TEST_TARGET= test
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index ebc187cc3ea..d6537516fba 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/04/26 20:00:06 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-desktop-2.10.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_PERL5= yes
USE_X11= yes
USE_LIBTOOL= yes
diff --git a/x11/gnome-gkrellm/Makefile b/x11/gnome-gkrellm/Makefile
index 931baf7aabf..12233f93f76 100644
--- a/x11/gnome-gkrellm/Makefile
+++ b/x11/gnome-gkrellm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:47 jlam Exp $
DISTNAME= gkrellm-gnome
PKGNAME= gnome-gkrellm-0.1
@@ -10,7 +10,7 @@ MAINTAINER= damon@NetBSD.org
HOMEPAGE= http://web.wt.net/~billw/gkrellm/Plugins.html
COMMENT= gkrellm gnome plugin
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
pre-install:
${INSTALL_DATA_DIR} ${PREFIX}/lib/gkrellm/plugins
diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile
index 09057bd851f..01cd63333ae 100644
--- a/x11/gnome-libs/Makefile
+++ b/x11/gnome-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.109 2005/05/22 20:08:47 jlam Exp $
DISTNAME= gnome-libs-1.4.2
PKGREVISION= 4
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
USE_DIRS+= gnome1-1.5
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 7eb1b0c7b33..d337102e0df 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-mag-0.12.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= GNOME screen magnifier
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index e7f18e00da2..5a1b044f149 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/04/26 20:05:24 drochner Exp $
+# $NetBSD: Makefile,v 1.51 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-panel-2.10.1
@@ -12,7 +12,7 @@ COMMENT= GNOME2 panel application
GNU_CONFIGURE= YES
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_PKGLOCALEDIR= YES
USE_X11= YES
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 13c9cd1f35a..c84ec1d3e95 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.50 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-session-2.10.0
@@ -18,7 +18,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
USE_PERL5= build
USE_LIBTOOL= yes
diff --git a/x11/gnome-themes-extras/Makefile b/x11/gnome-themes-extras/Makefile
index c7b28a1470f..6b7679dcd9d 100644
--- a/x11/gnome-themes-extras/Makefile
+++ b/x11/gnome-themes-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/19 16:25:37 drochner Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-themes-extras-0.8.1
@@ -20,7 +20,7 @@ USE_DIRS+= xdg-1.1
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
BUILDLINK_TRANSFORM+= rm:-DG_DISABLE_DEPRECATED
diff --git a/x11/gnome-themes/Makefile b/x11/gnome-themes/Makefile
index 806b6e333c5..d345fecaffc 100644
--- a/x11/gnome-themes/Makefile
+++ b/x11/gnome-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/05/18 16:24:29 drochner Exp $
+# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-themes-2.10.1
@@ -13,7 +13,7 @@ COMMENT= Collection of themes and icons for GNOME 2
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5 theme-1.0
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile
index 777154dd99e..0262354bd0a 100644
--- a/x11/gnome2-applets/Makefile
+++ b/x11/gnome2-applets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.41 2005/05/19 21:11:23 jmmv Exp $
+# $NetBSD: Makefile,v 1.42 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-applets-2.10.1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= YES
GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index ad8e8dab37b..cc7c578d146 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/04/26 20:07:45 drochner Exp $
+# $NetBSD: Makefile,v 1.44 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= control-center-2.10.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE= yes
USE_DIRS+= gnome2-1.5
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_X11= yes
diff --git a/x11/gnome2-terminal/Makefile b/x11/gnome2-terminal/Makefile
index cef230d192a..99140b77cf0 100644
--- a/x11/gnome2-terminal/Makefile
+++ b/x11/gnome2-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.38 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnome-terminal-2.10.0
@@ -19,7 +19,7 @@ USE_PERL5= build
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/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile
index 6c7cf8d246e..e857d8d5a4c 100644
--- a/x11/gnopernicus/Makefile
+++ b/x11/gnopernicus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/19 21:09:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gnopernicus-0.10.6
@@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Collection of accessibility apps for GNOME 2
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
diff --git a/x11/gnustep-preferences/Makefile b/x11/gnustep-preferences/Makefile
index fbea2bfe521..1bdc4c43ff4 100644
--- a/x11/gnustep-preferences/Makefile
+++ b/x11/gnustep-preferences/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= Preferences-1.2.0
@@ -13,7 +13,7 @@ HOMEPAGE= http://prefsapp.sourceforge.net/
COMMENT= Application for setting preferences for the GNUstep system
NO_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
MAKEFILE= GNUmakefile
diff --git a/x11/gtk+extra/Makefile b/x11/gtk+extra/Makefile
index 7fbaeb5f357..755699a7b26 100644
--- a/x11/gtk+extra/Makefile
+++ b/x11/gtk+extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gtk+extra-0.99.17
@@ -11,7 +11,7 @@ HOMEPAGE= http://gtkextra.sourceforge.net/
COMMENT= Useful set of GTK+ widgets for creating GUIs
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
diff --git a/x11/gtk-thinice-engine/Makefile b/x11/gtk-thinice-engine/Makefile
index b29f83b7ba9..716c5b1c587 100644
--- a/x11/gtk-thinice-engine/Makefile
+++ b/x11/gtk-thinice-engine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/05/22 20:08:47 jlam Exp $
#
DISTNAME= gtk-thinice-engine-2.0.2
@@ -14,7 +14,7 @@ COMMENT= Simple, clean theme engine
BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
diff --git a/x11/gtk/Makefile b/x11/gtk/Makefile
index fb69f2bac40..4c308930624 100644
--- a/x11/gtk/Makefile
+++ b/x11/gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2005/04/11 21:48:07 tv Exp $
+# $NetBSD: Makefile,v 1.107 2005/05/22 20:08:48 jlam Exp $
DISTNAME= gtk+-1.2.10
PKGREVISION= 8
@@ -20,7 +20,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= xdg-1.1
USE_PERL5= build
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
PKGCONFIG_OVERRIDE= gdk.pc.in
diff --git a/x11/gtk2-chtheme/Makefile b/x11/gtk2-chtheme/Makefile
index e699f3e8170..d4f02e23035 100644
--- a/x11/gtk2-chtheme/Makefile
+++ b/x11/gtk2-chtheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtk-chtheme-0.3.1
@@ -11,7 +11,7 @@ MAINTAINER= kirtai@users.sourceforge.net
HOMEPAGE= http://plasmasturm.org/programs/gtk-chtheme/
COMMENT= GTK+2 theme changer with preview
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
REPLACE_PERL= replace
USE_PERL5= build
diff --git a/x11/gtk2-engines-bluecurve/Makefile b/x11/gtk2-engines-bluecurve/Makefile
index 040517fa654..d7f7a7d311c 100644
--- a/x11/gtk2-engines-bluecurve/Makefile
+++ b/x11/gtk2-engines-bluecurve/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= GTK2-Wonderland-Engine-1.0
@@ -14,7 +14,7 @@ COMMENT= Port of famous Bluecurve theme for GTK2+
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
WRKSRC= ${WRKDIR}/Bluecurve
diff --git a/x11/gtk2-theme-switch/Makefile b/x11/gtk2-theme-switch/Makefile
index 14d79c97d1b..1833b765d2f 100644
--- a/x11/gtk2-theme-switch/Makefile
+++ b/x11/gtk2-theme-switch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtk-theme-switch-2.0.0rc2
@@ -11,7 +11,7 @@ MAINTAINER= dotz@irc.pl
HOMEPAGE= http://www.muhri.net/
COMMENT= Allows quick & easy switching of GTK+ 2.x themes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILDLINK_TRANSFORM+= rm:-DGTK_DISABLE_DEPRECATED
diff --git a/x11/gtk2/Makefile b/x11/gtk2/Makefile
index 56290e3c31f..1219f61c1c3 100644
--- a/x11/gtk2/Makefile
+++ b/x11/gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2005/05/08 09:07:08 jmmv Exp $
+# $NetBSD: Makefile,v 1.83 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtk+-2.6.7
@@ -25,7 +25,7 @@ USE_DIRS+= xdg-1.1
USE_PKGINSTALL= yes
USE_PKGLOCALEDIR= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PTHREAD_AUTO_VARS= yes
@@ -70,7 +70,7 @@ SUBST_FILES.pthread= gdk-pixbuf/Makefile.in
.if !empty(CC_VERSION:MSun)
CPPFLAGS+= -Xc
.elif ${OPSYS} == "IRIX" && !empty(CC_VERSION:Mgcc*)
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
.endif
post-install:
diff --git a/x11/gtkmm/Makefile b/x11/gtkmm/Makefile
index 5a276cea05f..b96da9e6516 100644
--- a/x11/gtkmm/Makefile
+++ b/x11/gtkmm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtkmm-2.2.12
@@ -12,7 +12,7 @@ COMMENT= C++ interface to Gtk+ v2
GNU_CONFIGURE= YES
USE_LIBTOOL= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PERL5= YES
USE_X11= YES
USE_LANGUAGES= c c++
diff --git a/x11/gtkmm24/Makefile b/x11/gtkmm24/Makefile
index bf4151dcf7a..7f55f46b062 100644
--- a/x11/gtkmm24/Makefile
+++ b/x11/gtkmm24/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:48 jlam Exp $
DISTNAME= gtkmm-2.4.8
PKGNAME= gtkmm24-2.4.8
@@ -10,7 +10,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.gtkmm.org/
COMMENT= C++ interface to Gtk+ v2
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
USE_PERL5= yes
diff --git a/x11/gtksourceview/Makefile b/x11/gtksourceview/Makefile
index 049d5744d3a..f0d5e6f406e 100644
--- a/x11/gtksourceview/Makefile
+++ b/x11/gtksourceview/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:08 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= gtksourceview-1.2.0
@@ -16,7 +16,7 @@ GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_PERL5= build
USE_PKGLOCALEDIR= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PKGCONFIG_OVERRIDE= gtksourceview-1.0.pc.in
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 09b543dd042..789d4e22d5f 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2005/04/19 10:59:37 wiz Exp $
+# $NetBSD: Makefile,v 1.79 2005/05/22 20:08:48 jlam Exp $
DISTNAME= kdebase-${_KDE_VERSION}
PKGREVISION= 3
@@ -17,7 +17,7 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_DIRS+= xdg-1.2
USE_PKGINSTALL= YES
-USE_GNU_TOOLS+= awk
+USE_TOOLS+= gawk
CONFIGURE_ARGS+= --with-ssl-dir="${BUILDLINK_PREFIX.openssl}"
CONFIGURE_ARGS+= --with-ldap="${BUILDLINK_PREFIX.openldap}"
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index bc9df4b004d..59172d44c1c 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= keylaunch-1.3.0
@@ -11,7 +11,7 @@ COMMENT= X utility for binding commands to a hot key
WRKSRC= ${WRKDIR}/keylaunch
USE_X11= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin
diff --git a/x11/kkbswitch/Makefile b/x11/kkbswitch/Makefile
index 46387b2adad..012238fc67f 100644
--- a/x11/kkbswitch/Makefile
+++ b/x11/kkbswitch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= kkbswitch-1.4.3
@@ -9,7 +9,7 @@ MAINTAINER= ianzag@mail.ru
HOMEPAGE= http://kkbswitch.sourceforge.net/
COMMENT= Keyboard layout indicator for KDE 2 or 3
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/x11/kmessage/Makefile b/x11/kmessage/Makefile
index e3a4181e51f..d3434500d72 100644
--- a/x11/kmessage/Makefile
+++ b/x11/kmessage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:48 jlam Exp $
DISTNAME= kmessage-0.1
PKGREVISION= 5
@@ -9,7 +9,7 @@ MAINTAINER= markd@NetBSD.org
HOMEPAGE= http://soliton.wins.uva.nl/~wijnhout/kmessage/
COMMENT= KMessage is an xmessage clone for KDE
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
diff --git a/x11/lablgtk/Makefile b/x11/lablgtk/Makefile
index 0e9bdebf17a..5d348fbd684 100644
--- a/x11/lablgtk/Makefile
+++ b/x11/lablgtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:48 jlam Exp $
DISTNAME= lablgtk-1.2.7
CATEGORIES= x11
@@ -8,7 +8,7 @@ MAINTAINER= tech-pkg@NetBSD.org
HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/lablgtk.html
COMMENT= GTK+ bindings for ocaml
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
BUILDLINK_DEPMETHOD.ocaml= full
diff --git a/x11/lablgtk2/Makefile b/x11/lablgtk2/Makefile
index 29ba7119a4c..dc40deb97a0 100644
--- a/x11/lablgtk2/Makefile
+++ b/x11/lablgtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= lablgtk-2.4.0
@@ -11,7 +11,7 @@ HOMEPAGE= http://wwwfun.kurims.kyoto-u.ac.jp/soft/olabl/
COMMENT= GTK+ 2.x bindings for Objective Caml
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
BUILDLINK_DEPMETHOD.ocaml= full
diff --git a/x11/lesstif/Makefile b/x11/lesstif/Makefile
index ca4f31cdfa7..fcf9110e1d3 100644
--- a/x11/lesstif/Makefile
+++ b/x11/lesstif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.80 2005/05/22 20:08:48 jlam Exp $
DISTNAME= lesstif-0.94.0
PKGREVISION= 1
@@ -13,7 +13,7 @@ COMMENT= API compatible clone of the OSF/Motif toolkit
CONFLICTS+= openmotif-[0-9]*
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= YES
GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --enable-production --disable-debug --disable-verbose
diff --git a/x11/libzvt/Makefile b/x11/libzvt/Makefile
index a4c0d4a37cc..07f0e180f95 100644
--- a/x11/libzvt/Makefile
+++ b/x11/libzvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:48 jlam Exp $
#
DISTNAME= libzvt-2.0.1
@@ -12,7 +12,7 @@ HOMEPAGE= http://www.gnome.org/
COMMENT= Virtual Terminal Widget Library for GNOME2
GNU_CONFIGURE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= YES
USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE= libzvt/libzvt-2.0.pc.in
diff --git a/x11/multi-gnome-terminal/Makefile b/x11/multi-gnome-terminal/Makefile
index 70718282bab..891c1a844ae 100644
--- a/x11/multi-gnome-terminal/Makefile
+++ b/x11/multi-gnome-terminal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:48:11 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:48 jlam Exp $
DISTNAME= multi-gnome-terminal-1.6.1
PKGREVISION= 7
@@ -11,7 +11,7 @@ COMMENT= Gnome tabbed terminal emulator
USE_DIRS+= xdg-1.1
USE_X11BASE= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
USE_LIBTOOL= # defined
diff --git a/x11/openmotif/Makefile b/x11/openmotif/Makefile
index 9f218283892..54abffa038f 100644
--- a/x11/openmotif/Makefile
+++ b/x11/openmotif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/04/11 21:48:12 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:48 jlam Exp $
PKGVER= 2.1.30
DISTNAME= openmotif${PKGVER}
@@ -44,7 +44,7 @@ PLIST_SUBST+= AVAILABLE=
# We must use GNU make on Linux
.if ${OPSYS} == "Linux"
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
.endif
INSTALLATION_DIRS= lib/X11/config man/man1 man/man3 man/man5
diff --git a/x11/p5-gtk2/Makefile b/x11/p5-gtk2/Makefile
index 193d1434475..de66a750c28 100644
--- a/x11/p5-gtk2/Makefile
+++ b/x11/p5-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:48:12 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:49 jlam Exp $
DISTNAME= Gtk2-1.042
PKGNAME= p5-gtk2-1.042
@@ -13,7 +13,7 @@ COMMENT= Perl bindings for GTK+ 2.0
DEPENDS+= p5-ExtUtils-Depends>=0.2:../../devel/p5-ExtUtils-Depends
DEPENDS+= p5-ExtUtils-PkgConfig>=1.03:../../devel/p5-ExtUtils-PkgConfig
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
PERL5_REQD= 5.8
diff --git a/x11/py-gtk2/Makefile b/x11/py-gtk2/Makefile
index e6efe092dd6..b62c0bfe4e0 100644
--- a/x11/py-gtk2/Makefile
+++ b/x11/py-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/05/13 11:11:29 drochner Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= pygtk-2.6.2
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
PKGCONFIG_OVERRIDE+= pygtk-2.0.pc.in pygobject-2.0.pc.in
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
PYTHON_VERSIONS_ACCEPTED= 24 23
diff --git a/x11/py-qt3-base/Makefile b/x11/py-qt3-base/Makefile
index 80f3fd439b5..ae060e0ae5c 100644
--- a/x11/py-qt3-base/Makefile
+++ b/x11/py-qt3-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 15:36:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= PyQt-x11-gpl-3.14.1
@@ -12,7 +12,7 @@ COMMENT= Python binding for qt3
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
BUILDLINK_DEPENDS.qt3-tools= qt3-tools>=3.1.2nb2
diff --git a/x11/py-qt3-modules/Makefile b/x11/py-qt3-modules/Makefile
index ad4054055f0..e820e477d12 100644
--- a/x11/py-qt3-modules/Makefile
+++ b/x11/py-qt3-modules/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/05/02 15:36:53 drochner Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= PyQt-x11-gpl-3.14.1
@@ -12,7 +12,7 @@ COMMENT= Python binding for qt3
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS= -b ${PREFIX}/bin
diff --git a/x11/py-qt3-qscintilla/Makefile b/x11/py-qt3-qscintilla/Makefile
index 0ed27674b68..76db0b29929 100644
--- a/x11/py-qt3-qscintilla/Makefile
+++ b/x11/py-qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 15:36:53 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= PyQt-x11-gpl-3.14.1
@@ -12,7 +12,7 @@ COMMENT= Python binding for qt3
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS= -b ${PREFIX}/bin
diff --git a/x11/py-qt3-sip/Makefile b/x11/py-qt3-sip/Makefile
index 0ab7fcc98a5..3b26a5aead1 100644
--- a/x11/py-qt3-sip/Makefile
+++ b/x11/py-qt3-sip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/05/02 15:35:39 drochner Exp $
+# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= sip-4.2.1
@@ -17,7 +17,7 @@ BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
USE_X11= yes
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
CONFIGURE_ARGS= -b ${PREFIX}/bin
diff --git a/x11/py-wxWidgets/Makefile b/x11/py-wxWidgets/Makefile
index f276f9f7f7e..61ab774a2b3 100644
--- a/x11/py-wxWidgets/Makefile
+++ b/x11/py-wxWidgets/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:48:12 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= wxPythonSrc-2.4.2.4
@@ -12,7 +12,7 @@ HOMEPAGE= http://wxpython.org/
COMMENT= wxPython: Python bindings for wxWidgets
WRKSRC= ${WRKDIR}/wxPythonSrc-2.4.2.4/wxPython
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
# previous name of the package
CONFLICTS+= ${PYPKGPREFIX}-wxWindows-[0-9]*
diff --git a/x11/pygtk/Makefile b/x11/pygtk/Makefile
index 6b75a3dadbd..628332700ae 100644
--- a/x11/pygtk/Makefile
+++ b/x11/pygtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= pygtk-0.6.11
@@ -13,7 +13,7 @@ COMMENT= Python Bindings for the GTK Widget Set
GNU_CONFIGURE= YES
CONFIGURE_ENV+= PYTHON=${PYTHONBIN}
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
PY_PATCHPLIST= yes
diff --git a/x11/qt1/Makefile b/x11/qt1/Makefile
index b3a18273e8a..5b6831cc153 100644
--- a/x11/qt1/Makefile
+++ b/x11/qt1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:49 jlam Exp $
#
DISTNAME= qt-1.44
@@ -13,7 +13,7 @@ HOMEPAGE= http://www.troll.no/products/qt.html
COMMENT= C++ X GUI toolkit
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
diff --git a/x11/qt2-libs/Makefile.common b/x11/qt2-libs/Makefile.common
index e8b82f7217a..b670b3e3a56 100644
--- a/x11/qt2-libs/Makefile.common
+++ b/x11/qt2-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2004/01/24 15:30:33 grant Exp $
+# $NetBSD: Makefile.common,v 1.22 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qt-x11-${QTVERSION}
@@ -11,7 +11,7 @@ MASTER_SITES= ftp://ftp.trolltech.com/qt/source/ \
WRKSRC= ${WRKDIR}/qt-${QTVERSION}
HAS_CONFIGURE= yes
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
CONFIGURE_ARGS+= -static -sm -no-thread \
-system-zlib -system-libpng \
diff --git a/x11/qt3-libs/Makefile.common b/x11/qt3-libs/Makefile.common
index e3cf1f37cf4..ac8de82814d 100644
--- a/x11/qt3-libs/Makefile.common
+++ b/x11/qt3-libs/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.46 2005/05/17 15:34:46 reed Exp $
+# $NetBSD: Makefile.common,v 1.47 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qt-x11-free-${QTVERSION}
CATEGORIES= x11
@@ -14,12 +14,10 @@ PATCHDIR= ${.CURDIR}/../../x11/qt3-libs/patches
HAS_CONFIGURE= yes
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gawk gmake
USE_LANGUAGES= c c++
USE_LIBTOOL= yes
-USE_GNU_TOOLS+= awk
-
QTPREFIX= ${PREFIX}/qt3
CONFIGURE_ARGS+= -prefix ${QTPREFIX}
diff --git a/x11/qt3-qscintilla/Makefile b/x11/qt3-qscintilla/Makefile
index ec85866625a..510f2d6f296 100644
--- a/x11/qt3-qscintilla/Makefile
+++ b/x11/qt3-qscintilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qscintilla-1.62-gpl-1.5
@@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/qt
# needs qmake
BUILD_DEPENDS+= qt3-tools-3.*:../../x11/qt3-tools
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MAKE_ENV+= QTPREFIX=${QTDIR}
diff --git a/x11/qtarch/Makefile b/x11/qtarch/Makefile
index ddeb38f0e32..b42d7d5f300 100644
--- a/x11/qtarch/Makefile
+++ b/x11/qtarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/05/22 20:08:50 jlam Exp $
#
DISTNAME= qtarch-2.2-1
@@ -14,7 +14,7 @@ COMMENT= Graphical dialog editor for the Qt widget set
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/qtarch ${PREFIX}/bin
diff --git a/x11/qwspritefield/Makefile b/x11/qwspritefield/Makefile
index 66d96a27c24..31388d25d5c 100644
--- a/x11/qwspritefield/Makefile
+++ b/x11/qwspritefield/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:50 jlam Exp $
DISTNAME= QwSpriteField1.6
PKGNAME= qwspritefield-1.6
@@ -13,7 +13,7 @@ CONFLICTS= kdesupport-1.0
WRKSRC= ${WRKDIR}/QwSpriteField
USE_X11= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
QW_INCLUDES= Pix.h QwCluster.h QwPublicList.h QwSpriteField.h
diff --git a/x11/qwt/Makefile b/x11/qwt/Makefile
index 6a797972499..6806f7b559c 100644
--- a/x11/qwt/Makefile
+++ b/x11/qwt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:50 jlam Exp $
DISTNAME= qwt-0.3.0
PKGREVISION= 2
@@ -10,7 +10,7 @@ HOMEPAGE= http://sourceforge.net/projects/qwt
COMMENT= Qt widget library for technical purposes
USE_X11BASE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_LIBTOOL= yes
MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
diff --git a/x11/rep-gtk/Makefile b/x11/rep-gtk/Makefile
index ca6d8fb5e07..16fba331212 100644
--- a/x11/rep-gtk/Makefile
+++ b/x11/rep-gtk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/04/11 21:48:13 tv Exp $
+# $NetBSD: Makefile,v 1.30 2005/05/22 20:08:51 jlam Exp $
DISTNAME= rep-gtk-0.15
PKGREVISION= 8
@@ -11,7 +11,7 @@ COMMENT= librep bindings for gtk (used by sawmill)
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
REPEXECDIR= libexec/rep/${MACHINE_GNU_PLATFORM}
INSTALL_ALIASES= ${PREFIX}/${REPEXECDIR}/install-aliases
diff --git a/x11/vte/Makefile b/x11/vte/Makefile
index 02b04684a45..4aec2b06dd4 100644
--- a/x11/vte/Makefile
+++ b/x11/vte/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/18 16:19:05 drochner Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:51 jlam Exp $
#
DISTNAME= vte-0.11.13
@@ -16,7 +16,7 @@ USE_DIRS+= gnome2-1.2
USE_PKGLOCALEDIR= yes
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
CONFIGURE_ARGS+= --disable-gtk-doc
diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile
index e81852c2133..c9a45b535f3 100644
--- a/x11/wmweather/Makefile
+++ b/x11/wmweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/11 21:48:14 tv Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= wmweather-2.4.2
@@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_X11= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGINSTALL= yes
CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR}
diff --git a/x11/wxhaskell/Makefile b/x11/wxhaskell/Makefile
index 394fba65fdf..89b3b615067 100644
--- a/x11/wxhaskell/Makefile
+++ b/x11/wxhaskell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/22 08:43:21 augustss Exp $
+# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:52 jlam Exp $
DISTNAME= wxhaskell-src-0.9.4
PKGNAME= ${DISTNAME:S/-src//}
@@ -10,7 +10,7 @@ MAINTAINER= augustss@NetBSD.org
HOMEPAGE= http://wxhaskell.sourceforge.net/index.html
COMMENT= wxGTK binding for Haskell
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
WRKSRC= ${WRKDIR}/${PKGNAME_NOREV}
diff --git a/x11/xfce3/Makefile b/x11/xfce3/Makefile
index aa3b4018e57..bbf0b783d65 100644
--- a/x11/xfce3/Makefile
+++ b/x11/xfce3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:52 jlam Exp $
DISTNAME= xfce-3.8.18
PKGREVISION= 5
@@ -15,7 +15,7 @@ USE_X11BASE= # defined
USE_PKGLOCALEDIR= # defined
USE_LIBTOOL= # defined
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= # defined
.if ${MACHINE_ARCH} == "alpha"
diff --git a/x11/xfstt/Makefile b/x11/xfstt/Makefile
index 93ef421c5a3..313c1adb3bc 100644
--- a/x11/xfstt/Makefile
+++ b/x11/xfstt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/12/28 02:47:52 reed Exp $
+# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= xfstt-1.6
@@ -12,7 +12,7 @@ COMMENT= TrueType font server for X11
USE_PKGINSTALL= YES
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
GNU_CONFIGURE= YES
# There isn't really any l10n yet, only some preliminary i18n support.
diff --git a/x11/xglobe/Makefile b/x11/xglobe/Makefile
index f9ce36a5457..a1bce933a66 100644
--- a/x11/xglobe/Makefile
+++ b/x11/xglobe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.24 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= xglobe-0.5
@@ -23,7 +23,7 @@ MAPS= LE.400.gif Brill.400.gif mggd.gif
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_X11BASE= YES
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
post-install:
${INSTALL_DATA_DIR} ${X11PREFIX}/lib/xglobe
diff --git a/x11/xpad/Makefile b/x11/xpad/Makefile
index 5dc03284b35..4ac1ea13341 100644
--- a/x11/xpad/Makefile
+++ b/x11/xpad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/11 21:48:15 tv Exp $
+# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= xpad-1.12
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
GNU_CONFIGURE= yes
USE_DIRS+= xdg-1.1
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_PKGLOCALEDIR= yes
USE_X11= yes
diff --git a/x11/xplanet/Makefile b/x11/xplanet/Makefile
index 7a25e308549..5a50f281e53 100644
--- a/x11/xplanet/Makefile
+++ b/x11/xplanet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/04/11 21:48:16 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/05/22 20:08:52 jlam Exp $
DISTNAME= xplanet-1.1.2
CATEGORIES= x11
@@ -8,7 +8,7 @@ MAINTAINER= atatat@NetBSD.org
HOMEPAGE= http://xplanet.sourceforge.net/
COMMENT= Rotating rendered map of the Earth in X11 root window
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
GNU_CONFIGURE= yes
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 475da8fbef1..22a9c006af1 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:48:17 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:52 jlam Exp $
#
DISTNAME= zenity-2.10.0
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT= yes
USE_DIRS+= gnome2-1.5
USE_PKGLOCALEDIR= yes
GNU_CONFIGURE= yes
-USE_GNU_TOOLS+= make
+USE_TOOLS+= gmake
USE_X11= yes
BUILDLINK_DEPENDS.glib2+= glib2>=2.6.0