Fixed some pkglint warnings of the form:

- WARN: archivers/bzip2/Makefile:15: Please use ${CC:Q} instead of "${CC}".
jsonn · Dec 1, 2005 · 4c8d916 · 4c8d916
1 parent 04603d6
commit 4c8d916
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 27 deletions.
diff --git a/archivers/bzip2/Makefile b/archivers/bzip2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.39 2005/05/26 15:03:11 salo Exp $
+# $NetBSD: Makefile,v 1.40 2005/12/01 16:41:29 rillig Exp $
 #
 
 DISTNAME=	bzip2-1.0.3
@@ -12,7 +12,7 @@ COMMENT=	Block-sorting file compressor
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LIBTOOL=		yes
-MAKE_ENV+=		REALCC="${CC}"
+MAKE_ENV+=		REALCC=${CC:Q}
 
 .include "../../mk/compiler.mk"
 

diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/11/03 19:38:50 adrianp Exp $
+# $NetBSD: Makefile,v 1.27 2005/12/01 16:41:29 rillig Exp $
 #
 
 DISTNAME=       cpio-2.6
@@ -27,7 +27,7 @@ LIBS+=		-lgnumalloc
 .if defined(GNU_PROGRAM_PREFIX)
 CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 .endif
-PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/08/26 06:09:42 reed Exp $
+# $NetBSD: Makefile,v 1.31 2005/12/01 16:41:29 rillig Exp $
 
 DISTNAME=	sharutils-4.2.1
 PKGNAME=	g${DISTNAME}
@@ -23,7 +23,7 @@ INFO_FILES=		remsync.info sharutils.info
 USE_TOOLS+=		sh:run mktemp:run
 
 CONFIGURE_ARGS+=	--disable-uucode
-CONFIGURE_ENV+=		SH="${TOOLS_SH}"
+CONFIGURE_ENV+=		SH=${TOOLS_SH:Q}
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -42,7 +42,7 @@ CPPFLAGS+=		-D_nl_default_dirname=libintl_nl_default_dirname
 .if defined(GNU_PROGRAM_PREFIX)
 CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
 .endif
-PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX}
+PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
 post-patch:

diff --git a/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2005/11/04 16:39:50 rillig Exp $
+# $NetBSD: Makefile,v 1.46 2005/12/01 16:41:29 rillig Exp $
 #
 
 DISTNAME=       tar-1.15.1
@@ -36,7 +36,7 @@ CONFIGURE_ARGS+=	--program-prefix=${GTAR_PROGRAM_PREFIX}
 # lie to configure about gettext -- it does not need GNU gettext
 CONFIGURE_ENV+=		gt_cv_func_gnugettext2_libintl=yes
 
-PLIST_SUBST+=		GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX}
+PLIST_SUBST+=		GTAR_PROGRAM_PREFIX=${GTAR_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 BUILD_DEFS+=		GTAR_PROGRAM_PREFIX
 

diff --git a/archivers/lbrate/Makefile b/archivers/lbrate/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/01 16:41:29 rillig Exp $
 
 DISTNAME=	lbrate-1.1
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	Extract/decompress CP/M LBR archives
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-MAKE_FLAGS+=	PREFIX=${PREFIX}
+MAKE_FLAGS+=	PREFIX=${PREFIX:Q}
 LBRATE_DOCSDIR=	${PREFIX}/share/doc/lbrate
 
 post-install:

diff --git a/archivers/lha/Makefile b/archivers/lha/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/10/23 20:40:20 rillig Exp $
+# $NetBSD: Makefile,v 1.26 2005/12/01 16:41:29 rillig Exp $
 
 DISTNAME=       lha-114i
 PKGNAME=	lha-114.9
@@ -23,7 +23,7 @@ LHA_CPPFLAGS=	-DSYSTIME_HAS_NO_TM -DMKTIME -DUSESTRCASECMP -DSYSV_SYSTEM_DIR
 .if ${OPSYS} == "Darwin"
 LHA_CPPFLAGS+=	-DHAVE_NO_LCHOWN
 .endif
-MAKE_FLAGS+=	MACHINE="${LHA_CPPFLAGS}"
+MAKE_FLAGS+=	MACHINE=${LHA_CPPFLAGS:Q}
 
 INSTALLATION_DIRS=	bin man/ja_JP.EUC/man1
 

diff --git a/archivers/macutil/Makefile b/archivers/macutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.20 2005/12/01 16:41:29 rillig Exp $
 
 DISTNAME=		macutil2.0b3
 PKGNAME=		macutil-2.0b3
@@ -12,7 +12,7 @@ COMMENT=		Create & extract Mac archive files
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 MAKEFILE=		makefile
-MAKE_ENV+=		CF="${CFLAGS}"
+MAKE_ENV+=		CF=${CFLAGS:M*:Q}
 
 WRKSRC=			${WRKDIR}/macutil
 

diff --git a/archivers/nomarch/Makefile b/archivers/nomarch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/04/11 21:44:49 tv Exp $
+# $NetBSD: Makefile,v 1.9 2005/12/01 16:41:29 rillig Exp $
 #
 
 DISTNAME=	nomarch-1.3
@@ -11,9 +11,9 @@ COMMENT=	Free replacement for the arc program
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-MAKE_FLAGS+=	PREFIX=${PREFIX}
-MAKE_FLAGS+=	CC="${CC}"
-MAKE_FLAGS+=	CFLAGS="${CFLAGS}"
+MAKE_FLAGS+=	PREFIX=${PREFIX:Q}
+MAKE_FLAGS+=	CC=${CC:Q}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:M*:Q}
 
 INSTALLATION_DIRS=	bin man/man1
 

diff --git a/archivers/ppunpack/Makefile b/archivers/ppunpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/10/23 20:43:26 rillig Exp $
+# $NetBSD: Makefile,v 1.18 2005/12/01 16:41:29 rillig Exp $
 
 DISTNAME=	ppsmall-1.0
 PKGNAME=	ppunpack-1.0
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}/PPUnpack
 .include "../../mk/bsd.prefs.mk"
 
 MAKE_FLAGS+=	CC=${CC:Q}
-MAKE_FLAGS+=	COPTS=${CFLAGS:Q}
+MAKE_FLAGS+=	COPTS=${CFLAGS:M*:Q}
 BUILD_TARGET=	ppunpack
 LICENSE=	no-commercial-use
 

diff --git a/archivers/star/Makefile b/archivers/star/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/10/03 11:22:02 joerg Exp $
+# $NetBSD: Makefile,v 1.15 2005/12/01 16:41:29 rillig Exp $
 #
 
 DISTNAME=	star-1.4.3
@@ -12,7 +12,7 @@ COMMENT=	The fastest tar like archiver for UNIX
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_TOOLS+=	gmake
-MAKE_FLAGS+=	INS_BASE=${PREFIX}
+MAKE_FLAGS+=	INS_BASE=${PREFIX:Q}
 
 .include "../../mk/bsd.prefs.mk"
 

diff --git a/archivers/zip/Makefile b/archivers/zip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2005/10/23 20:55:14 rillig Exp $
+# $NetBSD: Makefile,v 1.48 2005/12/01 16:41:30 rillig Exp $
 
 DISTNAME=	zip231
 PKGNAME=	zip-2.31
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_FLAGS+=	LOCAL_ZIP=${CFLAGS:Q}
+MAKE_FLAGS+=	LOCAL_ZIP=${CFLAGS:M*:Q}
 MAKE_FLAGS+=	LFLAGS1=${_STRIPFLAG_CC:Q}
 .if ${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "powerpc"
 CFLAGS+=	-O0

diff --git a/archivers/zip1/Makefile b/archivers/zip1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/10/03 20:34:56 joerg Exp $
+# $NetBSD: Makefile,v 1.36 2005/12/01 16:41:30 rillig Exp $
 #
 
 DISTNAME=	zip1-1.1
@@ -24,7 +24,7 @@ BUILD_TARGET=	zip zipcloak
 
 .include "../../mk/bsd.prefs.mk"
 
-MAKE_FLAGS+=	CFLAGS=${CFLAGS:Q}
+MAKE_FLAGS+=	CFLAGS=${CFLAGS:M*:Q}
 .if ${OPSYS} == "Linux" || ${OPSYS} == "Interix" || ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly"
 CFLAGS+=	-DSYSV -DMODERN -DTERMIOS
 .else