Index: mail/dovecot/Makefile
===================================================================
--- mail/dovecot/Makefile	(revision 560298)
+++ mail/dovecot/Makefile	(working copy)
@@ -8,8 +8,7 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.3.11.3
-PORTREVISION=	1
+PORTVERSION=	2.3.13
 CATEGORIES=	mail
 MASTER_SITES=	https://dovecot.org/releases/2.3/
 
@@ -37,7 +36,7 @@
 USERS=		dovecot dovenull
 GROUPS=		${USERS}
 
-OPTIONS_DEFINE=	LIBSODIUM LIBWRAP LUA LZ4 VPOPMAIL DOCS EXAMPLES
+OPTIONS_DEFINE=	LIBSODIUM LIBWRAP LUA LZ4 DOCS EXAMPLES
 OPTIONS_DEFAULT=GSSAPI_NONE LIBWRAP
 OPTIONS_SUB=	yes
 
@@ -49,7 +48,6 @@
 OPTIONS_SINGLE_GSSAPI=	GSSAPI_NONE GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT
 
 LZ4_DESC=	LZ4 compression support
-VPOPMAIL_DESC=	vpopmail support
 
 DB_DESC=	Database support
 CDB_DESC=	CDB database support
@@ -78,9 +76,6 @@
 LZ4_CONFIGURE_WITH=	lz4
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 
-VPOPMAIL_BUILD_DEPENDS=	vpopmail>=0:mail/vpopmail
-VPOPMAIL_CONFIGURE_WITH=vpopmail
-
 # Databases
 CDB_CONFIGURE_WITH=	cdb
 CDB_LIB_DEPENDS=	libcdb.so:databases/tinycdb
Index: mail/dovecot/distinfo
===================================================================
--- mail/dovecot/distinfo	(revision 560298)
+++ mail/dovecot/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597259906
-SHA256 (dovecot-2.3.11.3.tar.gz) = d3d9ea9010277f57eb5b9f4166a5d2ba539b172bd6d5a2b2529a6db524baafdc
-SIZE (dovecot-2.3.11.3.tar.gz) = 7353412
+TIMESTAMP = 1609774767
+SHA256 (dovecot-2.3.13.tar.gz) = a3f875b80ec11a452480690108660030978c94fa8e796ad6d943a874b496f1c4
+SIZE (dovecot-2.3.13.tar.gz) = 7456073
Index: mail/dovecot/pkg-plist
===================================================================
--- mail/dovecot/pkg-plist	(revision 560298)
+++ mail/dovecot/pkg-plist	(working copy)
@@ -37,10 +37,10 @@
 %%ETCDIR%%/example-config/conf.d/auth-sql.conf.ext
 %%ETCDIR%%/example-config/conf.d/auth-static.conf.ext
 %%ETCDIR%%/example-config/conf.d/auth-system.conf.ext
-%%ETCDIR%%/example-config/conf.d/auth-vpopmail.conf.ext
 %%ETCDIR%%/example-config/dovecot-dict-auth.conf.ext
 %%ETCDIR%%/example-config/dovecot-dict-sql.conf.ext
 %%ETCDIR%%/example-config/dovecot-ldap.conf.ext
+%%ETCDIR%%/example-config/dovecot-oauth2.conf.ext
 %%ETCDIR%%/example-config/dovecot-sql.conf.ext
 %%ETCDIR%%/example-config/dovecot.conf
 %%ETCDIR%%/README
@@ -164,6 +164,8 @@
 include/dovecot/dsync-ibc.h
 include/dovecot/eacces-error.h
 include/dovecot/env-util.h
+include/dovecot/event-filter-parser.h
+include/dovecot/event-filter-private.h
 include/dovecot/event-filter.h
 include/dovecot/event-log.h
 include/dovecot/execv-const.h
@@ -470,7 +472,7 @@
 include/dovecot/mdbox-storage.h
 include/dovecot/mdbox-sync.h
 include/dovecot/mech-digest-md5-private.h
-include/dovecot/mech-otp-skey-common.h
+include/dovecot/mech-otp-common.h
 include/dovecot/mech-plain-common.h
 include/dovecot/mech-scram.h
 include/dovecot/mech.h
@@ -637,6 +639,7 @@
 include/dovecot/subscription-file.h
 include/dovecot/syslog-util.h
 include/dovecot/test-common.h
+include/dovecot/test-subprocess.h
 include/dovecot/time-util.h
 include/dovecot/unichar.h
 include/dovecot/unix-socket-create.h
@@ -645,7 +648,6 @@
 include/dovecot/uri-util.h
 include/dovecot/userdb-blocking.h
 include/dovecot/userdb-template.h
-include/dovecot/userdb-vpopmail.h
 include/dovecot/userdb.h
 include/dovecot/utc-mktime.h
 include/dovecot/utc-offset.h
Index: mail/dovecot-fts-xapian/Makefile
===================================================================
--- mail/dovecot-fts-xapian/Makefile	(revision 560298)
+++ mail/dovecot-fts-xapian/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	fts-xapian
 PORTVERSION=	1.4.4
+PORTREVISION=	1
 CATEGORIES=	mail
 PKGNAMEPREFIX=	dovecot-
 
Index: mail/dovecot-pigeonhole/Makefile
===================================================================
--- mail/dovecot-pigeonhole/Makefile	(revision 560298)
+++ mail/dovecot-pigeonhole/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot-pigeonhole
-PORTVERSION=	0.5.11
+PORTVERSION=	0.5.13
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
Index: mail/dovecot-pigeonhole/distinfo
===================================================================
--- mail/dovecot-pigeonhole/distinfo	(revision 560298)
+++ mail/dovecot-pigeonhole/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1597360057
-SHA256 (dovecot-2.3-pigeonhole-0.5.11.tar.gz) = 0b972a441f680545ddfacd2f41fb2a705fb03249d46ed5ce7e01fe68b6cfb5f0
-SIZE (dovecot-2.3-pigeonhole-0.5.11.tar.gz) = 1912411
+TIMESTAMP = 1609775237
+SHA256 (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 911fe566da5b638eab1b11105314300bc9049cc3832d4bd2aed44c265013bf17
+SIZE (dovecot-2.3-pigeonhole-0.5.13.tar.gz) = 1908839