diff options
| author | jlam <jlam> | 2004-02-05 06:58:02 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-02-05 06:58:02 +0000 |
| commit | 91bc291f41ded5a7610d7def5080ce479b65499e (patch) | |
| tree | 435c664e6b88ad088b762f222d98f5c10bace96c /security/PAM | |
| parent | abcbd9a281594691f5813bc65435050263601f44 (diff) | |
| download | pkgsrc-91bc291f41ded5a7610d7def5080ce479b65499e.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.mk | 10 | ||||
| -rw-r--r-- | security/PAM/buildlink3.mk | 10 |
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 |