From 6419e9879b474c98a43178286be712c4c66d688c Mon Sep 17 00:00:00 2001 From: rillig Date: Thu, 8 Dec 2005 09:14:50 +0000 Subject: Fixed PLIST quoting issue introduced by the recent "pkglint --autofix" change. --- fonts/py-fonttools/Makefile | 4 ++-- lang/ruby/Makefile.common | 4 ++-- lang/smlnj/Makefile.common | 4 ++-- meta-pkgs/XFree86/Makefile.common | 12 ++++++------ meta-pkgs/xorg/Makefile.common | 14 +++++++------- net/ntp4/Makefile | 4 ++-- www/mozilla/Makefile.common | 4 ++-- 7 files changed, 23 insertions(+), 23 deletions(-) diff --git a/fonts/py-fonttools/Makefile b/fonts/py-fonttools/Makefile index 41ff8e346b5..bb338678e69 100644 --- a/fonts/py-fonttools/Makefile +++ b/fonts/py-fonttools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:14 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/08 09:23:14 rillig Exp $ # DISTNAME= fonttools-2.0b1 @@ -14,7 +14,7 @@ COMMENT= Library for manipulating fonts WRKSRC= ${WRKDIR}/fonttools PYDISTUTILSPKG= yes -PLIST_SUBST+= FONTTOOLSPTH=${FONTTOOLSPTH:Q} +PLIST_SUBST+= FONTTOOLSPTH=${FONTTOOLSPTH} .include "../../lang/python/extension.mk" .if !empty(PYPKGPREFIX:M*pth) diff --git a/lang/ruby/Makefile.common b/lang/ruby/Makefile.common index 31540c430c5..6c0e6724304 100644 --- a/lang/ruby/Makefile.common +++ b/lang/ruby/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:50:27 rillig Exp $ +# $NetBSD: Makefile.common,v 1.9 2005/12/08 09:14:50 rillig Exp $ # # Ruby base distribution common definition @@ -38,7 +38,7 @@ DIST_SUBDIR?= ${RUBY_DIST_SUBDIR} # PLIST_SUBST+= RUBY_SHLIBVER=${RUBY_SHLIBVER:Q} \ RUBY_SHLIBMAJOR=${RUBY_SHLIBMAJOR:Q} \ - RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR:Q} \ + RUBY_NOSHLIBMAJOR=${RUBY_NOSHLIBMAJOR} \ RUBY_NAME=${RUBY_NAME:Q} # Common macros. diff --git a/lang/smlnj/Makefile.common b/lang/smlnj/Makefile.common index a1c56a9350b..e458cf295b9 100644 --- a/lang/smlnj/Makefile.common +++ b/lang/smlnj/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:27 rillig Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/12/08 09:15:37 rillig Exp $ # smlnj also supports hppa, sparc, ppc, mlrisc & alpha # pkg support for those platforms, and say, solaris-x86 @@ -28,4 +28,4 @@ NLFFI= "@comment " BOX= ${MACHINE_ARCH} .endif -PLIST_SUBST+= BOX=${BOX:Q} OS=${OS:Q} NLFFI=${NLFFI:Q} +PLIST_SUBST+= BOX=${BOX:Q} OS=${OS:Q} NLFFI=${NLFFI} diff --git a/meta-pkgs/XFree86/Makefile.common b/meta-pkgs/XFree86/Makefile.common index a8c90eae9b7..fd6c59b6eb4 100644 --- a/meta-pkgs/XFree86/Makefile.common +++ b/meta-pkgs/XFree86/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:50:37 rillig Exp $ +# $NetBSD: Makefile.common,v 1.25 2005/12/08 09:17:21 rillig Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -104,11 +104,11 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX} .if !defined(XFREE86_ONLY_DIRS) || empty(XFREE86_ONLY_DIRS:M[Yy][Ee][Ss]) -PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR:Q} -PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB:Q} -PLIST_SUBST+= XF86RUSH=${XF86RUSH:Q} -PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS:Q} -PLIST_SUBST+= LIBDRI=${LIBDRI:Q} +PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR} +PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB} +PLIST_SUBST+= XF86RUSH=${XF86RUSH} +PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS} +PLIST_SUBST+= LIBDRI=${LIBDRI} PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q} PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q} PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q} diff --git a/meta-pkgs/xorg/Makefile.common b/meta-pkgs/xorg/Makefile.common index d7812ad782b..545cc70b49f 100644 --- a/meta-pkgs/xorg/Makefile.common +++ b/meta-pkgs/xorg/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.36 2005/12/05 20:50:37 rillig Exp $ +# $NetBSD: Makefile.common,v 1.37 2005/12/08 09:18:24 rillig Exp $ # # XBUILD_DIRS is the group of directories under ${WRKSRC} that will # be built in. @@ -124,12 +124,12 @@ MISCMAN_SUFFIX= ${MAN_SUFFIX} .if !defined(XORG_ONLY_DIRS) || empty(XORG_ONLY_DIRS:M[Yy][Ee][Ss]) -PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ:Q} -PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR:Q} -PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB:Q} -PLIST_SUBST+= XF86RUSH=${XF86RUSH:Q} -PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS:Q} -PLIST_SUBST+= LIBDRI=${LIBDRI:Q} +PLIST_SUBST+= DARWIN_QUARTZ=${DARWIN_QUARTZ} +PLIST_SUBST+= XTHRSTUB_MINOR=${XTHRSTUB_MINOR} +PLIST_SUBST+= LIBXTHRSTUB=${LIBXTHRSTUB} +PLIST_SUBST+= XF86RUSH=${XF86RUSH} +PLIST_SUBST+= IMAKE_MANTOOLS=${IMAKE_MANTOOLS} +PLIST_SUBST+= LIBDRI=${LIBDRI} PLIST_SUBST+= MAN_DIR=${MAN_DIR:Q} PLIST_SUBST+= LIBMAN_DIR=${LIBMAN_DIR:Q} PLIST_SUBST+= MAN_SUFFIX=${MAN_SUFFIX:Q} diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index 74811b5ad02..dc49b229ae7 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/12/05 23:55:14 rillig Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/08 09:19:22 rillig Exp $ # DISTNAME= ntp-4.2.0 @@ -62,7 +62,7 @@ TIMETRIM= "@comment " NO_TIMETRIM= "" .endif -PLIST_SUBST+= TIMETRIM=${TIMETRIM:Q} NO_TIMETRIM=${NO_TIMETRIM:Q} +PLIST_SUBST+= TIMETRIM=${TIMETRIM} NO_TIMETRIM=${NO_TIMETRIM} .include "../../security/openssl/buildlink3.mk" diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 7f1719d70be..01cda8dc9e8 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.65 2005/12/05 20:51:13 rillig Exp $ +# $NetBSD: Makefile.common,v 1.66 2005/12/08 09:19:49 rillig Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -121,7 +121,7 @@ SUNOSLIB= .else SUNOSLIB= "@comment " .endif -PLIST_SUBST+= SUNOSLIB=${SUNOSLIB:Q} +PLIST_SUBST+= SUNOSLIB=${SUNOSLIB} SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q} SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q} -- cgit v1.2.3