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

14 files changed, 28 insertions, 32 deletions

diff --git a/comms/asterisk-sounds-extra/Makefile b/comms/asterisk-sounds-extra/Makefile
index af1c758801d..265e0c11187 100644
--- a/comms/asterisk-sounds-extra/Makefile
+++ b/comms/asterisk-sounds-extra/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/10/10 17:16:15 hira Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:54 rillig Exp $
 #
 
 VER=			1.0.9
@@ -11,6 +11,6 @@ MASTER_SITES=		http://ftp1.digium.com/pub/asterisk/ \
 
 MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://ftp.digium.com/pub/asterisk/
-COMMENT=		Asterisk IVR and miscellaneous sound files.
+COMMENT=		Asterisk IVR and miscellaneous sound files
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/asterisk/Makefile b/comms/asterisk/Makefile
index 736113b06a0..a4f780138d6 100644
--- a/comms/asterisk/Makefile
+++ b/comms/asterisk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/10/10 21:45:08 rh Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:54 rillig Exp $
 
 DISTNAME=	asterisk-1.0.9
 CATEGORIES=	comms net audio
@@ -79,7 +79,6 @@ CONF_FILES+=	${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
 	telcordia-1.adsi
 CONF_FILES+= 	${ASTEXAMPLEDIR}/${_file_} ${ASTETCDIR}/${_file_}
 .endfor
-.undef _file_
 
 PTHREAD_OPTS+=	require native
 
diff --git a/comms/fidogate/Makefile b/comms/fidogate/Makefile
index 8ec0442806a..e8c78870d0d 100644
--- a/comms/fidogate/Makefile
+++ b/comms/fidogate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/08/23 11:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.43 2005/12/05 20:49:54 rillig Exp $
 #
 
 DISTNAME=	fidogate-4.4.10
@@ -11,7 +11,7 @@ COMMENT=	FidoNet (FTN) <-> Internet mail and news gateway
 
 USE_PKGINSTALL=		yes
 USE_TOOLS+=		gmake perl:run
-MAKE_ENV=		DEBUG="${CFLAGS} -Werror"
+MAKE_ENV+=		DEBUG="${CFLAGS} -Werror"
 BUILDLINK_SETENV.CC=	CC="cc ${_STRIPFLAG_CC}"
 
 USE_MAKEINFO=	YES
diff --git a/comms/gkermit/Makefile b/comms/gkermit/Makefile
index 10139a70549..1332a1e4f74 100644
--- a/comms/gkermit/Makefile
+++ b/comms/gkermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:45:06 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:54 rillig Exp $
 #
 
 DISTNAME=	gku100
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}
 BUILD_TARGET=	posix
 MAKEFILE=	makefile
-MAKE_ENV+=	KFLAGS="${CFLAGS}"
+MAKE_ENV+=	KFLAGS=${CFLAGS:M*:Q}
 
 INSTALLATION_DIRS=	bin man/man1
 
diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index 3be2d084f47..a9140fee262 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/11/28 06:41:20 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/12/05 20:49:54 rillig Exp $
 
 VERS=		4.2.2
 DISTNAME=	hylafax-${VERS}
@@ -24,8 +24,8 @@ CONFIGURE_ARGS+=	--with-MAKE=${MAKE_PROGRAM}
 CONFIGURE_ARGS+=	--with-INSTALL="" --nointeractive
 CONFIGURE_ARGS+=	--with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include
 CONFIGURE_ARGS+=	--with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz"
-CONFIGURE_ENV+=		PREFIX="${PREFIX}" OPTIMIZER="${CFLAGS}"
-CONFIGURE_ENV+=		FAXUID="${FAXUSER}" FAXGID="${FAXGROUP}"
+CONFIGURE_ENV+=		PREFIX=${PREFIX:Q} OPTIMIZER=${CFLAGS:M*:Q}
+CONFIGURE_ENV+=		FAXUID=${FAXUSER:Q} FAXGID=${FAXGROUP:Q}
 MANCOMPRESSED=		yes
 
 FAXUSER?=	uucp
diff --git a/comms/kermit/Makefile b/comms/kermit/Makefile
index ab4616991ef..81ef2505698 100644
--- a/comms/kermit/Makefile
+++ b/comms/kermit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.64 2005/12/02 17:01:35 wiz Exp $
+# $NetBSD: Makefile,v 1.65 2005/12/05 20:49:54 rillig Exp $
 
 DISTNAME=	cku211
 PKGNAME=	kermit-8.0.211
@@ -17,7 +17,7 @@ LICENSE=	kermit-license
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 BUILD_DEFS+=	KFLAGS LIBS MANINSTALL
-MAKE_ENV+=	KFLAGS=${KFLAGS:Q} LIBS=${LIBS:Q}
+MAKE_ENV+=	KFLAGS=${KFLAGS:Q} LIBS=${LIBS:M*:Q}
 MAKE_ENV+=	SSLINC=${SSLINC:Q} SSLLIB=${SSLLIB:Q}
 MAKEFILE=	makefile
 
diff --git a/comms/linuxsms/Makefile b/comms/linuxsms/Makefile
index 44446993adb..cc62f14423f 100644
--- a/comms/linuxsms/Makefile
+++ b/comms/linuxsms/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:07 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:55 rillig Exp $
 #
 
 DISTNAME=	linuxsms-0.65
@@ -23,6 +23,5 @@ do-install:
 .for f in BUGS CHANGES README README.ES TODO
 	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/doc/linuxsms
 .endfor
-.undef f
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/lrzsz/Makefile b/comms/lrzsz/Makefile
index fe81e68b39e..f12382419e8 100644
--- a/comms/lrzsz/Makefile
+++ b/comms/lrzsz/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.22 2005/12/05 20:49:55 rillig Exp $
 
 DISTNAME=	lrzsz-0.12.20
 CATEGORIES=	comms
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.prefs.mk"
 
-.ifdef (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix")
+.if (${OPSYS} == "SunOS" || ${OPSYS} == "Darwin" || ${OPSYS} == "Interix")
 .  include "../../devel/gettext-lib/buildlink3.mk"
 LOCALE_SUFFIX=		mo
 .else
@@ -23,6 +23,6 @@ CONFIGURE_ARGS+=	--with-catgets
 LOCALE_SUFFIX=		cat
 .endif
 
-PLIST_SUBST+=	LOCALE_SUFFIX=${LOCALE_SUFFIX}
+PLIST_SUBST+=	LOCALE_SUFFIX=${LOCALE_SUFFIX:Q}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/comms/mgetty+sendfax/Makefile b/comms/mgetty+sendfax/Makefile
index 35745d08728..9b28308158f 100644
--- a/comms/mgetty+sendfax/Makefile
+++ b/comms/mgetty+sendfax/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/07/01 10:16:28 hira Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/05 20:49:55 rillig Exp $
 
 DISTNAME=	mgetty1.1.31-Jul24
 PKGNAME=	mgetty-1.1.31
@@ -21,13 +21,13 @@ USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
-MAKE_ENV=		MGETTY_CONFDIR=${PKG_SYSCONFDIR}
+MAKE_ENV+=		MGETTY_CONFDIR=${PKG_SYSCONFDIR:Q}
 
 USE_MAKEINFO=		YES
 INFO_FILES=		mgetty.info
 PKG_SYSCONFSUBDIR=	mgetty+sendfax
 
-.ifndef CONF_FILES
+.if !defined(CONF_FILES)
 . for cfg in		dialin.config		\
 			faxheader		\
 			faxrunq.config		\
diff --git a/comms/modemd/Makefile b/comms/modemd/Makefile
index 6c2660e5423..cb83b50d226 100644
--- a/comms/modemd/Makefile
+++ b/comms/modemd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:07 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:55 rillig Exp $
 
 DISTNAME=	modemd-970221
 PKGNAME=	modemd-19970221
@@ -8,7 +8,7 @@ MASTER_SITES=	ftp://ftp.vix.com/pub/modemd/
 MAINTAINER=	tsarna@NetBSD.org
 COMMENT=	Replacement getty for dialup ttys and a modem server
 
-MANCOMPRESSED_IF_MANZ=	# defined
+MANCOMPRESSED_IF_MANZ=	yes
 
 pre-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/modemd
diff --git a/comms/modemd/distinfo b/comms/modemd/distinfo
index 2d4a2075f79..4f7ddb91d59 100644
--- a/comms/modemd/distinfo
+++ b/comms/modemd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2005/02/23 16:05:30 agc Exp $
+$NetBSD: distinfo,v 1.5 2005/12/05 20:49:55 rillig Exp $
 
 SHA1 (modemd-970221.tar.gz) = 104f8e596f711e349203b2da8c4f2ecf40d490c3
 RMD160 (modemd-970221.tar.gz) = ade5d735e5fd07b91006cf1334a41a43dca7e3d9
@@ -13,6 +13,6 @@ SHA1 (patch-ag) = 8d93d4da055170a19336e127017dfe42501a0538
 SHA1 (patch-ah) = 9294419cd64c3b5cc9ebadc3a4c135a0a969262d
 SHA1 (patch-ai) = 8e81c1e522979f616f2f4aafd5dd65400a6330fa
 SHA1 (patch-aj) = 5616eff4fa6bc17377d2a433bbbaf2ca83909b94
-SHA1 (patch-ak) = 94e41ab3462933f3ddfa9ab0a235d39974dc779e
-SHA1 (patch-al) = 926b9ec9af6a7c5a4a460b448f4957913c411fe5
+SHA1 (patch-ak) = 089a0217e119e2f6e1138e35f81661d92e71f780
+SHA1 (patch-al) = a75de09e5df044b66b034a4ca9aa2148d0c68576
 SHA1 (patch-am) = d740f41abf89f760431f32ca7ffa25bf1b3bd4e1
diff --git a/comms/modemd/patches/patch-ak b/comms/modemd/patches/patch-ak
index 4f352cf43f7..854bf80b128 100644
--- a/comms/modemd/patches/patch-ak
+++ b/comms/modemd/patches/patch-ak
@@ -1,4 +1,4 @@
-$NetBSD: patch-ak,v 1.2 1998/08/07 10:36:46 agc Exp $
+$NetBSD: patch-ak,v 1.3 2005/12/05 20:49:55 rillig Exp $
 
 --- common/atparse.c.orig       Thu Jun 18 16:48:18 1998
 +++ common/atparse.c    Thu Jun 18 16:48:50 1998
@@ -7,4 +7,3 @@ $NetBSD: patch-ak,v 1.2 1998/08/07 10:36:46 agc Exp $
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
-
diff --git a/comms/modemd/patches/patch-al b/comms/modemd/patches/patch-al
index 806c3a7196b..505c6c25434 100644
--- a/comms/modemd/patches/patch-al
+++ b/comms/modemd/patches/patch-al
@@ -1,4 +1,4 @@
-$NetBSD: patch-al,v 1.2 1998/08/07 10:36:46 agc Exp $
+$NetBSD: patch-al,v 1.3 2005/12/05 20:49:55 rillig Exp $
 
 --- incoming/modemd.c.orig      Thu Jun 18 16:50:31 1998
 +++ incoming/modemd.c   Thu Jun 18 16:51:08 1998
@@ -7,4 +7,3 @@ $NetBSD: patch-al,v 1.2 1998/08/07 10:36:46 agc Exp $
 +#ifdef __NetBSD__
 +#include <stdlib.h>
 +#endif
-
diff --git a/comms/pilotmgr/Makefile b/comms/pilotmgr/Makefile
index bc239f08f97..adbfa72d4c6 100644
--- a/comms/pilotmgr/Makefile
+++ b/comms/pilotmgr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/08/05 20:31:52 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2005/12/05 20:49:55 rillig Exp $
 
 DISTNAME=	pilotmgr-1.107p2
 PKGNAME=	pilotmgr-1.107.2
@@ -22,7 +22,7 @@ NO_BUILD=		YES
 USE_TOOLS+=		perl:run
 
 CONFIGURE_ARGS=		</dev/null
-CONFIGURE_ENV+=		PERL="${LOCALBASE}/bin/perl" WRKDIR="${WRKDIR}"
+CONFIGURE_ENV+=		PERL="${LOCALBASE}/bin/perl" WRKDIR=${WRKDIR:Q}
 CONFIGURE_SCRIPT=	./Setup
 
 PM_PERL_DIR=	${PREFIX}/lib/${DISTNAME:C/-.*$//}