Instantly deprecate USE_PAM from pkgsrc as its value is being set from

within NetBSD-current's bsd.own.mk, which conflicts with its usage in
pkgsrc.  The package that use USE_PAM have been converted to use the
bsd.options.mk framework.  This should fix PR pkg/29257.

5 files changed, 18 insertions, 7 deletions

diff --git a/mail/courier-auth/Makefile b/mail/courier-auth/Makefile
index c3fe66dd2a4..7b95de832b5 100644
--- a/mail/courier-auth/Makefile
+++ b/mail/courier-auth/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/12/28 02:47:44 reed Exp $
+# $NetBSD: Makefile,v 1.18 2005/02/07 11:35:42 jlam Exp $
 
 PKGNAME=	courier-auth-${BASE_VERS}
 PKGREVISION=	1
@@ -15,6 +15,8 @@ USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 INSTALL_EXTRA_TMPL+=	${.CURDIR}/INSTALL
 
+PKG_OPTION_VAR=		PKG_OPTIONS.courier-auth
+
 .include "../courier-auth/Makefile.authdaemond"
 
 WRKSRC_FILES+=		imap/system-auth.authpam
diff --git a/mail/courier-auth/Makefile.authdaemond b/mail/courier-auth/Makefile.authdaemond
index 8beab8aef08..f81f8ea0522 100644
--- a/mail/courier-auth/Makefile.authdaemond
+++ b/mail/courier-auth/Makefile.authdaemond
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.authdaemond,v 1.14 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: Makefile.authdaemond,v 1.15 2005/02/07 11:35:42 jlam Exp $
 
 USE_BUILDLINK3=		yes
 USE_LANGUAGES=		c c++
@@ -44,7 +44,10 @@ PATCHDIR=		${.CURDIR}/../courier-auth/patches
 BUILD_DIRS=		${WRKSRC_SUBDIRS:S/^/${WRKSRC}\//}
 
 .include "../../mk/bdb.buildlink3.mk"
-.if defined(USE_PAM)
-BUILD_DEFS+=		USE_PAM
+
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MPAM)
 .  include "../../mk/pam.buildlink3.mk"
 .endif
diff --git a/mail/courier-authldap/Makefile b/mail/courier-authldap/Makefile
index ed6a69ab6fe..b5953fb900d 100644
--- a/mail/courier-authldap/Makefile
+++ b/mail/courier-authldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/10/03 00:12:52 tv Exp $
+# $NetBSD: Makefile,v 1.13 2005/02/07 11:35:44 jlam Exp $
 
 PKGNAME=	courier-authldap-${BASE_VERS}
 PKGREVISION=	1
@@ -8,6 +8,8 @@ CONFLICTS=	courier-imap-ldap-[0-9]*
 
 DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
 
+PKG_OPTION_VAR=	PKG_OPTIONS.courier-authldap
+
 .include "../courier-auth/Makefile.authdaemond"
 
 USE_PKGINSTALL=		yes
diff --git a/mail/courier-authmysql/Makefile b/mail/courier-authmysql/Makefile
index 91994ced090..8ed562c65bd 100644
--- a/mail/courier-authmysql/Makefile
+++ b/mail/courier-authmysql/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/10/29 05:59:24 jdolecek Exp $
+# $NetBSD: Makefile,v 1.10 2005/02/07 11:35:44 jlam Exp $
 
 PKGNAME=	courier-authmysql-${BASE_VERS}
 PKGREVISION=	1
@@ -6,6 +6,8 @@ COMMENT=	Courier MySQL authentication module
 
 DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
 
+PKG_OPTION_VAR=	PKG_OPTIONS.courier-authmysql
+
 .include "../courier-auth/Makefile.authdaemond"
 
 USE_PKGINSTALL=		yes
diff --git a/mail/courier-authpgsql/Makefile b/mail/courier-authpgsql/Makefile
index bc78b8f4593..cb28a42f618 100644
--- a/mail/courier-authpgsql/Makefile
+++ b/mail/courier-authpgsql/Makefile
@@ -1,10 +1,12 @@
-# $NetBSD: Makefile,v 1.11 2004/07/24 22:45:15 recht Exp $
+# $NetBSD: Makefile,v 1.12 2005/02/07 11:35:44 jlam Exp $
 
 PKGNAME=	courier-authpgsql-${BASE_VERS}
 COMMENT=	Courier PostgreSQL authentication module
 
 DEPENDS+=	courier-auth-${BASE_VERS}{,nb*}:../../mail/courier-auth
 
+PKG_OPTION_VAR=	PKG_OPTIONS.courier-authpgsql
+
 .include "../courier-auth/Makefile.authdaemond"
 
 USE_PKGINSTALL=		yes