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 unified 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,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.45 2016/05/03 01:49:52 taca Exp $ 1@comment $NetBSD: PLIST,v 1.46 2016/05/03 12:34:27 taca Exp $
2bin/doveadm 2bin/doveadm
3bin/doveconf 3bin/doveconf
4bin/dsync 4bin/dsync
5include/dovecot/abspath.h 5include/dovecot/abspath.h
6include/dovecot/access-lookup.h 6include/dovecot/access-lookup.h
7include/dovecot/acl-api-private.h 7include/dovecot/acl-api-private.h
8include/dovecot/acl-api.h 8include/dovecot/acl-api.h
9include/dovecot/acl-cache.h 9include/dovecot/acl-cache.h
10include/dovecot/acl-global-file.h 10include/dovecot/acl-global-file.h
11include/dovecot/acl-lookup-dict.h 11include/dovecot/acl-lookup-dict.h
12include/dovecot/acl-plugin.h 12include/dovecot/acl-plugin.h
13include/dovecot/acl-storage.h 13include/dovecot/acl-storage.h
14include/dovecot/anvil-client.h 14include/dovecot/anvil-client.h
@@ -263,27 +263,27 @@ include/dovecot/istream-private.h @@ -263,27 +263,27 @@ include/dovecot/istream-private.h
263include/dovecot/istream-qp.h 263include/dovecot/istream-qp.h
264include/dovecot/istream-raw-mbox.h 264include/dovecot/istream-raw-mbox.h
265include/dovecot/istream-rawlog.h 265include/dovecot/istream-rawlog.h
266include/dovecot/istream-seekable.h 266include/dovecot/istream-seekable.h
267include/dovecot/istream-sized.h 267include/dovecot/istream-sized.h
268include/dovecot/istream-tee.h 268include/dovecot/istream-tee.h
269include/dovecot/istream-timeout.h 269include/dovecot/istream-timeout.h
270include/dovecot/istream-unix.h 270include/dovecot/istream-unix.h
271include/dovecot/istream-zlib.h 271include/dovecot/istream-zlib.h
272include/dovecot/istream.h 272include/dovecot/istream.h
273include/dovecot/json-parser.h 273include/dovecot/json-parser.h
274include/dovecot/json-tree.h 274include/dovecot/json-tree.h
275include/dovecot/lda-settings.h 275include/dovecot/lda-settings.h
276include/dovecot/ldap-client.h 276${PLIST.ldap}include/dovecot/ldap-client.h
277include/dovecot/lib-signals.h 277include/dovecot/lib-signals.h
278include/dovecot/lib.h 278include/dovecot/lib.h
279include/dovecot/llist.h 279include/dovecot/llist.h
280include/dovecot/lmtp-client.h 280include/dovecot/lmtp-client.h
281include/dovecot/login-common.h 281include/dovecot/login-common.h
282include/dovecot/login-proxy-state.h 282include/dovecot/login-proxy-state.h
283include/dovecot/login-proxy.h 283include/dovecot/login-proxy.h
284include/dovecot/login-settings.h 284include/dovecot/login-settings.h
285include/dovecot/macros.h 285include/dovecot/macros.h
286include/dovecot/mail-autoexpunge.h 286include/dovecot/mail-autoexpunge.h
287include/dovecot/mail-cache-private.h 287include/dovecot/mail-cache-private.h
288include/dovecot/mail-cache.h 288include/dovecot/mail-cache.h
289include/dovecot/mail-copy.h 289include/dovecot/mail-copy.h
@@ -510,27 +510,27 @@ include/dovecot/unix-socket-create.h @@ -510,27 +510,27 @@ include/dovecot/unix-socket-create.h
510include/dovecot/unlink-directory.h 510include/dovecot/unlink-directory.h
511include/dovecot/unlink-old-files.h 511include/dovecot/unlink-old-files.h
512include/dovecot/uri-util.h 512include/dovecot/uri-util.h
513include/dovecot/userdb-blocking.h 513include/dovecot/userdb-blocking.h
514include/dovecot/userdb-template.h 514include/dovecot/userdb-template.h
515include/dovecot/userdb-vpopmail.h 515include/dovecot/userdb-vpopmail.h
516include/dovecot/userdb.h 516include/dovecot/userdb.h
517include/dovecot/utc-mktime.h 517include/dovecot/utc-mktime.h
518include/dovecot/utc-offset.h 518include/dovecot/utc-offset.h
519include/dovecot/var-expand.h 519include/dovecot/var-expand.h
520include/dovecot/wildcard-match.h 520include/dovecot/wildcard-match.h
521include/dovecot/write-full.h 521include/dovecot/write-full.h
522lib/dovecot/auth/libauthdb_imap.la 522lib/dovecot/auth/libauthdb_imap.la
523lib/dovecot/dict/libdict_ldap.la 523${PLIST.ldap}lib/dovecot/dict/libdict_ldap.la
524lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la 524lib/dovecot/doveadm/lib10_doveadm_acl_plugin.la
525lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la 525lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
526lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la 526lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
527lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la 527lib/dovecot/doveadm/lib20_doveadm_fts_plugin.la
528lib/dovecot/dovecot-config 528lib/dovecot/dovecot-config
529lib/dovecot/lib01_acl_plugin.la 529lib/dovecot/lib01_acl_plugin.la
530lib/dovecot/lib02_imap_acl_plugin.la 530lib/dovecot/lib02_imap_acl_plugin.la
531lib/dovecot/lib02_lazy_expunge_plugin.la 531lib/dovecot/lib02_lazy_expunge_plugin.la
532lib/dovecot/lib05_pop3_migration_plugin.la 532lib/dovecot/lib05_pop3_migration_plugin.la
533lib/dovecot/lib05_snarf_plugin.la 533lib/dovecot/lib05_snarf_plugin.la
534lib/dovecot/lib10_last_login_plugin.la 534lib/dovecot/lib10_last_login_plugin.la
535lib/dovecot/lib10_mail_filter_plugin.la 535lib/dovecot/lib10_mail_filter_plugin.la
536lib/dovecot/lib10_quota_plugin.la 536lib/dovecot/lib10_quota_plugin.la
@@ -546,27 +546,27 @@ lib/dovecot/lib20_mailbox_alias_plugin.l @@ -546,27 +546,27 @@ lib/dovecot/lib20_mailbox_alias_plugin.l
546lib/dovecot/lib20_push_notification_plugin.la 546lib/dovecot/lib20_push_notification_plugin.la
547lib/dovecot/lib20_quota_clone_plugin.la 547lib/dovecot/lib20_quota_clone_plugin.la
548lib/dovecot/lib20_replication_plugin.la 548lib/dovecot/lib20_replication_plugin.la
549lib/dovecot/lib20_virtual_plugin.la 549lib/dovecot/lib20_virtual_plugin.la
550lib/dovecot/lib20_zlib_plugin.la 550lib/dovecot/lib20_zlib_plugin.la
551lib/dovecot/lib21_fts_squat_plugin.la 551lib/dovecot/lib21_fts_squat_plugin.la
552lib/dovecot/lib30_imap_zlib_plugin.la 552lib/dovecot/lib30_imap_zlib_plugin.la
553lib/dovecot/lib90_stats_plugin.la 553lib/dovecot/lib90_stats_plugin.la
554lib/dovecot/lib95_imap_stats_plugin.la 554lib/dovecot/lib95_imap_stats_plugin.la
555lib/dovecot/libdovecot-compression.la 555lib/dovecot/libdovecot-compression.la
556lib/dovecot/libdovecot-dsync.la 556lib/dovecot/libdovecot-dsync.la
557lib/dovecot/libdovecot-fts.la 557lib/dovecot/libdovecot-fts.la
558lib/dovecot/libdovecot-lda.la 558lib/dovecot/libdovecot-lda.la
559lib/dovecot/libdovecot-ldap.la 559${PLIST.ldap}lib/dovecot/libdovecot-ldap.la
560lib/dovecot/libdovecot-login.la 560lib/dovecot/libdovecot-login.la
561lib/dovecot/libdovecot-sql.la 561lib/dovecot/libdovecot-sql.la
562lib/dovecot/libdovecot-storage.la 562lib/dovecot/libdovecot-storage.la
563lib/dovecot/libdovecot.la 563lib/dovecot/libdovecot.la
564lib/dovecot/libfs_compress.la 564lib/dovecot/libfs_compress.la
565${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la 565${PLIST.ssl}lib/dovecot/libssl_iostream_openssl.la
566lib/dovecot/stats/libstats_auth.la 566lib/dovecot/stats/libstats_auth.la
567lib/dovecot/stats/libstats_mail.la 567lib/dovecot/stats/libstats_mail.la
568libexec/dovecot/aggregator 568libexec/dovecot/aggregator
569libexec/dovecot/anvil 569libexec/dovecot/anvil
570libexec/dovecot/auth 570libexec/dovecot/auth
571libexec/dovecot/checkpassword-reply 571libexec/dovecot/checkpassword-reply
572libexec/dovecot/config 572libexec/dovecot/config
cvs diff -r1.8 -r1.9 pkgsrc/mail/dovecot2/options.mk (expand / switch to unified 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,25 +1,25 @@ @@ -1,25 +1,25 @@
1# $NetBSD: options.mk,v 1.8 2015/02/19 09:48:27 taca Exp $ 1# $NetBSD: options.mk,v 1.9 2016/05/03 12:34:27 taca Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot 3PKG_OPTIONS_VAR= PKG_OPTIONS.dovecot
4PKG_SUPPORTED_OPTIONS= gssapi kqueue ldap mysql pam pgsql sqlite tcpwrappers 4PKG_SUPPORTED_OPTIONS= gssapi kqueue ldap mysql pam pgsql sqlite tcpwrappers
5PKG_OPTIONS_OPTIONAL_GROUPS= ssl 5PKG_OPTIONS_OPTIONAL_GROUPS= ssl
6PKG_OPTIONS_GROUP.ssl= gnutls ssl 6PKG_OPTIONS_GROUP.ssl= gnutls ssl
7PKG_SUGGESTED_OPTIONS= pam sqlite ssl tcpwrappers 7PKG_SUGGESTED_OPTIONS= pam sqlite ssl tcpwrappers
8 8
9.if defined(PKG_HAVE_KQUEUE) 9.if defined(PKG_HAVE_KQUEUE)
10PKG_SUGGESTED_OPTIONS+= kqueue 10PKG_SUGGESTED_OPTIONS+= kqueue
11.endif 11.endif
12PLIST_VARS+= ssl tcpwrappers 12PLIST_VARS+= ldap ssl tcpwrappers
13 13
14.include "../../mk/bsd.options.mk" 14.include "../../mk/bsd.options.mk"
15 15
16### 16###
17### Build with OpenSSL or GNU TLS as the underlying crypto library 17### Build with OpenSSL or GNU TLS as the underlying crypto library
18### 18###
19.if !empty(PKG_OPTIONS:Mssl) 19.if !empty(PKG_OPTIONS:Mssl)
20CONFIGURE_ARGS+= --with-ssl=openssl 20CONFIGURE_ARGS+= --with-ssl=openssl
21CONFIGURE_ENV+= SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include" 21CONFIGURE_ENV+= SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
22CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto" 22CONFIGURE_ENV+= SSL_LIBS="-lssl -lcrypto"
23BUILDLINK_API_DEPENDS.openssl+=openssl>=0.9.8a 23BUILDLINK_API_DEPENDS.openssl+=openssl>=0.9.8a
24. include "../../security/openssl/buildlink3.mk" 24. include "../../security/openssl/buildlink3.mk"
25PLIST.ssl= yes 25PLIST.ssl= yes
@@ -43,26 +43,27 @@ CONFIGURE_ARGS+= --with-mysql @@ -43,26 +43,27 @@ CONFIGURE_ARGS+= --with-mysql
43### 43###
44.if !empty(PKG_OPTIONS:Mpgsql) 44.if !empty(PKG_OPTIONS:Mpgsql)
45CONFIGURE_ARGS+= --with-pgsql 45CONFIGURE_ARGS+= --with-pgsql
46CPPFLAGS+= -I${BUILDLINK_DIR}/include/pgsql 46CPPFLAGS+= -I${BUILDLINK_DIR}/include/pgsql
47. include "../../mk/pgsql.buildlink3.mk" 47. include "../../mk/pgsql.buildlink3.mk"
48.endif 48.endif
49 49
50### 50###
51### LDAP directory support 51### LDAP directory support
52### 52###
53.if !empty(PKG_OPTIONS:Mldap) 53.if !empty(PKG_OPTIONS:Mldap)
54CONFIGURE_ARGS+= --with-ldap 54CONFIGURE_ARGS+= --with-ldap
55. include "../../databases/openldap-client/buildlink3.mk" 55. include "../../databases/openldap-client/buildlink3.mk"
 56PLIST.ldap= yes
56.endif 57.endif
57 58
58### 59###
59### PAM support 60### PAM support
60### 61###
61.if !empty(PKG_OPTIONS:Mpam) 62.if !empty(PKG_OPTIONS:Mpam)
62CONFIGURE_ARGS+= --with-pam 63CONFIGURE_ARGS+= --with-pam
63. include "../../mk/pam.buildlink3.mk" 64. include "../../mk/pam.buildlink3.mk"
64.else 65.else
65CONFIGURE_ARGS+= --without-pam 66CONFIGURE_ARGS+= --without-pam
66.endif 67.endif
67 68
68### 69###