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

13 files changed, 30 insertions, 31 deletions

diff --git a/cad/fastcap/Makefile b/cad/fastcap/Makefile
index 952bd8a0ac1..ff12faf78c5 100644
--- a/cad/fastcap/Makefile
+++ b/cad/fastcap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:51 rillig Exp $
 #
 
 DISTNAME=	fastcap-2.0-18Sep92
@@ -16,7 +16,7 @@ EXTRACT_USING=	gtar	# cannot be extracted with pax as tar
 WRKSRC=			${WRKDIR}
 HAS_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	./config
-CONFIGURE_ARGS=		4
+CONFIGURE_ARGS+=	4
 TEX_DEPMETHOD=	build
 TEX_ACCEPTED=		teTeX1 teTeX2 teTeX3
 
diff --git a/cad/fasthenry/Makefile b/cad/fasthenry/Makefile
index 984557f53c7..fe958ef8248 100644
--- a/cad/fasthenry/Makefile
+++ b/cad/fasthenry/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/10/23 22:24:11 rillig Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:51 rillig Exp $
 #
 
 DISTNAME=	fasthenry-3.0-12Nov96
@@ -30,7 +30,7 @@ DEPENDS+=	libffm-[0-9]*:../../math/libffm
 LIBS+=		-lffm
 .endif
 LIBS+=		-lm
-MAKE_ENV+=	LIBS=${LIBS:Q}
+MAKE_ENV+=	LIBS=${LIBS:M*:Q}
 
 .if ${MACHINE_ARCH} == "arm" || ${MACHINE_ARCH} == "arm32"
 GCC_REQD+=		2.95.3
diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 55c5f18b713..b14af87353b 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/09/28 20:52:18 rillig Exp $
+# $NetBSD: Makefile,v 1.28 2005/12/05 20:49:51 rillig Exp $
 
 DISTNAME=		felt-3.05.src
 PKGNAME=		felt-3.05
@@ -17,9 +17,9 @@ WRKSRC=			${WRKDIR}/FElt-3.05
 USE_X11BASE=		yes
 XAW_TYPE?=		3d
 
-MAKE_ENV+=		CCOPTS="${CFLAGS}"
-MAKE_ENV+=		LDOPTS="${LDFLAGS}"
-MAKE_ENV+=		SH="${SH}"
+MAKE_ENV+=		CCOPTS=${CFLAGS:M*:Q}
+MAKE_ENV+=		LDOPTS=${LDFLAGS:M*:Q}
+MAKE_ENV+=		SH=${SH:Q}
 
 USE_GNU_READLINE=	# uses remove_history() and history_list()
 
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index fb72512575f..268abfe0b2e 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2005/08/22 12:25:00 cube Exp $
+# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:51 rillig Exp $
 #
 
 DISTNAME=		gtkwave-2.0.0pre5
-PKGNAME=		gtkwave-2.0.0pre5
 CATEGORIES=		cad
 MASTER_SITES=		ftp://ftp.cs.man.ac.uk/pub/amulet/gtkwave/2.0/
 
diff --git a/cad/magic/Makefile b/cad/magic/Makefile
index 70d1bb66219..8ccc8c3b18b 100644
--- a/cad/magic/Makefile
+++ b/cad/magic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/09/22 15:28:35 minskim Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:52 rillig Exp $
 #
 
 DISTNAME=	magic-7.1
@@ -11,7 +11,7 @@ HOMEPAGE=	http://vlsi.cornell.edu/magic/
 COMMENT=	Integrated circuit layout system
 
 USE_TOOLS+=	gmake
-MAKE_ENV+=	MAGIC_HOME=${PREFIX}
+MAKE_ENV+=	MAGIC_HOME=${PREFIX:Q}
 
 .include "../../mk/endian.mk"
 .if ${MACHINE_ENDIAN} == "big"
diff --git a/cad/mcalc/Makefile b/cad/mcalc/Makefile
index df3efa7f900..655de902b85 100644
--- a/cad/mcalc/Makefile
+++ b/cad/mcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/17 02:52:35 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:52 rillig Exp $
 #
 
 DISTNAME=	mcalc-1.5
@@ -15,7 +15,7 @@ NO_BUILD=	yes
 
 MCALCBASE?=	share/${PKGNAME}
 
-PLIST_SUBST+=	MCALCBASE=${MCALCBASE}
+PLIST_SUBST+=	MCALCBASE=${MCALCBASE:Q}
 MESSAGE_SUBST+=	MCALCBASE=${MCALCBASE}
 
 do-install:
diff --git a/cad/mex-wcalc/Makefile b/cad/mex-wcalc/Makefile
index c690c29f23c..b7388287564 100644
--- a/cad/mex-wcalc/Makefile
+++ b/cad/mex-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/12/02 00:00:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:52 rillig Exp $
 #
 
 .include "../../cad/wcalc/Makefile.common"
@@ -64,7 +64,7 @@ MEX_SUFX?=	${_MEX_SUFX}
 
 MATLAB_MEX?=		${_MATLAB_MEX}
 
-PLIST_SUBST+=		MEX_SUFX=${MEX_SUFX}
+PLIST_SUBST+=		MEX_SUFX=${MEX_SUFX:Q}
 
 .if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE})
 MATLAB_DIR!=		${MATLAB_MEX} -v 2>/dev/null | ${AWK} '/[ \t]MATLAB[ \t]/ {print $$NF}'
diff --git a/cad/oct-wcalc/Makefile b/cad/oct-wcalc/Makefile
index d20949b6ed0..0e30ef823b1 100644
--- a/cad/oct-wcalc/Makefile
+++ b/cad/oct-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/01 03:53:18 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:52 rillig Exp $
 #
 
 .include "../../cad/wcalc/Makefile.common"
@@ -22,7 +22,7 @@ CONFIGURE_ARGS+=	--without-scilab
 # the octave-forge mex script, not any c++ code
 # explicitly present in wcalc.  The fortran part
 # also comes from ocatve, not from wcalc.
-GCC_REQD=	3.0
+GCC_REQD+=	3.0
 USE_LANGUAGES=	c c++ fortran
 
 .include "../../math/octave/octave.mk"
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index efdee9004b4..52045bc90dc 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/12/03 02:37:28 joerg Exp $
+# $NetBSD: Makefile,v 1.30 2005/12/05 20:49:52 rillig Exp $
 
 DISTNAME=		qcad-1.5.4-src
 PKGNAME=		qcad-1.5.4
@@ -11,7 +11,7 @@ HOMEPAGE=		http://www.qcad.org/
 COMMENT=		2D CAD System
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
-MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH}
+MAKE_ENV+=		MACHINE_ARCH=${MACHINE_ARCH:Q}
 MAKE_ENV+=		QTDIR=${BUILDLINK_PREFIX.qt3}
 INSTALLATION_DIRS=	bin
 
diff --git a/cad/sci-wcalc/Makefile b/cad/sci-wcalc/Makefile
index a146b34db74..bc7ecf5bcf6 100644
--- a/cad/sci-wcalc/Makefile
+++ b/cad/sci-wcalc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2005/11/01 03:52:50 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:52 rillig Exp $
 #
 
 .include "../../cad/wcalc/Makefile.common"
@@ -17,7 +17,7 @@ CONFIGURE_ARGS+=	--without-matlab
 CONFIGURE_ARGS+=	--without-octave
 CONFIGURE_ARGS+=	--with-scilab=${SCI}
 
-PLIST_SUBST+=		SCIVERSION=${SCIVERSION}
+PLIST_SUBST+=		SCIVERSION=${SCIVERSION:Q}
 MESSAGE_SUBST+=		SCIVERSION=${SCIVERSION}
 
 .include "../../cad/libwcalc/buildlink3.mk"
diff --git a/cad/simian/Makefile b/cad/simian/Makefile
index 9de641503dc..0b93324adce 100644
--- a/cad/simian/Makefile
+++ b/cad/simian/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/11/03 19:56:36 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:52 rillig Exp $
 #
 
 DISTNAME=	simian_12_98
@@ -18,7 +18,7 @@ NO_SRC_ON_FTP=		${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 USE_LANGUAGES=		c++
-GCC_REQD=		3.0
+GCC_REQD+=		3.0
 
 WRKSRC=		${WRKDIR}/Simian
 BUILD_DIRS=	src
diff --git a/cad/tkgate/Makefile b/cad/tkgate/Makefile
index 44754876a09..9e7e1cd3525 100644
--- a/cad/tkgate/Makefile
+++ b/cad/tkgate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:07:41 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:52 rillig Exp $
 #
 
 DISTNAME=	tkgate-1.6i
@@ -19,8 +19,8 @@ USE_TOOLS+=		gm4
 
 TKGATE_SITENAME=	Earth
 
-CONFIGURE_ENV+=		BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}"
-CONFIGURE_ENV+=		PREFIX="${PREFIX}"
+CONFIGURE_ENV+=		BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q}
+CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 
 SUBST_CLASSES+=		tkgate
 SUBST_MESSAGE.tkgate=	"Fixing paths in configuration files."
diff --git a/cad/wcalc/Makefile.common b/cad/wcalc/Makefile.common
index df93f916f76..bbb74deb593 100644
--- a/cad/wcalc/Makefile.common
+++ b/cad/wcalc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2005/12/01 23:58:16 dmcmahill Exp $
+# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:49:52 rillig Exp $
 #
 
 DISTNAME=       wcalc-0.9
@@ -46,6 +46,6 @@ MESSAGE_SUBST+=	WCALC_HTMLPATH=${WCALC_HTMLPATH}
 MESSAGE_SUBST+=	WCALC_DIR=${WCALC_DIR}
 
 # and the PLIST too
-PLIST_SUBST+=	WCALC_CGIDIR=${WCALC_CGIDIR}
-PLIST_SUBST+=	WCALC_HTMLDIR=${WCALC_HTMLDIR}
-PLIST_SUBST+=	WCALC_DIR=${WCALC_DIR}
+PLIST_SUBST+=	WCALC_CGIDIR=${WCALC_CGIDIR:Q}
+PLIST_SUBST+=	WCALC_HTMLDIR=${WCALC_HTMLDIR:Q}
+PLIST_SUBST+=	WCALC_DIR=${WCALC_DIR:Q}