From f365d6a8ac3c54e563f337dd0cf40aa1e433b567 Mon Sep 17 00:00:00 2001
From: tv <tv>
Date: Sat, 4 Mar 2006 16:06:29 +0000
Subject: Make "pam" an option as it is with many other pkgs; it is now off by
 default.  This correctly fixes the PLIST problem with pam, and makes the
 package more consistent with the rest of pkgsrc.

---
 mail/perdition/Makefile   |  4 ++--
 mail/perdition/PLIST      |  3 ++-
 mail/perdition/options.mk | 16 ++++++++++++++--
 3 files changed, 18 insertions(+), 5 deletions(-)

(limited to 'mail')

diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile
index 4c6ae9e58b2..88a31f9a2c0 100644
--- a/mail/perdition/Makefile
+++ b/mail/perdition/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2006/03/03 16:56:35 tv Exp $
+# $NetBSD: Makefile,v 1.6 2006/03/04 16:06:29 tv Exp $
 #
 
-PKGREVISION=		4
+PKGREVISION=		5
 
 PERDITION_COMMENT=	main program
 
diff --git a/mail/perdition/PLIST b/mail/perdition/PLIST
index 7bbab2c0209..3e65f2f2dc5 100644
--- a/mail/perdition/PLIST
+++ b/mail/perdition/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/03 16:56:35 tv Exp $
+@comment $NetBSD: PLIST,v 1.4 2006/03/04 16:06:29 tv Exp $
 include/jain.h
 lib/libjain.la
 lib/libperditiondb_nis.la
@@ -16,6 +16,7 @@ sbin/perdition.imap4s
 sbin/perdition.imaps
 sbin/perdition.pop3
 sbin/perdition.pop3s
+${PERDITION_HAVE_PAM}share/examples/pam.d/perdition
 share/examples/perdition/Makefile
 share/examples/perdition/Makefile.popmap
 share/examples/perdition/perdition.conf
diff --git a/mail/perdition/options.mk b/mail/perdition/options.mk
index aac5ad0065f..1b1c6238e1e 100644
--- a/mail/perdition/options.mk
+++ b/mail/perdition/options.mk
@@ -1,11 +1,23 @@
-# $NetBSD: options.mk,v 1.1 2006/01/31 21:07:30 tv Exp $
+# $NetBSD: options.mk,v 1.2 2006/03/04 16:06:29 tv Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.perdition
-PKG_SUPPORTED_OPTIONS=	ssl
+PKG_SUPPORTED_OPTIONS=	ssl pam
 PKG_SUGGESTED_OPTIONS=	ssl
 
 .include "../../mk/bsd.options.mk"
 
+###
+### Build with PAM support.
+###
+.if !empty(PKG_OPTIONS:Mpam)
+.  include "../../mk/pam.buildlink3.mk"
+PLIST_SUBST+=		PERDITION_HAVE_PAM=
+.else
+# prevent recognition of PAM in the base system
+CONFIGURE_ENV+=		ac_cv_header_security_pam_appl_h=no
+PLIST_SUBST+=		PERDITION_HAVE_PAM="@comment "
+.endif
+
 ###
 ### Build with OpenSSL as the underlying crypto library.
 ###
-- 
cgit v1.2.3