Make PREFER_PKGSRC just yes/no or a list of packages. This makes it

simpler to understand.

5 files changed, 15 insertions, 25 deletions

diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk
index 669dd55d98e..39e44bf1d7d 100644
--- a/security/PAM/buildlink2.mk
+++ b/security/PAM/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.4 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(PAM_BUILDLINK2_MK)
 PAM_BUILDLINK2_MK=	# defined
@@ -14,11 +14,9 @@ _NEED_PAM=		NO
 _NEED_PAM=		YES
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mpam)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mpam)
 _NEED_PAM=	YES
-.  endif
 .endif
 
 .if ${_NEED_PAM} == "YES"
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index b45540e9de7..ca1f2d334af 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
@@ -20,11 +20,9 @@ BUILDLINK_IS_BUILTIN.pam=	YES
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mpam)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mpam)
 BUILDLINK_USE_BUILTIN.pam=	NO
-.  endif
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.pam:M[yY][eE][sS])
diff --git a/security/heimdal/buildlink3.mk b/security/heimdal/buildlink3.mk
index 7ae82479fb6..5c35e447df3 100644
--- a/security/heimdal/buildlink3.mk
+++ b/security/heimdal/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.8 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 HEIMDAL_BUILDLINK3_MK:=	${HEIMDAL_BUILDLINK3_MK}+
@@ -29,11 +29,9 @@ BUILDLINK_IS_BUILTIN.heimdal!=						\
 MAKEFLAGS+=	BUILDLINK_IS_BUILTIN.heimdal="${BUILDLINK_IS_BUILTIN.heimdal}"
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mheimdal)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mheimdal)
 BUILDLINK_USE_BUILTIN.heimdal=	NO
-.  endif
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.heimdal:M[yY][eE][sS])
diff --git a/security/openssl/buildlink2.mk b/security/openssl/buildlink2.mk
index 26d7681cd85..af0ef8a53bb 100644
--- a/security/openssl/buildlink2.mk
+++ b/security/openssl/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.17 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.18 2004/02/05 07:17:14 jlam Exp $
 
 .if !defined(OPENSSL_BUILDLINK2_MK)
 OPENSSL_BUILDLINK2_MK=	# defined
@@ -24,11 +24,9 @@ BUILDLINK_IS_BUILTIN.openssl=	YES
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mopenssl)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mopenssl)
 _NEED_OPENSSL=	YES
-.  endif
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS])
diff --git a/security/openssl/buildlink3.mk b/security/openssl/buildlink3.mk
index aafc62f8fda..72c2178647f 100644
--- a/security/openssl/buildlink3.mk
+++ b/security/openssl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.10 2004/02/05 07:06:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.11 2004/02/05 07:17:14 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 OPENSSL_BUILDLINK3_MK:=	${OPENSSL_BUILDLINK3_MK}+
@@ -28,11 +28,9 @@ BUILDLINK_IS_BUILTIN.openssl=	YES
 .  endif
 .endif
 
-.if defined(PREFER_PKGSRC)
-.  if empty(PREFER_PKGSRC) || !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
-      !empty(PREFER_PKGSRC:Mopenssl)
+.if !empty(PREFER_PKGSRC:M[yY][eE][sS]) || \
+    !empty(PREFER_PKGSRC:Mopenssl)
 BUILDLINK_USE_BUILTIN.openssl=	NO
-.  endif
 .endif
 
 .if !empty(BUILDLINK_CHECK_BUILTIN.openssl:M[yY][eE][sS])