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
2005-12-05 20:49:47 +00:00 · 2005-12-05 20:49:47 +00:00 · b71a1d488b
parent 624eed5892
commit b71a1d488b
1531 changed files with 4009 additions and 4138 deletions
--- a/archivers/advancecomp/hacks.mk
+++ b/archivers/advancecomp/hacks.mk
@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/21 21:48:32 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:49:47 rillig Exp $

-.ifndef ADVANCECOMP_HACKS_MK
+.if !defined(ADVANCECOMP_HACKS_MK)
 ADVANCECOMP_HACKS_MK=	# defined

 ### [Fri Jan 21 21:44:32 UTC 2005 : tv]
--- a/archivers/dar/hacks.mk
+++ b/archivers/dar/hacks.mk
@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.2 2005/01/24 20:48:35 tv Exp $
+# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:49:47 rillig Exp $

-.ifndef DAR_HACKS_MK
+.if !defined(DAR_HACKS_MK)
 DAR_HACKS_MK=		# defined

 ### [Mon Jan 24 16:39:35 UTC 2005 : tv]
--- a/archivers/p7zip/Makefile
+++ b/archivers/p7zip/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/08 08:27:42 adam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:47 rillig Exp $

 DISTNAME=	p7zip_4.29_src_all
 PKGNAME=	p7zip-4.29
@ -29,7 +29,7 @@ PLIST_SUBST+=		DYNAMIC_7Z="@comment "

 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV:S/-/_/}

-GCC_REQD=		3.0
+GCC_REQD+=		3.0

 INSTALLATION_DIRS=	bin

--- a/archivers/par2/hacks.mk
+++ b/archivers/par2/hacks.mk
@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.1 2005/01/21 21:48:32 tv Exp $
+# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:49:47 rillig Exp $

-.ifndef PAR2_HACKS_MK
+.if !defined(PAR2_HACKS_MK)
 PAR2_HACKS_MK=		# defined

 ### [Fri Jan 21 21:44:32 UTC 2005 : tv]
--- 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"
--- 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"
--- 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"
--- 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

--- 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:
--- 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
--- 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
--- 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'
--- 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

--- 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

--- 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
--- 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 \
--- 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"
--- 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 > \
--- 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"

--- 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

--- 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

--- 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

--- 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

--- 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"
--- 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
--- 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

--- 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"

--- 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
--- 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 ();
-
--- 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

--- 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
--- 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
--- 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

--- 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
--- 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"
--- 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

--- 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
--- 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+

--- 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}.
--- 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

--- 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:
--- 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"
--- 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"
--- 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

--- 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

--- 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
--- 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"
--- 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"
--- 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
--- 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 \
--- 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

--- 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
--- 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
--- 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

--- 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++

--- 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}
--- 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:
--- 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
--- 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}
--- 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"
--- 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"
--- 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"
--- 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}
--- 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
--- a/benchmarks/iozone/Makefile
+++ b/benchmarks/iozone/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/10/31 17:26:02 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=	iozone3_248
 PKGNAME=	iozone-3.248
@ -22,20 +22,20 @@ MAKEFILE=		makefile
 .include "../../mk/bsd.prefs.mk"

 .if !empty(OPSYS:M*BSD) || ${OPSYS} == "Linux"
-  BUILD_TARGET=		${LOWER_OPSYS}
+BUILD_TARGET=		${LOWER_OPSYS}
 .elif (${OPSYS} == "SunOS")
-  BUILD_TARGET=		Solaris
+BUILD_TARGET=		Solaris
 .elif (${OPSYS} == "Darwin")
-  BUILD_TARGET=		macosx
+BUILD_TARGET=		macosx
 .elif (${OPSYS} == "IRIX")
-  BUILD_TARGET=		${OPSYS}${ABI:M64}
+BUILD_TARGET=		${OPSYS}${ABI:M64}
 .elif (${OPSYS} == "BSDOS")
-  BUILD_TARGET=		bsdi
+BUILD_TARGET=		bsdi
 .elif (${OPSYS} == "AIX")
-  BUILD_TARGET=		${OPSYS}
+BUILD_TARGET=		${OPSYS}
 .else
-  # XXX: generic should work, but specific target would be better
-  BUILD_TARGET=		generic
+# XXX: generic should work, but specific target would be better
+BUILD_TARGET=		generic
 .endif

 INSTALLATION_DIRS=	bin man/man1
--- a/benchmarks/kttcp/Makefile
+++ b/benchmarks/kttcp/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/23 08:53:42 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=	kttcp-${VERSION}
 CATEGORIES=	benchmarks net
@ -6,11 +6,11 @@ MASTER_SITES=	# empty
 DISTFILES=	# empty

 MAINTAINER=	thorpej@NetBSD.org
-COMMENT=	kttcp kernel network throughput benchmark
+COMMENT=	Kernel network throughput benchmark

 VERSION=	20020711

-ONLY_FOR_PLATFORM=	NetBSD-1.6[B-Z]*-* NetBSD-[2-9]*
+ONLY_FOR_PLATFORM=	NetBSD-1.6[B-Z]*-* NetBSD-[2-9]*-*

 PKG_INSTALLATION_TYPES=	overwrite pkgviews

--- a/benchmarks/lmbench/Makefile
+++ b/benchmarks/lmbench/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=		lmbench-2alpha11
 PKGNAME=		lmbench-2.11a
@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews

 USE_TOOLS+=		gmake perl:run
 BUILD_TARGET=		build
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}

 INSTALLATION_DIRS=	man/man1 man/man3 man/man8

--- a/benchmarks/lmbench/distinfo
+++ b/benchmarks/lmbench/distinfo
@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2005/05/23 08:55:56 rillig Exp $
+$NetBSD: distinfo,v 1.9 2005/12/05 20:49:51 rillig Exp $

 SHA1 (lmbench-2alpha11.tgz) = 7480815b8f8d4000647db59eb6160e9dbac06490
 RMD160 (lmbench-2alpha11.tgz) = 361401104fd5ea3a6e0a26a754ffd66fb2d9e9d6
@ -7,10 +7,10 @@ SHA1 (patch-aa) = 0f16f206d56cfdfdd870d21afcef46e3b8e2c53a
 SHA1 (patch-ab) = b25c659fd808535738591892c552b062bb7e7e8f
 SHA1 (patch-ac) = 2aa73fbf3119db95ca483f676bd3f3c2fd25c8f6
 SHA1 (patch-ad) = a196e6a4734de9a0d698d38f1691b1146bda45a2
-SHA1 (patch-ae) = 9a1475b04bb51f2d36edf8f6cf572235a31c55e0
+SHA1 (patch-ae) = 6d55be411c3b1e02fb269a24c1fd115e6e86855a
 SHA1 (patch-af) = 9390d4b6fa950beb0020b44ad520dd22a8a2178e
 SHA1 (patch-ag) = cf5d1f3cf24b9fb6ab4a1a84ad8a44fda858add4
 SHA1 (patch-ah) = 3784e219af5be023bc7fe00dd8656f5af100279c
 SHA1 (patch-ai) = 81f3695239b96dfa848a6bc47f739038efc79dca
 SHA1 (patch-aj) = c0ddc2b95dab57b96f886dedcd6f253eadd9bf70
-SHA1 (patch-ak) = 347fc345f90872e922faace9fc651b5d8033dc64
+SHA1 (patch-ak) = 486db292921675cac78b8e266da84ca04ed8d697
--- a/benchmarks/lmbench/patches/patch-ae
+++ b/benchmarks/lmbench/patches/patch-ae
@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.2 2004/05/23 23:28:29 danw Exp $
+$NetBSD: patch-ae,v 1.3 2005/12/05 20:49:51 rillig Exp $

 --- src/lmdd.c.orig	Fri Jul 31 15:55:18 1998
 +++ src/lmdd.c
-@@ -40,7 +40,6 @@ char	*id = "$Id: lmdd.c,v 1.23 1997/12/0
+@@ -40,7 +40,6 @@
 #include	<stdlib.h>
 #include	<signal.h>
 #include	<string.h>
--- a/benchmarks/lmbench/patches/patch-ak
+++ b/benchmarks/lmbench/patches/patch-ak
@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.1 2004/06/16 04:33:51 minskim Exp $
+$NetBSD: patch-ak,v 1.2 2005/12/05 20:49:51 rillig Exp $

 --- src/lmhttp.c.orig	1998-07-31 14:55:18.000000000 -0500
 +++ src/lmhttp.c
-@@ -17,6 +17,7 @@ char	*id = "$Id: s.lmhttp.c 1.6 98/06/29
+@@ -17,6 +17,7 @@
 #include <sys/sysmp.h>
 #include <sys/syssgi.h>
 #endif
--- a/benchmarks/netio/Makefile
+++ b/benchmarks/netio/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/10 07:03:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=	netio123
 PKGNAME=	netio-1.23
@ -14,7 +14,7 @@ LICENSE=	no-commercial-use
 PKG_INSTALLATION_TYPES=	overwrite pkgviews

 WRKSRC=		${WRKDIR}
-MAKE_FLAGS+=	CC="${CC}" CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \
+MAKE_FLAGS+=	CC=${CC:Q} CFLAGS="-DUNIX ${PTHREAD_CFLAGS} ${CFLAGS}" \
 		LFLAGS="${PTHREAD_LDFLAGS} ${LDFLAGS}" \
 		LIBS="${PTHREAD_LIBS} ${LIBS}" O=.o OUT=-o X=

--- a/benchmarks/ttcp/Makefile
+++ b/benchmarks/ttcp/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/07/30 15:50:38 minskim Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=	ttcp
 PKGNAME=	${DISTNAME}-1.12
@ -14,15 +14,15 @@ COMMENT=	TCP testing and performance measuring tool
 PKG_INSTALLATION_TYPES=	overwrite pkgviews

 WRKSRC=		${WRKDIR}
-MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP}	\
-		MANOWN=${MANOWN} MANGRP=${MANGRP}
+MAKE_ENV+=	BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}	\
+		MANOWN=${MANOWN:Q} MANGRP=${MANGRP:Q}

 .include "../../mk/bsd.prefs.mk"

 MANCOMPRESSED_IF_MANZ=	YES

 .if (${OPSYS} == Darwin)
-MAKE_FLAGS=	CFLAGS="-Din_addr_t=\"unsigned long\""
+MAKE_FLAGS+=	CFLAGS="-Din_addr_t=\"unsigned long\""
 .endif

 INSTALLATION_DIRS=	bin man/cat1 man/man1
--- a/benchmarks/ttcp/distinfo
+++ b/benchmarks/ttcp/distinfo
@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.8 2005/11/07 13:55:32 joerg Exp $
+$NetBSD: distinfo,v 1.9 2005/12/05 20:49:51 rillig Exp $

 SHA1 (ttcp.tar.Z) = 33a60af208eff3dc9ae745060f44b24c4e74aa7e
 RMD160 (ttcp.tar.Z) = b5cb1a8efe0f716d25d58a4950f35bac47b17668
 Size (ttcp.tar.Z) = 18163 bytes
 SHA1 (patch-aa) = a9717aa9fd5f8cdff1a39c9b7d6ab17abbe399ad
-SHA1 (patch-ab) = 402874d81ec7c76b7279d4d4e79a5b851bf95804
+SHA1 (patch-ab) = b72ffd575ed97f62977743518c2b887182fe5595
--- a/benchmarks/ttcp/patches/patch-ab
+++ b/benchmarks/ttcp/patches/patch-ab
@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.6 2005/11/07 13:55:32 joerg Exp $
+$NetBSD: patch-ab,v 1.7 2005/12/05 20:49:51 rillig Exp $

 --- ttcp.c.orig	1997-02-27 21:30:23.000000000 +0000
 +++ ttcp.c
-@@ -55,6 +55,7 @@ static char RCSid[] = "ttcp.c $Revision:
+@@ -55,6 +55,7 @@
 #include <arpa/inet.h>
 #include <netdb.h>
 #include <sys/time.h>		/* struct timeval */
--- a/benchmarks/ubench/Makefile
+++ b/benchmarks/ubench/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/03 05:57:45 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:51 rillig Exp $
 #

 DISTNAME=	ubench-0.32
@ -11,7 +11,7 @@ COMMENT=	The Unix Benchmark utility

 BUILD_TARGET=	ubench

-SUBST_CLASSES=		path
+SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-configure
 SUBST_FILES.path=	Makefile
 SUBST_SED.path=		-e "s,/usr/local,${PREFIX},"
--- a/biology/clustalw/Makefile
+++ b/biology/clustalw/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/19 15:42:49 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=	clustalw1.83.UNIX
 PKGNAME=	clustalw-1.83
@ -16,7 +16,7 @@ MAKEFILE=	makefile
 BUILD_TARGET=	clustalw
 WRKSRC=		${WRKDIR}/clustalw1.83

-MAKE_FLAGS+=	CC="${CC}"
+MAKE_FLAGS+=	CC=${CC:Q}

 INSTALLATION_DIRS=	bin

--- a/biology/hmmer/Makefile
+++ b/biology/hmmer/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:45:01 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:51 rillig Exp $
 #

 DISTNAME=		hmmer-2.3.2
@ -13,6 +13,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews

 GNU_CONFIGURE=		yes

-MAKE_FLAGS+=            MKDIR="${MKDIR}"
+MAKE_FLAGS+=            MKDIR=${MKDIR:Q}

 .include "../../mk/bsd.pkg.mk"
--- a/biology/mummer/Makefile
+++ b/biology/mummer/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/07/16 19:10:38 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:51 rillig Exp $
 #

 DISTNAME=		MUMmer3.15
@ -14,8 +14,8 @@ COMMENT=		System for aligning whole genome sequences
 WRKSRC=			${WRKDIR}/${DISTNAME}
 USE_TOOLS+=		gmake perl:run

-MAKE_ENV+=		SH="${SH}"
-MAKE_ENV+=		PERL="${PERL5}"
+MAKE_ENV+=		SH=${SH:Q}
+MAKE_ENV+=		PERL=${PERL5:Q}
 INSTALLATION_DIRS=	bin

 do-install:
--- a/biology/rasmol/Makefile
+++ b/biology/rasmol/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/10/31 17:53:26 tv Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=	RasMol_2.7.3
 PKGNAME=	rasmol-2.7.3
@ -13,7 +13,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/src
 USE_IMAKE=	YES
 USE_TOOLS+=	gunzip

-MAKE_ENV+=	DEPTHDEF="${DEPTHDEF}"
+MAKE_ENV+=	DEPTHDEF=${DEPTHDEF:Q}

 .include "../../mk/bsd.prefs.mk"

@ -22,11 +22,11 @@ GCC_REQD+=		2.95.3
 .endif

 .if defined(RASMOL_DEPTH)
-.if ${RASMOL_DEPTH} == 32
+.  if ${RASMOL_DEPTH} == 32
 DEPTHDEF=	-DTHIRTYTWOBIT
-.else if ${RASMOL_DEPTH} == 16
+.  elif ${RASMOL_DEPTH} == 16
 DEPTHDEF=	-DSIXTEENBIT
-.endif
+.  endif
 .endif
 DEPTHDEF?=	-DEIGHTBIT

--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:51 rillig Exp $
 #

 DISTNAME=	fastcap-2.0-18Sep92
@ -16,7 +16,7 @@ EXTRACT_USING=	gtar	# cannot be extracted with pax as tar
 WRKSRC=			${WRKDIR}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
-CONFIGURE_ARGS=		4
+CONFIGURE_ARGS+=	4
 TEX_DEPMETHOD=	build
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3

--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/10/23 22:24:11 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:51 rillig Exp $
 #

 DISTNAME=	fasthenry-3.0-12Nov96
@ -30,7 +30,7 @@ DEPENDS+=	libffm-[0-9]*:../../math/libffm
 LIBS+=		-lffm
 .endif
 LIBS+=		-lm
-MAKE_ENV+=	LIBS=${LIBS:Q}
+MAKE_ENV+=	LIBS=${LIBS:M*:Q}

 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=		2.95.3
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:51 rillig Exp $

 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@ -17,9 +17,9 @@ WRKSRC=			${WRKDIR}/FElt-3.05
 USE_X11BASE=		yes
 XAW_TYPE?=		3d

-MAKE_ENV+=		CCOPTS="${CFLAGS}"
-MAKE_ENV+=		LDOPTS="${LDFLAGS}"
-MAKE_ENV+=		SH="${SH}"
+MAKE_ENV+=		CCOPTS=${CFLAGS:M*:Q}
+MAKE_ENV+=		LDOPTS=${LDFLAGS:M*:Q}
+MAKE_ENV+=		SH=${SH:Q}

 USE_GNU_READLINE=	# uses remove_history() and history_list()

--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/08/22 12:25:00 cube Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:51 rillig Exp $
 #

 DISTNAME=		gtkwave-2.0.0pre5
-PKGNAME=		gtkwave-2.0.0pre5
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/

--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/22 15:28:35 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=	magic-7.1
@ -11,7 +11,7 @@ HOMEPAGE=	http://vlsi.cornell.edu/magic/
 COMMENT=	Integrated circuit layout system

 USE_TOOLS+=	gmake
-MAKE_ENV+=	MAGIC_HOME=${PREFIX}
+MAKE_ENV+=	MAGIC_HOME=${PREFIX:Q}

 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "big"
--- a/cad/mcalc/Makefile
+++ b/cad/mcalc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/17 02:52:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=	mcalc-1.5
@ -15,7 +15,7 @@ NO_BUILD=	yes

 MCALCBASE?=	share/${PKGNAME}

-PLIST_SUBST+=	MCALCBASE=${MCALCBASE}
+PLIST_SUBST+=	MCALCBASE=${MCALCBASE:Q}
 MESSAGE_SUBST+=	MCALCBASE=${MCALCBASE}

 do-install:
--- a/cad/mex-wcalc/Makefile
+++ b/cad/mex-wcalc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/02 00:00:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:52 rillig Exp $
 #

 .include "../../cad/wcalc/Makefile.common"
@ -64,7 +64,7 @@ MEX_SUFX?=	${_MEX_SUFX}

 MATLAB_MEX?=		${_MATLAB_MEX}

-PLIST_SUBST+=		MEX_SUFX=${MEX_SUFX}
+PLIST_SUBST+=		MEX_SUFX=${MEX_SUFX:Q}

 .if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
 MATLAB_DIR!=		${MATLAB_MEX} -v 2>/dev/null | ${AWK} '/[ \t]MATLAB[ \t]/ {print $$NF}'
--- a/cad/oct-wcalc/Makefile
+++ b/cad/oct-wcalc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/01 03:53:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:52 rillig Exp $
 #

 .include "../../cad/wcalc/Makefile.common"
@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--without-scilab
 # the octave-forge mex script, not any c++ code
 # explicitly present in wcalc.  The fortran part
 # also comes from ocatve, not from wcalc.
-GCC_REQD=	3.0
+GCC_REQD+=	3.0
 USE_LANGUAGES=	c c++ fortran

 .include "../../math/octave/octave.mk"
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/03 02:37:28 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:49:52 rillig Exp $

 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
@ -11,7 +11,7 @@ HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System

 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
 MAKE_ENV+=		QTDIR=${BUILDLINK_PREFIX.qt3}
 INSTALLATION_DIRS=	bin

--- a/cad/sci-wcalc/Makefile
+++ b/cad/sci-wcalc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/01 03:52:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:52 rillig Exp $
 #

 .include "../../cad/wcalc/Makefile.common"
@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--without-matlab
 CONFIGURE_ARGS+=	--without-octave
 CONFIGURE_ARGS+=	--with-scilab=${SCI}

-PLIST_SUBST+=		SCIVERSION=${SCIVERSION}
+PLIST_SUBST+=		SCIVERSION=${SCIVERSION:Q}
 MESSAGE_SUBST+=		SCIVERSION=${SCIVERSION}

 .include "../../cad/libwcalc/buildlink3.mk"
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/03 19:56:36 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=	simian_12_98
@ -18,7 +18,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}

 USE_LANGUAGES=		c++
-GCC_REQD=		3.0
+GCC_REQD+=		3.0

 WRKSRC=		${WRKDIR}/Simian
 BUILD_DIRS=	src
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=	tkgate-1.6i
@ -19,8 +19,8 @@ USE_TOOLS+=		gm4

 TKGATE_SITENAME=	Earth

-CONFIGURE_ENV+=		BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}"
-CONFIGURE_ENV+=		PREFIX="${PREFIX}"
+CONFIGURE_ENV+=		BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q}
+CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}

 SUBST_CLASSES+=		tkgate
 SUBST_MESSAGE.tkgate=	"Fixing paths in configuration files."
--- a/cad/wcalc/Makefile.common
+++ b/cad/wcalc/Makefile.common
@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/12/01 23:58:16 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=       wcalc-0.9
@ -46,6 +46,6 @@ MESSAGE_SUBST+=	WCALC_HTMLPATH=${WCALC_HTMLPATH}
 MESSAGE_SUBST+=	WCALC_DIR=${WCALC_DIR}

 # and the PLIST too
-PLIST_SUBST+=	WCALC_CGIDIR=${WCALC_CGIDIR}
-PLIST_SUBST+=	WCALC_HTMLDIR=${WCALC_HTMLDIR}
-PLIST_SUBST+=	WCALC_DIR=${WCALC_DIR}
+PLIST_SUBST+=	WCALC_CGIDIR=${WCALC_CGIDIR:Q}
+PLIST_SUBST+=	WCALC_HTMLDIR=${WCALC_HTMLDIR:Q}
+PLIST_SUBST+=	WCALC_DIR=${WCALC_DIR:Q}
--- a/chat/aim/Makefile
+++ b/chat/aim/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:52 rillig Exp $

 DISTNAME=	aim-1.5.286
 CATEGORIES=	chat
@ -23,7 +23,7 @@ NO_BUILD=	YES

 EXTRACT_ONLY=	# nothing
 PLIST_SRC=	${WRKDIR}/PLIST.rpm
-PLIST_SUBST+=	EMULSUBDIR=${EMULSUBDIR}
+PLIST_SUBST+=	EMULSUBDIR=${EMULSUBDIR:Q}

 DIST_SUBDIR=	.
 RPMFILES=	${DISTFILES}
--- a/chat/bitlbee/Makefile
+++ b/chat/bitlbee/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/11/12 19:51:24 tonio Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=		bitlbee-0.99
@ -48,7 +48,6 @@ do-install:
 .for f in AUTHORS FAQ README TODO
 	${INSTALL_DATA} ${WRKSRC}/doc/${f} ${DOCDIR}
 .endfor
-.undef f

 PKG_OPTIONS_VAR=	PKG_OPTIONS.bitlbee
 PKG_SUPPORTED_OPTIONS=	inet6
--- a/chat/bnc/Makefile
+++ b/chat/bnc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/16 17:49:41 tonio Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:52 rillig Exp $

 DISTNAME=	bnc2.9.4
 PKGNAME=	${DISTNAME:S/bnc/&-/}
@ -12,9 +12,8 @@ COMMENT=	Simple IRC relay proxy with support for virtual hosting

 DEPENDS+=	dialog-[0-9]*:../../misc/dialog

-GNU_CONFIGURE=	YES
-
-CONFIGURE_ARGS=	--with-ssl
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--with-ssl

 INSTALLATION_DIRS=	bin

--- a/chat/bsflite/Makefile
+++ b/chat/bsflite/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/29 04:50:39 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:52 rillig Exp $

 DISTNAME=	bsflite-0.80
 CATEGORIES=	chat
@ -19,6 +19,6 @@ do-install:
 		${PREFIX}/share/examples/bsflite

 LIBS.SunOS+=	-lnsl -lsocket
-MAKE_ENV+=	LIBS=${LIBS:Q}
+MAKE_ENV+=	LIBS=${LIBS:M*:Q}

 .include "../../mk/bsd.pkg.mk"
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2005/12/03 17:04:23 adrianp Exp $
+# $NetBSD: Makefile,v 1.56 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=	centericq-4.21.0
@ -19,13 +19,13 @@ USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ssl --with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=      	--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
-LIBS=			${LDFLAGS}
+LIBS+=			${LDFLAGS}

 REPLACE_PERL=		misc/cicqconv

 INCOMPAT_CURSES+=	NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
 INCOMPAT_CURSES+=	NetBSD-1.6_*-* NetBSD-1.6.[1-9]_*-* NetBSD-1.6[A-T]-*
-INCOMPAT_CURSES+=	NetBSD-2.* NetBSD-3.*	# see PR 29060
+INCOMPAT_CURSES+=	NetBSD-2.*-* NetBSD-3.*-*	# see PR 29060

 .include "../../mk/bsd.prefs.mk"

--- a/chat/cgiirc/Makefile
+++ b/chat/cgiirc/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:49:52 rillig Exp $

 DISTNAME=	cgiirc-0.5.6
 CATEGORIES=	chat
@ -55,14 +55,12 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/docs/${f} \
 			${PREFIX}/share/examples/cgiirc/${f}
 .	endfor
-.	undef f
 	${INSTALL_DATA} ${WRKSRC}/cgiirc.config ${PREFIX}/share/examples/cgiirc
 	${INSTALL_DATA} ${WRKDIR}/cgiirc.conf ${PREFIX}/share/examples/cgiirc
 .	for f in ${EGFILES}
 		${INSTALL_DATA} ${WRKSRC}/${f} \
 			${PREFIX}/share/examples/cgiirc/${f}
 .	endfor
-.	undef f
 	${INSTALL_SCRIPT} ${WRKSRC}/*.cgi ${CGIIRC}
 	${INSTALL_DATA} ${WRKSRC}/formats/* ${CGIIRC}/formats/
 	${INSTALL_DATA} ${WRKSRC}/images/*.gif ${CGIIRC}/images/
--- a/chat/fugu/Makefile
+++ b/chat/fugu/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/10/16 19:12:27 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:49:52 rillig Exp $
 #

 DISTNAME=	fugu-1.0
@ -14,7 +14,7 @@ COMMENT=	Graphical client for the gale secure instant messaging system
 PYTHON_VERSIONS_ACCEPTED= 20 21 # no 22 - uses Makefile.pre.in

 GNU_CONFIGURE= 	YES
-CONFIGURE_ENV+=	vi_cv_path_python=${PYTHONBIN}
+CONFIGURE_ENV+=	vi_cv_path_python=${PYTHONBIN:Q}
 LDFLAGS+=	-L${BUILDLINK_PREFIX.py-Pmw}/lib \
 		${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.py-Pmw}/lib
 CPPFLAGS+=	-I${BUILDLINK_PREFIX.py-Pmw}/include \
--- a/chat/gale/Makefile
+++ b/chat/gale/Makefile
@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/09/07 13:58:16 adam Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $

 DISTNAME=	gale-0.99fruit
 PKGNAME=	gale-0.99f
@ -15,8 +15,8 @@ USE_GNU_READLINE=	yes	# needs rl_named_function()
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig
 GNU_CONFIGURE= 		yes
-CONFIGURE_ARGS=		--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ENV+=		PROG_GLIB_CONFIG="${GLIB_CONFIG}"
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ENV+=		PROG_GLIB_CONFIG=${GLIB_CONFIG:Q}

 CPPFLAGS+=		-I${BUILDLINK_PREFIX.rsaref}/include/rsaref
 CPPFLAGS+=		-I${BUILDLINK_PREFIX.libwww}/include/w3c-libwww
--- a/Show more
+++ b/Show more