summaryrefslogtreecommitdiff
path: root/audio
diff options
context:
space:
mode:
authorrillig <rillig>2005-12-05 20:49:47 +0000
committerrillig <rillig>2005-12-05 20:49:47 +0000
commitb4f920543059af038598712771c3211999ef42a6 (patch)
treedac5b1dd14794d86b061d26b9503adb2552ed3f8 /audio
parent5bf026ec112f405b514a2d69a72e10fa92c4c524 (diff)
downloadpkgsrc-b4f920543059af038598712771c3211999ef42a6.tar.gz
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some other changes are outlined in http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'audio')
-rw-r--r--audio/SDL-nas/Makefile4
-rw-r--r--audio/bmp/Makefile4
-rw-r--r--audio/cam/Makefile4
-rw-r--r--audio/cmp3/Makefile6
-rw-r--r--audio/daapd/Makefile6
-rw-r--r--audio/dap/Makefile4
-rw-r--r--audio/eawpatches/Makefile4
-rw-r--r--audio/esound/Makefile4
-rw-r--r--audio/faad2/Makefile4
-rw-r--r--audio/festival/Makefile42
-rw-r--r--audio/festvox-aec/Makefile4
-rw-r--r--audio/gkrellm-xmms/Makefile4
-rw-r--r--audio/gramofile/Makefile4
-rw-r--r--audio/guspatches/Makefile5
-rw-r--r--audio/icecast1/Makefile3
-rw-r--r--audio/juke/Makefile4
-rw-r--r--audio/lame/Makefile4
-rw-r--r--audio/libid3tag/Makefile4
-rw-r--r--audio/libmad/Makefile4
-rw-r--r--audio/libsndfile/Makefile4
-rw-r--r--audio/libvorbis/Makefile4
-rw-r--r--audio/madman/Makefile4
-rw-r--r--audio/madplay/Makefile4
-rw-r--r--audio/moc/distinfo4
-rw-r--r--audio/moc/patches/patch-aa3
-rw-r--r--audio/moss/Makefile4
-rw-r--r--audio/mp3asm/Makefile5
-rw-r--r--audio/mp3blaster/Makefile4
-rw-r--r--audio/mpg123-esound/Makefile4
-rw-r--r--audio/mpg123/Makefile.common4
-rw-r--r--audio/muse/Makefile6
-rw-r--r--audio/musicbox/Makefile4
-rw-r--r--audio/musicpd/Makefile4
-rw-r--r--audio/nspmod/Makefile4
-rw-r--r--audio/oss/Makefile6
-rw-r--r--audio/p5-MP3-Tag/Makefile4
-rw-r--r--audio/portaudio/Makefile3
-rw-r--r--audio/rio500/Makefile7
-rw-r--r--audio/rplay/Makefile3
-rw-r--r--audio/speex/Makefile4
-rw-r--r--audio/spiralloops/Makefile4
-rw-r--r--audio/spiralsynth/Makefile4
-rw-r--r--audio/splay/Makefile5
-rw-r--r--audio/sweep/Makefile4
-rw-r--r--audio/toolame/Makefile4
-rw-r--r--audio/tracker/Makefile4
-rw-r--r--audio/tremor-tools/Makefile4
-rw-r--r--audio/tremor/Makefile4
-rw-r--r--audio/ubs/Makefile8
-rw-r--r--audio/vorbis-tools/Makefile4
-rw-r--r--audio/xamp/Makefile4
-rw-r--r--audio/xmcd/Makefile8
-rw-r--r--audio/xmms-blursk/Makefile4
-rw-r--r--audio/xmms-esound/Makefile4
-rw-r--r--audio/xmms-fmradio/Makefile4
-rw-r--r--audio/xmms-iris/Makefile4
-rw-r--r--audio/xmms-mad/Makefile4
-rw-r--r--audio/xmms-tv-scope/Makefile4
-rw-r--r--audio/xmms/Makefile.common4
-rw-r--r--audio/xsidplay/Makefile4
60 files changed, 147 insertions, 149 deletions
diff --git a/audio/SDL-nas/Makefile b/audio/SDL-nas/Makefile
index a596fb4a0a0..fac10f1ab2d 100644
--- a/audio/SDL-nas/Makefile
+++ b/audio/SDL-nas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/07 10:16:27 adam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:47 rillig Exp $
.include "../../devel/SDL/Makefile.common"
@@ -19,7 +19,7 @@ do-install:
cd ${WRKSRC}/src/audio/nas && ${SHLIBTOOL} --mode=install \
${INSTALL_DATA} libaudio_nas.la ${PREFIX}/lib
-BUILDLINK_DEPENDS.SDL= SDL>=1.2.5nb6
+BUILDLINK_DEPENDS.SDL+= SDL>=1.2.5nb6
.include "../../audio/nas/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/audio/bmp/Makefile b/audio/bmp/Makefile
index af2caef7212..dbe74f754af 100644
--- a/audio/bmp/Makefile
+++ b/audio/bmp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/19 15:09:37 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:47 rillig Exp $
#
BMP_ENABLE_ENCODERS= yes
@@ -14,7 +14,7 @@ DEPENDS+= unzip-[0-9]*:../../archivers/unzip
# library is loaded, and is the one causing problems. See PR pkg/26846
# for more information.
USE_LANGUAGES= c c++
-LDFLAGS.NetBSD= -lstdc++ -lm
+LDFLAGS.NetBSD+= -lstdc++ -lm
.include "../../audio/id3lib/buildlink3.mk"
.include "../../audio/libvorbis/buildlink3.mk"
diff --git a/audio/cam/Makefile b/audio/cam/Makefile
index a4704168a51..b09aa3ec2e3 100644
--- a/audio/cam/Makefile
+++ b/audio/cam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:51 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= cam-1.02
@@ -25,7 +25,7 @@ CAMLIBS= -lcurses
CAMLIBS+= -lossaudio
.endif
-MAKE_ENV+= CAMLIBS="${CAMLIBS}"
+MAKE_ENV+= CAMLIBS=${CAMLIBS:Q}
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/cmp3/Makefile b/audio/cmp3/Makefile
index 6a6036e3150..5ee3bea9116 100644
--- a/audio/cmp3/Makefile
+++ b/audio/cmp3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/06/16 06:57:38 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= cmp3-2.0pre6
@@ -15,8 +15,8 @@ DEPENDS+= vorbis-tools-[0-9]*:../../audio/vorbis-tools
WRKSRC= ${WRKDIR}/cmp3-kenrevs
USE_TOOLS+= gmake
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]*
-INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-*
+INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-H]*-*
INSTALLATION_DIRS= bin
diff --git a/audio/daapd/Makefile b/audio/daapd/Makefile
index 239920b3207..49316640a71 100644
--- a/audio/daapd/Makefile
+++ b/audio/daapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/10/11 12:20:57 tonio Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:47 rillig Exp $
DISTNAME= daapd-0.2.3d
PKGREVISION= 3
@@ -26,9 +26,9 @@ PKG_SUPPORTED_OPTIONS=faad
.if !empty(PKG_OPTIONS:Mfaad)
.include "../../audio/faad2/buildlink3.mk"
- MAKE_ENV+= WITH_FAAD=1
+MAKE_ENV+= WITH_FAAD=1
.else
- MAKE_ENV+= WITH_FAAD=0
+MAKE_ENV+= WITH_FAAD=0
.endif
post-install:
diff --git a/audio/dap/Makefile b/audio/dap/Makefile
index 426e11e5cbf..d01407b102a 100644
--- a/audio/dap/Makefile
+++ b/audio/dap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/10/16 15:14:40 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:47 rillig Exp $
DISTNAME= dap-2.1.2
PKGREVISION= 5
@@ -12,7 +12,7 @@ COMMENT= Digital audio recording and processing package
MAKEFILE= Makefile.netbsd
-MAKE_ENV+= X11PREFIX=${X11PREFIX}
+MAKE_ENV+= X11PREFIX=${X11PREFIX:Q}
USE_LANGUAGES= c c++
INSTALLATION_DIRS= bin
diff --git a/audio/eawpatches/Makefile b/audio/eawpatches/Makefile
index 3a5eb13c023..26dc826f9ad 100644
--- a/audio/eawpatches/Makefile
+++ b/audio/eawpatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/03 14:20:03 ben Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= eawpats12_full
@@ -12,7 +12,7 @@ MAINTAINER= adam@NetBSD.org
HOMEPAGE= http://www.stardate.bc.ca/eawpatches/html/
COMMENT= Eric A. Welsh' patches (audio samples) for TiMidity
-BUILD_DEPENDS= unrar-[0-9]*:../../archivers/unrar
+BUILD_DEPENDS+= unrar-[0-9]*:../../archivers/unrar
EXTRACT_ONLY= # empty
NO_CONFIGURE= yes
diff --git a/audio/esound/Makefile b/audio/esound/Makefile
index b850de0c47f..1d77c12b84e 100644
--- a/audio/esound/Makefile
+++ b/audio/esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/07/27 17:16:32 drochner Exp $
+# $NetBSD: Makefile,v 1.58 2005/12/05 20:49:47 rillig Exp $
DISTNAME= esound-0.2.36
CATEGORIES= audio
@@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --disable-local-sound
.else
.include "../../mk/ossaudio.buildlink3.mk"
MAKE_ENV+= AM_CPPFLAGS='-DDEV_DSP=\"${DEVOSSAUDIO}\"'
-SUBST_CLASSES= oss
+SUBST_CLASSES+= oss
SUBST_STAGE.oss= post-patch
SUBST_FILES.oss= configure
SUBST_SED.oss= -e 's,-lossaudio,${LIBOSSAUDIO},g'
diff --git a/audio/faad2/Makefile b/audio/faad2/Makefile
index e1eea9762b5..15ac68a98b8 100644
--- a/audio/faad2/Makefile
+++ b/audio/faad2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/10/09 03:23:11 ben Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:49:47 rillig Exp $
#
DISTNAME= faad2-2.0
@@ -25,7 +25,7 @@ GNU_CONFIGURE= YES
CONFIGURE_ARGS+= --with-mp4v2
CONFIGURE_ARGS+= --includedir=${PREFIX}/include/faad2
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
LIBS+= -lm
diff --git a/audio/festival/Makefile b/audio/festival/Makefile
index 991f0bd7fb2..5cf25583f9a 100644
--- a/audio/festival/Makefile
+++ b/audio/festival/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/12/03 04:14:05 joerg Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/05 20:49:47 rillig Exp $
DISTNAME= festival-1.95-beta
PKGNAME= festival-1.95beta
@@ -44,28 +44,28 @@ PKG_COMPILER= ${PKG_COMPILER_cmd:sh}
.endif
.if empty(PKG_COMPILER)
-PKG_FAIL_REASON= "${CC_VERSION} is not currently supported."
+PKG_FAIL_REASON+= "${CC_VERSION} is not currently supported."
.endif
-MAKE_ENV+= PKG_EST_HOME="${SPEECHTOOLS}" \
- EST_HOME="${SPEECHTOOLS}" \
- PKG_FESTIVAL_BUILD_HOME="${FESTIVAL}" \
- PKG_FESTIVAL_HOME="${FHOME}" \
- PKG_COMPILER="${PKG_COMPILER}" \
- PKG_X11BASE="${X11BASE}" \
- PKG_PREFIX="${PREFIX}" \
- EGCS_CC="${CC}" \
- EGCS_CXX="${CXX}" \
- GCC295_CC="${CC}" \
- GCC295_CXX="${CXX}" \
- GCC28_CC="${CC}" \
- GCC28_CXX="${CXX}" \
- GCC27_CC="${CC}" \
- GCC27_CXX="${CXX}" \
- GCC26_CC="${CC}" \
- GCC26_CXX="${CXX}" \
- CC="${CC}" \
- CXX="${CXX}"
+MAKE_ENV+= PKG_EST_HOME=${SPEECHTOOLS:Q} \
+ EST_HOME=${SPEECHTOOLS:Q} \
+ PKG_FESTIVAL_BUILD_HOME=${FESTIVAL:Q} \
+ PKG_FESTIVAL_HOME=${FHOME:Q} \
+ PKG_COMPILER=${PKG_COMPILER:Q} \
+ PKG_X11BASE=${X11BASE:Q} \
+ PKG_PREFIX=${PREFIX:Q} \
+ EGCS_CC=${CC:Q} \
+ EGCS_CXX=${CXX:Q} \
+ GCC295_CC=${CC:Q} \
+ GCC295_CXX=${CXX:Q} \
+ GCC28_CC=${CC:Q} \
+ GCC28_CXX=${CXX:Q} \
+ GCC27_CC=${CC:Q} \
+ GCC27_CXX=${CXX:Q} \
+ GCC26_CC=${CC:Q} \
+ GCC26_CXX=${CXX:Q} \
+ CC=${CC:Q} \
+ CXX=${CXX:Q}
INSTALLATION_DIRS= bin libexec man/man1
diff --git a/audio/festvox-aec/Makefile b/audio/festvox-aec/Makefile
index 2da39777703..dd11343a6e7 100644
--- a/audio/festvox-aec/Makefile
+++ b/audio/festvox-aec/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/07/19 10:22:33 grant Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:48 rillig Exp $
DISTNAME= voice_aec_di-2.0
PKGNAME= festvox-aec-2.0
@@ -15,7 +15,7 @@ DEPENDS+= festlex-ogi>=2.0:../../audio/festlex-ogi
LICENSE= no-commercial-use
-DIST_SUBDIR= ${PKGNAME}
+DIST_SUBDIR= ${PKGNAME_NOREV}nb1
WRKSRC= ${WRKDIR}/festival
NO_BUILD= yes
diff --git a/audio/gkrellm-xmms/Makefile b/audio/gkrellm-xmms/Makefile
index 85a79231de0..2e6ff6a6973 100644
--- a/audio/gkrellm-xmms/Makefile
+++ b/audio/gkrellm-xmms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= gkrellmms-2.1.20
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake pkg-config
USE_PKGLOCALEDIR= YES
BUILD_USES_MSGFMT= YES
-BUILDLINK_DEPENDS.gkrellm= gkrellm>=2.2.0
+BUILDLINK_DEPENDS.gkrellm+= gkrellm>=2.2.0
WRKSRC= ${WRKDIR}/gkrellmms
MAKE_ENV+= LOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale \
diff --git a/audio/gramofile/Makefile b/audio/gramofile/Makefile
index af3fb3e76ca..1edf0f2631a 100644
--- a/audio/gramofile/Makefile
+++ b/audio/gramofile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= gramofile-1.6
@@ -23,7 +23,7 @@ do-install:
${INSTALL_PROGRAM} ${WRKSRC}/bplaysrc/bplay ${PREFIX}/bin/bplay_gramo
cd ${PREFIX}/bin && ${LN} -s bplay_gramo brec_gramo
-SUBST_CLASSES= snd
+SUBST_CLASSES+= snd
SUBST_STAGE.snd= post-patch
SUBST_FILES.snd= bplaysrc/sndfunc.c
SUBST_SED.snd= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
diff --git a/audio/guspatches/Makefile b/audio/guspatches/Makefile
index 041c72a9ec9..58b811f9a35 100644
--- a/audio/guspatches/Makefile
+++ b/audio/guspatches/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/29 22:16:12 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= dgguspat
@@ -16,9 +16,8 @@ NO_BIN_ON_FTP= ${RESTRICTED}
NO_BIN_ON_CDROM= ${RESTRICTED}
EXTRACT_ONLY= # empty
-NO_TOOLS= yes
NO_BUILD= yes
-MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR}
+MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q}
do-configure:
${SED} "s|@PREFIX@|${PREFIX}|" < ${FILESDIR}/gravis.cfg > \
diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile
index 928669b9cd8..430c1c150bb 100644
--- a/audio/icecast1/Makefile
+++ b/audio/icecast1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/11 17:21:11 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= icecast-1.3.12
@@ -32,7 +32,6 @@ EGFILES= groups.aut mounts.aut users.aut icecast.conf
.for f in ${EGFILES}
CONF_FILES+= ${EGDIR}/${f}.dist ${PKG_SYSCONFDIR}/${f}
.endfor
-.undef f
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/juke/Makefile b/audio/juke/Makefile
index 0f19e68eabe..fcb635b4c1e 100644
--- a/audio/juke/Makefile
+++ b/audio/juke/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/16 15:05:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= juke-0.7
@@ -14,7 +14,7 @@ USE_PKGINSTALL= YES
GNU_CONFIGURE= YES
# halfdelay()
-INCOMPAT_CURSES= NetBSD-1.[45]*-* NetBSD-1.6[-_.]* NetBSD-1.6[A-L]-*
+INCOMPAT_CURSES= NetBSD-1.[45]*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-L]-*
EGDIR= ${PREFIX}/share/examples/juke
diff --git a/audio/lame/Makefile b/audio/lame/Makefile
index a14c8efe067..7e125558b62 100644
--- a/audio/lame/Makefile
+++ b/audio/lame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.51 2005/09/04 02:37:02 xtraeme Exp $
+# $NetBSD: Makefile,v 1.52 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= lame-${VERS}
@@ -24,7 +24,7 @@ GNU_CONFIGURE= yes
CONFIGURE_ARGS+= --without-vorbis
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
LDFLAGS.SunOS+= -lm
diff --git a/audio/libid3tag/Makefile b/audio/libid3tag/Makefile
index c8dac1b1764..a693c1c0aac 100644
--- a/audio/libid3tag/Makefile
+++ b/audio/libid3tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= libid3tag-0.15.1b
@@ -20,7 +20,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
INSTALLATION_DIRS= lib/pkgconfig
diff --git a/audio/libmad/Makefile b/audio/libmad/Makefile
index 6014e43a698..ba889893b9f 100644
--- a/audio/libmad/Makefile
+++ b/audio/libmad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:11 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= libmad-0.15.1b
@@ -20,7 +20,7 @@ USE_LIBTOOL= YES
USE_TOOLS+= pkg-config
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
INSTALLATION_DIRS= lib/pkgconfig
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 1534e47de08..1c6e670ef18 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/09/30 13:26:02 adam Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:49:48 rillig Exp $
DISTNAME= libsndfile-1.0.12
CATEGORIES= audio
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
# This package compiles with gcc2, but its configure script doesn't know that
CONFIGURE_ENV+= ac_cv_c_struct_hack=yes
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
diff --git a/audio/libvorbis/Makefile b/audio/libvorbis/Makefile
index 460c33a6643..11cf8df5d67 100644
--- a/audio/libvorbis/Makefile
+++ b/audio/libvorbis/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/10/15 18:14:03 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/05 20:49:48 rillig Exp $
DISTNAME= libvorbis-1.1.1
CATEGORIES= devel audio
@@ -16,7 +16,7 @@ USE_LIBTOOL= YES
GCC_REQD+= 2.95.3
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
PKGCONFIG_OVERRIDE+= vorbis.pc.in
PKGCONFIG_OVERRIDE+= vorbisenc.pc.in
diff --git a/audio/madman/Makefile b/audio/madman/Makefile
index 565d60b6982..7c993fc5dfc 100644
--- a/audio/madman/Makefile
+++ b/audio/madman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:48 rillig Exp $
DISTNAME= madman-0.93
PKGREVISION= 2
@@ -11,7 +11,7 @@ COMMENT= Powerful audio manager for large collections
BUILD_DEPENDS+= scons>=0.96:../../devel/scons
-GCC_REQD= 3.0
+GCC_REQD+= 3.0
INSTALLATION_DIRS= bin
diff --git a/audio/madplay/Makefile b/audio/madplay/Makefile
index 5686d63d463..89528f3b8b4 100644
--- a/audio/madplay/Makefile
+++ b/audio/madplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/31 16:16:50 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:48 rillig Exp $
#
DISTNAME= madplay-0.15.2b
@@ -18,7 +18,7 @@ GNU_CONFIGURE= YES
USE_LIBTOOL= YES
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
.include "options.mk"
diff --git a/audio/moc/distinfo b/audio/moc/distinfo
index 4497afaa4ec..f5ec9c6ca1c 100644
--- a/audio/moc/distinfo
+++ b/audio/moc/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/11/19 10:55:37 xtraeme Exp $
+$NetBSD: distinfo,v 1.3 2005/12/05 20:49:48 rillig Exp $
SHA1 (moc-2.3.2.tar.bz2) = ca1a331ea9ea3699d76d4771416587190a814516
RMD160 (moc-2.3.2.tar.bz2) = 1da768dbb625bbeedd960eb7c09c0113eeba7482
Size (moc-2.3.2.tar.bz2) = 406058 bytes
-SHA1 (patch-aa) = abf10af1869428886f6616c5fc54a424474efd18
+SHA1 (patch-aa) = 3538c7632571a394a4749065ceb5db09b32e24ae
diff --git a/audio/moc/patches/patch-aa b/audio/moc/patches/patch-aa
index b4eab15f6b1..2765947bf02 100644
--- a/audio/moc/patches/patch-aa
+++ b/audio/moc/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.1 2005/11/19 10:55:37 xtraeme Exp $
+$NetBSD: patch-aa,v 1.2 2005/12/05 20:49:48 rillig Exp $
--- player.c.orig 2005-09-09 08:20:13.000000000 +0000
+++ player.c
@@ -20,4 +20,3 @@ $NetBSD: patch-aa,v 1.1 2005/11/19 10:55:37 xtraeme Exp $
if (tags_changed)
tags_change ();
-
diff --git a/audio/moss/Makefile b/audio/moss/Makefile
index 303186c5d1b..0af542edfaa 100644
--- a/audio/moss/Makefile
+++ b/audio/moss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:44:55 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:48 rillig Exp $
DISTNAME= moss-0.1.13
PKGREVISION= 1
@@ -28,7 +28,7 @@ SUBST_FILES.path= moss.conf.sample
SUBST_SED.path= -e 's,$${PREFIX}/var,${VARBASE},g' \
-e 's,$${PREFIX}/share,${PREFIX}/share,g'
-FILES_SUBST+= INTERPRETER=${PYTHONBIN}
+FILES_SUBST+= INTERPRETER=${PYTHONBIN:Q}
PYDISTUTILSPKG= yes
diff --git a/audio/mp3asm/Makefile b/audio/mp3asm/Makefile
index 7ffef3ea30b..ced6ac7d256 100644
--- a/audio/mp3asm/Makefile
+++ b/audio/mp3asm/Makefile
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.8 2005/10/31 15:55:30 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= mp3asm-0.1.3-1
+PKGNAME= mp3asm-0.1.3.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=mp3asm/}
EXTRACT_SUFX= .tar.bz2
MAINTAINER= rxg@NetBSD.org
HOMEPAGE= http://mp3asm.sourceforge.net/
-COMMENT= mpeg 1/2/2.5 audio layer 1,2,3 frame level editor
+COMMENT= MPEG 1/2/2.5 audio layer 1,2,3 frame level editor
WRKSRC= ${WRKDIR}/mp3asm-0.1
GNU_CONFIGURE= yes
diff --git a/audio/mp3blaster/Makefile b/audio/mp3blaster/Makefile
index 7a066325bda..fe505dccc70 100644
--- a/audio/mp3blaster/Makefile
+++ b/audio/mp3blaster/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:07:38 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:49:49 rillig Exp $
DISTNAME= mp3blaster-3.2.0
PKGREVISION= 2
@@ -9,7 +9,7 @@ MAINTAINER= rxg@NetBSD.org
HOMEPAGE= http://www.stack.nl/~brama/mp3blaster.html
COMMENT= MP3 console curses-based player
-PTHREAD_OPTS= require
+PTHREAD_OPTS+= require
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
diff --git a/audio/mpg123-esound/Makefile b/audio/mpg123-esound/Makefile
index 32a831e85cb..da933d961ea 100644
--- a/audio/mpg123-esound/Makefile
+++ b/audio/mpg123-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/03 15:17:14 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:49 rillig Exp $
PKGNAME= mpg123-esound-${MPG123_VERSION}
PKGREVISION= 6
@@ -6,7 +6,7 @@ COMMENT= Command-line player for mpeg layer 1, 2 and 3 audio with EsounD
TARGET_SUFFIX= -esd
-.include "../mpg123/Makefile.common"
+.include "../../audio/mpg123/Makefile.common"
INSTALLATION_DIRS= bin man/man1
diff --git a/audio/mpg123/Makefile.common b/audio/mpg123/Makefile.common
index c6ca8ffa2ce..f8a320cf226 100644
--- a/audio/mpg123/Makefile.common
+++ b/audio/mpg123/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2005/05/24 13:55:30 rillig Exp $
+# $NetBSD: Makefile.common,v 1.23 2005/12/05 20:49:49 rillig Exp $
DISTNAME= mpg123-0.59r
MPG123_VERSION= 0.59.18
@@ -65,7 +65,7 @@ BUILD_TARGET= ${LOWER_OPSYS}${TARGET_SUFFIX}
CPPFLAGS+= -DINET6
.endif
-MAKE_FLAGS+= PREFIX="${PREFIX}"
+MAKE_FLAGS+= PREFIX=${PREFIX:Q}
pre-patch:
${LN} -s . ${WRKSRC}/mpg123
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index 0a76bf8ab66..ae71de9910c 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= MuSE-0.9
@@ -21,10 +21,10 @@ CONFIGURE_ARGS+= --disable-ncurses
CONFIGURE_ARGS+= --disable-lubrify
CONFIGURE_ARGS+= --enable-gtk2
LIBS+= ${LIBOSSAUDIO}
-MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR}
+MAKE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q}
MAKE_FLAGS+= docsdir=${PREFIX:Q}/share/doc/MuSE
-SUBST_CLASSES= dsp
+SUBST_CLASSES+= dsp
SUBST_STAGE.dsp= post-patch
SUBST_FILES.dsp= src/jmixer.cpp src/libmpeg/fileplayer.cc
SUBST_SED.dsp= -e "s,/dev/dsp,${DEVOSSAUDIO},g"
diff --git a/audio/musicbox/Makefile b/audio/musicbox/Makefile
index 37c26165fda..c8c1c5963ff 100644
--- a/audio/musicbox/Makefile
+++ b/audio/musicbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:49 rillig Exp $
DISTNAME= musicbox-1.01p2
CATEGORIES= audio
@@ -12,7 +12,7 @@ DEPENDS+= mpg123>=0.59.18:../../audio/mpg123
WRKSRC= ${WRKDIR}/musicbox-1.01
CFLAGS+= -D${OPSYS}
-MAKE_ENV+= QT1DIR="${QT1DIR}"
+MAKE_ENV+= QT1DIR=${QT1DIR:Q}
INSTALLATION_DIRS= bin
diff --git a/audio/musicpd/Makefile b/audio/musicpd/Makefile
index b8b0931c2ea..f7be2096528 100644
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/11/22 00:01:40 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:49 rillig Exp $
DISTNAME= mpd-0.11.5
PKGNAME= ${DISTNAME:S/mpd/musicpd/}
@@ -21,7 +21,7 @@ USE_PKGINSTALL= yes
EGDIR= ${PREFIX}/share/examples/mpd
RCD_SCRIPTS= mpd
-FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO}
+FILES_SUBST+= DEVOSSAUDIO=${DEVOSSAUDIO:Q}
LDFLAGS+= ${LIBOSSAUDIO}
SUBST_CLASSES+= config
diff --git a/audio/nspmod/Makefile b/audio/nspmod/Makefile
index 79e89e7bed2..4bacee4dea1 100644
--- a/audio/nspmod/Makefile
+++ b/audio/nspmod/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.13 2005/10/31 16:11:20 tv Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= nspmod-0.1
CATEGORIES= audio
MASTER_SITES= ${MASTER_SITE_SUNSITE:=apps/sound/players/}
-MAINTAINER= mycroft@NetBSD.ORG
+MAINTAINER= mycroft@NetBSD.org
#HOMEPAGE= http://www.jeton.or.jp/users/toru/www/orgsoft/index.html
COMMENT= MOD/S3M/MTM tracker that does its own DSP, uses VoxWare v2.90+
diff --git a/audio/oss/Makefile b/audio/oss/Makefile
index 4cbbd1e5ccd..5026fd7217d 100644
--- a/audio/oss/Makefile
+++ b/audio/oss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/10/31 16:47:15 tv Exp $
+# $NetBSD: Makefile,v 1.34 2005/12/05 20:49:49 rillig Exp $
DISTNAME= oss-${OSS_VERSION} # Overridden below
PKGNAME= oss-${OSS_VERSION}
@@ -39,8 +39,8 @@ MODSTAT= /usr/bin/modstat
CHROOT?= /usr/sbin/chroot
OSSLIBDIR= ${PREFIX}/lib/oss
-FILES_SUBST+= OSSLIBDIR=${OSSLIBDIR}
-FILES_SUBST+= MODSTAT=${MODSTAT}
+FILES_SUBST+= OSSLIBDIR=${OSSLIBDIR:Q}
+FILES_SUBST+= MODSTAT=${MODSTAT:Q}
# OSS needs to find certain files in /etc, so this package can't be
# made to honor ${PKG_SYSCONFDIR}.
diff --git a/audio/p5-MP3-Tag/Makefile b/audio/p5-MP3-Tag/Makefile
index 23622972530..4d4f31b2837 100644
--- a/audio/p5-MP3-Tag/Makefile
+++ b/audio/p5-MP3-Tag/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/08/06 06:19:04 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:49 rillig Exp $
DISTNAME= tagged-0.40
PKGNAME= p5-MP3-Tag-0.40
@@ -11,7 +11,7 @@ MAINTAINER= damon@brodiefamily.org
HOMEPAGE= http://tagged.sourceforge.net/
COMMENT= This is a perl module to read/write tags of mp3-files
-DEPENDS= p5-Compress-Zlib-1.*:../../devel/p5-Compress-Zlib
+DEPENDS+= p5-Compress-Zlib-1.*:../../devel/p5-Compress-Zlib
PERL5_PACKLIST= auto/MP3/Tag/.packlist
diff --git a/audio/portaudio/Makefile b/audio/portaudio/Makefile
index e8fc312c27c..c5f78c298f8 100644
--- a/audio/portaudio/Makefile
+++ b/audio/portaudio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/31 16:13:06 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:49 rillig Exp $
DISTNAME= portaudio_v18_1
PKGNAME= portaudio-18.1
@@ -17,7 +17,6 @@ USE_TOOLS+= gmake
USE_LIBTOOL= yes
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --prefix=${PREFIX}
EXTRACT_CMD_OPTS.zip= -aqo
pre-configure:
diff --git a/audio/rio500/Makefile b/audio/rio500/Makefile
index cf1789034bd..5f6e7b77bcd 100644
--- a/audio/rio500/Makefile
+++ b/audio/rio500/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/31 16:13:50 tv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= rio500-0.7
@@ -14,8 +14,9 @@ NOT_FOR_PLATFORM= Interix-*-*
USE_TOOLS+= gmake
-GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --with-devicepath=/dev --with-deviceentry=urio0
+GNU_CONFIGURE= yes
+CONFIGURE_ARGS+= --with-devicepath=/dev
+CONFIGURE_ARGS+= --with-deviceentry=urio0
.include "../../devel/glib/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile
index 9366148a219..4a8126b3117 100644
--- a/audio/rplay/Makefile
+++ b/audio/rplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/05/23 08:43:59 rillig Exp $
+# $NetBSD: Makefile,v 1.50 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= rplay-3.3.2
@@ -36,7 +36,6 @@ post-install:
.for f in rplay.conf rplay.helpers rplay.hosts rplay.servers
${INSTALL_DATA} ${WRKSRC}/etc/${f} ${EGDIR}
.endfor
-.undef f
.include "../../audio/gsm/buildlink3.mk"
.include "../../devel/readline/buildlink3.mk"
diff --git a/audio/speex/Makefile b/audio/speex/Makefile
index c31f41df9d0..4fc1113e94b 100644
--- a/audio/speex/Makefile
+++ b/audio/speex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= speex-1.0.5
@@ -20,7 +20,7 @@ CONFLICTS= Speex-[0-9]*
CONFIGURE_ARGS+= --with-ogg-dir="${BUILDLINK_PREFIX.libogg}"
# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+= F77=${FALSE}
+CONFIGURE_ENV+= F77=${FALSE:Q}
BUILDLINK_TRANSFORM+= l:gnugetopt:getopt
diff --git a/audio/spiralloops/Makefile b/audio/spiralloops/Makefile
index e549e0f6013..09ce01925c9 100644
--- a/audio/spiralloops/Makefile
+++ b/audio/spiralloops/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/11/07 00:19:14 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= SpiralLoops-2.0.0
@@ -19,7 +19,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
USE_LANGUAGES= c++
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
CXXFLAGS+= -DFLTK_1_0_COMPAT
diff --git a/audio/spiralsynth/Makefile b/audio/spiralsynth/Makefile
index fd66f40cee7..8ad6a01e5c1 100644
--- a/audio/spiralsynth/Makefile
+++ b/audio/spiralsynth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:39 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= SpiralSynth-2.0.0
@@ -18,7 +18,7 @@ ONLY_FOR_PLATFORM= *-*-alpha *-*-arc *-*-cobalt *-*-dreamcast \
USE_LANGUAGES= c++
USE_TOOLS+= gmake
GNU_CONFIGURE= yes
-MAKE_ENV+= CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q}
CXXFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
INSTALLATION_DIRS= bin
diff --git a/audio/splay/Makefile b/audio/splay/Makefile
index 8f4f1ed59a0..180defc8f24 100644
--- a/audio/splay/Makefile
+++ b/audio/splay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:49 rillig Exp $
#
DISTNAME= splay-0.8.2
@@ -13,7 +13,8 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews
USE_LANGUAGES= c++
GNU_CONFIGURE= yes
-CONFIGURE_ARGS= --without-xsplay --without-pthread
+CONFIGURE_ARGS+= --without-xsplay
+CONFIGURE_ARGS+= --without-pthread
LIBS+= ${LIBOSSAUDIO}
.include "../../mk/ossaudio.buildlink3.mk"
diff --git a/audio/sweep/Makefile b/audio/sweep/Makefile
index 58f8db80f3e..1c1d2054289 100644
--- a/audio/sweep/Makefile
+++ b/audio/sweep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= sweep-0.8.3
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --disable-oggtest
CONFIGURE_ARGS+= --disable-vorbistest
CPPFLAGS+= -DDEVOSSAUDIO="\"${DEVOSSAUDIO}\""
-MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS}
+MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q}
.include "../../audio/libvorbis/buildlink3.mk"
.include "../../audio/libsamplerate/buildlink3.mk"
diff --git a/audio/toolame/Makefile b/audio/toolame/Makefile
index 9948cbd480c..68f6938d451 100644
--- a/audio/toolame/Makefile
+++ b/audio/toolame/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/26 17:30:31 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= toolame-02l
@@ -15,7 +15,7 @@ USE_TOOLS+= gmake
TOOLAME_ARCH?=
-MAKE_ENV+= CC="${CC}" CFLAGS="${CFLAGS}" ARCH="${TOOLAME_ARCH}"
+MAKE_ENV+= CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} ARCH=${TOOLAME_ARCH:Q}
BUILD_TARGET= toolame
INSTALLATION_DIRS= bin
diff --git a/audio/tracker/Makefile b/audio/tracker/Makefile
index 3f31b67f225..2eaae8e52b1 100644
--- a/audio/tracker/Makefile
+++ b/audio/tracker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/07/20 01:54:04 kristerw Exp $
+# $NetBSD: Makefile,v 1.35 2005/12/05 20:49:50 rillig Exp $
DISTNAME= tracker-5.3
PKGREVISION= 1
@@ -17,7 +17,7 @@ NO_SRC_ON_CDROM= ${RESTRICTED}
PKG_INSTALLATION_TYPES= overwrite pkgviews
WRKSRC= ${WRKDIR}/tracker
-MAKE_FLAGS= MACHINE=${LOWER_OPSYS} INSTALL="${INSTALL}" \
+MAKE_FLAGS+= MACHINE=${LOWER_OPSYS:Q} INSTALL=${INSTALL:Q} \
INST_BIN_OPT="-c -s -m ${BINMODE} -o ${BINOWN} -g ${BINGRP}" \
INST_MAN_OPT="-c -m 644 -o ${BINOWN} -g ${BINGRP}" \
COMPRESSION_FILE=${PKG_SYSCONFDIR}/compression_methods \
diff --git a/audio/tremor-tools/Makefile b/audio/tremor-tools/Makefile
index fbdd74aab9f..81dd07a67f6 100644
--- a/audio/tremor-tools/Makefile
+++ b/audio/tremor-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/08 12:35:14 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:50 rillig Exp $
DISTNAME= vorbis-tools-1.0
PKGNAME= tremor-tools-1.0.0.8
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
--with-ao-prefix=${BUILDLINK_PREFIX.libao}
-PLIST_SUBST+= DISTNAME="${DISTNAME}"
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
PTHREAD_OPTS+= require
diff --git a/audio/tremor/Makefile b/audio/tremor/Makefile
index 0a7a037e2d4..30b5de29748 100644
--- a/audio/tremor/Makefile
+++ b/audio/tremor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 20:07:59 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:50 rillig Exp $
DISTNAME= tremor_snapshot_030406
PKGNAME= tremor-1.0.2
@@ -17,7 +17,7 @@ GNU_CONFIGURE= yes
USE_TOOLS+= automake14 gmake
USE_LIBTOOL= yes
-PLIST_SUBST+= DISTNAME=${DISTNAME}
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
pre-configure:
cd ${WRKSRC} && aclocal
diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile
index 59b35e27f76..9eb1e6ce4c0 100644
--- a/audio/ubs/Makefile
+++ b/audio/ubs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/04/11 21:44:57 tv Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= ubs-0.17
@@ -27,9 +27,9 @@ UBS_GROUP?= ubs
PKG_GROUPS= ${UBS_GROUP}
PKG_USERS= ${UBS_USER}:${UBS_GROUP}
-FILES_SUBST+= PREFIX="${PREFIX}"
-FILES_SUBST+= UBS_USER="${UBS_USER}"
-FILES_SUBST+= UBS_GROUP="${UBS_GROUP}"
+FILES_SUBST+= PREFIX=${PREFIX:Q}
+FILES_SUBST+= UBS_USER=${UBS_USER:Q}
+FILES_SUBST+= UBS_GROUP=${UBS_GROUP:Q}
OWN_DIRS_PERMS= ${UBS_BASEDIR} ${UBS_USER} ${UBS_GROUP} 0750
OWN_DIRS_PERMS+= ${UBS_BASEDIR}/var ${UBS_USER} ${UBS_GROUP} 0750
diff --git a/audio/vorbis-tools/Makefile b/audio/vorbis-tools/Makefile
index 0118a82caeb..d7eb23ad8cb 100644
--- a/audio/vorbis-tools/Makefile
+++ b/audio/vorbis-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/10/15 21:24:16 wiz Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:49:50 rillig Exp $
DISTNAME= vorbis-tools-1.1.1
CATEGORIES= audio
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --with-ogg-prefix=${BUILDLINK_PREFIX.libogg} \
--with-vorbis-prefix=${BUILDLINK_PREFIX.libvorbis} \
--with-ao-prefix=${BUILDLINK_PREFIX.libao}
-PLIST_SUBST+= DISTNAME="${DISTNAME}"
+PLIST_SUBST+= DISTNAME=${DISTNAME:Q}
PTHREAD_OPTS+= require
diff --git a/audio/xamp/Makefile b/audio/xamp/Makefile
index 7389251498f..c100175176f 100644
--- a/audio/xamp/Makefile
+++ b/audio/xamp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:49:50 rillig Exp $
DISTNAME= xamp-0.8-10
PKGNAME= xamp-0.8.10
@@ -16,7 +16,7 @@ COMMENT= Version of amp (stands for `Audio Mpeg Player') plus a Qt GUI
WRKSRC= ${WRKDIR}/xamp-0.8/xamp-0.8g
DIST_SUBDIR= xamp
GNU_CONFIGURE= yes
-CONFIGURE_ENV+= CXXFLAGS="${CFLAGS}"
+CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q}
USE_TOOLS+= gmake
USE_LANGUAGES= c c++
diff --git a/audio/xmcd/Makefile b/audio/xmcd/Makefile
index 1a751a7d323..0e684ccddb8 100644
--- a/audio/xmcd/Makefile
+++ b/audio/xmcd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.53 2005/09/21 23:19:14 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.54 2005/12/05 20:49:50 rillig Exp $
DISTNAME= xmcd-3.0.2
PKGREVISION= 5
@@ -23,9 +23,9 @@ USE_IMAKE= yes
MAKE_ENV+= BATCH_BINDIR=${PREFIX}/bin
MAKE_ENV+= BATCH_LIBDIR=${PREFIX}/lib/X11
MAKE_ENV+= BATCH_MANDIR=${PREFIX}/man/man1
-MAKE_ENV+= SHELL=${SH}
+MAKE_ENV+= SHELL=${SH:Q}
-INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* NetBSD-1.6[A-S]*
+INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-S]*-*
.include "../../mk/bsd.prefs.mk"
.if ${OPSYS} == "SunOS"
@@ -36,7 +36,7 @@ ARCH= ${OPSYS}
ARCHBIN= ${PREFIX}/lib/X11/xmcd/bin-${ARCH}-${MACHINE_ARCH}
XMCDDIR= ${PREFIX}/lib/X11/xmcd
-PLIST_SUBST+= ARCH=${ARCH}
+PLIST_SUBST+= ARCH=${ARCH:Q}
_SETUID_ROOT= ${ROOT_USER} ${ROOT_GROUP} 4711
SPECIAL_PERMS= ${ARCHBIN}/cda ${_SETUID_ROOT}
diff --git a/audio/xmms-blursk/Makefile b/audio/xmms-blursk/Makefile
index ac0b5741e2d..a17c517c647 100644
--- a/audio/xmms-blursk/Makefile
+++ b/audio/xmms-blursk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:50 rillig Exp $
DISTNAME= Blursk-1.3
PKGNAME= xmms-blursk-1.3
@@ -19,7 +19,7 @@ USE_LIBTOOL= YES
.include "../../mk/bsd.prefs.mk"
.if !exists(${X11BASE}/include/X11/extensions/Xvlib.h)
-PKG_FAIL_REASON= "${PKGNAME} requires libXv.a"
+PKG_FAIL_REASON+= "${PKGNAME} requires libXv.a"
.endif
post-install:
diff --git a/audio/xmms-esound/Makefile b/audio/xmms-esound/Makefile
index a0000345596..13b125ce296 100644
--- a/audio/xmms-esound/Makefile
+++ b/audio/xmms-esound/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/11/20 22:10:22 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:50 rillig Exp $
#
.include "../../audio/xmms/Makefile.common"
@@ -11,7 +11,7 @@ COMMENT= XMMS plugin to output sound through the esound daemon
CONFLICTS+= xmms<=1.2.7nb8
-BUILDLINK_DEPENDS.xmms= xmms>=1.2.7nb9
+BUILDLINK_DEPENDS.xmms+= xmms>=1.2.7nb9
BUILD_DIRS= ${WRKSRC}/Output/esd
INSTALL_DIRS= ${WRKSRC}/Output/esd
diff --git a/audio/xmms-fmradio/Makefile b/audio/xmms-fmradio/Makefile
index 5aaad7a4f4d..a7cd7063015 100644
--- a/audio/xmms-fmradio/Makefile
+++ b/audio/xmms-fmradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:39 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xmms-FMRadio-1.4
@@ -12,7 +12,7 @@ MAINTAINER= jmcneill@NetBSD.org
HOMEPAGE= http://silicone.free.fr/xmms-FMRadio/
COMMENT= Use a Radio Tuner card in XMMS
-ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-*-* NetBSD-1.6*-* NetBSD-[2-9]*-*
+ONLY_FOR_PLATFORM= NetBSD-1.5Z[A-Z]-* NetBSD-1.6*-* NetBSD-[2-9]*-*
BINOWN?= ${ROOT_USER}
BINGRP?= ${ROOT_GROUP}
diff --git a/audio/xmms-iris/Makefile b/audio/xmms-iris/Makefile
index 7f11bc5014a..c230861e419 100644
--- a/audio/xmms-iris/Makefile
+++ b/audio/xmms-iris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/04/11 21:44:59 tv Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= iris-0.11
@@ -18,7 +18,7 @@ USE_LIBTOOL= YES
# Needs libXxf86vm.so which isn't provided on NetBSD currently.
.if !exists(${X11BASE}/lib/libXxf86vm.so)
-PKG_FAIL_REASON= "${PKGNAME} requires libXxf86vm.so"
+PKG_FAIL_REASON+= "${PKGNAME} requires libXxf86vm.so"
.endif
.include "../../audio/xmms/buildlink3.mk"
diff --git a/audio/xmms-mad/Makefile b/audio/xmms-mad/Makefile
index cf4b08daedb..eddf1e11148 100644
--- a/audio/xmms-mad/Makefile
+++ b/audio/xmms-mad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:12 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xmms-mad-0.5.5
@@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config
CPPFLAGS.NetBSD+= -DHAVE_NANOSLEEP=1
-BUILDLINK_DEPENDS.libmad= libmad>=0.15.0bnb1
+BUILDLINK_DEPENDS.libmad+= libmad>=0.15.0bnb1
.include "../../audio/libid3tag/buildlink3.mk"
.include "../../audio/libmad/buildlink3.mk"
diff --git a/audio/xmms-tv-scope/Makefile b/audio/xmms-tv-scope/Makefile
index 8844daba674..d3f473ab03f 100644
--- a/audio/xmms-tv-scope/Makefile
+++ b/audio/xmms-tv-scope/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:45:00 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= tv_scope-0.0.2
@@ -16,7 +16,7 @@ GNU_CONFIGURE= YES
ONLY_FOR_PLATFORM= SunOS-*-* Linux-*-* Darwin-*-*
ONLY_FOR_PLATFORM+= NetBSD-1.6[N-Z]-* NetBSD-1.6Z[A-Z]-*
-ONLY_FOR_PLATFORM+= NetBSD-[2-9]*
+ONLY_FOR_PLATFORM+= NetBSD-[2-9]*-*
.include "../../audio/xmms/buildlink3.mk"
.include "../../devel/SDL/buildlink3.mk"
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index 9ed98740a18..d968ef8e2d6 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2005/11/02 15:20:51 joerg Exp $
+# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xmms-1.2.10
@@ -23,7 +23,7 @@ PATCHDIR= ${.CURDIR}/../../audio/xmms/patches
CONFIGURE_ARGS+= --without-gnome
SHLIBTOOL_OVERRIDE= libtool
-# Broken configure script assumes that iconv_open lives in libc; work around.
+# Broken configure script assumes that iconv_open lives in libc; work around.
CPPFLAGS+= -DHAVE_ICONV_OPEN=1
CONFIGURE_ENV+= ac_cv_func_iconv_open=yes
LDFLAGS+= ${BUILDLINK_LDADD.iconv}
diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile
index 34114137a09..4fc98909505 100644
--- a/audio/xsidplay/Makefile
+++ b/audio/xsidplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/06/16 06:57:40 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/12/05 20:49:50 rillig Exp $
#
DISTNAME= xsidplay-1.6.5.1a
@@ -15,7 +15,7 @@ USE_LIBTOOL= yes
GNU_CONFIGURE= yes
USE_TOOLS+= gmake
-MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q}
CONFIGURE_ARGS+= --with-qt-dir=${QTDIR}
CONFIGURE_ENV+= DISABLE_ESD_TEST=yes