summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2005-05-22 20:07:36 +0000
committerjlam <jlam@pkgsrc.org>2005-05-22 20:07:36 +0000
commit585534220c0ea1afd4b19eb9ffb4355e14576dcd (patch)
treeed91fd903dcb96e6914328617419b0659c2bb9f1 /audio
parent9f94b112f01d9322b4806a06b02bdb565874da4d (diff)
downloadpkgsrc-585534220c0ea1afd4b19eb9ffb4355e14576dcd.tar.gz
Remove USE_GNU_TOOLS and replace with the correct USE_TOOLS definitions:
USE_GNU_TOOLS -> USE_TOOLS awk -> gawk m4 -> gm4 make -> gmake sed -> gsed yacc -> bison
Diffstat (limited to 'audio')
-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
59 files changed, 118 insertions, 118 deletions
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"