diff options
| author | jlam <jlam> | 2004-02-12 02:35:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-12 02:35:06 +0000 |
| commit | 4e85cabc1c163ea2780c37e373cd563a72a2f768 (patch) | |
| tree | abedabb5e0a307cd66dc653a926873635736358e /x11/Xrender | |
| parent | 10d0052f053d86a19523c1efbd5d7a4e4b5133ce (diff) | |
| download | pkgsrc-4e85cabc1c163ea2780c37e373cd563a72a2f768.tar.gz | |
Create a new variable PREFER_NATIVE that has the opposite semantics
as PREFER_PKGSRC. Preferences are determined by the most specific
instance of the package in either PREFER_PKGSRC or PREFER_NATIVE. If
a package is specified in neither or in both variables, then PREFER_PKGSRC
has precedence over PREFER_NATIVE.
Diffstat (limited to 'x11/Xrender')
| -rw-r--r-- | x11/Xrender/buildlink2.mk | 16 | ||||
| -rw-r--r-- | x11/Xrender/buildlink3.mk | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/x11/Xrender/buildlink2.mk b/x11/Xrender/buildlink2.mk index d20401f7c15..b84104bf4c6 100644 --- a/x11/Xrender/buildlink2.mk +++ b/x11/Xrender/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.9 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $ .if !defined(XRENDER_BUILDLINK2_MK) XRENDER_BUILDLINK2_MK= # defined @@ -51,8 +51,18 @@ _NEED_XRENDER= NO _NEED_XRENDER= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:MXrender) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_XRENDER} == "YES" +_NEED_XRENDER= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_XRENDER= YES +.endif +.if !empty(PREFER_NATIVE:MXrender) && \ + ${_BUILTIN_XRENDER} == "YES" +_NEED_XRENDER= NO +.endif +.if !empty(PREFER_PKGSRC:MXrender) _NEED_XRENDER= YES .endif diff --git a/x11/Xrender/buildlink3.mk b/x11/Xrender/buildlink3.mk index 14249369e16..51c66796cd9 100644 --- a/x11/Xrender/buildlink3.mk +++ b/x11/Xrender/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.19 2004/02/12 02:35:07 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ XRENDER_BUILDLINK3_MK:= ${XRENDER_BUILDLINK3_MK}+ @@ -62,8 +62,18 @@ BUILDLINK_USE_BUILTIN.Xrender= YES BUILDLINK_USE_BUILTIN.Xrender= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:MXrender) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.Xrender= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.Xrender= NO +.endif +.if !empty(PREFER_NATIVE:MXrender) && \ + !empty(BUILDLINK_IS_BUILTIN.Xrender:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.Xrender= YES +.endif +.if !empty(PREFER_PKGSRC:MXrender) BUILDLINK_USE_BUILTIN.Xrender= NO .endif |