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

11 files changed, 26 insertions, 26 deletions

diff --git a/pkgtools/dfdisk/Makefile b/pkgtools/dfdisk/Makefile
index c44c4a97dfd..58bc8a081ad 100644
--- a/pkgtools/dfdisk/Makefile
+++ b/pkgtools/dfdisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/10/23 21:54:35 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:51 rillig Exp $
 #
 
 DISTNAME=	dfdisk-1.0
@@ -17,7 +17,7 @@ USE_PKGINSTALL=	yes
 EGDIR=		${PREFIX}/share/examples/dfdisk
 CONF_FILES=	${EGDIR}/dfdisk.conf ${PKG_SYSCONFDIR}/dfdisk.conf
 
-FILES_SUBST+=	PKGVERSION="${PKGVERSION}"
+FILES_SUBST+=	PKGVERSION=${PKGVERSION:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index 01a4ae4d5cd..47dd7dd33b5 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/11/17 17:02:04 rillig Exp $
+# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:51 rillig Exp $
 #
 
 DISTNAME=		pkg_filecheck-0.1
@@ -19,8 +19,8 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 
-FILES_SUBST+=	X11PREFIX=${X11PREFIX}
-FILES_SUBST+=	PKG_DBDIR=${PKG_DBDIR}
+FILES_SUBST+=	X11PREFIX=${X11PREFIX:Q}
+FILES_SUBST+=	PKG_DBDIR=${PKG_DBDIR:Q}
 CONF_FILES=	${PREFIX}/share/examples/pkg_filecheck/pkg_filecheck.conf \
 		${PKG_SYSCONFDIR}/pkg_filecheck.conf
 
diff --git a/pkgtools/pkg_install-info/Makefile b/pkgtools/pkg_install-info/Makefile
index e0b33df4a6e..3538c29ad9c 100644
--- a/pkgtools/pkg_install-info/Makefile
+++ b/pkgtools/pkg_install-info/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:51 rillig Exp $
 #
 
 DISTNAME=		pkg_install-info-${VERSION}
@@ -21,7 +21,7 @@ NO_CHECKSUM=		yes
 # Otherwise use PKGREVISION if you need to change this package version.
 VERSION=		4.5
 
-MAKE_ENV+=		BINOWN=${BINOWN} BINGRP=${BINGRP}
+MAKE_ENV+=		BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
 
 INSTALLATION_DIRS=	bin
 
diff --git a/pkgtools/pkg_select/Makefile b/pkgtools/pkg_select/Makefile
index 6266432ba7a..cd7674caf7c 100644
--- a/pkgtools/pkg_select/Makefile
+++ b/pkgtools/pkg_select/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/08/25 10:34:12 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:51 rillig Exp $
 #
 
 DISTNAME=	pkg_select-20050817
@@ -32,7 +32,7 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/mirrors.ftp ${PREFIX}/share/pkg_select
 	${INSTALL_MAN} ${WRKSRC}/pkg_select.1 ${PREFIX}/man/man1
 
-SUBST_CLASSES=		path
+SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	Makefile pkg_select.1
 SUBST_SED.path=		-e "s|/usr/pkgsrc|${PKGSRCDIR}|g" \
diff --git a/pkgtools/pkgclean/Makefile b/pkgtools/pkgclean/Makefile
index b0f3846e228..7651570d1b7 100644
--- a/pkgtools/pkgclean/Makefile
+++ b/pkgtools/pkgclean/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/11/17 22:30:09 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:51 rillig Exp $
 
 DISTNAME=	pkgclean-20051116
 CATEGORIES=	pkgtools
@@ -23,7 +23,7 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/pkgclean.sh ${PREFIX}/bin/pkgclean
 	${INSTALL_MAN} ${WRKSRC}/pkgclean.1 ${PREFIX}/man/man1/pkgclean.1
 
-SUBST_CLASSES=          path
+SUBST_CLASSES+=          path
 SUBST_STAGE.path=       post-patch
 SUBST_FILES.path=       pkgclean.sh pkgclean.1
 SUBST_SED.path+=	-e 's,@SH@,${SH},g'
diff --git a/pkgtools/pkgdiff/Makefile b/pkgtools/pkgdiff/Makefile
index f4825e3251a..304e91ed353 100644
--- a/pkgtools/pkgdiff/Makefile
+++ b/pkgtools/pkgdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/08/06 06:19:29 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:51 rillig Exp $
 #
 
 DISTNAME=	pkgdiff-0.118
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}
 USE_LANGUAGES=	# empty
 USE_TOOLS+=	perl:run
 
-MAKE_ENV=	PKGSRCDIR=${_PKGSRCDIR:Q}
+MAKE_ENV+=	PKGSRCDIR=${_PKGSRCDIR:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/pkgtools/pkgfind/Makefile b/pkgtools/pkgfind/Makefile
index 8b1b8159d2c..0a58ef4c387 100644
--- a/pkgtools/pkgfind/Makefile
+++ b/pkgtools/pkgfind/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/08/04 22:21:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:51 rillig Exp $
 
 DISTNAME=	pkgfind-20050804
 CATEGORIES=	pkgtools
@@ -25,7 +25,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/pkgfind ${PREFIX}/bin/pkgfind
 	${INSTALL_MAN} ${WRKSRC}/pkgfind.1 ${PREFIX}/man/man1/pkgfind.1
 
-SUBST_CLASSES=		path
+SUBST_CLASSES+=		path
 SUBST_STAGE.path=	post-patch
 SUBST_FILES.path=	pkgfind.c pkgfind.1
 SUBST_SED.path=		-e "s,/usr/pkgsrc,${PKGSRCDIR},g"
diff --git a/pkgtools/rpm2pkg/Makefile b/pkgtools/rpm2pkg/Makefile
index 27f1960d968..9974cb3d8b3 100644
--- a/pkgtools/rpm2pkg/Makefile
+++ b/pkgtools/rpm2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:51 rillig Exp $
 
 DISTNAME=	rpm2pkg-2.1
 PKGREVISION=	1
@@ -17,7 +17,7 @@ NO_CHECKSUM=	YES
 
 CPPFLAGS+=	${BUILDLINK_CPPFLAGS.bzip2} ${BUILDLINK_CPPFLAGS.rpm} \
 		${BUILDLINK_CPPFLAGS.zlib}
-LIBS=		-lrpm -lintl -lz -lbz2
+LIBS+=		-lrpm -lintl -lz -lbz2
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/pkgtools/shlock/Makefile b/pkgtools/shlock/Makefile
index 0de28d2a278..d5e80fbecac 100644
--- a/pkgtools/shlock/Makefile
+++ b/pkgtools/shlock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/08/08 21:40:48 xtraeme Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:51 rillig Exp $
 #
 
 DISTNAME=	shlock-20020114
@@ -12,14 +12,14 @@ COMMENT=	Shell utility to perform dot-locking
 
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	#empty
-NO_CHECKSUM=	#defined
+NO_CHECKSUM=	yes
 MANCOMPRESSED_IF_MANZ=	yes
 PLIST_SRC=	${WRKDIR}/PLIST
 BUILD_DEFS+=	MANINSTALL
 
 MAKE_ENV+=	BINDIR=${PREFIX}/bin MANDIR=${PREFIX}/man
-MAKE_ENV+=	BINOWN=${BINOWN} BINGRP=${BINGRP}
-MAKE_ENV+=	MANOWN=${BINOWN} MANGRP=${BINGRP}
+MAKE_ENV+=	BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q}
+MAKE_ENV+=	MANOWN=${BINOWN:Q} MANGRP=${BINGRP:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/pkgtools/x11-links/Makefile b/pkgtools/x11-links/Makefile
index 11632b0e826..f1deb0ac88d 100644
--- a/pkgtools/x11-links/Makefile
+++ b/pkgtools/x11-links/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2005/07/25 20:50:25 reed Exp $
+# $NetBSD: Makefile,v 1.73 2005/12/05 20:50:51 rillig Exp $
 #
 # NOTE:	If you update this package, then you'll likely need to also update
 #	the x11-links dependency in buildlink3.mk to the correct version,
@@ -28,7 +28,7 @@ PLIST_SRC=		${.CURDIR}/PLIST ${PLIST_SRC.files} ${PLIST_SRC.dirs}
 .include "../../mk/bsd.prefs.mk"
 
 .if !exists(${X11BASE}/include/X11/X.h)
-PKG_FAIL_REASON=	"${PKGNAME} requires X headers to be installed"
+PKG_FAIL_REASON+=	"${PKGNAME} requires X headers to be installed"
 .endif
 
 .if ${OPSYS} == "IRIX"
diff --git a/pkgtools/xpkgwedge/Makefile b/pkgtools/xpkgwedge/Makefile
index 890a0abae67..c737c40a96e 100644
--- a/pkgtools/xpkgwedge/Makefile
+++ b/pkgtools/xpkgwedge/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.59 2005/09/28 20:52:25 rillig Exp $
+# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:51 rillig Exp $
 
 DISTNAME=	xpkgwedge-1.14
 CATEGORIES=	pkgtools devel x11
@@ -52,12 +52,12 @@ do-build:
 .if defined(X11_TYPE) && !empty(X11_TYPE:Mxorg) || \
     defined(X11_TYPE) && !empty(X11_TYPE:MXFree86)
 X11TYPEFLAGS?=		-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
-SUBST_CLASSES=		fix
+SUBST_CLASSES+=		fix
 SUBST_STAGE.fix=	post-patch
 SUBST_FILES.fix=	xpkgwedge.def
 SUBST_SED.fix=		-e "s|@X11TYPEFLAGS@|${X11TYPEFLAGS}|"
 .else # X11_TYPE == XFree86 || X11_TYPE == xorg.
-SUBST_CLASSES=		foo
+SUBST_CLASSES+=		foo
 SUBST_STAGE.foo=	post-patch
 SUBST_FILES.foo=	xpkgwedge.def
 SUBST_SED.foo=		-e "s|\#define ExtraLoadFlags @X11TYPEFLAGS@||"