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

6 files changed, 27 insertions, 26 deletions

diff --git a/shells/ast-ksh/Makefile.common b/shells/ast-ksh/Makefile.common
index 1a560de7b55..95644b78b33 100644
--- a/shells/ast-ksh/Makefile.common
+++ b/shells/ast-ksh/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2005/07/29 18:32:17 jlam Exp $
+# $NetBSD: Makefile.common,v 1.16 2005/12/05 20:50:58 rillig Exp $
 
 DISTNAME=	ast-ksh-${ASTKSH_VERSION}
 PKGNAME=	ast-ksh-${ASTKSH_VERSION:S/-//g}
@@ -26,7 +26,7 @@ ASTKSH_VERSION=	2003-07-24
 
 WRKSRC=		${WRKDIR}
 USE_PKGINSTALL=	YES
-MAKE_FLAGS=	CC="${CC}" CCFLAGS="${CFLAGS}"
+MAKE_FLAGS+=	CC=${CC:Q} CCFLAGS=${CFLAGS:M*:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/shells/bash/Makefile b/shells/bash/Makefile
index 1ed276eac47..f17b2ab149c 100644
--- a/shells/bash/Makefile
+++ b/shells/bash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:58 rillig Exp $
 
 DISTNAME=	bash-3.0
 PKGNAME=	bash-3.0pl16
@@ -25,7 +25,7 @@ USE_MAKEINFO=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-MAKE_ENV+=		INSTALL_SCRIPT='${INSTALL_SCRIPT}'
+MAKE_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 TEST_TARGET=		test
 
 INFO_FILES=		bash.info
diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile
index f0166cb981a..7b624a7419d 100644
--- a/shells/bash2/Makefile
+++ b/shells/bash2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2005/10/05 13:29:50 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2005/12/05 20:50:58 rillig Exp $
 #
 
 DISTNAME=	bash-2.05b
@@ -24,7 +24,7 @@ USE_GNU_READLINE=	yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-installed-readline
-MAKE_ENV+=		INSTALL_SCRIPT='${INSTALL_SCRIPT}'
+MAKE_ENV+=		INSTALL_SCRIPT=${INSTALL_SCRIPT:Q}
 TEST_TARGET=		test
 
 PKG_SHELL=		bin/bash
diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile
index f1a3f8f4fc2..53e1bc0ffc7 100644
--- a/shells/scponly/Makefile
+++ b/shells/scponly/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/12/05 03:04:28 snj Exp $
+# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:59 rillig Exp $
 
 DISTNAME=	scponly-4.1
 CATEGORIES=	shells security
@@ -12,21 +12,21 @@ COMMENT=	Tiny shell that only permits scp and sftp
 GNU_CONFIGURE=	yes
 
 USE_TOOLS+=		chgrp chmod chown echo id ln ls mkdir mv pwd rm rmdir
-CONFIGURE_ENV+=		scponly_PROG_CHGRP="${TOOLS_CHGRP}"
-CONFIGURE_ENV+=		PROG_CHMOD="${TOOLS_CHMOD}"
-CONFIGURE_ENV+=		scponly_PROG_CHMOD="${TOOLS_CHMOD}"
-CONFIGURE_ENV+=		PROG_CHOWN="${TOOLS_CHOWN}"
-CONFIGURE_ENV+=		scponly_PROG_CHOWN="${TOOLS_CHOWN}"
-CONFIGURE_ENV+=		ac_cv_path_scponly_PROG_ECHO="${TOOLS_ECHO}"
-CONFIGURE_ENV+=		scponly_PROG_ID="${TOOLS_ID}"
-CONFIGURE_ENV+=		scponly_PROG_LN="${TOOLS_LN}"
-CONFIGURE_ENV+=		scponly_PROG_LS="${TOOLS_LS}"
-CONFIGURE_ENV+=		scponly_PROG_MKDIR="${TOOLS_MKDIR}"
-CONFIGURE_ENV+=		scponly_PROG_MV="${TOOLS_MV}"
-CONFIGURE_ENV+=		scponly_PROG_PWD="${TOOLS_PWD_CMD}"
-CONFIGURE_ENV+=		PROG_RM="${TOOLS_RM}"
-CONFIGURE_ENV+=		scponly_PROG_RM="${TOOLS_RM}"
-CONFIGURE_ENV+=		scponly_PROG_RMDIR="${TOOLS_RMDIR}"
+CONFIGURE_ENV+=		scponly_PROG_CHGRP=${TOOLS_CHGRP:Q}
+CONFIGURE_ENV+=		PROG_CHMOD=${TOOLS_CHMOD:Q}
+CONFIGURE_ENV+=		scponly_PROG_CHMOD=${TOOLS_CHMOD:Q}
+CONFIGURE_ENV+=		PROG_CHOWN=${TOOLS_CHOWN:Q}
+CONFIGURE_ENV+=		scponly_PROG_CHOWN=${TOOLS_CHOWN:Q}
+CONFIGURE_ENV+=		ac_cv_path_scponly_PROG_ECHO=${TOOLS_ECHO:Q}
+CONFIGURE_ENV+=		scponly_PROG_ID=${TOOLS_ID:Q}
+CONFIGURE_ENV+=		scponly_PROG_LN=${TOOLS_LN:Q}
+CONFIGURE_ENV+=		scponly_PROG_LS=${TOOLS_LS:Q}
+CONFIGURE_ENV+=		scponly_PROG_MKDIR=${TOOLS_MKDIR:Q}
+CONFIGURE_ENV+=		scponly_PROG_MV=${TOOLS_MV:Q}
+CONFIGURE_ENV+=		scponly_PROG_PWD=${TOOLS_PWD_CMD:Q}
+CONFIGURE_ENV+=		PROG_RM=${TOOLS_RM:Q}
+CONFIGURE_ENV+=		scponly_PROG_RM=${TOOLS_RM:Q}
+CONFIGURE_ENV+=		scponly_PROG_RMDIR=${TOOLS_RMDIR:Q}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 USE_PKGINSTALL=		yes
 PKG_SHELL=		bin/scponly
diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile
index 80f2e668a8f..67539404bf4 100644
--- a/shells/standalone-tcsh/Makefile
+++ b/shells/standalone-tcsh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/07/29 18:32:18 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:59 rillig Exp $
 #
 
 NO_MTREE=		YES
@@ -17,7 +17,8 @@ PKG_INFO:=		${PKG_INFO}
 PKG_CREATE:=		${PKG_CREATE}
 PREFIX=			/
 NLSDIR=			usr/share/nls
-CONFIGURE_ARGS=		--prefix=${PREFIX} --bindir=/bin
+CONFIGURE_ARGS+=	--prefix=${PREFIX}
+CONFIGURE_ARGS+=	--bindir=/bin
 CONFIGURE_ARGS+=	--mandir=/usr/share/man
 
 DISTINFO_FILE=		${.CURDIR}/../../shells/tcsh/distinfo
diff --git a/shells/zsh3/hacks.mk b/shells/zsh3/hacks.mk
index e5598f53366..0f8feb5c950 100644
--- a/shells/zsh3/hacks.mk
+++ b/shells/zsh3/hacks.mk
@@ -1,6 +1,6 @@
-# $NetBSD: hacks.mk,v 1.2 2005/01/25 18:22:24 tv Exp $
+# $NetBSD: hacks.mk,v 1.3 2005/12/05 20:50:59 rillig Exp $
 
-.ifndef ZSH3_HACKS_MK
+.if !defined(ZSH3_HACKS_MK)
 ZSH3_HACKS_MK=		# defined
 
 ### [Mon Jan 24 22:27:33 UTC 2005 : tv]