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.

5 files changed, 65 insertions, 15 deletions

diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk
index f2348d0f858..c429fb3ae90 100644
--- a/security/PAM/buildlink2.mk
+++ b/security/PAM/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.6 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.7 2004/02/12 02:35:07 jlam Exp $
 
 .if !defined(PAM_BUILDLINK2_MK)
 PAM_BUILDLINK2_MK=	# defined
@@ -20,8 +20,18 @@ _NEED_PAM=		NO
 _NEED_PAM=		YES
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mpam)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    ${_BUILTIN_PAM} == "YES"
+_NEED_PAM=	NO
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+_NEED_PAM=	YES
+.endif
+.if !empty(PREFER_NATIVE:Mpam) && \
+    ${_BUILTIN_PAM} == "YES"
+_NEED_PAM=	NO
+.endif
+.if !empty(PREFER_PKGSRC:Mpam)
 _NEED_PAM=	YES
 .endif
 
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index b80345cf8ab..eca8411f143 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2004/02/12 02:35:07 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
@@ -26,8 +26,18 @@ BUILDLINK_USE_BUILTIN.pam=	YES
 BUILDLINK_USE_BUILTIN.pam=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mpam)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.pam=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.pam=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mpam) && \
+    !empty(BUILDLINK_IS_BUILTIN.pam:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.pam=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mpam)
 BUILDLINK_USE_BUILTIN.pam=	NO
 .endif
 
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index a69fee08e9a..e18886777a0 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/02/12 01:59:38 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2004/02/12 02:35:07 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -80,8 +80,18 @@ BUILDLINK_USE_BUILTIN.heimdal=	YES
 BUILDLINK_USE_BUILTIN.heimdal=	NO
 .endif
 
-.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-    !empty(PREFER_PKGSRC:Mheimdal)
+.if !empty(PREFER_NATIVE:M[yY][eE][sS]) && \
+    !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.heimdal=	YES
+.endif
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.heimdal=	NO
+.endif
+.if !empty(PREFER_NATIVE:Mheimdal) && \
+    !empty(BUILDLINK_IS_BUILTIN.heimdal:M[yY][eE][sS])
+BUILDLINK_USE_BUILTIN.heimdal=	YES
+.endif
+.if !empty(PREFER_PKGSRC:Mheimdal)
 BUILDLINK_USE_BUILTIN.heimdal=	NO
 .endif
 
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