summaryrefslogtreecommitdiff
path: root/security/PAM
diff options
context:
space:
mode:
authorjlam <jlam>2004-02-05 07:17:14 +0000
committerjlam <jlam>2004-02-05 07:17:14 +0000
commit609b1ecd9faf34479e407e0dd09192ab6e0e39ef (patch)
treeedbbed6f9491b43337c846644df6d1c3e8ce8f32 /security/PAM
parentb1770a7720f03a2832f44de82413ac976f8a3c93 (diff)
downloadpkgsrc-609b1ecd9faf34479e407e0dd09192ab6e0e39ef.tar.gz
Make PREFER_PKGSRC just yes/no or a list of packages. This makes it
simpler to understand.
Diffstat (limited to 'security/PAM')
-rw-r--r--security/PAM/buildlink2.mk8
-rw-r--r--security/PAM/buildlink3.mk8
2 files changed, 6 insertions, 10 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])