diff options
author | rillig <rillig> | 2005-12-05 22:07:07 +0000 |
---|---|---|
committer | rillig <rillig> | 2005-12-05 22:07:07 +0000 |
commit | 7664794fed84c0ca5a860791f551480a59061d9c (patch) | |
tree | a408d210ca70e7629a1164ecf102e8adff03b5c4 | |
parent | 5d70bffac3d44eaef1300a3827409d032034f137 (diff) | |
download | pkgsrc-7664794fed84c0ca5a860791f551480a59061d9c.tar.gz |
Applied all quoting fixes found by "pkglint --autofix".
-rw-r--r-- | mk/bsd.pkg.mk | 54 | ||||
-rw-r--r-- | mk/bsd.pkg.use.mk | 30 | ||||
-rw-r--r-- | mk/bsd.prefs.mk | 34 | ||||
-rw-r--r-- | mk/dlopen.buildlink3.mk | 14 | ||||
-rw-r--r-- | mk/emacs.mk | 4 | ||||
-rw-r--r-- | mk/fonts.mk | 8 | ||||
-rw-r--r-- | mk/install/bsd.pkginstall.mk | 38 | ||||
-rw-r--r-- | mk/java-vm.mk | 4 | ||||
-rw-r--r-- | mk/motif.buildlink3.mk | 6 | ||||
-rw-r--r-- | mk/ossaudio.buildlink3.mk | 16 | ||||
-rw-r--r-- | mk/platform/IRIX.mk | 6 | ||||
-rw-r--r-- | mk/tex.buildlink3.mk | 4 | ||||
-rw-r--r-- | mk/texinfo.mk | 4 | ||||
-rw-r--r-- | mk/tools/pkg-config.mk | 6 | ||||
-rw-r--r-- | mk/wrapper/bsd.wrapper.mk | 10 |
15 files changed, 119 insertions, 119 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index d45ac403077..a6eb5861470 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -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 @@ ALL_ENV+= PREFIX=${PREFIX} 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 @@ _ULIMIT_CMD= ${UNLIMIT_RESOURCES:@_lim_@${ULIMIT_CMD_${_lim_}};@} # 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 @@ SCRIPTS_ENV+= ${INSTALL_MACROS} .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 @@ PLIST_SUBST+= OPSYS=${OPSYS} \ 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 @@ BUILD_DEFS+= _DISTFILES _PATCHFILES 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 @@ VIEWBASE= ${LOCALBASE} .elif ${PKG_INSTALLATION_TYPE} == "overwrite" VIEWBASE= ${PREFIX} .endif -MAKE_ENV+= VIEWBASE=${VIEWBASE} +MAKE_ENV+= VIEWBASE=${VIEWBASE:Q} PKGVIEWS+= ${DEFAULT_VIEW.${PKGBASE}} diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index d5a1e9c6b9c..f7ffd8d9731 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -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 --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 8825302eed3..7ce0f0a6477 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -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 @@ CUT=echo Unknown .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 @@ MAKEFLAGS+= OPSYS=${OPSYS} .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?= bsdi 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_VENDOR?= pc 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 @@ LOWER_ARCH!= ${UNAME} -m | sed -e 's/i.86/i386/' -e 's/ppc/powerpc/' . 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 @@ LOWER_VENDOR?= unknown .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 @@ MACHINE_ARCH= i386 . 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_OPSYS!= echo ${OPSYS} | tr A-Z a-z 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 @@ NO_WHOLE_ARCHIVE_FLAG?= ${_OPSYS_NO_WHOLE_ARCHIVE_FLAG} .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 @@ MAKEFLAGS+= DIGEST=${DIGEST} 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 @@ LINKFARM_CMD?= ${PKG_TOOLS_BIN}/linkfarm .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 @@ BUILD_DIR!= cd ${.CURDIR} && ${PWD_CMD} .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 --git a/mk/dlopen.buildlink3.mk b/mk/dlopen.buildlink3.mk index b7f29e659e7..477115a6b13 100644 --- a/mk/dlopen.buildlink3.mk +++ b/mk/dlopen.buildlink3.mk @@ -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 $ # # This Makefile fragment is included by package Makefiles and # buildlink3.mk files for the packages that use dlopen(). @@ -35,10 +35,10 @@ PKG_SKIP_REASON= "${PKGNAME} requires a working dlopen()." DL_CFLAGS= ${BUILDLINK_CFLAGS.dl} DL_LDFLAGS= ${BUILDLINK_LDFLAGS.dl} DL_LIBS= ${BUILDLINK_LIBS.dl} -CONFIGURE_ENV+= DL_CFLAGS="${DL_CFLAGS}" -CONFIGURE_ENV+= DL_LDFLAGS="${DL_LDFLAGS}" -CONFIGURE_ENV+= DL_LIBS="${DL_LIBS}" -MAKE_ENV+= DL_CFLAGS="${DL_CFLAGS}" -MAKE_ENV+= DL_LDFLAGS="${DL_LDFLAGS}" -MAKE_ENV+= DL_LIBS="${DL_LIBS}" +CONFIGURE_ENV+= DL_CFLAGS=${DL_CFLAGS:Q} +CONFIGURE_ENV+= DL_LDFLAGS=${DL_LDFLAGS:Q} +CONFIGURE_ENV+= DL_LIBS=${DL_LIBS:Q} +MAKE_ENV+= DL_CFLAGS=${DL_CFLAGS:Q} +MAKE_ENV+= DL_LDFLAGS=${DL_LDFLAGS:Q} +MAKE_ENV+= DL_LIBS=${DL_LIBS:Q} .endif # DLOPEN_BUILDLINK3_MK diff --git a/mk/emacs.mk b/mk/emacs.mk index 3f290a0ee7c..dd453b8343f 100644 --- a/mk/emacs.mk +++ b/mk/emacs.mk @@ -1,4 +1,4 @@ -# $NetBSD: emacs.mk,v 1.22 2005/09/01 22:23:41 rillig Exp $ +# $NetBSD: emacs.mk,v 1.23 2005/12/05 22:07:07 rillig Exp $ # # This Makefile fragment handles Emacs Lisp Packages (== ELPs). # @@ -314,7 +314,7 @@ _EMACS_FOR.${_EMACS_TYPE}= "" _EMACS_NOTFOR.${EMACS_FLAVOR}= "@comment " _EMACS_NOTFOR.${_EMACS_TYPE}= "@comment " -PLIST_SUBST+= EMACS_VERSION=${_EMACS_VERSION_NOREV} +PLIST_SUBST+= EMACS_VERSION=${_EMACS_VERSION_NOREV:Q} PLIST_SUBST+= EMACS_LISPPREFIX=${EMACS_LISPPREFIX:C|^${PREFIX}/||} PLIST_SUBST+= FOR_emacs=${_EMACS_FOR.emacs} PLIST_SUBST+= FOR_emacs21=${_EMACS_FOR.emacs21} diff --git a/mk/fonts.mk b/mk/fonts.mk index 94fd177e943..3fab68bf1f7 100644 --- a/mk/fonts.mk +++ b/mk/fonts.mk @@ -1,4 +1,4 @@ -# $NetBSD: fonts.mk,v 1.6 2004/12/28 14:38:03 wiz Exp $ +# $NetBSD: fonts.mk,v 1.7 2005/12/05 22:07:07 rillig Exp $ # # This Makefile fragment is intended to be included by packages that install # fonts (most of them in the fonts category). It takes care of updating the @@ -31,7 +31,7 @@ HEADER_EXTRA_TMPL+= ${.CURDIR}/../../mk/install/fonts EVAL_PREFIX+= TTMKFDIR_PREFIX=ttmkfdir TTMKFDIR_PREFIX_DEFAULT= ${LOCALBASE} FILES_SUBST+= FONTS_TTF="YES" -FILES_SUBST+= FONTS_TTF_DIRS="${FONTS_TTF_DIRS}" +FILES_SUBST+= FONTS_TTF_DIRS=${FONTS_TTF_DIRS:Q} FILES_SUBST+= TTMKFDIR="${TTMKFDIR_PREFIX}/bin/ttmkfdir" DEPENDS+= ttmkfdir2>=20021109:../../fonts/ttmkfdir2 # also need to run mkfontdir there @@ -42,7 +42,7 @@ FONTS_X11_DIRS+= ${FONTS_TTF_DIRS} EVAL_PREFIX+= TYPE1INST_PREFIX=type1inst TYPE1INST_PREFIX_DEFAULT= ${LOCALBASE} FILES_SUBST+= FONTS_TYPE1="YES" -FILES_SUBST+= FONTS_TYPE1_DIRS="${FONTS_TYPE1_DIRS}" +FILES_SUBST+= FONTS_TYPE1_DIRS=${FONTS_TYPE1_DIRS:Q} FILES_SUBST+= TYPE1INST="${TYPE1INST_PREFIX}/bin/type1inst" DEPENDS+= type1inst>=0.6.1:../../fonts/type1inst # also need to run mkfontdir there @@ -51,7 +51,7 @@ FONTS_X11_DIRS+= ${FONTS_TYPE1_DIRS} .if !empty(FONTS_X11_DIRS) FILES_SUBST+= FONTS_X11="YES" -FILES_SUBST+= FONTS_X11_DIRS="${FONTS_X11_DIRS}" +FILES_SUBST+= FONTS_X11_DIRS=${FONTS_X11_DIRS:Q} FILES_SUBST+= MKFONTDIR="${X11BASE}/bin/mkfontdir" .endif diff --git a/mk/install/bsd.pkginstall.mk b/mk/install/bsd.pkginstall.mk index c479f796077..0a43ebeded2 100644 --- a/mk/install/bsd.pkginstall.mk +++ b/mk/install/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.29 2005/10/28 20:09:38 joerg Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.30 2005/12/05 22:07:07 rillig Exp $ # # This Makefile fragment is included by bsd.pkg.mk to use the common # INSTALL/DEINSTALL scripts. To use this Makefile fragment, simply: @@ -80,18 +80,18 @@ INSTALL_SRC?= ${INSTALL_TEMPLATES} # FILES_SUBST lists what to substitute in DEINSTALL/INSTALL scripts and in # rc.d scripts. # -FILES_SUBST+= PREFIX=${PREFIX} -FILES_SUBST+= LOCALBASE=${LOCALBASE} -FILES_SUBST+= X11BASE=${X11BASE} -FILES_SUBST+= DEPOTBASE=${DEPOTBASE} -FILES_SUBST+= VARBASE=${VARBASE} -FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE} -FILES_SUBST+= PKG_SYSCONFDEPOTBASE=${PKG_SYSCONFDEPOTBASE} -FILES_SUBST+= PKG_SYSCONFBASEDIR=${PKG_SYSCONFBASEDIR} -FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} +FILES_SUBST+= PREFIX=${PREFIX:Q} +FILES_SUBST+= LOCALBASE=${LOCALBASE:Q} +FILES_SUBST+= X11BASE=${X11BASE:Q} +FILES_SUBST+= DEPOTBASE=${DEPOTBASE:Q} +FILES_SUBST+= VARBASE=${VARBASE:Q} +FILES_SUBST+= PKG_SYSCONFBASE=${PKG_SYSCONFBASE:Q} +FILES_SUBST+= PKG_SYSCONFDEPOTBASE=${PKG_SYSCONFDEPOTBASE:Q} +FILES_SUBST+= PKG_SYSCONFBASEDIR=${PKG_SYSCONFBASEDIR:Q} +FILES_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} FILES_SUBST+= CONF_DEPENDS=${CONF_DEPENDS:C/:.*//:Q} -FILES_SUBST+= PKGBASE=${PKGBASE} -FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE} +FILES_SUBST+= PKGBASE=${PKGBASE:Q} +FILES_SUBST+= PKG_INSTALLATION_TYPE=${PKG_INSTALLATION_TYPE:Q} # PKG_USERS represents the users to create for the package. It is a # space-separated list of elements of the form @@ -116,8 +116,8 @@ PKG_GROUPS?= # empty PKG_USERS?= # empty _PKG_USER_HOME?= /nonexistent _PKG_USER_SHELL?= ${NOLOGIN} -FILES_SUBST+= PKG_USER_HOME=${_PKG_USER_HOME} -FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL} +FILES_SUBST+= PKG_USER_HOME=${_PKG_USER_HOME:Q} +FILES_SUBST+= PKG_USER_SHELL=${_PKG_USER_SHELL:Q} # REMOVE: after 2005Q4 .if !empty(PKG_USERS:M*\\\\*) @@ -288,7 +288,7 @@ RCD_SCRIPTS?= # empty RCD_SCRIPTS_MODE?= 0755 RCD_SCRIPTS_EXAMPLEDIR= share/examples/rc.d RCD_SCRIPTS_SHELL?= ${SH} -FILES_SUBST+= RCD_SCRIPTS_SHELL=${RCD_SCRIPTS_SHELL} +FILES_SUBST+= RCD_SCRIPTS_SHELL=${RCD_SCRIPTS_SHELL:Q} MESSAGE_SUBST+= RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR} MESSAGE_SUBST+= RCD_SCRIPTS_EXAMPLEDIR=${RCD_SCRIPTS_EXAMPLEDIR} @@ -565,10 +565,10 @@ PKG_CREATE_USERGROUP?= YES PKG_CONFIG?= YES PKG_RCD_SCRIPTS?= NO PKG_REGISTER_SHELLS?= YES -FILES_SUBST+= PKG_CREATE_USERGROUP=${PKG_CREATE_USERGROUP} -FILES_SUBST+= PKG_CONFIG=${PKG_CONFIG} -FILES_SUBST+= PKG_RCD_SCRIPTS=${PKG_RCD_SCRIPTS} -FILES_SUBST+= PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS} +FILES_SUBST+= PKG_CREATE_USERGROUP=${PKG_CREATE_USERGROUP:Q} +FILES_SUBST+= PKG_CONFIG=${PKG_CONFIG:Q} +FILES_SUBST+= PKG_RCD_SCRIPTS=${PKG_RCD_SCRIPTS:Q} +FILES_SUBST+= PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS:Q} # Substitute for various programs used in the DEINSTALL/INSTALL scripts and # in the rc.d scripts. diff --git a/mk/java-vm.mk b/mk/java-vm.mk index 87679bf3d8b..6caa0970fde 100644 --- a/mk/java-vm.mk +++ b/mk/java-vm.mk @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.42 2005/06/02 10:07:48 abs Exp $ +# $NetBSD: java-vm.mk,v 1.43 2005/12/05 22:07:07 rillig Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -310,7 +310,7 @@ CLASSPATH?= ${CLASSPATH_cmd:sh} ALL_ENV+= CLASSPATH=${CLASSPATH:Q} ALL_ENV+= JAVA_HOME=${PKG_JAVA_HOME} BUILD_DEFS+= PKG_JVM PKG_JAVA_HOME -MAKEFLAGS+= PKG_JVM=${PKG_JVM} +MAKEFLAGS+= PKG_JVM=${PKG_JVM:Q} PREPEND_PATH+= ${PKG_JAVA_HOME}/bin .endif # JAVA_VM_MK diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk index e0ce5b10f33..1b8c0c2f504 100644 --- a/mk/motif.buildlink3.mk +++ b/mk/motif.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: motif.buildlink3.mk,v 1.9 2005/11/04 15:29:21 rillig Exp $ +# $NetBSD: motif.buildlink3.mk,v 1.10 2005/12/05 22:07:07 rillig Exp $ # # Package-settable variables: # @@ -91,8 +91,8 @@ MOTIFBASE= ${_MOTIFBASE} .include "../../mk/x11.buildlink3.mk" -MAKE_ENV+= MOTIFLIB="${MOTIFLIB}" -MAKE_ENV+= MOTIFBASE="${_MOTIFBASE}" +MAKE_ENV+= MOTIFLIB=${MOTIFLIB:Q} +MAKE_ENV+= MOTIFBASE=${_MOTIFBASE:Q} CPPFLAGS+= -I${_MOTIFBASE}/include LDFLAGS+= -L${_MOTIFBASE}/lib LDFLAGS+= ${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib diff --git a/mk/ossaudio.buildlink3.mk b/mk/ossaudio.buildlink3.mk index 03801b943d3..7222faa4067 100644 --- a/mk/ossaudio.buildlink3.mk +++ b/mk/ossaudio.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: ossaudio.buildlink3.mk,v 1.4 2005/12/01 19:18:50 wiz Exp $ +# $NetBSD: ossaudio.buildlink3.mk,v 1.5 2005/12/05 22:07:07 rillig Exp $ # # This file should be included by Makefiles for packages that use OSS. # By checking the value of HAVE_OSS after including this file, it's possible @@ -18,7 +18,7 @@ OSSAUDIO_BUILDLINK3_MK:= ${OSSAUDIO_BUILDLINK3_MK}+ .if !empty(OSSAUDIO_BUILDLINK3_MK:M+) . if !defined(_HAVE_OSS) _HAVE_OSS!= if ${PKG_INFO} -qe oss; then ${ECHO} YES; else ${ECHO} NO; fi -MAKEFLAGS+= _HAVE_OSS=${_HAVE_OSS} +MAKEFLAGS+= _HAVE_OSS=${_HAVE_OSS:Q} . endif HAVE_OSS?= ${_HAVE_OSS} .endif # OSSAUDIO_BUILDLINK3_MK @@ -43,13 +43,13 @@ DEVOSSSOUND?= /dev/sound .endif .if !empty(OSSAUDIO_BUILDLINK3_MK:M+) -CONFIGURE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}" -CONFIGURE_ENV+= DEVOSSAUDIO="${DEVOSSAUDIO}" -CONFIGURE_ENV+= DEVOSSSOUND="${DEVOSSSOUND}" +CONFIGURE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q} +CONFIGURE_ENV+= DEVOSSAUDIO=${DEVOSSAUDIO:Q} +CONFIGURE_ENV+= DEVOSSSOUND=${DEVOSSSOUND:Q} -MAKE_ENV+= LIBOSSAUDIO="${LIBOSSAUDIO}" -MAKE_ENV+= DEVOSSAUDIO="${DEVOSSAUDIO}" -MAKE_ENV+= DEVOSSSOUND="${DEVOSSSOUND}" +MAKE_ENV+= LIBOSSAUDIO=${LIBOSSAUDIO:Q} +MAKE_ENV+= DEVOSSAUDIO=${DEVOSSAUDIO:Q} +MAKE_ENV+= DEVOSSSOUND=${DEVOSSSOUND:Q} BUILDLINK_TARGETS+= buildlink-ossaudio-soundcard-h diff --git a/mk/platform/IRIX.mk b/mk/platform/IRIX.mk index 272cd11aa0d..755891cb1d0 100644 --- a/mk/platform/IRIX.mk +++ b/mk/platform/IRIX.mk @@ -1,4 +1,4 @@ -# $NetBSD: IRIX.mk,v 1.18 2005/12/04 01:44:30 joerg Exp $ +# $NetBSD: IRIX.mk,v 1.19 2005/12/05 22:07:08 rillig Exp $ # # Variable definitions for the IRIX operating system. @@ -82,8 +82,8 @@ _STRIPFLAG_INSTALL?= ${_INSTALL_UNSTRIPPED:D:U-s} # install(1) option to strip LOCALBASE?= ${DESTDIR}/usr/pkg PKG_TOOLS_BIN?= ${LOCALBASE}/sbin -CONFIGURE_ENV+= ABI=${ABI} -MAKE_ENV+= ABI=${ABI} +CONFIGURE_ENV+= ABI=${ABI:Q} +MAKE_ENV+= ABI=${ABI:Q} LIBABISUFFIX?= ${ABI} diff --git a/mk/tex.buildlink3.mk b/mk/tex.buildlink3.mk index a16145992df..97b70676e48 100644 --- a/mk/tex.buildlink3.mk +++ b/mk/tex.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: tex.buildlink3.mk,v 1.7 2005/11/20 18:14:49 minskim Exp $ +# $NetBSD: tex.buildlink3.mk,v 1.8 2005/12/05 22:07:07 rillig Exp $ # # A Makefile fragment for TeX and LaTeX packages # @@ -128,7 +128,7 @@ PKG_TEXMFPREFIX= ${PREFIX}/share/texmf PKG_LOCALTEXMFPREFIX= ${PREFIX}/share/texmf .endif -PLIST_SUBST+= TEX_TYPE=${TEX_TYPE} +PLIST_SUBST+= TEX_TYPE=${TEX_TYPE:Q} PLIST_SUBST+= PKG_TEXMFPREFIX=${PKG_TEXMFPREFIX:C|^${PREFIX}/||} PLIST_SUBST+= PKG_LOCALTEXMFPREFIX=${PKG_LOCALTEXMFPREFIX:C|^${PREFIX}/||} diff --git a/mk/texinfo.mk b/mk/texinfo.mk index af8bedc8144..7ef227e460e 100644 --- a/mk/texinfo.mk +++ b/mk/texinfo.mk @@ -1,4 +1,4 @@ -# $NetBSD: texinfo.mk,v 1.28 2005/05/11 02:07:37 jlam Exp $ +# $NetBSD: texinfo.mk,v 1.29 2005/12/05 22:07:07 rillig Exp $ # # Copyright (c) 2002, 2003 The NetBSD Foundation, Inc. # All rights reserved. @@ -126,7 +126,7 @@ MAKEINFO_VERSION= MAKEINFO_VERSION= ${_i_} . endif . endfor -MAKEFLAGS+= MAKEINFO_VERSION=${MAKEINFO_VERSION} +MAKEFLAGS+= MAKEINFO_VERSION=${MAKEINFO_VERSION:Q} . endif # Sort out if the version provided by devel/gtexinfo is needed. diff --git a/mk/tools/pkg-config.mk b/mk/tools/pkg-config.mk index b722f62f7a2..c06f65c38ee 100644 --- a/mk/tools/pkg-config.mk +++ b/mk/tools/pkg-config.mk @@ -1,4 +1,4 @@ -# $NetBSD: pkg-config.mk,v 1.4 2005/10/01 14:30:15 jmmv Exp $ +# $NetBSD: pkg-config.mk,v 1.5 2005/12/05 22:07:08 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -47,10 +47,10 @@ TOOLS_SCRIPT.pkg-config= \ CONFIGURE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q} CONFIGURE_ENV+= PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} -CONFIGURE_ENV+= PKG_CONFIG_LOG=${_PKG_CONFIG_LOG} +CONFIGURE_ENV+= PKG_CONFIG_LOG=${_PKG_CONFIG_LOG:Q} MAKE_ENV+= PKG_CONFIG=${TOOLS_CMD.pkg-config:Q} MAKE_ENV+= PKG_CONFIG_LIBDIR=${_PKG_CONFIG_LIBDIR:Q} -MAKE_ENV+= PKG_CONFIG_LOG=${_PKG_CONFIG_LOG} +MAKE_ENV+= PKG_CONFIG_LOG=${_PKG_CONFIG_LOG:Q} .if defined(PKG_DEVELOPER) post-build: pkgconfig-post-build diff --git a/mk/wrapper/bsd.wrapper.mk b/mk/wrapper/bsd.wrapper.mk index 0d8ff3c9b90..66b53eafad0 100644 --- a/mk/wrapper/bsd.wrapper.mk +++ b/mk/wrapper/bsd.wrapper.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.wrapper.mk,v 1.38 2005/10/16 19:44:44 schwarz Exp $ +# $NetBSD: bsd.wrapper.mk,v 1.39 2005/12/05 22:07:08 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -60,8 +60,8 @@ PREPEND_PATH+= ${WRAPPER_BINDIR} .if !empty(PHASES_AFTER_WRAPPER:M${PKG_PHASE}) WRAPPER_DEBUG?= yes -CONFIGURE_ENV+= WRAPPER_DEBUG="${WRAPPER_DEBUG}" -MAKE_ENV+= WRAPPER_DEBUG="${WRAPPER_DEBUG}" +CONFIGURE_ENV+= WRAPPER_DEBUG=${WRAPPER_DEBUG:Q} +MAKE_ENV+= WRAPPER_DEBUG=${WRAPPER_DEBUG:Q} SCRIPTS_ENV+= WRAPPER_DEBUG="${WRAPPER_DEBUG}" # The caching code, which greatly speeds up the build process, doesn't @@ -77,8 +77,8 @@ WRAPPER_UPDATE_CACHE= no . endif . endfor .endif -CONFIGURE_ENV+= WRAPPER_UPDATE_CACHE="${WRAPPER_UPDATE_CACHE}" -MAKE_ENV+= WRAPPER_UPDATE_CACHE="${WRAPPER_UPDATE_CACHE}" +CONFIGURE_ENV+= WRAPPER_UPDATE_CACHE=${WRAPPER_UPDATE_CACHE:Q} +MAKE_ENV+= WRAPPER_UPDATE_CACHE=${WRAPPER_UPDATE_CACHE:Q} # Only do the (expensive) reordering step if we have reordering # transformations. |