* Rename the buildlink module name associated with the security/PAM

  package from "pam" to "linux-pam".

* Rewrite PAM/builtin.mk to check that we have Linux-PAM, and re-classify
  MacOS X's PAM as Linux-PAM because it _is_, according to to Apple.
  Also don't use BUILDLINK_TRANSFORM.* to rewrite header file paths
  -- just use a symlink so that <security/*.h> can be used to find
  <pam/*.h>.

5 files changed, 49 insertions, 37 deletions

diff --git a/security/PAM/buildlink3.mk b/security/PAM/buildlink3.mk
index 18cee8f73c9..db1531f38ab 100644
--- a/security/PAM/buildlink3.mk
+++ b/security/PAM/buildlink3.mk
@@ -1,19 +1,19 @@
-# $NetBSD: buildlink3.mk,v 1.17 2004/11/25 22:47:15 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2005/01/14 00:08:46 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PAM_BUILDLINK3_MK:=	${PAM_BUILDLINK3_MK}+
 
 .if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	pam
+BUILDLINK_DEPENDS+=	linux-pam
 .endif
 
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npam}
-BUILDLINK_PACKAGES+=	pam
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlinux-pam}
+BUILDLINK_PACKAGES+=	linux-pam
 
 .if !empty(PAM_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.pam+=		PAM>=0.75
-BUILDLINK_RECOMMENDED.pam+=	PAM>=0.77nb4
-BUILDLINK_PKGSRCDIR.pam?=	../../security/PAM
+BUILDLINK_DEPENDS.linux-pam+=		PAM>=0.75
+BUILDLINK_RECOMMENDED.linux-pam+=	PAM>=0.77nb4
+BUILDLINK_PKGSRCDIR.linux-pam?=		../../security/PAM
 .endif	# PAM_BUILDLINK3_MK
 
 .include "../../mk/dlopen.buildlink3.mk"
diff --git a/security/PAM/builtin.mk b/security/PAM/builtin.mk
index 8890dbdda7e..60b0d4d432b 100644
--- a/security/PAM/builtin.mk
+++ b/security/PAM/builtin.mk
@@ -1,38 +1,50 @@
-# $NetBSD: builtin.mk,v 1.9 2005/01/12 02:27:48 xtraeme Exp $
+# $NetBSD: builtin.mk,v 1.10 2005/01/14 00:08:46 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
 
-.if !defined(IS_BUILTIN.pam)
-IS_BUILTIN.pam=	no
+.if !defined(IS_BUILTIN.linux-pam)
+IS_BUILTIN.linux-pam=	no
 .  if empty(_SECURITY_PAM_APPL_H:M${LOCALBASE}/*) && \
       exists(${_SECURITY_PAM_APPL_H})
-IS_BUILTIN.pam=	yes
-.  endif
-.endif	# IS_BUILTIN.pam
-
-.if !defined(USE_BUILTIN.pam)
-USE_BUILTIN.pam?=	${IS_BUILTIN.pam}
-.  if empty(_PAM_PAM_APPL_H:M${LOCALBASE}/*) && exists(${_PAM_PAM_APPL_H})
+IS_BUILTIN.linux-pam!=	\
+	if ${GREP} -q "The Linux-PAM Framework layer API" ${_SECURITY_PAM_APPL_H}; then \
+		${ECHO} "yes";						\
+	else								\
+		${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:
 #
-# Treat MacOS X's PAM implementation as Linux-PAM-compatible.
+#	http://developer.apple.com/documentation/Darwin/Reference/ManPages/man8/pam.8.html
 #
-USE_BUILTIN.pam=	yes
+IS_BUILTIN.linux-pam=	yes
 .  endif
-.endif
+BUILDLINK_VARS+=	IS_BUILTIN.linux-pam
+.endif	# IS_BUILTIN.linux-pam
 
-CHECK_BUILTIN.pam?=	no
-.if !empty(CHECK_BUILTIN.pam:M[nN][oO])
+USE_BUILTIN.linux-pam?=	${IS_BUILTIN.linux-pam}
+
+CHECK_BUILTIN.linux-pam?=	no
+.if !empty(CHECK_BUILTIN.linux-pam:M[nN][oO])
+
+.  if !empty(USE_BUILTIN.linux-pam:M[yY][eE][sS])
+BUILDLINK_TARGETS+=	buildlink-pam-security
+.  endif
 
-.if !empty(USE_BUILTIN.pam:M[yY][eE][sS])
-.  if exists(${_SECURITY_PAM_APPL_H})
-BUILDLINK_TRANSFORM.pam+=	-e "s|/include/pam/|/include/security/|"
-BUILDLINK_FILES.pam+=		include/security/*.h
-.  else
-BUILDLINK_FILES.pam+=		include/pam/*.h
+.  if !target(buildlink-pam-security)
+.PHONY: buildlink-pam-security
+buildlink-pam-security:
+	${_PKG_SILENT}${_PKG_DEBUG}					\
+	if [ -d ${BUILDLINK_PREFIX.linux-pam}/include/pam ]; then	\
+		${RM} -fr ${BUILDLINK_DIR}/include/security;		\
+		${LN} -fs ${BUILDLINK_PREFIX.linux-pam}/include/pam	\
+			${BUILDLINK_DIR}/include/security;		\
+	fi
 .  endif
-.endif
 
-.endif	# CHECK_BUILTIN.pam
+.endif	# CHECK_BUILTIN.linux-pam
diff --git a/security/PAM/module.mk b/security/PAM/module.mk
index a7b4d22fdce..45e1c420f8b 100644
--- a/security/PAM/module.mk
+++ b/security/PAM/module.mk
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.2 2004/05/11 04:39:03 snj Exp $
+# $NetBSD: module.mk,v 1.3 2005/01/14 00:08:46 jlam Exp $
 
 .if !defined(PAM_MODULE_MK)
 PAM_MODULE_MK=	# defined
@@ -7,8 +7,8 @@ PAM_MODULE_MK=	# defined
 .  include "../../security/PAM/buildlink3.mk"
 .endif
 
-.if defined(DEFAULT_VIEW.pam)
-DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.pam}
+.if defined(DEFAULT_VIEW.linux-pam)
+DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.linux-pam}
 .endif
 
 PAM_MODULEDIR=		${VIEWBASE}/lib/security
diff --git a/security/cy-login/Makefile b/security/cy-login/Makefile
index 3b35dfe525d..43ec4df9ac0 100644
--- a/security/cy-login/Makefile
+++ b/security/cy-login/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/03 15:15:07 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/01/14 00:08:46 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy-login/}
 PKGREVISION=	1
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--enable-plain		# PLAIN
 .if defined(USE_PAM)
 .  include "../../security/PAM/buildlink3.mk"
 BUILD_DEFS+=		USE_PAM
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
+CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.linux-pam}
 .endif
 
 BUILD_DIRS=	${WRKSRC}/plugins
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index 77bc6f6f8e7..fd7dc290095 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2004/11/17 19:56:49 xtraeme Exp $
+# $NetBSD: options.mk,v 1.4 2005/01/14 00:08:46 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
 PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap gssapi
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap gssapi
 ###
 .if !empty(PKG_OPTIONS:MPAM)
 .  include "../../security/PAM/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
+CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.linux-pam}
 .endif
 
 ###