diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-05 07:06:15 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-05 07:06:15 +0000 |
| commit | 4006dd8d3c16be15e01d264394098f7a0798db4c (patch) | |
| tree | 12fb12151bde110b07a88dc1c8875abc30741865 /x11/Xrender | |
| parent | 6ba053729abf2a4090e9d49f9fcf75a27a919827 (diff) | |
| download | pkgsrc-4006dd8d3c16be15e01d264394098f7a0798db4c.tar.gz | |
Rename BUILDLINK_PREFER_PKGSRC to PREFER_PKGSRC so that we can use its
value outside of buildlink-related files.
Diffstat (limited to 'x11/Xrender')
| -rw-r--r-- | x11/Xrender/buildlink2.mk | 9 | ||||
| -rw-r--r-- | x11/Xrender/buildlink3.mk | 9 |
2 files changed, 8 insertions, 10 deletions
diff --git a/x11/Xrender/buildlink2.mk b/x11/Xrender/buildlink2.mk index 0f5e88c6d8b..3d2b4e6df00 100644 --- a/x11/Xrender/buildlink2.mk +++ b/x11/Xrender/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $ .if !defined(XRENDER_BUILDLINK2_MK) XRENDER_BUILDLINK2_MK= # defined @@ -52,10 +52,9 @@ _NEED_XRENDER!= \ BUILDLINK_FILES.Xrender= include/X11/extensions/Xrender.h BUILDLINK_FILES.Xrender+= lib/libXrender.* -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:MXrender) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:MXrender) _NEED_XRENDER= YES . endif .endif diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index de5eb77a8bb..eb507c8dccc 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.14 2004/02/05 06:58:03 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.15 2004/02/05 07:06:15 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -29,10 +29,9 @@ BUILDLINK_IS_BUILTIN.Xrender!= \ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.Xrender="${BUILDLINK_IS_BUILTIN.Xrender}" .endif -.if defined(BUILDLINK_PREFER_PKGSRC) -. if empty(BUILDLINK_PREFER_PKGSRC) || \ - !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(BUILDLINK_PREFER_PKGSRC:MXrender) +.if defined(PREFER_PKGSRC) +. if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ + !empty(PREFER_PKGSRC:MXrender) BUILDLINK_USE_BUILTIN.Xrender= NO . endif .endif |