--- b/mail/dovecot-fts-xapian/Makefile	
+++ b/mail/dovecot-fts-xapian/Makefile	
@@ -1,6 +1,7 @@ 
 PORTNAME=	fts-xapian
 DISTVERSION=	1.4.9
 DISTVERSIONSUFFIX=	b
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
--- b/mail/dovecot-pigeonhole/Makefile	
+++ b/mail/dovecot-pigeonhole/Makefile	
@@ -2,6 +2,7 @@ 
 
 PORTNAME=	dovecot-pigeonhole
 PORTVERSION=	0.5.13
+PORTREVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
--- b/mail/dovecot/Makefile	
+++ b/mail/dovecot/Makefile	
@@ -7,8 +7,7 @@ 
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.3.13
-PORTREVISION=	1
+PORTVERSION=	2.3.15
 CATEGORIES=	mail
 MASTER_SITES=	https://dovecot.org/releases/2.3/
 
--- b/mail/dovecot/distinfo	
+++ b/mail/dovecot/distinfo	
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1609941410
-SHA256 (dovecot-2.3.13.tar.gz) = a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
-SIZE (dovecot-2.3.13.tar.gz) = 7456073
+TIMESTAMP = 1624907936
+SHA256 (dovecot-2.3.15.tar.gz) = 21bbdd5d45957a99133de8b7e71813ecb73d9476c89dfc63479e9102b3553590
+SIZE (dovecot-2.3.15.tar.gz) = 7608561
--- b/mail/dovecot/files/patch-configure	
+++ b/mail/dovecot/files/patch-configure	
@@ -1,15 +1,15 @@ 
---- configure.orig	2020-12-22 13:27:02 UTC
+--- configure.orig	2021-06-14 13:40:48 UTC
 +++ configure
-@@ -26053,7 +26053,7 @@ fi
- $as_echo "$with_lua" >&6; }
+@@ -26321,7 +26321,7 @@ $as_echo "$with_lua" >&6; }
  
-   if test "x$with_lua" != "xno"; then :
--  for LUAPC in lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
-+  for LUAPC in lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.2 lua-5.2 lua52 lua5.1 lua-5.1 lua51 lua; do
+ else
+ 
+-      for LUAPC in lua5.3 lua-5.3 lua53 lua5.1 lua-5.1 lua51 lua; do
++      for LUAPC in lua5.4 lua-5.4 lua54 lua5.3 lua-5.3 lua53 lua5.1 lua-5.1 lua51 lua; do
  
  pkg_failed=no
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LUA" >&5
-@@ -29355,13 +29355,13 @@ fi
+@@ -29748,13 +29748,13 @@ fi
  
  
    if test $want_stemmer != no; then
--- a/mail/dovecot/files/patch-src_plugins_fts-solr_solr-connection.c	
+++ /dev/null	
@@ -1,11 +0,0 @@ 
---- src/plugins/fts-solr/solr-connection.c.orig	2020-08-12 12:20:41 UTC
-+++ src/plugins/fts-solr/solr-connection.c
-@@ -103,7 +103,7 @@ int solr_connection_init(const struct fts_solr_setting
- 		http_set.ssl = ssl_client_set;
- 		http_set.debug = solr_set->debug;
- 		http_set.rawlog_dir = solr_set->rawlog_dir;
--		solr_http_client = http_client_init(&http_set);
-+		solr_http_client = http_client_init_private(&http_set);
- 	}
- 
- 	*conn_r = conn;
--- a/mail/dovecot/files/patch-src_plugins_fts_fts-parser-tika.c	
+++ /dev/null	
@@ -1,11 +0,0 @@ 
---- src/plugins/fts/fts-parser-tika.c.orig	2019-01-02 22:11:26 UTC
-+++ src/plugins/fts/fts-parser-tika.c
-@@ -77,7 +77,7 @@ tika_get_http_client_url(struct mail_user *user, struc
- 		http_set.request_timeout_msecs = 60*1000;
- 		http_set.ssl = &ssl_set;
- 		http_set.debug = user->mail_debug;
--		tika_http_client = http_client_init(&http_set);
-+		tika_http_client = http_client_init_private(&http_set);
- 	}
- 	*http_url_r = tuser->http_url;
- 	return 0;
--- b/mail/dovecot/files/pkg-message.in	
+++ b/mail/dovecot/files/pkg-message.in	
@@ -38,4 +38,10 @@ 
      %%ETCDIR%%/examples-config/
 EOM
 }
+{ type: remove
+  message: <<EOM
+ If you are removing dovecot permanently, you should 'rm -rf
+ /var/db/dovecot' to clear out any remaining data.
+EOM
+}
 ]
--- b/mail/dovecot/pkg-plist	
+++ b/mail/dovecot/pkg-plist	
@@ -1,23 +1,14 @@ 
-@postunexec echo "If you are removing dovecot permanently, you should 'rm -rf /var/db/dovecot' to clear out any remaining data."
-%%DATADIR%%/stopwords/stopwords_da.txt
-%%DATADIR%%/stopwords/stopwords_de.txt
-%%DATADIR%%/stopwords/stopwords_en.txt
-%%DATADIR%%/stopwords/stopwords_es.txt
-%%DATADIR%%/stopwords/stopwords_fi.txt
-%%DATADIR%%/stopwords/stopwords_fr.txt
-%%DATADIR%%/stopwords/stopwords_it.txt
-%%DATADIR%%/stopwords/stopwords_nl.txt
-%%DATADIR%%/stopwords/stopwords_no.txt
-%%DATADIR%%/stopwords/stopwords_pt.txt
-%%DATADIR%%/stopwords/stopwords_ro.txt
-%%DATADIR%%/stopwords/stopwords_ru.txt
-%%DATADIR%%/stopwords/stopwords_sv.txt
-%%DATADIR%%/stopwords/stopwords_tr.txt
+bin/doveadm
+bin/doveconf
+bin/dovecot-sysreport
+bin/dsync
+%%ETCDIR%%/README
 %%ETCDIR%%/example-config/conf.d/10-auth.conf
 %%ETCDIR%%/example-config/conf.d/10-director.conf
 %%ETCDIR%%/example-config/conf.d/10-logging.conf
 %%ETCDIR%%/example-config/conf.d/10-mail.conf
 %%ETCDIR%%/example-config/conf.d/10-master.conf
+%%ETCDIR%%/example-config/conf.d/10-metrics.conf
 %%ETCDIR%%/example-config/conf.d/10-ssl.conf
 %%ETCDIR%%/example-config/conf.d/15-lda.conf
 %%ETCDIR%%/example-config/conf.d/15-mailboxes.conf
@@ -43,31 +34,6 @@ 
 %%ETCDIR%%/example-config/dovecot-oauth2.conf.ext
 %%ETCDIR%%/example-config/dovecot-sql.conf.ext
 %%ETCDIR%%/example-config/dovecot.conf
-%%ETCDIR%%/README
-%%LDAP%%include/dovecot/ldap-client.h
-%%LDAP%%lib/dovecot/libdovecot-ldap.a
-%%LDAP%%lib/dovecot/libdovecot-ldap.so
-%%LDAP%%lib/dovecot/libdovecot-ldap.so.0
-%%LDAP%%lib/dovecot/libdovecot-ldap.so.0.0.0
-%%LIBWRAP%%libexec/dovecot/tcpwrap
-%%LUA%%lib/dovecot/lib01_mail_lua_plugin.a
-%%LUA%%lib/dovecot/lib01_mail_lua_plugin.so
-%%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.a
-%%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.so
-%%LUA%%include/dovecot/dlua-script-private.h
-%%LUA%%include/dovecot/dlua-script.h
-%%LUA%%include/dovecot/mail-lua-plugin.h
-%%LUA%%include/dovecot/mail-storage-lua.h
-%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a
-%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so
-%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a
-%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.so
-%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.a
-%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so
-bin/doveadm
-bin/doveconf
-bin/dovecot-sysreport
-bin/dsync
 include/dovecot/access-lookup.h
 include/dovecot/acl-api-private.h
 include/dovecot/acl-api.h
@@ -122,9 +88,8 @@ include/dovecot/config-parser.h
 include/dovecot/config-request.h
 include/dovecot/config.h
 include/dovecot/connection.h
+include/dovecot/cpu-limit.h
 include/dovecot/crc32.h
-include/dovecot/cydir-storage.h
-include/dovecot/cydir-sync.h
 include/dovecot/data-stack.h
 include/dovecot/db-checkpassword.h
 include/dovecot/db-dict.h
@@ -141,9 +106,15 @@ include/dovecot/dcrypt-iostream.h
 include/dovecot/dcrypt-private.h
 include/dovecot/dcrypt.h
 include/dovecot/dict-client.h
+%%LUA%%include/dovecot/dict-lua-private.h
+%%LUA%%include/dovecot/dict-lua.h
 include/dovecot/dict-private.h
 include/dovecot/dict-transaction-memory.h
 include/dovecot/dict.h
+%%LUA%%include/dovecot/dlua-compat.h
+%%LUA%%include/dovecot/dlua-script-private.h
+%%LUA%%include/dovecot/dlua-script.h
+%%LUA%%include/dovecot/dlua-wrapper.h
 include/dovecot/dns-lookup.h
 include/dovecot/dns-util.h
 include/dovecot/doveadm-cmd.h
@@ -205,6 +176,7 @@ include/dovecot/fts-tokenizer-generic-private.h
 include/dovecot/fts-tokenizer-private.h
 include/dovecot/fts-tokenizer.h
 include/dovecot/fts-user.h
+include/dovecot/fuzzer.h
 include/dovecot/guid.h
 include/dovecot/hash-decl.h
 include/dovecot/hash-format.h
@@ -358,6 +330,7 @@ include/dovecot/istream.h
 include/dovecot/json-parser.h
 include/dovecot/json-tree.h
 include/dovecot/lda-settings.h
+%%LDAP%%include/dovecot/ldap-client.h
 include/dovecot/lib-event-private.h
 include/dovecot/lib-event.h
 include/dovecot/lib-signals.h
@@ -391,6 +364,7 @@ include/dovecot/mail-index-transaction-private.h
 include/dovecot/mail-index-util.h
 include/dovecot/mail-index-view-private.h
 include/dovecot/mail-index.h
+%%LUA%%include/dovecot/mail-lua-plugin.h
 include/dovecot/mail-namespace.h
 include/dovecot/mail-search-build.h
 include/dovecot/mail-search-mime-build.h
@@ -402,6 +376,8 @@ include/dovecot/mail-search-register.h
 include/dovecot/mail-search.h
 include/dovecot/mail-send.h
 include/dovecot/mail-storage-hooks.h
+%%LUA%%include/dovecot/mail-storage-lua-private.h
+%%LUA%%include/dovecot/mail-storage-lua.h
 include/dovecot/mail-storage-private.h
 include/dovecot/mail-storage-service.h
 include/dovecot/mail-storage-settings.h
@@ -639,6 +615,7 @@ include/dovecot/submission-settings.h
 include/dovecot/subscription-file.h
 include/dovecot/syslog-util.h
 include/dovecot/test-common.h
+include/dovecot/test-mail-storage-common.h
 include/dovecot/test-subprocess.h
 include/dovecot/time-util.h
 include/dovecot/unichar.h
@@ -661,10 +638,10 @@ lib/dovecot/auth/libauthdb_imap.a
 lib/dovecot/auth/libauthdb_imap.so
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.a
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
-lib/dovecot/doveadm/lib10_doveadm_expire_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
+%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a
+%%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so
 lib/dovecot/doveadm/lib20_doveadm_fts_plugin.a
 lib/dovecot/doveadm/lib20_doveadm_fts_plugin.so
 lib/dovecot/doveadm/libdoveadm_mail_crypt_plugin.a
@@ -672,6 +649,8 @@ lib/dovecot/doveadm/libdoveadm_mail_crypt_plugin.so
 lib/dovecot/dovecot-config
 lib/dovecot/lib01_acl_plugin.a
 lib/dovecot/lib01_acl_plugin.so
+%%LUA%%lib/dovecot/lib01_mail_lua_plugin.a
+%%LUA%%lib/dovecot/lib01_mail_lua_plugin.so
 lib/dovecot/lib02_imap_acl_plugin.a
 lib/dovecot/lib02_imap_acl_plugin.so
 lib/dovecot/lib02_lazy_expunge_plugin.a
@@ -680,14 +659,10 @@ lib/dovecot/lib05_mail_crypt_acl_plugin.a
 lib/dovecot/lib05_mail_crypt_acl_plugin.so
 lib/dovecot/lib05_pop3_migration_plugin.a
 lib/dovecot/lib05_pop3_migration_plugin.so
-lib/dovecot/lib05_snarf_plugin.a
-lib/dovecot/lib05_snarf_plugin.so
 lib/dovecot/lib10_last_login_plugin.a
 lib/dovecot/lib10_last_login_plugin.so
 lib/dovecot/lib10_mail_crypt_plugin.a
 lib/dovecot/lib10_mail_crypt_plugin.so
-lib/dovecot/lib10_mail_filter_plugin.a
-lib/dovecot/lib10_mail_filter_plugin.so
 lib/dovecot/lib10_quota_plugin.a
 lib/dovecot/lib10_quota_plugin.so
 lib/dovecot/lib11_imap_quota_plugin.a
@@ -696,12 +671,8 @@ lib/dovecot/lib11_trash_plugin.a
 lib/dovecot/lib11_trash_plugin.so
 lib/dovecot/lib15_notify_plugin.a
 lib/dovecot/lib15_notify_plugin.so
-lib/dovecot/lib20_autocreate_plugin.a
-lib/dovecot/lib20_autocreate_plugin.so
 lib/dovecot/lib20_charset_alias_plugin.a
 lib/dovecot/lib20_charset_alias_plugin.so
-lib/dovecot/lib20_expire_plugin.a
-lib/dovecot/lib20_expire_plugin.so
 lib/dovecot/lib20_fts_plugin.a
 lib/dovecot/lib20_fts_plugin.so
 lib/dovecot/lib20_listescape_plugin.a
@@ -724,8 +695,14 @@ lib/dovecot/lib20_virtual_plugin.a
 lib/dovecot/lib20_virtual_plugin.so
 lib/dovecot/lib20_zlib_plugin.a
 lib/dovecot/lib20_zlib_plugin.so
+%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.a
+%%LUCENE%%lib/dovecot/lib21_fts_lucene_plugin.so
+%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.a
+%%SOLR%%lib/dovecot/lib21_fts_solr_plugin.so
 lib/dovecot/lib21_fts_squat_plugin.a
 lib/dovecot/lib21_fts_squat_plugin.so
+%%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.a
+%%LUA%%lib/dovecot/lib22_push_notification_lua_plugin.so
 lib/dovecot/lib30_imap_zlib_plugin.a
 lib/dovecot/lib30_imap_zlib_plugin.so
 lib/dovecot/lib90_old_stats_plugin.a
@@ -752,14 +729,26 @@ lib/dovecot/libdovecot-lda.a
 lib/dovecot/libdovecot-lda.so
 lib/dovecot/libdovecot-lda.so.0
 lib/dovecot/libdovecot-lda.so.0.0.0
+%%LDAP%%lib/dovecot/libdovecot-ldap.a
+%%LDAP%%lib/dovecot/libdovecot-ldap.so
+%%LDAP%%lib/dovecot/libdovecot-ldap.so.0
+%%LDAP%%lib/dovecot/libdovecot-ldap.so.0.0.0
 lib/dovecot/libdovecot-login.a
 lib/dovecot/libdovecot-login.so
 lib/dovecot/libdovecot-login.so.0
 lib/dovecot/libdovecot-login.so.0.0.0
+%%LUA%%lib/dovecot/libdovecot-lua.a
+%%LUA%%lib/dovecot/libdovecot-lua.so
+%%LUA%%lib/dovecot/libdovecot-lua.so.0
+%%LUA%%lib/dovecot/libdovecot-lua.so.0.0.0
 lib/dovecot/libdovecot-sql.a
 lib/dovecot/libdovecot-sql.so
 lib/dovecot/libdovecot-sql.so.0
 lib/dovecot/libdovecot-sql.so.0.0.0
+%%LUA%%lib/dovecot/libdovecot-storage-lua.a
+%%LUA%%lib/dovecot/libdovecot-storage-lua.so
+%%LUA%%lib/dovecot/libdovecot-storage-lua.so.0
+%%LUA%%lib/dovecot/libdovecot-storage-lua.so.0.0.0
 lib/dovecot/libdovecot-storage.a
 lib/dovecot/libdovecot-storage.so
 lib/dovecot/libdovecot-storage.so.0
@@ -817,6 +806,7 @@ libexec/dovecot/script-login
 libexec/dovecot/stats
 libexec/dovecot/submission
 libexec/dovecot/submission-login
+%%LIBWRAP%%libexec/dovecot/tcpwrap
 libexec/dovecot/xml2text
 man/man1/deliver.1.gz
 man/man1/doveadm-acl.1.gz
@@ -869,3 +859,17 @@ man/man1/dsync.1.gz
 man/man7/doveadm-search-query.7.gz
 sbin/dovecot
 share/aclocal/dovecot.m4
+%%DATADIR%%/stopwords/stopwords_da.txt
+%%DATADIR%%/stopwords/stopwords_de.txt
+%%DATADIR%%/stopwords/stopwords_en.txt
+%%DATADIR%%/stopwords/stopwords_es.txt
+%%DATADIR%%/stopwords/stopwords_fi.txt
+%%DATADIR%%/stopwords/stopwords_fr.txt
+%%DATADIR%%/stopwords/stopwords_it.txt
+%%DATADIR%%/stopwords/stopwords_nl.txt
+%%DATADIR%%/stopwords/stopwords_no.txt
+%%DATADIR%%/stopwords/stopwords_pt.txt
+%%DATADIR%%/stopwords/stopwords_ro.txt
+%%DATADIR%%/stopwords/stopwords_ru.txt
+%%DATADIR%%/stopwords/stopwords_sv.txt
+%%DATADIR%%/stopwords/stopwords_tr.txt