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

26 files changed, 61 insertions, 59 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 59b1d58d589..4f19cc828df 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:41 rillig Exp $
 #
 
 DISTNAME=	avidemux-2.0.40
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://fixounet.free.fr/avidemux/
 COMMENT=	Graphical video editing program
 
-GCC_REQD=		3.0
+GCC_REQD+=		3.0
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
diff --git a/multimedia/divxplayer/Makefile b/multimedia/divxplayer/Makefile
index 653bbdea26d..7699705cbad 100644
--- a/multimedia/divxplayer/Makefile
+++ b/multimedia/divxplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:41 rillig Exp $
 
 DISTNAME=	divx-player-installer
 PKGNAME=	divxplayer-0.2.0
@@ -19,7 +19,7 @@ CHECK_SHLIBS=	NO
 NO_BUILD=	YES
 USE_X11BASE=	YES
 
-DIST_SUBDIR=	${PKGNAME}
+DIST_SUBDIR=	${PKGNAME_NOREV}
 
 BINARY=		divxPlayer.bin
 DATADIR=	${PREFIX}/share/divxplayer
diff --git a/multimedia/dvdauthor/Makefile b/multimedia/dvdauthor/Makefile
index 7bdcc598189..45e949368f1 100644
--- a/multimedia/dvdauthor/Makefile
+++ b/multimedia/dvdauthor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:41 rillig Exp $
 
 DISTNAME=		dvdauthor-0.6.10
 PKGREVISION=	2
@@ -10,9 +10,9 @@ HOMEPAGE=		http://dvdauthor.sourceforge.net/
 COMMENT=		Tools to assist DVD authoring
 
 GNU_CONFIGURE=		YES
-USE_TOOLS=		gmake
+USE_TOOLS+=		gmake
 
 .include "../../graphics/ImageMagick/buildlink3.mk"
 .include "../../converters/fribidi/buildlink3.mk"
-.include "../libdvdread/buildlink3.mk"
+.include "../../multimedia/libdvdread/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/dvdrip/Makefile b/multimedia/dvdrip/Makefile
index cbc66c5e0ac..980ebc96063 100644
--- a/multimedia/dvdrip/Makefile
+++ b/multimedia/dvdrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/10/29 02:27:47 grant Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:41 rillig Exp $
 #
 
 DISTNAME=	Video-DVDRip-0.50.18
@@ -24,7 +24,7 @@ DEPENDS+=	vcdimager>=0.7.12:../../sysutils/vcdimager-devel
 #DEPENDS+=	rar>=2.02:../../archivers/rar
 .endif
 
-BUILDLINK_DEPENDS.perl= perl>=5.6.0
+BUILDLINK_DEPENDS.perl+=	perl>=5.6.0
 
 USE_PKGLOCALEDIR=	YES
 
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 906ef56befc..f9dad02bb21 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:41 rillig Exp $
 
 DISTNAME=	ffmpeg-0.4.8
 PKGREVISION=	3
@@ -21,8 +21,11 @@ MAKE_ENV+=	EXTRA_LIBS=${BUILDLINK_LDADD.getopt:Q} \
 		FFSERVER_CONF=${PKG_SYSCONFDIR:Q}/ffserver.conf \
 		LOCALBASE=${LOCALBASE:Q}
 
-CONFIGURE_ARGS=		--cc=${CC} --prefix=${PREFIX}
-CONFIGURE_ARGS+=	--enable-pp --disable-vhook --disable-debug
+CONFIGURE_ARGS+=	--cc=${CC:Q}
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--enable-pp
+CONFIGURE_ARGS+=	--disable-vhook
+CONFIGURE_ARGS+=	--disable-debug
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg
 PKG_SUPPORTED_OPTIONS=	bktr lame mmx vorbis
diff --git a/multimedia/gst-plugins/Makefile.common b/multimedia/gst-plugins/Makefile.common
index 2d3e33dcdfd..444a3160753 100644
--- a/multimedia/gst-plugins/Makefile.common
+++ b/multimedia/gst-plugins/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2005/10/12 21:54:04 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:41 rillig Exp $
 #
 
 DISTNAME=		gst-plugins-0.8.11
@@ -129,7 +129,6 @@ CONFIGURE_ENV+=		have_func=no
 		xvideo
 CONFIGURE_ARGS+=	--disable-${driver}
 .endfor
-.undef driver
 
 # A package building a single plugin of gst-plugins has to include this
 # file and define the following variables:
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index a7b9e1b55ba..635dfa72fb5 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/10/12 21:53:42 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:41 rillig Exp $
 #
 
 DISTNAME=		gstreamer-0.8.11
@@ -21,7 +21,7 @@ USE_TOOLS+=		gmake perl pkg-config
 CONFIGURE_ARGS+=	--disable-plugin-builddir
 CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/libdata/gstreamer-0.8
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ENV+=		ac_cv_path_PYTHON="${PYTHONBIN}"
+CONFIGURE_ENV+=		ac_cv_path_PYTHON=${PYTHONBIN:Q}
 CONFIGURE_ARGS+=	HAVE_GTK_DOC=no
 
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-control.pc.in
diff --git a/multimedia/gstreamer/plugins.mk b/multimedia/gstreamer/plugins.mk
index dbe0bc50873..b172c409730 100644
--- a/multimedia/gstreamer/plugins.mk
+++ b/multimedia/gstreamer/plugins.mk
@@ -1,4 +1,4 @@
-# $NetBSD: plugins.mk,v 1.5 2005/03/25 12:45:09 jmmv Exp $
+# $NetBSD: plugins.mk,v 1.6 2005/12/05 20:50:41 rillig Exp $
 #
 # This Makefile fragment is intended to be included by packages that install
 # GStreamer modules.  It takes care of rebuilding the corresponding databases
@@ -12,9 +12,9 @@ GST_DBDIR=		${BUILDLINK_PREFIX.gstreamer}/libdata/gstreamer-0.8
 GST_COMPPREP=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-compprep
 GST_REGISTER=		${BUILDLINK_PREFIX.gstreamer}/bin/gst-register
 
-FILES_SUBST+=		GST_DBDIR="${GST_DBDIR}"
-FILES_SUBST+=		GST_COMPPREP="${GST_COMPPREP}"
-FILES_SUBST+=		GST_REGISTER="${GST_REGISTER}"
+FILES_SUBST+=		GST_DBDIR=${GST_DBDIR:Q}
+FILES_SUBST+=		GST_COMPPREP=${GST_COMPPREP:Q}
+FILES_SUBST+=		GST_REGISTER=${GST_REGISTER:Q}
 INSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
 DEINSTALL_EXTRA_TMPL+=	../../multimedia/gstreamer/files/plugins.tmpl
 USE_PKGINSTALL=		YES
diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index de93226325e..1c9dacc7d84 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:41 rillig Exp $
 
 DISTNAME=	kdemultimedia-${_KDE_VERSION}
 CATEGORIES=	multimedia
@@ -19,7 +19,7 @@ CONF_FILES+=		${PREFIX}/share/examples/kdemultimedia3/applications-merged/kde-mu
 
 .include "../../mk/compiler.mk"
 .if !empty(CC_VERSION:Mgcc-3.*)
-BUILDLINK_DEPENDS.xine-lib=	xine-lib>=1rc0anb1
+BUILDLINK_DEPENDS.xine-lib+=	xine-lib>=1rc0anb1
 .endif
 
 CONFIGURE_ARGS+=	--enable-cdparanoia
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 85910650b1b..a65091971aa 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/10/31 17:35:28 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:41 rillig Exp $
 #
 
 DISTNAME=	kmplayer-0.9.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://kmplayer.kde.org/
 COMMENT=	KDE frontend to mplayer
 
 BUILD_USES_MSGFMT=	yes
-DEPENDS=		mplayer>=1.0rc3:../../multimedia/mplayer
+DEPENDS+=		mplayer>=1.0rc3:../../multimedia/mplayer
 DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
 DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 
diff --git a/multimedia/libflash/Makefile b/multimedia/libflash/Makefile
index 8ba41cffc7d..698cfcf91a7 100644
--- a/multimedia/libflash/Makefile
+++ b/multimedia/libflash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:42 rillig Exp $
 #
 
 .include "Makefile.common"
@@ -9,7 +9,7 @@ COMMENT=	Open source Flash(tm) library
 
 USE_LIBTOOL=	yes
 BUILD_DIRS=	${WRKSRC}/Lib
-MAKE_ENV+=	LIBOSSAUDIO="${LIBOSSAUDIO}"
+MAKE_ENV+=	LIBOSSAUDIO=${LIBOSSAUDIO:Q}
 MAKE_ENV+=	LIBSTDCPP=-lstdc++
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/multimedia/libmatroska/Makefile b/multimedia/libmatroska/Makefile
index d1be0e06ac4..eecd5223f0a 100644
--- a/multimedia/libmatroska/Makefile
+++ b/multimedia/libmatroska/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/11/04 18:55:07 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=	libmatroska-0.7.7
@@ -17,7 +17,7 @@ USE_LANGUAGES=	c++
 
 NO_CONFIGURE=	yes
 MAKEFLAGS+=	prefix=${PREFIX:Q}
-MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:Q} RANLIB=${RANLIB:Q}
+MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:M*:Q} RANLIB=${RANLIB:Q}
 BUILD_DIRS=	make/linux
 BUILD_TARGET=	staticlib
 INSTALL_TARGET=	install_headers install_staticlib
diff --git a/multimedia/libogg/Makefile b/multimedia/libogg/Makefile
index 4048807f1d3..495b6825f28 100644
--- a/multimedia/libogg/Makefile
+++ b/multimedia/libogg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=	libogg-1.1.2
@@ -18,7 +18,7 @@ USE_LIBTOOL=	YES
 
 GCC_REQD+=	2.95.3
 
-PLIST_SUBST+=	DISTNAME=${DISTNAME}
+PLIST_SUBST+=	DISTNAME=${DISTNAME:Q}
 
 PKGCONFIG_OVERRIDE+=	ogg.pc.in
 
diff --git a/multimedia/mmg/Makefile b/multimedia/mmg/Makefile
index 72f9d527cbb..35fa6c7fbe7 100644
--- a/multimedia/mmg/Makefile
+++ b/multimedia/mmg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/08/07 11:34:22 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:43 rillig Exp $
 #
 
 .include "../../multimedia/mkvtoolnix/Makefile.dist"
@@ -17,7 +17,7 @@ USE_LANGUAGES=	c++
 
 BUILD_TARGET=	src/mmg/mmg
 
-SUBST_CLASSES=		man help
+SUBST_CLASSES+=		man help
 
 SUBST_STAGE.man=	pre-configure
 SUBST_FILES.man=	doc/mmg.1
diff --git a/multimedia/moz-bin-flash/Makefile b/multimedia/moz-bin-flash/Makefile
index 5f34b022c80..fe5a5bcfe29 100644
--- a/multimedia/moz-bin-flash/Makefile
+++ b/multimedia/moz-bin-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:23 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=	install_flash_player_6_linux
@@ -22,7 +22,7 @@ NO_BUILD=	YES
 WRKSRC=		${WRKDIR}/install_flash_player_6_linux
 
 DOCDIR=		share/doc/moz-bin-flash
-PLIST_SUBST+=	DOCDIR="${DOCDIR}"
+PLIST_SUBST+=	DOCDIR=${DOCDIR:Q}
 
 INSTALLATION_DIRS=	lib/mozilla-linux/components lib/mozilla-linux/plugins
 
diff --git a/multimedia/moz-flash/Makefile b/multimedia/moz-flash/Makefile
index e91665ffff5..5d6b148c7e5 100644
--- a/multimedia/moz-flash/Makefile
+++ b/multimedia/moz-flash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:43 rillig Exp $
 #
 
 .include "../../multimedia/libflash/Makefile.common"
@@ -16,8 +16,8 @@ USE_LIBTOOL=	YES
 
 BUILD_DIRS=	${WRKSRC}/Plugin
 CPPFLAGS+=	-DDEV_DSP="\"${DEVOSSSOUND}\""
-MAKE_ENV+=	SHLIBTOOL="${SHLIBTOOL}"
-MAKE_ENV+=	MOZ_PLUGDIR="${MOZ_PLUGDIR}"
+MAKE_ENV+=	SHLIBTOOL=${SHLIBTOOL:Q}
+MAKE_ENV+=	MOZ_PLUGDIR=${MOZ_PLUGDIR:Q}
 
 MOZ_PLUGDIR=	${PREFIX}/lib/mozilla/plugins
 
diff --git a/multimedia/mpeg-lib/Makefile b/multimedia/mpeg-lib/Makefile
index 7c651aade3f..e5288d52bf6 100644
--- a/multimedia/mpeg-lib/Makefile
+++ b/multimedia/mpeg-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/04/11 21:46:42 tv Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=	mpeg_lib-1.3.1
@@ -18,7 +18,7 @@ GNU_CONFIGURE=	YES
 
 BUILD_TARGET=	libmpeg_lib.la
 
-CONFIGURE_ENV+=	OPTIMIZE="${CFLAGS}" EXTRA_LDFLAGS="${LDFLAGS}"	\
-		EXTRA_CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=	OPTIMIZE=${CFLAGS:M*:Q} EXTRA_LDFLAGS=${LDFLAGS:M*:Q}	\
+		EXTRA_CPPFLAGS=${CPPFLAGS:M*:Q}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-firefox/Makefile.common b/multimedia/mplayer-plugin-firefox/Makefile.common
index c9ce766aeda..1e0cbbcdd48 100644
--- a/multimedia/mplayer-plugin-firefox/Makefile.common
+++ b/multimedia/mplayer-plugin-firefox/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2005/08/10 20:56:20 jlam Exp $
+# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=		mplayerplug-in-2.70
@@ -24,7 +24,7 @@ DISTINFO_FILE=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/distinfo
 PLIST_SRC=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/PLIST
 DESCR_SRC=	${.CURDIR}/../../multimedia/mplayer-plugin-firefox/DESCR
 
-PLIST_SUBST+=	BROWSER=${BROWSER}
+PLIST_SUBST+=	BROWSER=${BROWSER:Q}
 
 post-extract:
 .for f in nspr xpcom plugin
diff --git a/multimedia/mplayer-plugin-mozilla-gtk2/Makefile b/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
index 87cba12b944..c3350bb6cc7 100644
--- a/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
+++ b/multimedia/mplayer-plugin-mozilla-gtk2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:43 rillig Exp $
 #
 
 BROWSER=	mozilla-gtk2
@@ -6,7 +6,7 @@ PKGREVISION=	1
 
 CONFIGURE_ARGS+=	--disable-gtk1
 
-.include "../mplayer-plugin-firefox/Makefile.common"
+.include "../../multimedia/mplayer-plugin-firefox/Makefile.common"
 .include "../../www/mozilla-gtk2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-plugin-mozilla/Makefile b/multimedia/mplayer-plugin-mozilla/Makefile
index 918c6768f43..878d599398f 100644
--- a/multimedia/mplayer-plugin-mozilla/Makefile
+++ b/multimedia/mplayer-plugin-mozilla/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/03/27 15:43:38 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:43 rillig Exp $
 #
 
 BROWSER=	mozilla
@@ -7,7 +7,7 @@ PKGREVISION=	1
 CONFIGURE_ARGS+=	--disable-gtk2
 CONFIGURE_ARGS+=	--enable-gtk1
 
-.include "../mplayer-plugin-firefox/Makefile.common"
+.include "../../multimedia/mplayer-plugin-firefox/Makefile.common"
 .include "../../www/mozilla/buildlink3.mk"
 .include "../../x11/gtk/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common
index 6c19c1ae46d..3fb3ee69713 100644
--- a/multimedia/mplayer-share/Makefile.common
+++ b/multimedia/mplayer-share/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2005/11/24 03:59:12 ben Exp $
+# $NetBSD: Makefile.common,v 1.25 2005/12/05 20:50:43 rillig Exp $
 
 MPLAYER_DIST_VERSION=	1.0pre7
 
@@ -29,7 +29,7 @@ HOMEPAGE?=		http://www.mplayerhq.hu/
 PATCHDIR=		${.CURDIR}/../../multimedia/mplayer-share/patches
 DISTINFO_FILE=		${.CURDIR}/../../multimedia/mplayer-share/distinfo
 
-NO_BIN_ON_CD=		"a dependency is restricted"
+NO_BIN_ON_CDROM=	"a dependency is restricted"
 NO_BIN_ON_FTP=		"a dependency is restricted"
 NO_SRC_ON_FTP=		"prohibited by USAs DMCA"
 
@@ -50,7 +50,7 @@ ONLY_FOR_COMPILER=	gcc
 # The configure script attempts to test-execute compiled programs in /tmp,
 # but that directory may be mounted as noexec; work this around by setting
 # TMPDIR to ${WRKDIR}
-CONFIGURE_ENV+=		TMPDIR=${WRKDIR}
+CONFIGURE_ENV+=		TMPDIR=${WRKDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index a72f376763d..01de1b75e02 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:43 rillig Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	2
@@ -23,7 +23,7 @@ USE_TOOLS+=		gmake
 USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
-CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
+CONFIGURE_ENV+=		CPPFLAGS=${CPPFLAGS:M*:Q}
 #CONFIGURE_ARGS+=	--enable-obsdaudio
 #CONFIGURE_ARGS+=	--disable-sunaudio
 
diff --git a/multimedia/p5-xmltv/Makefile b/multimedia/p5-xmltv/Makefile
index 149203161ed..f950c37cf97 100644
--- a/multimedia/p5-xmltv/Makefile
+++ b/multimedia/p5-xmltv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:43 rillig Exp $
 
 DISTNAME=	xmltv-0.5.40
 PKGNAME=	p5-${DISTNAME}
@@ -46,7 +46,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 PERL5_PACKLIST=	auto/XMLTV/.packlist
 
 MAKE_PARAMS+=	PREFIX=${PREFIX:Q}
-PLIST_SUBST+=	DISTNAME=${DISTNAME}
+PLIST_SUBST+=	DISTNAME=${DISTNAME:Q}
 
 .include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/py-ming/Makefile b/multimedia/py-ming/Makefile
index a4c8ed24bb4..efbf6458301 100644
--- a/multimedia/py-ming/Makefile
+++ b/multimedia/py-ming/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/04 04:29:14 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=		${MING_DISTNAME}
@@ -17,7 +17,7 @@ PYBINMODULE=		yes
 BUILD_TARGET=		mingcmodule.so
 BUILD_DIRS=		${WRKSRC}/py_ext
 
-MAKE_ENV+=		PYSITELIB=${PYSITELIB}
+MAKE_ENV+=		PYSITELIB=${PYSITELIB:Q}
 
 PYCOMPILEALL=	${BUILDLINK_PREFIX.${PYPACKAGE}}/${PYLIB}/compileall.py
 
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 900579071b5..3251f5e478d 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:07 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=		xine-ui-0.99.2
@@ -12,7 +12,7 @@ COMMENT=		Skinned xlib-based xine GUI
 
 BUILD_USES_MSGFMT=	YES
 
-BUILDLINK_DEPENDS.curl=	curl>7.10.2
+BUILDLINK_DEPENDS.curl+=	curl>7.10.2
 
 USE_PKGLOCALEDIR=	YES
 USE_DIRS+=		xdg-1.1
diff --git a/multimedia/xvidcore/Makefile b/multimedia/xvidcore/Makefile
index f369e7a3c0e..2075fc23799 100644
--- a/multimedia/xvidcore/Makefile
+++ b/multimedia/xvidcore/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/21 07:41:53 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:43 rillig Exp $
 #
 
 DISTNAME=	xvidcore-1.0.3
@@ -20,6 +20,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}/${DISTNAME}/build/generic
 GNU_CONFIGURE=	YES
 
-MAKE_ENV+=	MKDIR="${MKDIR}"
+MAKE_ENV+=	MKDIR=${MKDIR:Q}
 
 .include "../../mk/bsd.pkg.mk"