diff options
| author | jlam <jlam> | 2005-01-14 07:54:20 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-01-14 07:54:20 +0000 |
| commit | da3b655deb137ab349af0e6a96f86419028b2d7d (patch) | |
| tree | 8222f304130541fbebc7d2c7b9955af7fe958c86 /mk | |
| parent | 3e036cb57cd216fea0f46bbd70e3ad560f3c1948 (diff) | |
| download | pkgsrc-da3b655deb137ab349af0e6a96f86419028b2d7d.tar.gz | |
Modify linux-pam and solaris-pam builtin.mk files to be more general
in their tests for built-in versions of the PAM implementations. The
MacOS X case now collapses nicely into the linux-pam case. Allow
pam.buildlink3.mk to use solaris-pam as an accepted PAM implementation.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pam.buildlink3.mk | 4 | ||||
| -rw-r--r-- | mk/solaris-pam.builtin.mk | 29 |
2 files changed, 21 insertions, 12 deletions
diff --git a/mk/pam.buildlink3.mk b/mk/pam.buildlink3.mk index 648a717a9e5..00d366ab480 100644 --- a/mk/pam.buildlink3.mk +++ b/mk/pam.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: pam.buildlink3.mk,v 1.2 2005/01/14 07:37:39 jlam Exp $ +# $NetBSD: pam.buildlink3.mk,v 1.3 2005/01/14 07:54:20 jlam Exp $ # # This Makefile fragment is meant to be included by packages that # require a PAM implementation. pam.buildlink3.mk will: @@ -25,7 +25,7 @@ PAM_BUILDLINK3_MK:= ${PAM_BUILDLINK3_MK}+ # This is an exhaustive list of all of the PAM implementations # that may be used with PAM.buildlink3.mk, in order of precedence. # -_PAM_PKGS?= linux-pam openpam #solaris-pam +_PAM_PKGS?= linux-pam openpam solaris-pam BUILDLINK_BUILTIN_MK.linux-pam= ../../security/PAM/builtin.mk BUILDLINK_BUILTIN_MK.openpam= ../../security/openpam/builtin.mk diff --git a/mk/solaris-pam.builtin.mk b/mk/solaris-pam.builtin.mk index 3df553c468a..7245ee78f88 100644 --- a/mk/solaris-pam.builtin.mk +++ b/mk/solaris-pam.builtin.mk @@ -1,18 +1,27 @@ -# $NetBSD: solaris-pam.builtin.mk,v 1.1 2005/01/14 06:29:55 jlam Exp $ +# $NetBSD: solaris-pam.builtin.mk,v 1.2 2005/01/14 07:54:20 jlam Exp $ -_SECURITY_PAM_APPL_H= /usr/include/security/pam_appl.h +_SOLARIS_PAM_APPL_HEADERS= /usr/include/security/pam_appl.h +_SOLARIS_PAM_IDENT= Copyright.*Sun Microsystems .if !defined(IS_BUILTIN.solaris-pam) -IS_BUILTIN.solaris-pam= no -. if empty(_SECURITY_PAM_APPL_H:M${LOCALBASE}/*) && \ - exists(${_SECURITY_PAM_APPL_H}) +IS_BUILTIN.solaris-pam= no +. for _inc_ in ${_SOLARIS_PAM_APPL_HEADERS} +. if !empty(IS_BUILTIN.solaris-pam:M[nN][oO]) && exists(${_inc_}) IS_BUILTIN.solaris-pam!= \ - if ${GREP} -q "Copyright.*Sun Microsystems" ${_SECURITY_PAM_APPL_H}; then \ - ${ECHO} "yes"; \ - else \ + case ${_inc_} in \ + ${LOCALBASE}/*) \ ${ECHO} "no"; \ - fi -. endif + ;; \ + *) \ + if ${GREP} -q "${_SOLARIS_PAM_IDENT}" ${_inc_}; then \ + ${ECHO} "yes"; \ + else \ + ${ECHO} "no"; \ + fi; \ + ;; \ + esac +. endif +. endfor BUILDLINK_VARS+= IS_BUILTIN.solaris-pam .endif # IS_BUILTIN.solaris-pam |