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

20 files changed, 41 insertions, 45 deletions

diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index f1d05fe58bf..254f20d6c52 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/23 21:27:47 rillig Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	amiwm0.20pl48
@@ -20,7 +20,7 @@ NO_BIN_ON_CDROM=        ${RESTRICTED}
 GNU_CONFIGURE=	yes
 CFLAGS+=	-DHAVE_X11_EXTENSIONS_SHAPE_H=1
 CFLAGS+=	-O
-CONFIGURE_ENV+=	CFLAGS=${CFLAGS:Q}
+CONFIGURE_ENV+=	CFLAGS=${CFLAGS:M*:Q}
 CONFIGURE_ENV+=	X_PRE_LIBS=${X_PRE_LIBS:Q}
 CONFIGURE_ENV+=	X_EXTRA_LIBS=-lXt
 
diff --git a/wm/blackbox/Makefile b/wm/blackbox/Makefile
index 191aa651e75..bb14516eddf 100644
--- a/wm/blackbox/Makefile
+++ b/wm/blackbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/11/11 19:07:40 tonio Exp $
+# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	blackbox-0.65.0
@@ -10,7 +10,7 @@ MAINTAINER=	jschauma@NetBSD.org
 HOMEPAGE=	http://blackboxwm.sourceforge.net/
 COMMENT=	Small and fast X11R6 window manager
 
-DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS+=	bsetroot>=0.1nb1:../../wm/bsetroot
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
diff --git a/wm/fluxbox/Makefile b/wm/fluxbox/Makefile
index a0d27901813..47ec8e664ba 100644
--- a/wm/fluxbox/Makefile
+++ b/wm/fluxbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/10/24 17:23:33 tonio Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	fluxbox-0.9.14
@@ -13,7 +13,7 @@ COMMENT=	Window Manager for X based on Blackbox
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
-USE_TOOLS=	gmake
+USE_TOOLS+=	gmake
 USE_LIBTOOL=	YES
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/wm/flwm/Makefile b/wm/flwm/Makefile
index 6b4e3887376..ecee3a176f9 100644
--- a/wm/flwm/Makefile
+++ b/wm/flwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	flwm-1.00
@@ -14,7 +14,7 @@ COMMENT=	The Fast, Light Window Manager
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	X_LIBS="-lGL"
-MAKE_ENV+=	CXXFLAGS="${CXXFLAGS}"
+MAKE_ENV+=	CXXFLAGS=${CXXFLAGS:M*:Q}
 CXXFLAGS+=	-DFLTK_1_0_COMPAT
 
 .include "../../x11/fltk/buildlink3.mk"
diff --git a/wm/fvwm1/Makefile b/wm/fvwm1/Makefile
index c118f76d1de..2bba3e76750 100644
--- a/wm/fvwm1/Makefile
+++ b/wm/fvwm1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:13:03 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:09 rillig Exp $
 
 DISTNAME=	fvwm-1.24r
 PKGNAME=	${DISTNAME:S/fvwm/fvwm1/}
@@ -9,7 +9,7 @@ MAINTAINER=	cjs@NetBSD.org
 HOMEPAGE=	http://www.fvwm.org/
 COMMENT=	Virtual window manager for X
 
-DEPENDS=	xpmroot-2.*:../../x11/xpmroot
+DEPENDS+=	xpmroot-2.*:../../x11/xpmroot
 
 CONFLICTS=	fvwm2-* fvwm>=1
 
diff --git a/wm/fvwm2/Makefile b/wm/fvwm2/Makefile
index deb09088a08..e733af402af 100644
--- a/wm/fvwm2/Makefile
+++ b/wm/fvwm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/05/30 23:24:10 wiz Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:51:09 rillig Exp $
 
 DISTNAME=	fvwm-${FVWM_VER}
 PKGNAME=	fvwm2-${FVWM_VER}
@@ -23,7 +23,7 @@ USE_X11BASE=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	YES
 
-PLIST_SUBST+=		FVWM_VER=${FVWM_VER}
+PLIST_SUBST+=		FVWM_VER=${FVWM_VER:Q}
 
 EVAL_PREFIX+=		XPMDIR=xpm
 CONFIGURE_ARGS+=	--without-gnome
@@ -33,7 +33,7 @@ CONFIGURE_ARGS+=	--with-xpm-includes=${XPMDIR}/include
 CONFIGURE_ARGS+=	--with-imagepath=${PREFIX}/lib/X11/fvwm2/pixmaps:${X11BASE}/include/X11/bitmaps:${X11BASE}/include/X11/pixmaps
 
 # We don't want to have CPP from the buildlink directory
-CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP="${CPP}"
+CONFIGURE_ENV+=		ac_cv_path_FVWM_CPP=${CPP:Q}
 
 post-extract:
 	${MKDIR} ${WRKDIR}/icons
diff --git a/wm/icecc/Makefile b/wm/icecc/Makefile
index a4c976d1116..cc1be211260 100644
--- a/wm/icecc/Makefile
+++ b/wm/icecc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/06/25 01:55:08 reed Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:09 rillig Exp $
 
 # Package version reflects icecc version, with PKGREVISION incremented
 # for any tool updates, according to the authors scheme.
@@ -38,7 +38,7 @@ PYTHON_PATCH_SCRIPTS=	icecursorscfg-0.6/icecurcfg.py iceiconcvt-1.0/iceiconcvt.p
 PYTHON_PATCH_SCRIPTS+=	icemergeprefs-0.5/icemergeprefs.py icerrun-0.5/icerrrun.py
 PYTHON_PATCH_SCRIPTS+=	icerrun-0.5/icerrun.py
 
-SUBST_CLASSES=		path
+SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	icebgset-1.3/icebgset.pro icecc-2.9/icecc.pro iceked-1.5/iceked.pro
 SUBST_FILES.path+=	icemc-2.1/icemc.pro icesndcfg-1.3/icesndcfg.pro icets-1.4/icets.pro
@@ -49,7 +49,7 @@ SUBST_SED.path=		"s|/usr/local|${PREFIX}|g"
 SUBST_MESSAGE.path=	"Fixing hardcoded paths."
 
 # VIM_SUBDIR comes from "editors/vim-share/version.mk"
-PLIST_SUBST+=		VIM_SUBDIR=${VIM_SUBDIR}
+PLIST_SUBST+=		VIM_SUBDIR=${VIM_SUBDIR:Q}
 
 do-configure:
 .   for dir in ${QSRC}
diff --git a/wm/icewm-imlib/Makefile b/wm/icewm-imlib/Makefile
index 38a71fab10b..317a152a917 100644
--- a/wm/icewm-imlib/Makefile
+++ b/wm/icewm-imlib/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.17 2005/01/20 04:27:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:09 rillig Exp $
 
 PKGNAME=	${DISTNAME:S/-/-imlib-/}
 COMMENT=	Small, fast and light-weight window manager (imlib version)
 
 CONFLICTS+=	icewm-[0-9]* icewm-gnome-[0-9]*
 
-.include "../icewm/Makefile.common"
+.include "../../wm/icewm/Makefile.common"
 
 PLIST_SRC=		${.CURDIR}/../icewm/PLIST
 
diff --git a/wm/mlvwm/Makefile b/wm/mlvwm/Makefile
index 5e9906db4ad..808645d80f1 100644
--- a/wm/mlvwm/Makefile
+++ b/wm/mlvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/09/04 06:57:08 xtraeme Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	mlvwm091
@@ -24,7 +24,7 @@ post-install:
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/pixmap/*.xpm ${PREFIX}/share/mlvwm
 
-SUBST_CLASSES=		xpm
+SUBST_CLASSES+=		xpm
 SUBST_STAGE.xpm=	post-configure
 SUBST_FILES.xpm=	sample_rc/Mlvwmrc
 SUBST_SED.xpm=		-e "s,@PREFIX@,${PREFIX},"
diff --git a/wm/openbox2/Makefile b/wm/openbox2/Makefile
index e576d85a9bf..7542a700e0a 100644
--- a/wm/openbox2/Makefile
+++ b/wm/openbox2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/10 20:56:25 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	openbox-2.2.3
@@ -10,7 +10,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://icculus.org/openbox/
 COMMENT=	Window manager based on Blackbox (2.x branch)
 
-DEPENDS=	bsetroot>=0.1nb1:../../wm/bsetroot
+DEPENDS+=	bsetroot>=0.1nb1:../../wm/bsetroot
 
 USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	YES
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 09bf8bbd4c1..413d7a18fc2 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:24 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	pekwm-0.1.3
@@ -35,7 +35,6 @@ CONF_FILES=
 .for f in autoproperties config keys menu mouse start
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
-.undef f
 
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/qvwm/Makefile b/wm/qvwm/Makefile
index f59e0891438..d580918b07a 100644
--- a/wm/qvwm/Makefile
+++ b/wm/qvwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/11/13 19:18:14 martin Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	qvwm-1.1.12
@@ -12,7 +12,7 @@ COMMENT=	Windows 95/98/NT like window manager for X11
 
 GNU_CONFIGURE=	yes
 USE_TOOLS+=	gmake rm
-CONFIGURE_ENV+=	PATH_RM="${TOOLS_RM}"
+CONFIGURE_ENV+=	PATH_RM=${TOOLS_RM:Q}
 USE_LANGUAGES=	c++
 
 post-install:
diff --git a/wm/sawfish/Makefile b/wm/sawfish/Makefile
index 79e8bd576c2..f44fe8aca8e 100644
--- a/wm/sawfish/Makefile
+++ b/wm/sawfish/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/09/28 20:52:27 rillig Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:09 rillig Exp $
 #
 
 PKGNAME=		sawfish-${SF_VERS}
@@ -11,14 +11,14 @@ DEPENDS+=		sawfish-replibs-${SF_VERS}nb5:../../wm/sawfish-replibs
 USE_DIRS+=		xdg-1.1
 USE_X11BASE=		yes
 
-CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
-MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
+MAKE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
 BUILD_USES_MSGFMT=	YES
 
 USE_MAKEINFO=		YES
 INFO_FILES=		sawfish.info
 
-PLIST_SUBST+=		SF_VERS=${SF_VERS}
+PLIST_SUBST+=		SF_VERS=${SF_VERS:Q}
 
 .include "../../mk/x11.buildlink3.mk"
 
diff --git a/wm/sawfish/Makefile.common b/wm/sawfish/Makefile.common
index cca8f8f1188..29492206df8 100644
--- a/wm/sawfish/Makefile.common
+++ b/wm/sawfish/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.27 2005/09/28 21:55:32 rillig Exp $
+# $NetBSD: Makefile.common,v 1.28 2005/12/05 20:51:09 rillig Exp $
 
 DISTNAME=		sawfish-${SF_VERS}-gtk1
 SF_VERS=		1.2
@@ -13,7 +13,7 @@ DEPENDS+=		rep-gtk>=0.15nb2:../../x11/rep-gtk
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake
-GNU_CONFIGURE=		# defined
+GNU_CONFIGURE=		yes
 
 DISTINFO_FILE=		${.CURDIR}/../../wm/sawfish/distinfo
 PATCHDIR=		${.CURDIR}/../../wm/sawfish/patches
diff --git a/wm/wampager/Makefile b/wm/wampager/Makefile
index 6ee5f01d2fd..18c1ce29bf2 100644
--- a/wm/wampager/Makefile
+++ b/wm/wampager/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	wampager-0.9.1
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.waimea.org/wampager_info.html
 COMMENT=	Virtual pager dockapp for the Waimea Window Manager
 
-DEPENDS=	waimea>=0.4.0:../../wm/waimea
+DEPENDS+=	waimea>=0.4.0:../../wm/waimea
 
 INSTALLATION_DIRS=	bin
 
diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile
index 408b1484ce9..c110266913b 100644
--- a/wm/windowmaker/Makefile
+++ b/wm/windowmaker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/10/27 08:10:08 joerg Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:51:10 rillig Exp $
 
 DISTNAME=	WindowMaker-0.92.0
 PKGNAME=	${DISTNAME:S/WindowMaker/windowmaker/}
@@ -23,7 +23,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASEDIR}
 CONFIGURE_ARGS+=	--with-gnustepdir=${PREFIX}/share/GNUstep
 CONFIGURE_ARGS+=	--with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale
 CONFIGURE_ENV+=		LINGUAS=yes
-CONFIGURE_ENV+=		CPP_PATH="${CPP}"
+CONFIGURE_ENV+=		CPP_PATH=${CPP:Q}
 .if ${MACHINE_ARCH} != "i386"
 CONFIGURE_ENV+=		ac_cv_c_inline_asm=no
 .endif
@@ -42,7 +42,6 @@ CONF_FILES=
 .for f in WMGLOBAL WMRootMenu WMState WMWindowAttributes WindowMaker
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
-.undef f
 
 # WINDOWMAKER_OPTIONS is a space-separated list of compile-time options
 # to support.  Currently supported options:
diff --git a/wm/wm2/Makefile b/wm/wm2/Makefile
index ec98a2503f0..c0dfb235091 100644
--- a/wm/wm2/Makefile
+++ b/wm/wm2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:10 rillig Exp $
 
 DISTNAME=	wm2-4
 PKGNAME=	wm2-4.0
@@ -13,7 +13,7 @@ BUILD_TARGET=	depend wm2
 
 USE_LANGUAGES=	c c++
 USE_X11BASE=	YES
-MAKE_ENV+=	CCC="${CXX}"
+MAKE_ENV+=	CCC=${CXX:Q}
 
 INSTALLATION_DIRS=	bin man/cat1
 
diff --git a/wm/wmii/Makefile b/wm/wmii/Makefile
index 673fe3f408d..0f3b6304cf2 100644
--- a/wm/wmii/Makefile
+++ b/wm/wmii/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/11/03 02:47:58 minskim Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:10 rillig Exp $
 #
 
 DISTNAME=	wmii-20051031
@@ -29,7 +29,6 @@ EGFILES=		_clabel extern progmenu rcmenu status	\
 .for f in ${EGFILES}
 CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
-.undef f
 
 .include "../../mk/x11.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/wmthemes/Makefile b/wm/wmthemes/Makefile
index 9824c2a23b1..a4e412c657b 100644
--- a/wm/wmthemes/Makefile
+++ b/wm/wmthemes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:26 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:10 rillig Exp $
 
 #
 # There is no distinfo file because users can specify alternate themes
@@ -36,7 +36,6 @@ THEME_FILES=
 THEME_FILES+=	${theme}.tar.gz
 SITES_${theme}.tar.gz=	http://download.freshmeat.net/themes/${theme:C/-[^-]*$//}/
 .endfor
-.undef theme
 
 .include "../../mk/x11.buildlink3.mk"
 
diff --git a/wm/wmx/Makefile.common b/wm/wmx/Makefile.common
index 6929f38f0f5..979024e525f 100644
--- a/wm/wmx/Makefile.common
+++ b/wm/wmx/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2005/09/28 21:55:32 rillig Exp $
+# $NetBSD: Makefile.common,v 1.15 2005/12/05 20:51:10 rillig Exp $
 
 DISTNAME=	wmx-6
 WMX_VERS=	6.0
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=	c c++
 USE_X11BASE=	yes
-GNU_CONFIGURE=	# defined
+GNU_CONFIGURE=	yes
 BUILD_TARGET=	depend all
 
 DISTINFO_FILE=	${.CURDIR}/../../wm/wmx/distinfo