pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Applied all quoting fixes found by "pkglint --autof...
details: https://anonhg.NetBSD.org/pkgsrc/rev/d371046c40da
branches: trunk
changeset: 504152:d371046c40da
user: rillig <rillig%pkgsrc.org@localhost>
date: Mon Dec 05 22:07:07 2005 +0000
description:
Applied all quoting fixes found by "pkglint --autofix".
diffstat:
mk/bsd.pkg.mk | 54 ++++++++++++++++++++++----------------------
mk/bsd.pkg.use.mk | 30 ++++++++++++------------
mk/bsd.prefs.mk | 34 +++++++++++++-------------
mk/dlopen.buildlink3.mk | 14 +++++-----
mk/emacs.mk | 4 +-
mk/fonts.mk | 8 +++---
mk/install/bsd.pkginstall.mk | 38 +++++++++++++++---------------
mk/java-vm.mk | 4 +-
mk/motif.buildlink3.mk | 6 ++--
mk/ossaudio.buildlink3.mk | 16 ++++++------
mk/platform/IRIX.mk | 6 ++--
mk/tex.buildlink3.mk | 4 +-
mk/texinfo.mk | 4 +-
mk/tools/pkg-config.mk | 6 ++--
mk/wrapper/bsd.wrapper.mk | 10 ++++----
15 files changed, 119 insertions(+), 119 deletions(-)
diffs (truncated from 632 to 300 lines):
diff -r fde410987ef5 -r d371046c40da mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk Mon Dec 05 21:56:13 2005 +0000
+++ b/mk/bsd.pkg.mk Mon Dec 05 22:07:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1773 2005/12/04 15:52:32 rillig Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1774 2005/12/05 22:07:07 rillig Exp $
#
# This file is in the public domain.
#
@@ -309,12 +309,12 @@
MAKE_ENV+= ${ALL_ENV}
MAKE_ENV+= ${NO_EXPORT_CPP:D:UCPP=${CPP:Q}}
MAKE_ENV+= LINK_ALL_LIBGCC_HACK=${LINK_ALL_LIBGCC_HACK:Q}
-MAKE_ENV+= LOCALBASE=${LOCALBASE}
+MAKE_ENV+= LOCALBASE=${LOCALBASE:Q}
MAKE_ENV+= NO_WHOLE_ARCHIVE_FLAG=${NO_WHOLE_ARCHIVE_FLAG:Q}
MAKE_ENV+= WHOLE_ARCHIVE_FLAG=${WHOLE_ARCHIVE_FLAG:Q}
-MAKE_ENV+= X11BASE=${X11BASE}
-MAKE_ENV+= X11PREFIX=${X11PREFIX}
-MAKE_ENV+= PKGMANDIR=${PKGMANDIR}
+MAKE_ENV+= X11BASE=${X11BASE:Q}
+MAKE_ENV+= X11PREFIX=${X11PREFIX:Q}
+MAKE_ENV+= PKGMANDIR=${PKGMANDIR:Q}
# Constants to provide a consistent environment for packages using
# BSD-style Makefiles.
@@ -374,7 +374,7 @@
# also pass in a CONFIG_SHELL to avoid picking up bash
.if defined(GNU_CONFIGURE)
CONFIG_SHELL?= ${SH}
-CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL}
+CONFIGURE_ENV+= CONFIG_SHELL=${CONFIG_SHELL:Q}
CONFIGURE_ENV+= LIBS=${LIBS:M*:Q}
CONFIGURE_ENV+= install_sh=${INSTALL:Q}
. if (defined(USE_LIBTOOL) || !empty(PKGDIR:M*/libtool-base)) && defined(_OPSYS_MAX_CMDLEN_CMD)
@@ -473,24 +473,24 @@
.endif
# Set PLIST_SUBST to substitute "${variable}" to "value" in PLIST
-PLIST_SUBST+= OPSYS=${OPSYS} \
- OS_VERSION=${OS_VERSION} \
- MACHINE_ARCH=${MACHINE_ARCH} \
- MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH} \
- MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM} \
+PLIST_SUBST+= OPSYS=${OPSYS:Q} \
+ OS_VERSION=${OS_VERSION:Q} \
+ MACHINE_ARCH=${MACHINE_ARCH:Q} \
+ MACHINE_GNU_ARCH=${MACHINE_GNU_ARCH:Q} \
+ MACHINE_GNU_PLATFORM=${MACHINE_GNU_PLATFORM:Q} \
LN=${LN:Q} \
- LOWER_VENDOR=${LOWER_VENDOR} \
- LOWER_OPSYS=${LOWER_OPSYS} \
- LOWER_OS_VERSION=${LOWER_OS_VERSION} \
- PKGBASE=${PKGBASE} \
- PKGNAME=${PKGNAME_NOREV} \
- PKGLOCALEDIR=${PKGLOCALEDIR} \
+ LOWER_VENDOR=${LOWER_VENDOR:Q} \
+ LOWER_OPSYS=${LOWER_OPSYS:Q} \
+ LOWER_OS_VERSION=${LOWER_OS_VERSION:Q} \
+ PKGBASE=${PKGBASE:Q} \
+ PKGNAME=${PKGNAME_NOREV:Q} \
+ PKGLOCALEDIR=${PKGLOCALEDIR:Q} \
PKGVERSION=${PKGVERSION:C/nb[0-9]*$//} \
- LOCALBASE=${LOCALBASE} \
- VIEWBASE=${VIEWBASE} \
- X11BASE=${X11BASE} \
- X11PREFIX=${X11PREFIX} \
- SVR4_PKGNAME=${SVR4_PKGNAME} \
+ LOCALBASE=${LOCALBASE:Q} \
+ VIEWBASE=${VIEWBASE:Q} \
+ X11BASE=${X11BASE:Q} \
+ X11PREFIX=${X11PREFIX:Q} \
+ SVR4_PKGNAME=${SVR4_PKGNAME:Q} \
CHGRP=${CHGRP:Q} \
CHMOD=${CHMOD:Q} \
CHOWN=${CHOWN:Q} \
@@ -498,8 +498,8 @@
RMDIR=${RMDIR:Q} \
RM=${RM:Q} \
TRUE=${TRUE:Q} \
- QMAILDIR=${QMAILDIR} \
- PKGMANDIR=${PKGMANDIR}
+ QMAILDIR=${QMAILDIR:Q} \
+ PKGMANDIR=${PKGMANDIR:Q}
# Handle alternatives
#
@@ -673,11 +673,11 @@
HAS_CONFIGURE= yes
GNU_CONFIGURE_PREFIX?= ${PREFIX}
-CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX}
+CONFIGURE_ARGS+= --prefix=${GNU_CONFIGURE_PREFIX:Q}
USE_GNU_CONFIGURE_HOST?= yes
. if !empty(USE_GNU_CONFIGURE_HOST:M[yY][eE][sS])
-CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM}
+CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q}
. endif
CONFIGURE_HAS_INFODIR?= yes
@@ -4198,7 +4198,7 @@
.elif ${PKG_INSTALLATION_TYPE} == "overwrite"
VIEWBASE= ${PREFIX}
.endif
-MAKE_ENV+= VIEWBASE=${VIEWBASE}
+MAKE_ENV+= VIEWBASE=${VIEWBASE:Q}
PKGVIEWS+= ${DEFAULT_VIEW.${PKGBASE}}
diff -r fde410987ef5 -r d371046c40da mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Mon Dec 05 21:56:13 2005 +0000
+++ b/mk/bsd.pkg.use.mk Mon Dec 05 22:07:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.use.mk,v 1.24 2005/12/04 01:44:30 joerg Exp $
+# $NetBSD: bsd.pkg.use.mk,v 1.25 2005/12/05 22:07:07 rillig Exp $
#
# Turn USE_* macros into proper depedency logic. Included near the top of
# bsd.pkg.mk, after bsd.prefs.mk.
@@ -8,20 +8,20 @@
############################################################################
.if defined(USE_IMAKE) || !empty(USE_TOOLS:Mimake)
-PLIST_SUBST+= IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH}
-PLIST_SUBST+= IMAKE_MAN_DIR=${IMAKE_MAN_DIR}
-PLIST_SUBST+= IMAKE_LIBMAN_DIR=${IMAKE_LIBMAN_DIR}
-PLIST_SUBST+= IMAKE_KERNMAN_DIR=${IMAKE_KERNMAN_DIR}
-PLIST_SUBST+= IMAKE_FILEMAN_DIR=${IMAKE_FILEMAN_DIR}
-PLIST_SUBST+= IMAKE_GAMEMAN_DIR=${IMAKE_GAMEMAN_DIR}
-PLIST_SUBST+= IMAKE_MISCMAN_DIR=${IMAKE_MISCMAN_DIR}
-PLIST_SUBST+= IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX}
-PLIST_SUBST+= IMAKE_LIBMAN_SUFFIX=${IMAKE_LIBMAN_SUFFIX}
-PLIST_SUBST+= IMAKE_KERNMAN_SUFFIX=${IMAKE_KERNMAN_SUFFIX}
-PLIST_SUBST+= IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX}
-PLIST_SUBST+= IMAKE_GAMEMAN_SUFFIX=${IMAKE_GAMEMAN_SUFFIX}
-PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX}
-PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX}
+PLIST_SUBST+= IMAKE_MAN_SOURCE_PATH=${IMAKE_MAN_SOURCE_PATH:Q}
+PLIST_SUBST+= IMAKE_MAN_DIR=${IMAKE_MAN_DIR:Q}
+PLIST_SUBST+= IMAKE_LIBMAN_DIR=${IMAKE_LIBMAN_DIR:Q}
+PLIST_SUBST+= IMAKE_KERNMAN_DIR=${IMAKE_KERNMAN_DIR:Q}
+PLIST_SUBST+= IMAKE_FILEMAN_DIR=${IMAKE_FILEMAN_DIR:Q}
+PLIST_SUBST+= IMAKE_GAMEMAN_DIR=${IMAKE_GAMEMAN_DIR:Q}
+PLIST_SUBST+= IMAKE_MISCMAN_DIR=${IMAKE_MISCMAN_DIR:Q}
+PLIST_SUBST+= IMAKE_MAN_SUFFIX=${IMAKE_MAN_SUFFIX:Q}
+PLIST_SUBST+= IMAKE_LIBMAN_SUFFIX=${IMAKE_LIBMAN_SUFFIX:Q}
+PLIST_SUBST+= IMAKE_KERNMAN_SUFFIX=${IMAKE_KERNMAN_SUFFIX:Q}
+PLIST_SUBST+= IMAKE_FILEMAN_SUFFIX=${IMAKE_FILEMAN_SUFFIX:Q}
+PLIST_SUBST+= IMAKE_GAMEMAN_SUFFIX=${IMAKE_GAMEMAN_SUFFIX:Q}
+PLIST_SUBST+= IMAKE_MISCMAN_SUFFIX=${IMAKE_MISCMAN_SUFFIX:Q}
+PLIST_SUBST+= IMAKE_MANNEWSUFFIX=${IMAKE_MANNEWSUFFIX:Q}
.endif
.if defined(USE_IMAKE)
diff -r fde410987ef5 -r d371046c40da mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk Mon Dec 05 21:56:13 2005 +0000
+++ b/mk/bsd.prefs.mk Mon Dec 05 22:07:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.214 2005/12/02 17:08:49 wiz Exp $
+# $NetBSD: bsd.prefs.mk,v 1.215 2005/12/05 22:07:07 rillig Exp $
#
# Make file, included to get the site preferences, if any. Should
# only be included by package Makefiles before any .if defined()
@@ -52,7 +52,7 @@
.if !defined(OPSYS)
OPSYS!= ${UNAME} -s | tr -d /
-MAKEFLAGS+= OPSYS=${OPSYS}
+MAKEFLAGS+= OPSYS=${OPSYS:Q}
.endif
# The _CMD indirection allows code below to modify these values
@@ -61,12 +61,12 @@
.if !defined(OS_VERSION)
_OS_VERSION_CMD= ${UNAME} -r
OS_VERSION= ${_OS_VERSION_CMD:sh}
-MAKEFLAGS+= OS_VERSION=${OS_VERSION}
+MAKEFLAGS+= OS_VERSION=${OS_VERSION:Q}
.endif
.if !defined(LOWER_OS_VERSION)
_LOWER_OS_VERSION_CMD= echo ${OS_VERSION} | tr 'A-Z' 'a-z'
LOWER_OS_VERSION= ${_LOWER_OS_VERSION_CMD:sh}
-MAKEFLAGS+= LOWER_OS_VERSION=${LOWER_OS_VERSION}
+MAKEFLAGS+= LOWER_OS_VERSION=${LOWER_OS_VERSION:Q}
.endif
# Preload these for architectures not in all variations of bsd.own.mk,
@@ -111,14 +111,14 @@
LOWER_OPSYS?= darwin
LOWER_ARCH!= ${UNAME} -p
MACHINE_ARCH= ${LOWER_ARCH}
-MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH}
+MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_VENDOR?= apple
.elif ${OPSYS} == "DragonFly"
LOWER_OPSYS?= dragonfly
LOWER_ARCH!= ${UNAME} -p
MACHINE_ARCH= ${LOWER_ARCH}
-MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH}
+MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_OPSYS_VERSUFFIX!= echo ${LOWER_OS_VERSION} | ${CUT} -c -1
LOWER_VENDOR?= pc
@@ -126,7 +126,7 @@
LOWER_OPSYS?= freebsd
LOWER_ARCH!= ${UNAME} -p
MACHINE_ARCH= ${LOWER_ARCH}
-MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH}
+MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
LOWER_OPSYS_VERSUFFIX!= echo ${LOWER_OS_VERSION} | ${CUT} -c -1
. if ${LOWER_ARCH} == "i386"
LOWER_VENDOR?= pc
@@ -159,7 +159,7 @@
. endif # !defined(LOWER_ARCH)
. if ${MACHINE_ARCH} == "unknown" || ${MACHINE_ARCH} == ""
MACHINE_ARCH= ${LOWER_ARCH}
-MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH}
+MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
. endif
. if exists(/etc/debian_version)
LOWER_VENDOR?= debian
@@ -176,7 +176,7 @@
.elif ${OPSYS} == "OSF1"
LOWER_ARCH!= ${UNAME} -p
-MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH}
+MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
MACHINE_ARCH?= ${LOWER_ARCH}
OS_VERSION:= ${OS_VERSION:C/^V//}
LOWER_OPSYS?= osf${OS_VERSION}
@@ -194,7 +194,7 @@
. if !defined(LOWER_ARCH)
LOWER_ARCH!= ${UNAME} -p
. endif # !defined(LOWER_ARCH)
-MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH}
+MAKEFLAGS+= LOWER_ARCH=${LOWER_ARCH:Q}
. endif
LOWER_VENDOR?= sun
LOWER_OPSYS?= solaris
@@ -208,7 +208,7 @@
LOWER_OS_VERSION:= ${LOWER_OS_VERSION}
OS_VERSION:= ${OS_VERSION}
-MAKEFLAGS+= LOWER_OPSYS=${LOWER_OPSYS}
+MAKEFLAGS+= LOWER_OPSYS=${LOWER_OPSYS:Q}
LOWER_VENDOR?= # empty ("arch--opsys")
LOWER_ARCH?= ${MACHINE_GNU_ARCH}
@@ -463,7 +463,7 @@
.if !defined(DIGEST)
DIGEST:= ${LOCALBASE}/bin/digest
-MAKEFLAGS+= DIGEST=${DIGEST}
+MAKEFLAGS+= DIGEST=${DIGEST:Q}
.endif
# Only add the DIGEST_VERSION value to MAKEFLAGS when we know
@@ -475,7 +475,7 @@
DIGEST_VERSION= 20010301
.elif !defined(DIGEST_VERSION)
DIGEST_VERSION!= ${DIGEST} -V 2>/dev/null
-MAKEFLAGS+= DIGEST_VERSION=${DIGEST_VERSION}
+MAKEFLAGS+= DIGEST_VERSION=${DIGEST_VERSION:Q}
.endif
# This is the package database directory for the default view.
@@ -500,7 +500,7 @@
.if !defined(PKGTOOLS_VERSION)
PKGTOOLS_VERSION!= ${PKG_INFO_CMD} -V 2>/dev/null || echo 20010302
-MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION}
+MAKEFLAGS+= PKGTOOLS_VERSION=${PKGTOOLS_VERSION:Q}
.endif
# The binary pkg_install tools all need to consistently to refer to the
@@ -574,13 +574,13 @@
.if defined(OBJHOSTNAME)
. if !defined(_HOSTNAME)
_HOSTNAME!= ${UNAME} -n
-MAKEFLAGS+= _HOSTNAME=${_HOSTNAME}
+MAKEFLAGS+= _HOSTNAME=${_HOSTNAME:Q}
. endif
WRKDIR_BASENAME?= work.${_HOSTNAME:C|\..*||}
-MAKEFLAGS+= OBJHOSTNAME=${OBJHOSTNAME}
+MAKEFLAGS+= OBJHOSTNAME=${OBJHOSTNAME:Q}
.elif defined(OBJMACHINE)
WRKDIR_BASENAME?= work.${MACHINE_ARCH}
-MAKEFLAGS+= OBJMACHINE=${OBJMACHINE}
+MAKEFLAGS+= OBJMACHINE=${OBJMACHINE:Q}
.else
WRKDIR_BASENAME?= work
.endif
diff -r fde410987ef5 -r d371046c40da mk/dlopen.buildlink3.mk
--- a/mk/dlopen.buildlink3.mk Mon Dec 05 21:56:13 2005 +0000
+++ b/mk/dlopen.buildlink3.mk Mon Dec 05 22:07:07 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: dlopen.buildlink3.mk,v 1.9 2005/06/26 13:11:22 minskim Exp $
+# $NetBSD: dlopen.buildlink3.mk,v 1.10 2005/12/05 22:07:07 rillig Exp $
#
Home |
Main Index |
Thread Index |
Old Index