diff options
| author | jlam <jlam> | 2004-02-12 02:35:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-12 02:35:06 +0000 |
| commit | 904fb99528f41da42271c33b5e2c2fb70a5898a8 (patch) | |
| tree | abedabb5e0a307cd66dc653a926873635736358e /devel/readline | |
| parent | 7a53d0f6f6f5347ca16705bd2c05ed41a190a6e0 (diff) | |
| download | pkgsrc-904fb99528f41da42271c33b5e2c2fb70a5898a8.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/readline')
| -rw-r--r-- | devel/readline/buildlink2.mk | 16 | ||||
| -rw-r--r-- | devel/readline/buildlink3.mk | 16 |
2 files changed, 26 insertions, 6 deletions
diff --git a/devel/readline/buildlink2.mk b/devel/readline/buildlink2.mk index f395cbe82c7..8e2bc27d47d 100644 --- a/devel/readline/buildlink2.mk +++ b/devel/readline/buildlink2.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink2.mk,v 1.8 2004/02/12 02:35:06 jlam Exp $ # # Optionally define USE_GNU_READLINE to force use of GNU readline. # @@ -37,8 +37,18 @@ _NEED_GNU_READLINE= NO _NEED_GNU_READLINE= YES .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mreadline) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + ${_BUILTIN_READLINE} == "YES" +_NEED_GNU_READLINE= NO +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +_NEED_GNU_READLINE= YES +.endif +.if !empty(PREFER_NATIVE:Mreadline) && \ + ${_BUILTIN_READLINE} == "YES" +_NEED_GNU_READLINE= NO +.endif +.if !empty(PREFER_PKGSRC:Mreadline) _NEED_GNU_READLINE= YES .endif diff --git a/devel/readline/buildlink3.mk b/devel/readline/buildlink3.mk index f64d39b6e48..b16b90e848b 100644 --- a/devel/readline/buildlink3.mk +++ b/devel/readline/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 01:59:38 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 02:35:06 jlam Exp $ # # Optionally define USE_GNU_READLINE to force use of GNU readline. # @@ -45,8 +45,18 @@ BUILDLINK_USE_BUILTIN.readline= YES BUILDLINK_USE_BUILTIN.readline= NO .endif -.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \ - !empty(PREFER_PKGSRC:Mreadline) +.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \ + !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.readline= YES +.endif +.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.readline= NO +.endif +.if !empty(PREFER_NATIVE:Mreadline) && \ + !empty(BUILDLINK_IS_BUILTIN.readline:M[yY][eE][sS]) +BUILDLINK_USE_BUILTIN.readline= YES +.endif +.if !empty(PREFER_PKGSRC:Mreadline) BUILDLINK_USE_BUILTIN.readline= NO .endif |