[pkgsrc/trunk]: pkgsrc Modify linux-pam and solaris-pam builtin.mk files to b...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/a35236578c23
branches:  trunk
changeset: 487422:a35236578c23
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri Jan 14 07:54:20 2005 +0000

description:
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:

 mk/pam.buildlink3.mk      |   4 ++--
 mk/solaris-pam.builtin.mk |  29 +++++++++++++++++++----------
 security/PAM/builtin.mk   |  37 +++++++++++++++++++------------------
 3 files changed, 40 insertions(+), 30 deletions(-)

diffs (111 lines):

diff -r 66da26f33c46 -r a35236578c23 mk/pam.buildlink3.mk
--- a/mk/pam.buildlink3.mk      Fri Jan 14 07:47:29 2005 +0000
+++ b/mk/pam.buildlink3.mk      Fri Jan 14 07:54:20 2005 +0000
@@ -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 @@
 # 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 -r 66da26f33c46 -r a35236578c23 mk/solaris-pam.builtin.mk
--- a/mk/solaris-pam.builtin.mk Fri Jan 14 07:47:29 2005 +0000
+++ b/mk/solaris-pam.builtin.mk Fri Jan 14 07:54:20 2005 +0000
@@ -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
 
diff -r 66da26f33c46 -r a35236578c23 security/PAM/builtin.mk
--- a/security/PAM/builtin.mk   Fri Jan 14 07:47:29 2005 +0000
+++ b/security/PAM/builtin.mk   Fri Jan 14 07:54:20 2005 +0000
@@ -1,29 +1,30 @@
-# $NetBSD: builtin.mk,v 1.10 2005/01/14 00:08:46 jlam Exp $
+# $NetBSD: builtin.mk,v 1.11 2005/01/14 07:54:20 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
-_PAM_PAM_APPL_H=       /usr/include/pam/pam_appl.h
-_SECURITY_PAM_APPL_H=  /usr/include/security/pam_appl.h
+_LINUX_PAM_APPL_HEADERS=       /usr/include/pam/pam_appl.h             \
+                               /usr/include/security/pam_appl.h
+_LINUX_PAM_IDENT=              The Linux-PAM Framework layer API
 
 .if !defined(IS_BUILTIN.linux-pam)
 IS_BUILTIN.linux-pam=  no
-.  if empty(_SECURITY_PAM_APPL_H:M${LOCALBASE}/*) && \
-      exists(${_SECURITY_PAM_APPL_H})
+.  for _inc_ in ${_LINUX_PAM_APPL_HEADERS}
+.    if !empty(IS_BUILTIN.linux-pam:M[nN][oO]) && exists(${_inc_})
 IS_BUILTIN.linux-pam!= \
-       if ${GREP} -q "The Linux-PAM Framework layer API" ${_SECURITY_PAM_APPL_H}; then \
-               ${ECHO} "yes";                                          \
-       else                                                            \
+       case ${_inc_} in                                                \
+       ${LOCALBASE}/*)                                                 \
                ${ECHO} "no";                                           \
-       fi
-.  elif empty(_PAM_PAM_APPL_H:M${LOCALBASE}/*) && exists(${_PAM_PAM_APPL_H})
-#
-# MacOS X installs their PAM headers as /usr/include/pam/*.h, and their
-# PAM implementation is derived from Linux-PAM:
-#
-#      http://developer.apple.com/documentation/Darwin/Reference/ManPages/man8/pam.8.html
-#
-IS_BUILTIN.linux-pam=  yes
-.  endif
+               ;;                                                      \
+       *)                                                              \
+               if ${GREP} -q "${_LINUX_PAM_IDENT}" ${_inc_}; then      \
+                       ${ECHO} "yes";                                  \
+               else                                                    \
+                       ${ECHO} "no";                                   \
+               fi;                                                     \
+               ;;                                                      \
+       esac
+.    endif
+.  endfor
 BUILDLINK_VARS+=       IS_BUILTIN.linux-pam
 .endif # IS_BUILTIN.linux-pam