diff options
author | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2004-02-05 07:17:14 +0000 |
commit | 9cbd62fd0ae1890790c971e914f6ff3cf6203177 (patch) | |
tree | edbbed6f9491b43337c846644df6d1c3e8ce8f32 /x11/Xrender | |
parent | 4006dd8d3c16be15e01d264394098f7a0798db4c (diff) | |
download | pkgsrc-9cbd62fd0ae1890790c971e914f6ff3cf6203177.tar.gz |
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'x11/Xrender')
-rw-r--r-- | x11/Xrender/buildlink2.mk | 8 | ||||
-rw-r--r-- | x11/Xrender/buildlink3.mk | 8 |
2 files changed, 6 insertions, 10 deletions
diff --git a/x11/Xrender/buildlink2.mk b/x11/Xrender/buildlink2.mk index 3d2b4e6df00..33a26e85e16 100644 --- a/x11/Xrender/buildlink2.mk +++ b/x11/Xrender/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $ .if !defined(XRENDER_BUILDLINK2_MK) XRENDER_BUILDLINK2_MK= # defined @@ -52,11 +52,9 @@ _NEED_XRENDER!= \ BUILDLINK_FILES.Xrender= include/X11/extensions/Xrender.h BUILDLINK_FILES.Xrender+= lib/libXrender.* -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:MXrender) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:MXrender) _NEED_XRENDER= YES -. endif .endif .if ${_NEED_XRENDER} == "YES" diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index eb507c8dccc..32a89378d0b 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.15 2004/02/05 07:06:15 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.16 2004/02/05 07:17:14 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -29,11 +29,9 @@ BUILDLINK_IS_BUILTIN.Xrender!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender="${BUILDLINK_IS_BUILTIN.Xrender}" .endif -.if defined(PREFER_PKGSRC) -. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:MXrender) +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:MXrender) BUILDLINK_USE_BUILTIN.Xrender= NO -. endif .endif .if !empty(BUILDLINK_CHECK_BUILTIN.Xrender:M[yY][eE][sS]) |