summaryrefslogtreecommitdiff
path: root/security/openssl
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-12 02:35:06 +0000
committerjlam <jlam@pkgsrc.org>2004-02-12 02:35:06 +0000
commitd2b62c66fbc6fa5d43546377699557ae9780a930 (patch)
treeabedabb5e0a307cd66dc653a926873635736358e /security/openssl
parent8d7a59f64baaca76cd5a0b7d879528cc17e128f4 (diff)
downloadpkgsrc-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 'security/openssl')
-rw-r--r--security/openssl/buildlink2.mk16
-rw-r--r--security/openssl/buildlink3.mk16
2 files changed, 26 insertions, 6 deletions
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
index 7d6e0412657..da625632074 100644
--- a/security/openssl/buildlink2.mk
+++ b/security/openssl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.20 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.21 2004/02/12 02:35:07 jlam Exp $
.if !defined(OPENSSL_BUILDLINK2_MK)
OPENSSL_BUILDLINK2_MK= # defined
@@ -105,8 +105,18 @@ _NEED_OPENSSL= NO
_NEED_OPENSSL= YES
.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
- !empty(PREFER_PKGSRC:Mopenssl)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+ ${_BUILTIN_OPENSSL} == "YES"
+_NEED_OPENSSL= NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_OPENSSL= YES
+.endif
+.if !empty(PREFER_NATIVE:Mopenssl) && \
+ ${_BUILTIN_OPENSSL} == "YES"
+_NEED_OPENSSL= NO
+.endif
+.if !empty(PREFER_PKGSRC:Mopenssl)
_NEED_OPENSSL= YES
.endif
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index a559c5a66f8..9596663d053 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.13 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.14 2004/02/12 02:35:07 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
OPENSSL_BUILDLINK3_MK:= ${OPENSSL_BUILDLINK3_MK}+
@@ -116,8 +116,18 @@ BUILDLINK_USE_BUILTIN.openssl= YES
BUILDLINK_USE_BUILTIN.openssl= NO
.endif
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
- !empty(PREFER_PKGSRC:Mopenssl)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+ !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.openssl= YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.openssl= NO
+.endif
+.if !empty(PREFER_NATIVE:Mopenssl) && \
+ !empty(BUILDLINK_IS_BUILTIN.openssl:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.openssl= YES
+.endif
+.if !empty(PREFER_PKGSRC:Mopenssl)
BUILDLINK_USE_BUILTIN.openssl= NO
.endif