From bccaba8d4be2a3c883336ad53db6de460fdb1750 Mon Sep 17 00:00:00 2001
From: jlam <jlam@pkgsrc.org>
Date: Mon, 7 Feb 2005 11:35:41 +0000
Subject: 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.

---
 security/cy-login/Makefile       | 10 +++++++---
 security/openssh+gssapi/Makefile | 10 +++++++---
 2 files changed, 14 insertions(+), 6 deletions(-)

(limited to 'security')

diff --git a/security/cy-login/Makefile b/security/cy-login/Makefile
index 2c6d2885b49..e7902239233 100644
--- a/security/cy-login/Makefile
+++ b/security/cy-login/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/01/14 05:15:39 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/02/07 11:35:47 jlam Exp $
 
 PKGNAME=	${DISTNAME:S/cyrus-sasl/cy-login/}
 PKGREVISION=	1
@@ -12,9 +12,13 @@ SASL_PLUGIN=	YES
 #
 CONFIGURE_ARGS+=	--enable-login		# LOGIN
 CONFIGURE_ARGS+=	--enable-plain		# PLAIN
-.if defined(USE_PAM)
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.cy-login
+PKG_SUPPORTED_OPTIONS=	PAM
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:MPAM)
 .  include "../../mk/pam.buildlink3.mk"
-BUILD_DEFS+=		USE_PAM
 CONFIGURE_ARGS+=	--with-pam=${PAMBASE}
 .endif
 
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index 305ca52ed63..c6a6956e813 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/01/14 05:15:40 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/02/07 11:35:47 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
@@ -73,8 +73,12 @@ CPPFLAGS+=		-I/usr/include/krb5 -I/usr/include/kerberosIV
 # XXX: PAM authentication causes memory faults, and I haven't tracked down
 # XXX: why yet.  For the moment, disable PAM authentication.
 #
-#.if defined(USE_PAM)
-#.include "../../mk/pam.buildlink3.mk"
+#PKG_OPTIONS_VAR=	PKG_OPTIONS.openssh+gssapi
+#PKG_SUPPORTED_OPTIONS=	PAM
+#.include "../../mk/bsd.options.mk"
+#
+#.if !empty(PKG_OPTIONS:MPAM)
+#.  include "../../mk/pam.buildlink3.mk"
 #CONFIGURE_ARGS+=	--with-pam
 #PLIST_SRC+=		${.CURDIR}/PLIST.pam
 #MESSAGE_SRC+=		${.CURDIR}/MESSAGE.pam
-- 
cgit v1.2.3