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

16 files changed, 46 insertions, 46 deletions

diff --git a/inputmethod/anthy-elisp/Makefile b/inputmethod/anthy-elisp/Makefile
index ae532a37caf..20299b6b28a 100644
--- a/inputmethod/anthy-elisp/Makefile
+++ b/inputmethod/anthy-elisp/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2005/10/01 12:47:55 taya Exp $
+# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:23 rillig Exp $
 
 .include	"../../inputmethod/anthy/Makefile.common"
 PKGNAME=	${EMACS_PKGNAME_PREFIX}anthy-elisp-${ANTHY_VERSION}
-CATEGORIES=	inputmethod editor
+CATEGORIES=	inputmethod editors
 PKGREVISION=	1
 
 MAINTAINER=	taya@NetBSD.org
@@ -11,8 +11,8 @@ COMMENT=	Emacs lisp files for inputmethod/anthy
 DEPENDS+=	anthy>=${ANTHY_VERSION}:../../inputmethod/anthy
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ENV+=	EMACS=${EMACS_BIN}
-EMACS_USE_LEIM=	# defined (for emacs21/emacs20)
+CONFIGURE_ENV+=	EMACS=${EMACS_BIN:Q}
+EMACS_USE_LEIM=	yes	# (for emacs21/emacs20)
 
 .include "../../mk/emacs.mk"
 .if ${EMACS_FLAVOR} == "xemacs"
diff --git a/inputmethod/canna-dict/Makefile b/inputmethod/canna-dict/Makefile
index d279eb123c1..313452e7490 100644
--- a/inputmethod/canna-dict/Makefile
+++ b/inputmethod/canna-dict/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2005/07/19 10:17:17 grant Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:23 rillig Exp $
 #
-.include "../canna/Makefile.common"
+.include "../../inputmethod/canna/Makefile.common"
 
 CANNA_MODULE=	dict
 
@@ -32,7 +32,7 @@ do-build:
 do-install:
 	@cd ${WRKSRC}/dic/ideo; ${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} install
 
-.include "../canna/Makefile.include"
+.include "../../inputmethod/canna/Makefile.include"
 
 # Need to set this here _after_ bsd.pkg.mk
 PREFIX=		${IMDICTDIR}
diff --git a/inputmethod/canna-lib/Makefile b/inputmethod/canna-lib/Makefile
index 2f1dd3ee584..ac2c0bf8bbd 100644
--- a/inputmethod/canna-lib/Makefile
+++ b/inputmethod/canna-lib/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2003/05/31 08:28:34 uebayasi Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:23 rillig Exp $
 #
-.include "../canna/Makefile.common"
+.include "../../inputmethod/canna/Makefile.common"
 
 CANNA_MODULE=	lib
 
@@ -27,4 +27,4 @@ do-configure:
 post-configure:
 	@${LN} -s ${WRKSRC}/server/*.h ${WRKSRC}/include
 
-.include "../canna/Makefile.include"
+.include "../../inputmethod/canna/Makefile.include"
diff --git a/inputmethod/canna-server/MESSAGE b/inputmethod/canna-server/MESSAGE
index 03c198fa6eb..f93d7250182 100644
--- a/inputmethod/canna-server/MESSAGE
+++ b/inputmethod/canna-server/MESSAGE
@@ -1,5 +1,5 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.4 2005/09/28 14:15:49 rillig Exp $
+$NetBSD: MESSAGE,v 1.5 2005/12/05 20:50:23 rillig Exp $
 
 If you want Canna server to boot automatically,
 
@@ -8,10 +8,10 @@ If you want Canna server to boot automatically,
 
 		canna=YES	canna_flags="-u ${CANNA_USER}"
 
-canna_flags="-u ${CANNA_USER}" is not required, but recommended.  Note that our
-Canna package no longer uses setuid(2) to make the server run as user
-"${CANNA_USER}", owing to the implementation of "-u" option (3.6 and above).  See
-cannaserver(1M).
+canna_flags="-u ${CANNA_USER}" is not required, but recommended.  Note
+that our Canna package no longer uses setuid(2) to make the server run
+as user "${CANNA_USER}", owing to the implementation of "-u" option (3.6
+and above).  See cannaserver(1M).
 
 Also note that by default cannaserver(1M) no longer allows connections
 through tcp port 5680.  You need to explicitly specify the port by the
diff --git a/inputmethod/canna-server/Makefile b/inputmethod/canna-server/Makefile
index c99dd5dd218..99b4980f89d 100644
--- a/inputmethod/canna-server/Makefile
+++ b/inputmethod/canna-server/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:47 rillig Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:23 rillig Exp $
 #
-.include "../canna/Makefile.common"
+.include "../../inputmethod/canna/Makefile.common"
 
 PKGREVISION=	1
 
@@ -39,4 +39,4 @@ do-configure:
 .include "../../devel/nbitools/buildlink3.mk"
 .include "../../inputmethod/canna-lib/buildlink3.mk"
 
-.include "../canna/Makefile.include"
+.include "../../inputmethod/canna/Makefile.include"
diff --git a/inputmethod/canna/Makefile.common b/inputmethod/canna/Makefile.common
index a2e6d93be95..b924694bc87 100644
--- a/inputmethod/canna/Makefile.common
+++ b/inputmethod/canna/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.13 2005/05/17 22:22:52 jlam Exp $
+# $NetBSD: Makefile.common,v 1.14 2005/12/05 20:50:23 rillig Exp $
 #
 # Canna common makefile.
 #
@@ -16,7 +16,7 @@ FILESDIR=	${.CURDIR}/../canna/files
 DISTINFO_FILE=	${.CURDIR}/../canna/distinfo
 PATCHDIR=	${.CURDIR}/../canna/patches
 
-.include "../canna/Makefile.version"
+.include "../../inputmethod/canna/Makefile.version"
 
 USE_TOOLS+=	imake
 CANNA_SPOOL=	${DESTDIR}/var/spool/canna
diff --git a/inputmethod/imhangul_status_applet/Makefile b/inputmethod/imhangul_status_applet/Makefile
index 1b699e1beab..1c3fc152959 100644
--- a/inputmethod/imhangul_status_applet/Makefile
+++ b/inputmethod/imhangul_status_applet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/10/17 00:04:02 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:23 rillig Exp $
 #
 
 DISTNAME=		imhangul_status_applet-0.3
@@ -9,7 +9,7 @@ MAINTAINER=		minskim@NetBSD.org
 HOMEPAGE=		http://imhangul.kldp.net/\#APPLET
 COMMENT=		GNOME2 applet to show imhangul status
 
-DEPENDS=		imhangul>=0.9.6:../../inputmethod/imhangul
+DEPENDS+=		imhangul>=0.9.6:../../inputmethod/imhangul
 
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1 gnome2-1.5
diff --git a/inputmethod/ja-freewnn-dict/Makefile b/inputmethod/ja-freewnn-dict/Makefile
index 5f0fa93204a..a1ebaf8bf34 100644
--- a/inputmethod/ja-freewnn-dict/Makefile
+++ b/inputmethod/ja-freewnn-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/07/19 10:17:17 grant Exp $
+# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:23 rillig Exp $
 #
 
 PKGNAME=	ja-FreeWnn-dict-1.10
@@ -24,4 +24,4 @@ PATCHDIR=	${.CURDIR}/../ja-freewnn-lib/patches
 NO_MTREE=		YES
 INSTALLATION_PREFIX=	${IMDICTDIR}
 
-.include "../ja-freewnn-lib/Makefile.common"
+.include "../../inputmethod/ja-freewnn-lib/Makefile.common"
diff --git a/inputmethod/ja-freewnn-server-bin/Makefile b/inputmethod/ja-freewnn-server-bin/Makefile
index ebb4c80830b..32140129a04 100644
--- a/inputmethod/ja-freewnn-server-bin/Makefile
+++ b/inputmethod/ja-freewnn-server-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/08/23 11:48:48 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:23 rillig Exp $
 #
 
 PKGNAME=	ja-FreeWnn-server-bin-1.10
@@ -30,5 +30,5 @@ BUILD_DEFS+=	FREEWNN_USER FREEWNN_GROUP
 PKG_GROUPS=	${FREEWNN_GROUP}
 PKG_USERS=	${FREEWNN_USER}:${FREEWNN_GROUP}::Freewnn\ user
 
-.include "../ja-freewnn-lib/buildlink3.mk"
-.include "../ja-freewnn-lib/Makefile.common"
+.include "../../inputmethod/ja-freewnn-lib/buildlink3.mk"
+.include "../../inputmethod/ja-freewnn-lib/Makefile.common"
diff --git a/inputmethod/sj3-dict/Makefile b/inputmethod/sj3-dict/Makefile
index 06a525cb166..1d719b02bfc 100644
--- a/inputmethod/sj3-dict/Makefile
+++ b/inputmethod/sj3-dict/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/09/28 18:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:23 rillig Exp $
 #
 
 DISTNAME=	sj3-2.0.1.20
@@ -25,8 +25,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 NO_MTREE=       YES
 SJ3OWNER?=	daemon
 SJ3GROUP?=	daemon
-MAKE_ENV+=	SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} \
-		IMDICTDIR=${IMDICTDIR} LOCAL_LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
+		IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
 
 INSTALL_SRC=	${PKGDIR}/INSTALL
 INSTALL_FILE=	${WRKDIR}/INSTALL
diff --git a/inputmethod/sj3-lib/Makefile b/inputmethod/sj3-lib/Makefile
index 20139d6931d..27b6fefbde3 100644
--- a/inputmethod/sj3-lib/Makefile
+++ b/inputmethod/sj3-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/09/28 18:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:24 rillig Exp $
 
 DISTNAME=	sj3-2.0.1.20
 PKGNAME=	sj3-lib-2.0.1.20
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_ENV+=	IMDICTDIR=${IMDICTDIR}
+MAKE_ENV+=	IMDICTDIR=${IMDICTDIR:Q}
 
 pre-configure:
 	@${MV} ${WRKSRC}/Imakefile ${WRKSRC}/Imakefile.orig
diff --git a/inputmethod/sj3-server-bin/Makefile b/inputmethod/sj3-server-bin/Makefile
index a914ad13dec..e128f33e48b 100644
--- a/inputmethod/sj3-server-bin/Makefile
+++ b/inputmethod/sj3-server-bin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/28 18:22:11 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:24 rillig Exp $
 #
 
 DISTNAME=	sj3-2.0.1.20
@@ -23,8 +23,8 @@ USE_PKGINSTALL=	YES
 BUILD_DEFS+=	SJ3OWNER SJ3GROUP
 SJ3OWNER?=	daemon
 SJ3GROUP?=	daemon
-MAKE_ENV+=	SJ3OWNER=${SJ3OWNER} SJ3GROUP=${SJ3GROUP} \
-		IMDICTDIR=${IMDICTDIR} LOCAL_LDFLAGS="${LDFLAGS}"
+MAKE_ENV+=	SJ3OWNER=${SJ3OWNER:Q} SJ3GROUP=${SJ3GROUP:Q} \
+		IMDICTDIR=${IMDICTDIR:Q} LOCAL_LDFLAGS=${LDFLAGS:M*:Q}
 
 RCD_SCRIPTS=		sj3
 
diff --git a/inputmethod/skk/Makefile b/inputmethod/skk/Makefile
index 91f33161869..086344da485 100644
--- a/inputmethod/skk/Makefile
+++ b/inputmethod/skk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/08/28 04:25:30 uebayasi Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:50:24 rillig Exp $
 #
 
 DISTNAME=	ddskk-12.2.0
@@ -19,21 +19,21 @@ EMACS_VERSIONS_ACCEPTED=	emacs21 emacs21nox xemacs214 emacs20 xemacs215
 .include "../../mk/emacs.mk"
 .include "options.mk"
 
-DEPENDS=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
+DEPENDS+=	${EMACS_PKGNAME_PREFIX}apel>=10.6:../../devel/apel
 .if ${EMACS_FLAVOR} == "emacs"
-EMACS_USE_LEIM=	# defined
+EMACS_USE_LEIM=	yes
 BUILD_DEPENDS+=	${EMACS_PKGNAME_PREFIX}Mule-UCS-[0-9]*:../../editors/mule-ucs
 .else
 BUILD_DEPENDS+= xemacs-packages>=1.10:../../editors/xemacs-packages
 .endif
 
-MAKEFLAGS=	EMACS=${EMACS_BIN}
+MAKEFLAGS+=	EMACS=${EMACS_BIN:Q}
 BUILD_TARGET=	elc
 
 INFO_FILES=	skk.info
 
 # SKK-CFG was copied from ${FILESDIR} during post-extract.
-SUBST_CLASSES=		cfg
+SUBST_CLASSES+=		cfg
 SUBST_STAGE.cfg=	do-configure
 SUBST_FILES.cfg=	SKK-CFG
 SUBST_SED.cfg=		-e 's|@PREFIX@|${PREFIX}|g' \
diff --git a/inputmethod/skkfep/Makefile b/inputmethod/skkfep/Makefile
index 5e84a8954fa..ececb3c2bea 100644
--- a/inputmethod/skkfep/Makefile
+++ b/inputmethod/skkfep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/09/28 16:51:32 rillig Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:24 rillig Exp $
 
 DISTNAME=	skkfep0.86c
 PKGNAME=	skkfep-0.86c
@@ -13,7 +13,7 @@ BUILD_DEFS+=	USE_INET6
 
 WRKSRC=		${WRKDIR}/skkfep
 NO_CONFIGURE=	yes
-MAKE_ENV=	MAKE_FLAGS='EXECBASE=${LOCALBASE} CC=${CC}'
+MAKE_ENV+=	MAKE_FLAGS=EXECBASE=${LOCALBASE:Q}\ CC=${CC:Q}
 
 DESCR_SRC=	${WRKDIR}/DESCR
 INSTALL_FILE=	${WRKDIR}/INSTALL
diff --git a/inputmethod/skkinput/Makefile b/inputmethod/skkinput/Makefile
index 5ba57192a6f..a3bcce115f1 100644
--- a/inputmethod/skkinput/Makefile
+++ b/inputmethod/skkinput/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/06 03:53:27 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:24 rillig Exp $
 
 DISTNAME=	skkinput-2.06.3
 CATEGORIES=	japanese inputmethod
@@ -12,7 +12,7 @@ BUILD_DEFS+=	USE_INET6
 
 USE_IMAKE=	YES
 
-PLIST_SUBST=	PKGBASE=${LOCALBASE}
+PLIST_SUBST+=	PKGBASE=${LOCALBASE:Q}
 
 DESCR_SRC=	${WRKDIR}/DESCR
 INSTALL_FILE=	${WRKDIR}/INSTALL
diff --git a/inputmethod/skkserv/Makefile b/inputmethod/skkserv/Makefile
index d5d2bd49011..ae0753e05fc 100644
--- a/inputmethod/skkserv/Makefile
+++ b/inputmethod/skkserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/04/11 21:46:11 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:24 rillig Exp $
 
 DISTNAME=	skk9.6
 PKGNAME=	skkserv-3.9.4
@@ -37,7 +37,7 @@ SKKSERV_GID?=	65534		# nogroup
 .endif
 SKKSERV_UID?=	32767		# nobody
 SKKSERV_GID?=	32766		# nogroup
-MAKE_ENV=	SKKUID=${SKKSERV_UID} SKKGID=${SKKSERV_GID}
+MAKE_ENV+=	SKKUID=${SKKSERV_UID:Q} SKKGID=${SKKSERV_GID:Q}
 
 # tmp for building dictionary.  ~16MB required.  mfs would be much faster.
 TMPDIR?=	${WRKDIR}