diff options
author | jlam <jlam@pkgsrc.org> | 2004-02-06 19:04:24 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-02-06 19:04:24 +0000 |
commit | 7699290f1060509f9b32dff10f411e2e95c11798 (patch) | |
tree | 9e1ed235761e43178980383a9260a8ca70040dfb /x11 | |
parent | ca9cfaafab77ea1327c66314e401682f91707ba0 (diff) | |
download | pkgsrc-7699290f1060509f9b32dff10f411e2e95c11798.tar.gz |
If we're passing through MAKEFLAGS variables whose values may contain
spaces, use the :Q modifier instead of double-quoting the value. This
avoids breakage when executing the just-in-time su targets.
Diffstat (limited to 'x11')
-rw-r--r-- | x11/XF86Setup/Makefile | 4 | ||||
-rw-r--r-- | x11/Xrender/buildlink3.mk | 6 | ||||
-rw-r--r-- | x11/xscreensaver/Makefile.common | 4 | ||||
-rw-r--r-- | x11/xservers/Makefile | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/x11/XF86Setup/Makefile b/x11/XF86Setup/Makefile index a388f87244b..9b17a2583b3 100644 --- a/x11/XF86Setup/Makefile +++ b/x11/XF86Setup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2004/01/20 12:28:26 agc Exp $ +# $NetBSD: Makefile,v 1.30 2004/02/06 19:04:25 jlam Exp $ DISTNAME= XF86Setup-3.3.6 PKGREVISION= 1 @@ -25,7 +25,7 @@ USE_IMAKE= yes .if !defined(X11_RELEASE) && !defined(CHECK_X11) X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release -MAKEFLAGS+= X11_RELEASE="${X11_RELEASE}" +MAKEFLAGS+= X11_RELEASE=${X11_RELEASE} .if (${X11_RELEASE} == "6.4") PKG_SKIP_REASON= "This package doesn't work with your X11 distribution." .endif diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 32a89378d0b..e0408eb1281 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.16 2004/02/05 07:17:14 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.17 2004/02/06 19:04:25 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -26,7 +26,7 @@ BUILDLINK_IS_BUILTIN.Xrender!= \ ${ECHO} "NO"; \ fi . endif -MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender="${BUILDLINK_IS_BUILTIN.Xrender}" +MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender=${BUILDLINK_IS_BUILTIN.Xrender} .endif .if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ @@ -67,7 +67,7 @@ BUILDLINK_USE_BUILTIN.Xrender!= \ . endfor . endif MAKEFLAGS+= \ - BUILDLINK_USE_BUILTIN.Xrender="${BUILDLINK_USE_BUILTIN.Xrender}" + BUILDLINK_USE_BUILTIN.Xrender=${BUILDLINK_USE_BUILTIN.Xrender} .endif # BUILDLINK_USE_BUILTIN.Xrender .if !empty(BUILDLINK_USE_BUILTIN.Xrender:M[nN][oO]) diff --git a/x11/xscreensaver/Makefile.common b/x11/xscreensaver/Makefile.common index 7ac19ac7c14..10b72709282 100644 --- a/x11/xscreensaver/Makefile.common +++ b/x11/xscreensaver/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.69 2004/02/02 23:55:00 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.70 2004/02/06 19:04:25 jlam Exp $ # DISTNAME= xscreensaver-4.14 @@ -50,7 +50,7 @@ PLIST_SUBST+= AVAILABLE= .ifndef (PERL_VERSION) PERL_VERSION!= if [ -x ${PERL5} ]; then ${PERL5} -e 'print $$]'; else ${ECHO} "5.006"; fi -MAKEFLAGS+= PERL_VERSION="${PERL_VERSION}" +MAKEFLAGS+= PERL_VERSION=${PERL_VERSION} .endif .if (${OPSYS} == "NetBSD") diff --git a/x11/xservers/Makefile b/x11/xservers/Makefile index e6476975aad..3108757cac5 100644 --- a/x11/xservers/Makefile +++ b/x11/xservers/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2004/01/27 00:53:10 heinz Exp $# +# $NetBSD: Makefile,v 1.14 2004/02/06 19:04:25 jlam Exp $# DISTNAME= xservers-3.3.6.3 CATEGORIES= x11 @@ -17,7 +17,7 @@ USE_X11BASE= YES .if !defined(X11_RELEASE) && !defined(CHECK_X11) X11_RELEASE!= ${MAKE} CHECK_X11=YES print-x11-release -MAKEFLAGS+= X11_RELEASE="${X11_RELEASE}" +MAKEFLAGS+= X11_RELEASE=${X11_RELEASE} .if (${X11_RELEASE} == "6.3") PKG_SKIP_REASON= "${PKGNAME} is part of your X11 distribution" .endif |