summaryrefslogtreecommitdiff
path: root/security/PAM
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-02-05 06:58:02 +0000
committerjlam <jlam@pkgsrc.org>2004-02-05 06:58:02 +0000
commit6ba053729abf2a4090e9d49f9fcf75a27a919827 (patch)
tree435c664e6b88ad088b762f222d98f5c10bace96c /security/PAM
parentd730f145d3301610c97c8789987869a1021f254a (diff)
downloadpkgsrc-6ba053729abf2a4090e9d49f9fcf75a27a919827.tar.gz
Support a new global variable:
BUILDLINK_PREFER_PKGSRC This variable determines whether or not to prefer the pkgsrc versions of software that is also present in the base system. This variable is multi-state: defined, or "yes" always prefer the pkgsrc versions not defined, or "no" only use the pkgsrc versions if needed by dependency requirements This can also take a list of packages for which to prefer the pkgsrc-installed software. The package names may be found by consulting the value added to BUILDLINK_PACKAGES in the buildlink[23].mk files for that package.
Diffstat (limited to 'security/PAM')
-rw-r--r--security/PAM/buildlink2.mk10
-rw-r--r--security/PAM/buildlink3.mk10
2 files changed, 18 insertions, 2 deletions
diff --git a/security/PAM/buildlink2.mk b/security/PAM/buildlink2.mk
index 14cc2a7d512..8543afaedf2 100644
--- a/security/PAM/buildlink2.mk
+++ b/security/PAM/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.2 2002/08/25 18:39:48 jlam Exp $
+# $NetBSD: buildlink2.mk,v 1.3 2004/02/05 06:58:03 jlam Exp $
.if !defined(PAM_BUILDLINK2_MK)
PAM_BUILDLINK2_MK= # defined
@@ -14,6 +14,14 @@ _NEED_PAM= NO
_NEED_PAM= YES
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mpam)
+_NEED_PAM= YES
+. endif
+.endif
+
.if ${_NEED_PAM} == "YES"
BUILDLINK_PACKAGES+= pam
diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 08dd8c4a553..fb548519bed 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/01/24 03:12:32 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2004/02/05 06:58:03 jlam Exp $
BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+
PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+
@@ -20,6 +20,14 @@ BUILDLINK_IS_BUILTIN.pam= YES
. endif
.endif
+.if defined(BUILDLINK_PREFER_PKGSRC)
+. if empty(BUILDLINK_PREFER_PKGSRC) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:M[yY][eE][sS]) || \
+ !empty(BUILDLINK_PREFER_PKGSRC:Mpam)
+BUILDLINK_USE_BUILTIN.pam= NO
+. endif
+.endif
+
.if !empty(BUILDLINK_CHECK_BUILTIN.pam:M[yY][eE][sS])
BUILDLINK_USE_BUILTIN.pam= YES
.endif