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, 37 insertions, 38 deletions

diff --git a/cross/avr-binutils/Makefile b/cross/avr-binutils/Makefile
index b82551ee872..520799b6eca 100644
--- a/cross/avr-binutils/Makefile
+++ b/cross/avr-binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/05/22 20:07:44 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=		binutils-2.13.2.1
 PKGNAME=		avr-binutils-2.13.2.1
@@ -15,7 +15,7 @@ GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
 USE_MAKEINFO=		YES
 
-CONFIGURE_ARGS=		--target=avr
+CONFIGURE_ARGS+=	--target=avr
 
 # Prevent the need to run texi2pod.pl and pod2man hence
 # the need for perl as build dependency.
diff --git a/cross/avr-gcc/Makefile b/cross/avr-gcc/Makefile
index 4d721f873ba..f166a040aa5 100644
--- a/cross/avr-gcc/Makefile
+++ b/cross/avr-gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=		gcc-3.3.2003.05.11
 PKGNAME=		avr-gcc-3.3.2003.05.11
@@ -25,12 +25,12 @@ USE_BZIP2=		yes
 USE_TOOLS+=		bison gmake lex perl tar
 USE_PKGLOCALEDIR=	yes
 
-CONFIGURE_ARGS=		--target=avr --prefix=${PREFIX}
+CONFIGURE_ARGS+=	--target=avr
 
 MAN_AUX=		gcc-man.2003.05.11.gz
 
-MAKE_FLAGS=		LANGUAGES="c c++"
-MAKE_ENV=		MACHINE_ARCH=avr
+MAKE_FLAGS+=		LANGUAGES="c c++"
+MAKE_ENV+=		MACHINE_ARCH=avr
 
 pre-build:
 		if perl -e 'use 1.10 Pod::Man' >/dev/null 2>/dev/null ; \
diff --git a/cross/avr-libc/Makefile b/cross/avr-libc/Makefile
index 654b31c5189..ccd262b62d3 100644
--- a/cross/avr-libc/Makefile
+++ b/cross/avr-libc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/08/15 08:45:54 wennmach Exp $
+# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=		avr-libc-1.2.5
 CATEGORIES=		cross
@@ -12,7 +12,6 @@ COMMENT=		C and math library for Atmel AVR 8-bit microcontrollers
 
 BUILD_DEPENDS+=		avr-binutils-*:../../cross/avr-binutils
 BUILD_DEPENDS+=		avr-gcc-*:../../cross/avr-gcc
-BUILD_DEPENDS+=		gmake-*:../../devel/gmake
 BUILD_DEPENDS+=		doxygen-*:../../devel/doxygen
 BUILD_DEPENDS+=		transfig-*:../../print/transfig
 BUILD_DEPENDS+=		netpbm-*:../../graphics/netpbm
@@ -21,7 +20,7 @@ USE_BZIP2=		yes
 USE_TOOLS+=		gmake
 HAS_CONFIGURE=		yes
 CONFIGURE_ENV+=		CC=${LOCALBASE}/bin/avr-gcc
-CONFIGURE_ENV+=		PREFIX=${PREFIX}
+CONFIGURE_ENV+=		PREFIX=${PREFIX:Q}
 CONFIGURE_ARGS+=	--enable-doc
 CONFIGURE_ARGS+=	--disable-versioned-doc
 # avr-libc's method to build the man pages seems to be broken
@@ -34,10 +33,10 @@ do-build:
 
 do-install:
 	(cd ${WRKSRC}; ./domake MAKE=${GMAKE} install)
-	${MKDIR} ${PREFIX}/share/doc/avr-libc
-	${MKDIR} ${PREFIX}/share/doc/avr-libc/examples
-	${MKDIR} ${PREFIX}/share/doc/avr-libc/examples/demo
-	${MKDIR} ${PREFIX}/share/doc/avr-libc/examples/twitest
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples/demo
+	${INSTALL_DATA_DIR} ${PREFIX}/share/doc/avr-libc/examples/twitest
 	${INSTALL_DATA} \
 		${WRKSRC}/LICENSE \
 		${WRKSRC}/AUTHORS \
diff --git a/cross/avrdude/Makefile b/cross/avrdude/Makefile
index f1c97eb55f8..884787e977d 100644
--- a/cross/avrdude/Makefile
+++ b/cross/avrdude/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:24 tonio Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=	avrdude-4.1.0
 PKGREVISION=	2
@@ -19,7 +19,7 @@ GNU_CONFIGURE=	yes
 INFO_FILES=	avrdude.info
 USE_MAKEINFO=	yes
 
-CONFIGURE_ARGS=	--disable-versioned-doc
+CONFIGURE_ARGS+=	--disable-versioned-doc
 
 .include "../../devel/readline/buildlink3.mk"
 .include "../../mk/tex.buildlink3.mk"
diff --git a/cross/bfd-crunchide/Makefile b/cross/bfd-crunchide/Makefile
index 021664be8f2..73ba0d12bc9 100644
--- a/cross/bfd-crunchide/Makefile
+++ b/cross/bfd-crunchide/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/04/05 11:05:33 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=	bfd-crunchide-1.1
 PKGREVISION=	1
@@ -18,7 +18,7 @@ NO_CONFIGURE=	yes
 
 USE_CROSSBASE=	yes
 CPPFLAGS+=	-I${PREFIX}/include
-MAKE_ENV+=	LIBS="${BFD_LIBS}"
+MAKE_ENV+=	LIBS=${BFD_LIBS:Q}
 
 BFD_LIBS=	${PREFIX}/lib/libbfd.a ${PREFIX}/lib/libiberty.a ${PREFIX}/lib/libintl.a
 
diff --git a/cross/bfd-mdsetimage/Makefile b/cross/bfd-mdsetimage/Makefile
index 357ef4b48d2..017690b7379 100644
--- a/cross/bfd-mdsetimage/Makefile
+++ b/cross/bfd-mdsetimage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/05 11:06:40 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=	bfd-mdsetimage-1.15.1
 CATEGORIES=	cross
@@ -16,8 +16,8 @@ NO_CONFIGURE=	yes
 USE_CROSSBASE=	yes
 BFD_VERSION=	2.9.1
 CPPFLAGS+=	-I${PREFIX}/include
-MAKE_ENV+=	BFD_VERSION=${BFD_VERSION} \
-		LIBS="${BFD_LIBS}"
+MAKE_ENV+=	BFD_VERSION=${BFD_VERSION:Q} \
+		LIBS=${BFD_LIBS:Q}
 
 FIX_RPATH+=	BFD_LIBS
 BFD_LIBS=	-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lbfd -liberty -lintl
diff --git a/cross/binutils/Makefile b/cross/binutils/Makefile
index 072e11efe81..629d643345f 100644
--- a/cross/binutils/Makefile
+++ b/cross/binutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2005/06/20 01:46:01 jlam Exp $
+# $NetBSD: Makefile,v 1.45 2005/12/05 20:49:56 rillig Exp $
 #
 # GNU binutils configured to hold `as many targets as the cross system is
 # capable of using'.  Configures and builds everything except gas, which
@@ -29,7 +29,7 @@ CONFIGURE_ARGS+=	--target=i386-linux
 MAKE_ARGS+=		CFLAGS="${CFLAGS}"
 BUILD_TARGET=		all-binutils all-ld
 
-PLIST_SUBST=		LOCALBASE=${LOCALBASE}
+PLIST_SUBST+=		LOCALBASE=${LOCALBASE:Q}
 
 BINDIR=			${PREFIX}/libexec/binutils
 
diff --git a/cross/i386-cygwin32/Makefile b/cross/i386-cygwin32/Makefile
index 9f1c5dfe95e..f12fb3fc99d 100644
--- a/cross/i386-cygwin32/Makefile
+++ b/cross/i386-cygwin32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/07/09 20:48:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:49:56 rillig Exp $
 #
 
 DISTVERSION=		1.0.0.0
@@ -32,4 +32,4 @@ post-configure:
 	${CP} ${FILESDIR}/featuretest.h ${CROSS_SYS_INCLUDE}/sys/
 	${CP} ${FILESDIR}/limits.h ${CROSS_SYS_INCLUDE}/
 
-.include "../COMMON/cross.mk"
+.include "../../cross/COMMON/cross.mk"
diff --git a/cross/i386-linux/Makefile b/cross/i386-linux/Makefile
index 079cbe38696..d064b6182be 100644
--- a/cross/i386-linux/Makefile
+++ b/cross/i386-linux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/18 12:16:13 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:56 rillig Exp $
 #
 
 DISTVERSION=		2.0.7.1
@@ -57,4 +57,4 @@ post-install:
 		${LN} -sf libdb.so libndbm.so; \
 		${LN} -sf libbsd-compat.a libbsd.a
 
-.include "../COMMON/cross.mk"
+.include "../../cross/COMMON/cross.mk"
diff --git a/cross/i386-mingw32/Makefile b/cross/i386-mingw32/Makefile
index 3f11892a9fe..66a95ad6607 100644
--- a/cross/i386-mingw32/Makefile
+++ b/cross/i386-mingw32/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:08 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=		cross-${TARGET_ARCH}-3.2
 CROSS_DISTFILES=
@@ -21,7 +21,7 @@ CROSS_DISTFILES+=	gcc-${GCC_VERSION}.tar.gz gcc-3.3.3-20040217-1-src.diff.gz \
 MASTER_SITES+=		${MASTER_SITE_GNU:=gcc/releases/gcc-3.3.3/}
 GCC_WIN32_PATCH=	${WRKDIR}/gcc-3.3.3-20040217-1-src.diff
 GCC_WRKSRC=		${WRKDIR}/gcc-${GCC_VERSION}
-PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION}
+PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION:Q}
 CROSS_DISTFILES+=	mingw-runtime-3.2.tar.gz
 MINGW_WRKSRC=		${WRKDIR}/mingw-runtime-3.2
 CROSS_DISTFILES+=	w32api-2.5.tar.gz
@@ -68,7 +68,7 @@ bu-configure:
 	cd ${BINUTILS_WRKSRC} && ${SETENV} ${CONFIGURE_ENV} ./configure \
 		--prefix=${PREFIX} --target=${TARGET_ARCH} --disable-nls
 gcc-configure:
-	-${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}
+	${MKDIR} ${GCC_WRKSRC}/${TARGET_ARCH}
 	cd ${GCC_WRKSRC}/${TARGET_ARCH} && ${SETENV} ${CONFIGURE_ENV} ../configure \
 		--prefix=${PREFIX} --target=${TARGET_ARCH} \
 		--with-gnu-as --with-gnu-ld --disable-multilib --disable-nls \
diff --git a/cross/i386-msdosdjgpp/Makefile b/cross/i386-msdosdjgpp/Makefile
index ee5b5afe1b4..6b512c79ec8 100644
--- a/cross/i386-msdosdjgpp/Makefile
+++ b/cross/i386-msdosdjgpp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/04/18 11:42:23 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/12/05 20:49:56 rillig Exp $
 #
 
 DISTVERSION=		2.02.0
@@ -15,7 +15,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.delorie.com/djgpp/
 COMMENT=		Cross-compile environment for MS-DOS on 386 and higher
 
-BUILD_DEPENDS=		unzip-[0-9]*:../../archivers/unzip
+BUILD_DEPENDS+=		unzip-[0-9]*:../../archivers/unzip
 
 SITES_wmemu2b.zip=	http://ftp.delorie.com/pub/djgpp/beta/ \
 			ftp://ftp.delorie.com/pub/djgpp/beta/ \
@@ -66,4 +66,4 @@ do-install:
 	${LN} -f ${TARGET_DIR}/bin/stubedit ${PREFIX}/bin/${TARGET_ARCH}-stubify
 	${INSTALL_DATA} ${WRKSRC}/bin/wmemu387.dxe ${TARGET_DIR}/lib/
 
-.include "../COMMON/cross.mk"
+.include "../../cross/COMMON/cross.mk"
diff --git a/cross/i386-netbsdpe/Makefile b/cross/i386-netbsdpe/Makefile
index f141801bda9..ec6d2527cef 100644
--- a/cross/i386-netbsdpe/Makefile
+++ b/cross/i386-netbsdpe/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/24 19:29:57 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:56 rillig Exp $
 
 DISTVERSION=		3.3.3
 MAINTAINER=		peace-sacrifice@hauN.org
@@ -35,8 +35,8 @@ DISTFILES+=		${GCC_DISTNAME}.tar.gz
 USE_TOOLS+=		gmake
 USE_MAKEINFO=		YES
 GCC_LANGUAGES=		c,c++
-CONFIGURE_ENV=		${SETENV} CC="${CC}" CFLAGS="${CFLAGS}" \
-		CXXFLAGS="${CXXFLAGS}" LDFLAGS="${LDFLAGS}"
+CONFIGURE_ENV=		${SETENV} CC=${CC:Q} CFLAGS=${CFLAGS:M*:Q} \
+		CXXFLAGS=${CXXFLAGS:M*:Q} LDFLAGS=${LDFLAGS:M*:Q}
 GCC_CONFIGURE_ARGS=	--with-gnu-ld --with-gnu-as -disable-multilib \
 		--enable-threads=posix --disable-shared --with-system-zlib \
 		--enable-languages=${GCC_LANGUAGES} --with-headers=yes \
diff --git a/cross/mipsEEel-netbsd/Makefile b/cross/mipsEEel-netbsd/Makefile
index ad726d9a196..2eeea9005af 100644
--- a/cross/mipsEEel-netbsd/Makefile
+++ b/cross/mipsEEel-netbsd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/14 22:25:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:56 rillig Exp $
 
 DISTNAME=	cross-${TARGET_ARCH}-${DISTVERSION}
 TARGET_ARCH=	mipsEEel-netbsd
@@ -24,8 +24,8 @@ WRKSRC=		${WRKDIR}
 # for other cross compilers.
 #USE_CROSSBASE=	yes
 TARGET_DIR=	${PREFIX}/cross-ps2
-PLIST_SUBST+=	SUBDIR="cross-ps2" TARGET_ARCH="${TARGET_ARCH}" \
-		GCC_VERSION="${GCC_VERSION}"
+PLIST_SUBST+=	SUBDIR="cross-ps2" TARGET_ARCH=${TARGET_ARCH:Q} \
+		GCC_VERSION=${GCC_VERSION:Q}
 
 #
 # binutils