Create a pam.buildlink3.mk file that is used by PAM-using packages.

It includes the correct buildlink3.mk file from either Linux-PAM
(security/PAM) or OpenPAM (security/openpam) and eventually will
support solaris-pam.  pam.buildlink3.mk will:

	* set PAMBASE to the base directory of the PAM files;
	* set PAM_TYPE to the PAM implementation used.

There are two variables that can be used to tweak the selection of
the PAM implementation:

PAM_DEFAULT is a user-settable variable whose value is the default
	PAM implementation to use.

PAM_ACCEPTED is a package-settable list of PAM implementations
	that may be used by the package.

Modify most packages that include PAM/buildlink3.mk to include
pam.buildlink3.mk instead.

9 files changed, 23 insertions, 23 deletions

diff --git a/security/PAM/module.mk b/security/PAM/module.mk
index 45e1c420f8b..67cd4cef241 100644
--- a/security/PAM/module.mk
+++ b/security/PAM/module.mk
@@ -1,14 +1,14 @@
-# $NetBSD: module.mk,v 1.3 2005/01/14 00:08:46 jlam Exp $
+# $NetBSD: module.mk,v 1.4 2005/01/14 05:15:39 jlam Exp $
 
 .if !defined(PAM_MODULE_MK)
 PAM_MODULE_MK=	# defined
 
 .if empty(USE_BUILDLINK3:M[nN][oO])
-.  include "../../security/PAM/buildlink3.mk"
+.  include "../../mk/pam.buildlink3.mk"
 .endif
 
-.if defined(DEFAULT_VIEW.linux-pam)
-DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.linux-pam}
+.if defined(DEFAULT_VIEW.${PAM_TYPE})
+DEFAULT_VIEW.${PKGBASE}=	${DEFAULT_VIEW.${PAM_TYPE}}
 .endif
 
 PAM_MODULEDIR=		${VIEWBASE}/lib/security
diff --git a/security/cy-login/Makefile b/security/cy-login/Makefile
index 43ec4df9ac0..2c6d2885b49 100644
--- a/security/cy-login/Makefile
+++ b/security/cy-login/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/01/14 00:08:46 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/01/14 05:15:39 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy-login/}
 PKGREVISION=	1
@@ -13,9 +13,9 @@ SASL_PLUGIN=	YES
 CONFIGURE_ARGS+=	--enable-login		# LOGIN
 CONFIGURE_ARGS+=	--enable-plain		# PLAIN
 .if defined(USE_PAM)
-.  include "../../security/PAM/buildlink3.mk"
+.  include "../../mk/pam.buildlink3.mk"
 BUILD_DEFS+=		USE_PAM
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.linux-pam}
+CONFIGURE_ARGS+=	--with-pam=${PAMBASE}
 .endif
 
 BUILD_DIRS=	${WRKSRC}/plugins
diff --git a/security/cyrus-sasl/Makefile b/security/cyrus-sasl/Makefile
index 235ce048aff..2405cd5cd5f 100644
--- a/security/cyrus-sasl/Makefile
+++ b/security/cyrus-sasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/12/28 02:47:48 reed Exp $
+# $NetBSD: Makefile,v 1.48 2005/01/14 05:15:39 jlam Exp $
 
 .include "Makefile.common"
 
@@ -23,8 +23,8 @@ PKG_SUPPORTED_OPTIONS=	PAM gssapi kerberos
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:MPAM)
-.  include "../../security/PAM/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.pam}
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pam=${PAMBASE}
 .endif
 
 .if !empty(PKG_OPTIONS:Mkerberos)
diff --git a/security/cyrus-sasl/buildlink3.mk b/security/cyrus-sasl/buildlink3.mk
index 5b72a459ec2..64586804714 100644
--- a/security/cyrus-sasl/buildlink3.mk
+++ b/security/cyrus-sasl/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2004/11/25 22:55:54 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2005/01/14 05:15:39 jlam Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 CYRUS_SASL_BUILDLINK3_MK:=	${CYRUS_SASL_BUILDLINK3_MK}+
@@ -21,7 +21,7 @@ BUILDLINK_PKGSRCDIR.cyrus-sasl?=	../../security/cyrus-sasl
 PKG_OPTIONS.cyrus-sasl?=	${PKG_DEFAULT_OPTIONS}
 
 .if !empty(PKG_OPTIONS.cyrus-sasl:MPAM)
-.  include "../../security/PAM/buildlink3.mk"
+.  include "../../mk/pam.buildlink3.mk"
 .endif
 
 # Cyrus SASL mechanisms are shared modules loaded via dlopen().
diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk
index fd7dc290095..184603aafe5 100644
--- a/security/cyrus-saslauthd/options.mk
+++ b/security/cyrus-saslauthd/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.4 2005/01/14 00:08:46 jlam Exp $
+# $NetBSD: options.mk,v 1.5 2005/01/14 05:15:40 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-saslauthd
 PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap gssapi
@@ -8,8 +8,8 @@ PKG_SUPPORTED_OPTIONS=	PAM kerberos ldap gssapi
 ### PAM (Pluggable Authentication Mechanism)
 ###
 .if !empty(PKG_OPTIONS:MPAM)
-.  include "../../security/PAM/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-pam=${BUILDLINK_PREFIX.linux-pam}
+.  include "../../mk/pam.buildlink3.mk"
+CONFIGURE_ARGS+=	--with-pam=${PAMBASE}
 .endif
 
 ###
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 703ff8a4806..305ca52ed63 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/28 02:47:49 reed Exp $
+# $NetBSD: Makefile,v 1.19 2005/01/14 05:15:40 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -74,7 +74,7 @@ CPPFLAGS+=		-I/usr/include/krb5 -I/usr/include/kerberosIV
 # XXX: why yet.  For the moment, disable PAM authentication.
 #
 #.if defined(USE_PAM)
-#.include "../../security/PAM/buildlink3.mk"
+#.include "../../mk/pam.buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-pam
 #PLIST_SRC+=		${.CURDIR}/PLIST.pam
 #MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
diff --git a/security/openssh/options.mk b/security/openssh/options.mk
index c03569c661f..3d39929061d 100644
--- a/security/openssh/options.mk
+++ b/security/openssh/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.2 2004/12/22 21:46:25 jlam Exp $
+# $NetBSD: options.mk,v 1.3 2005/01/14 05:15:40 jlam Exp $
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -25,7 +25,7 @@ PATCH_DIST_STRIP=	-p1
 .if !empty(PKG_OPTIONS:MPAM)
 # XXX: PAM authentication causes memory faults, and haven't tracked down
 # XXX: why yet.  For the moment, disable PAM authentication for non-Linux.
-.include "../../security/PAM/buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 PLIST_SRC+=		${.CURDIR}/PLIST.pam
 MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
diff --git a/security/pam-dbm/Makefile b/security/pam-dbm/Makefile
index 74882a1ef76..ceaf34def04 100644
--- a/security/pam-dbm/Makefile
+++ b/security/pam-dbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/11/15 17:54:50 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/01/14 05:15:40 jlam Exp $
 #
 
 DISTNAME=		pam_dbm-0.2
@@ -15,6 +15,6 @@ USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 BDB_ACCEPTED=		db1
 
-.include "../../security/PAM/buildlink3.mk"
 .include "../../mk/bdb.buildlink3.mk"
+.include "../../mk/pam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/sudo/options.mk b/security/sudo/options.mk
index b211b6d5ff0..19a032573f5 100644
--- a/security/sudo/options.mk
+++ b/security/sudo/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.6 2004/12/22 04:36:33 jlam Exp $
+# $NetBSD: options.mk,v 1.7 2005/01/14 05:15:40 jlam Exp $
 #
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sudo
@@ -10,7 +10,7 @@ PKG_DEFAULT_OPTIONS+=	skey
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:MPAM)
-.  include "../../security/PAM/buildlink3.mk"
+.  include "../../mk/pam.buildlink3.mk"
 DL_AUTO_VARS=		yes
 CONFIGURE_ARGS+=	--with-pam
 .endif