From fdb7d7358fefd6fa1ffd3e45e16f47d8842af4bc Mon Sep 17 00:00:00 2001
From: taca <taca@pkgsrc.org>
Date: Tue, 3 May 2016 12:34:27 +0000
Subject: PLIST fix when ldap PKG_OPTIONS is not set, noted by Hauke Fath via
 private e-mail.

---
 mail/dovecot2/PLIST      | 8 ++++----
 mail/dovecot2/options.mk | 5 +++--
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'mail')

diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
index 3db31ea17e2..97ca5ae0ec6 100644
--- a/mail/dovecot2/PLIST
+++ b/mail/dovecot2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.45 2016/05/03 01:49:52 taca Exp $
+@comment $NetBSD: PLIST,v 1.46 2016/05/03 12:34:27 taca Exp $
 bin/doveadm
 bin/doveconf
 bin/dsync
@@ -273,7 +273,7 @@ include/dovecot/istream.h
 include/dovecot/json-parser.h
 include/dovecot/json-tree.h
 include/dovecot/lda-settings.h
-include/dovecot/ldap-client.h
+${PLIST.ldap}include/dovecot/ldap-client.h
 include/dovecot/lib-signals.h
 include/dovecot/lib.h
 include/dovecot/llist.h
@@ -520,7 +520,7 @@ include/dovecot/var-expand.h
 include/dovecot/wildcard-match.h
 include/dovecot/write-full.h
 lib/dovecot/auth/libauthdb_imap.la
-lib/dovecot/dict/libdict_ldap.la
+${PLIST.ldap}lib/dovecot/dict/libdict_ldap.la
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
@@ -556,7 +556,7 @@ lib/dovecot/libdovecot-compression.la
 lib/dovecot/libdovecot-dsync.la
 lib/dovecot/libdovecot-fts.la
 lib/dovecot/libdovecot-lda.la
-lib/dovecot/libdovecot-ldap.la
+${PLIST.ldap}lib/dovecot/libdovecot-ldap.la
 lib/dovecot/libdovecot-login.la
 lib/dovecot/libdovecot-sql.la
 lib/dovecot/libdovecot-storage.la
diff --git a/mail/dovecot2/options.mk b/mail/dovecot2/options.mk
index fbd8ef14833..a136d4b8467 100644
--- a/mail/dovecot2/options.mk
+++ b/mail/dovecot2/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.8 2015/02/19 09:48:27 taca Exp $
+# $NetBSD: options.mk,v 1.9 2016/05/03 12:34:27 taca Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
 PKG_SUPPORTED_OPTIONS=	gssapi kqueue ldap mysql pam pgsql sqlite tcpwrappers
@@ -9,7 +9,7 @@ PKG_SUGGESTED_OPTIONS=	pam sqlite ssl tcpwrappers
 .if defined(PKG_HAVE_KQUEUE)
 PKG_SUGGESTED_OPTIONS+=	kqueue
 .endif
-PLIST_VARS+=		ssl tcpwrappers
+PLIST_VARS+=		ldap ssl tcpwrappers
 
 .include "../../mk/bsd.options.mk"
 
@@ -53,6 +53,7 @@ CPPFLAGS+=		-I${BUILDLINK_DIR}/include/pgsql
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=	--with-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
+PLIST.ldap=	yes
 .endif
 
 ###
-- 
cgit v1.2.3