Tue May 3 12:34:27 2016 UTC ()
PLIST fix when ldap PKG_OPTIONS is not set, noted by Hauke Fath via
private e-mail.


(taca)
diff -r1.45 -r1.46 pkgsrc/mail/dovecot2/PLIST
diff -r1.8 -r1.9 pkgsrc/mail/dovecot2/options.mk

cvs diff -r1.45 -r1.46 pkgsrc/mail/dovecot2/PLIST (expand / switch to context diff)
--- pkgsrc/mail/dovecot2/PLIST 2016/05/03 01:49:52 1.45
+++ pkgsrc/mail/dovecot2/PLIST 2016/05/03 12:34:27 1.46
@@ -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/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/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-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

cvs diff -r1.8 -r1.9 pkgsrc/mail/dovecot2/options.mk (expand / switch to context diff)
--- pkgsrc/mail/dovecot2/options.mk 2015/02/19 09:48:27 1.8
+++ pkgsrc/mail/dovecot2/options.mk 2016/05/03 12:34:27 1.9
@@ -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 @@
 .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 @@
 .if !empty(PKG_OPTIONS:Mldap)
 CONFIGURE_ARGS+=	--with-ldap
 .  include "../../databases/openldap-client/buildlink3.mk"
+PLIST.ldap=	yes
 .endif
 
 ###