diff options
| author | jlam <jlam@pkgsrc.org> | 2004-02-12 02:35:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-02-12 02:35:06 +0000 |
| commit | d2b62c66fbc6fa5d43546377699557ae9780a930 (patch) | |
| tree | abedabb5e0a307cd66dc653a926873635736358e /devel/ncurses | |
| parent | 8d7a59f64baaca76cd5a0b7d879528cc17e128f4 (diff) | |
| download | pkgsrc-d2b62c66fbc6fa5d43546377699557ae9780a930.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 'devel/ncurses')
| -rw-r--r-- | devel/ncurses/buildlink2.mk | 22 | ||||
| -rw-r--r-- | devel/ncurses/buildlink3.mk | 16 |
2 files changed, 29 insertions, 9 deletions
diff --git a/devel/ncurses/buildlink2.mk b/devel/ncurses/buildlink2.mk index 1455fcc4305..71eb42bbb51 100644 --- a/devel/ncurses/buildlink2.mk +++ b/devel/ncurses/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.19 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.20 2004/02/12 02:35:06 jlam Exp $ # # Optionally define: # @@ -62,14 +62,24 @@ MAKEFLAGS+= BUILDLINK_IS_BUILTIN.ncurses=${BUILDLINK_IS_BUILTIN.ncurses} .endif .if !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) -_NEED_NCURSES= NO +_NEED_NCURSES= NO .else -_NEED_NCURSES= YES +_NEED_NCURSES= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mncurses) -_NEED_NCURSES= YES +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_NCURSES} == "YES" +_NEED_NCURSES= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_NCURSES= YES +.endif +.if !empty(PREFER_NATIVE:Mncurses) && \ + ${_BUILTIN_NCURSES} == "YES" +_NEED_NCURSES= NO +.endif +.if !empty(PREFER_PKGSRC:Mncurses) +_NEED_NCURSES= YES .endif .if ${_NEED_NCURSES} == "YES" diff --git a/devel/ncurses/buildlink3.mk b/devel/ncurses/buildlink3.mk index d3f3df47188..e3a8854f906 100644 --- a/devel/ncurses/buildlink3.mk +++ b/devel/ncurses/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.17 2004/02/12 01:59:37 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.18 2004/02/12 02:35:06 jlam Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ NCURSES_BUILDLINK3_MK:= ${NCURSES_BUILDLINK3_MK}+ @@ -97,8 +97,18 @@ BUILDLINK_USE_BUILTIN.ncurses= YES BUILDLINK_USE_BUILTIN.ncurses= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mncurses) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= NO +.endif +.if !empty(PREFER_NATIVE:Mncurses) && \ + !empty(BUILDLINK_IS_BUILTIN.ncurses:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.ncurses= YES +.endif +.if !empty(PREFER_PKGSRC:Mncurses) BUILDLINK_USE_BUILTIN.ncurses= NO .endif |