Index: Makefile
===================================================================
--- Makefile	(revision 458743)
+++ Makefile	(working copy)
@@ -12,10 +12,9 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.33.2
-PORTREVISION=	2
+PORTVERSION=	2.3.0
 CATEGORIES=	mail ipv6
-MASTER_SITES=	https://www.dovecot.org/releases/2.2/
+MASTER_SITES=	https://www.dovecot.org/releases/2.3/
 
 MAINTAINER=	adamw@FreeBSD.org
 COMMENT=	Secure, fast and powerful IMAP and POP3 server
@@ -28,6 +27,8 @@
 USES=		cpe iconv libtool ssl
 USE_RC_SUBR=	dovecot
 
+WRKSRC=		${WRKDIR}/${PORTNAME}-ce-${PORTVERSION}
+
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
 		--with-statedir=/var/db/dovecot \
Index: distinfo
===================================================================
--- distinfo	(revision 458743)
+++ distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1508511506
-SHA256 (dovecot-2.2.33.2.tar.gz) = fe1e3b78609a56ee22fc209077e4b75348fa1bbd54c46f52bde2472a4c4cee84
-SIZE (dovecot-2.2.33.2.tar.gz) = 6131086
+TIMESTAMP = 1515683307
+SHA256 (dovecot-2.3.0.tar.gz) = de60cb470d025e4dd0f8e8fbbb4b9316dfd4930eb949d307330669ffbeaf8581
+SIZE (dovecot-2.3.0.tar.gz) = 6635541
Index: files/patch-src_doveadm_Makefile.am
===================================================================
--- files/patch-src_doveadm_Makefile.am	(revision 458743)
+++ files/patch-src_doveadm_Makefile.am	(working copy)
@@ -1,13 +0,0 @@
---- src/doveadm/Makefile.am.orig	2017-10-11 17:29:32 UTC
-+++ src/doveadm/Makefile.am
-@@ -180,8 +180,8 @@ test_libs = \
- 	../lib/liblib.la
- test_deps = $(noinst_LTLIBRARIES) $(test_libs)
- 
--test_doveadm_util_SOURCES = test-doveadm-util.c
--test_doveadm_util_LDADD = doveadm-util.o $(test_libs) $(MODULE_LIBS)
-+test_doveadm_util_SOURCES = doveadm-util.c test-doveadm-util.c
-+test_doveadm_util_LDADD = $(test_libs) $(MODULE_LIBS)
- test_doveadm_util_DEPENDENCIES = $(test_deps)
- 
- check: check-am check-test
Index: pkg-plist
===================================================================
--- pkg-plist	(revision 458743)
+++ pkg-plist	(working copy)
@@ -1,6 +1,7 @@
 bin/doveadm
 bin/doveconf
 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
@@ -12,6 +13,7 @@
 %%ETCDIR%%/example-config/conf.d/20-imap.conf
 %%ETCDIR%%/example-config/conf.d/20-lmtp.conf
 %%ETCDIR%%/example-config/conf.d/20-pop3.conf
+%%ETCDIR%%/example-config/conf.d/20-submission.conf
 %%ETCDIR%%/example-config/conf.d/90-acl.conf
 %%ETCDIR%%/example-config/conf.d/90-plugin.conf
 %%ETCDIR%%/example-config/conf.d/90-quota.conf
@@ -30,8 +32,6 @@
 %%ETCDIR%%/example-config/dovecot-ldap.conf.ext
 %%ETCDIR%%/example-config/dovecot-sql.conf.ext
 %%ETCDIR%%/example-config/dovecot.conf
-%%ETCDIR%%/README
-include/dovecot/abspath.h
 include/dovecot/access-lookup.h
 include/dovecot/acl-api-private.h
 include/dovecot/acl-api.h
@@ -73,9 +73,11 @@
 include/dovecot/base32.h
 include/dovecot/base64.h
 include/dovecot/bits.h
+include/dovecot/bloomfilter.h
 include/dovecot/bsearch-insert-pos.h
 include/dovecot/buffer.h
 include/dovecot/byteorder.h
+include/dovecot/charset-utf8-private.h
 include/dovecot/charset-utf8.h
 include/dovecot/child-wait.h
 include/dovecot/client-common.h
@@ -91,9 +93,6 @@
 include/dovecot/cydir-storage.h
 include/dovecot/cydir-sync.h
 include/dovecot/data-stack.h
-include/dovecot/dcrypt-iostream.h
-include/dovecot/dcrypt-private.h
-include/dovecot/dcrypt.h
 include/dovecot/db-checkpassword.h
 include/dovecot/db-dict.h
 include/dovecot/db-ldap.h
@@ -105,10 +104,11 @@
 include/dovecot/dbox-mail.h
 include/dovecot/dbox-save.h
 include/dovecot/dbox-storage.h
+include/dovecot/dcrypt-iostream.h
+include/dovecot/dcrypt-private.h
+include/dovecot/dcrypt.h
 include/dovecot/dict-client.h
 include/dovecot/dict-private.h
-include/dovecot/dict-sql-settings.h
-include/dovecot/dict-sql.h
 include/dovecot/dict-transaction-memory.h
 include/dovecot/dict.h
 include/dovecot/dns-lookup.h
@@ -129,14 +129,14 @@
 include/dovecot/dsasl-client.h
 include/dovecot/dsync-brain.h
 include/dovecot/dsync-ibc.h
-include/dovecot/duplicate.h
 include/dovecot/eacces-error.h
 include/dovecot/env-util.h
+include/dovecot/event-filter.h
+include/dovecot/event-log.h
 include/dovecot/execv-const.h
 include/dovecot/fail-mail-storage.h
 include/dovecot/failures.h
-include/dovecot/fd-close-on-exec.h
-include/dovecot/fd-set-nonblock.h
+include/dovecot/fd-util.h
 include/dovecot/fdatasync-path.h
 include/dovecot/fdpass.h
 include/dovecot/file-cache.h
@@ -271,6 +271,8 @@
 include/dovecot/iostream-lz4.h
 include/dovecot/iostream-openssl.h
 include/dovecot/iostream-private.h
+include/dovecot/iostream-proxy.h
+include/dovecot/iostream-pump.h
 include/dovecot/iostream-rawlog-private.h
 include/dovecot/iostream-rawlog.h
 include/dovecot/iostream-ssl-private.h
@@ -310,6 +312,7 @@
 include/dovecot/istream-sized.h
 include/dovecot/istream-tee.h
 include/dovecot/istream-timeout.h
+include/dovecot/istream-try.h
 include/dovecot/istream-unix.h
 include/dovecot/istream-zlib.h
 include/dovecot/istream.h
@@ -316,10 +319,11 @@
 include/dovecot/json-parser.h
 include/dovecot/json-tree.h
 include/dovecot/lda-settings.h
+include/dovecot/lib-event-private.h
+include/dovecot/lib-event.h
 include/dovecot/lib-signals.h
 include/dovecot/lib.h
 include/dovecot/llist.h
-include/dovecot/lmtp-client.h
 include/dovecot/log-throttle.h
 include/dovecot/login-common.h
 include/dovecot/login-proxy-state.h
@@ -331,6 +335,7 @@
 include/dovecot/mail-cache.h
 include/dovecot/mail-copy.h
 include/dovecot/mail-deliver.h
+include/dovecot/mail-duplicate.h
 include/dovecot/mail-error.h
 include/dovecot/mail-html2text.h
 include/dovecot/mail-index-alloc-cache.h
@@ -425,6 +430,7 @@
 include/dovecot/mech-otp-skey-common.h
 include/dovecot/mech-plain-common.h
 include/dovecot/mech.h
+include/dovecot/memarea.h
 include/dovecot/mempool.h
 include/dovecot/message-address.h
 include/dovecot/message-binary-part.h
@@ -436,9 +442,9 @@
 include/dovecot/message-header-parser.h
 include/dovecot/message-id.h
 include/dovecot/message-parser.h
-include/dovecot/message-part.h
 include/dovecot/message-part-data.h
 include/dovecot/message-part-serialize.h
+include/dovecot/message-part.h
 include/dovecot/message-search.h
 include/dovecot/message-size.h
 include/dovecot/message-snippet.h
@@ -446,8 +452,8 @@
 include/dovecot/mmap-util.h
 include/dovecot/module-context.h
 include/dovecot/module-dir.h
-include/dovecot/mountpoint-list.h
 include/dovecot/mountpoint.h
+include/dovecot/murmurhash3.h
 include/dovecot/mycrypt.h
 include/dovecot/net.h
 include/dovecot/nfs-workarounds.h
@@ -475,6 +481,7 @@
 include/dovecot/passdb-template.h
 include/dovecot/passdb.h
 include/dovecot/password-scheme.h
+include/dovecot/path-util.h
 include/dovecot/pkcs5.h
 include/dovecot/pop3-capability.h
 include/dovecot/pop3-client.h
@@ -517,7 +524,6 @@
 include/dovecot/quota-private.h
 include/dovecot/quota.h
 include/dovecot/quoted-printable.h
-include/dovecot/rand.h
 include/dovecot/randgen.h
 include/dovecot/raw-storage.h
 include/dovecot/raw-sync.h
@@ -543,12 +549,29 @@
 include/dovecot/sha2.h
 include/dovecot/sha3.h
 include/dovecot/shared-storage.h
+include/dovecot/smtp-address.h
+include/dovecot/smtp-client-command.h
+include/dovecot/smtp-client-connection.h
+include/dovecot/smtp-client-private.h
+include/dovecot/smtp-client-transaction.h
 include/dovecot/smtp-client.h
+include/dovecot/smtp-command-parser.h
+include/dovecot/smtp-command.h
+include/dovecot/smtp-common.h
+include/dovecot/smtp-params.h
+include/dovecot/smtp-parser.h
+include/dovecot/smtp-reply-parser.h
+include/dovecot/smtp-reply.h
+include/dovecot/smtp-server-private.h
+include/dovecot/smtp-server.h
+include/dovecot/smtp-submit-settings.h
+include/dovecot/smtp-submit.h
+include/dovecot/smtp-syntax.h
 include/dovecot/sort.h
 include/dovecot/sql-api-private.h
 include/dovecot/sql-api.h
 include/dovecot/sql-db-cache.h
-include/dovecot/ssl-proxy.h
+include/dovecot/stats-client.h
 include/dovecot/stats-connection.h
 include/dovecot/stats-parser.h
 include/dovecot/stats.h
@@ -650,10 +673,10 @@
 lib/dovecot/lib21_fts_squat_plugin.so
 lib/dovecot/lib30_imap_zlib_plugin.a
 lib/dovecot/lib30_imap_zlib_plugin.so
-lib/dovecot/lib90_stats_plugin.a
-lib/dovecot/lib90_stats_plugin.so
-lib/dovecot/lib95_imap_stats_plugin.a
-lib/dovecot/lib95_imap_stats_plugin.so
+lib/dovecot/lib90_old_stats_plugin.a
+lib/dovecot/lib90_old_stats_plugin.so
+lib/dovecot/lib95_imap_old_stats_plugin.a
+lib/dovecot/lib95_imap_old_stats_plugin.so
 lib/dovecot/lib99_welcome_plugin.a
 lib/dovecot/lib99_welcome_plugin.so
 lib/dovecot/libdcrypt_openssl.a
@@ -698,10 +721,10 @@
 lib/dovecot/libfs_mail_crypt.so
 lib/dovecot/libssl_iostream_openssl.a
 lib/dovecot/libssl_iostream_openssl.so
-lib/dovecot/stats/libstats_auth.a
-lib/dovecot/stats/libstats_auth.so
-lib/dovecot/stats/libstats_mail.a
-lib/dovecot/stats/libstats_mail.so
+lib/dovecot/old-stats/libold_stats_mail.a
+lib/dovecot/old-stats/libold_stats_mail.so
+lib/dovecot/old-stats/libstats_auth.a
+lib/dovecot/old-stats/libstats_auth.so
 libexec/dovecot/aggregator
 libexec/dovecot/anvil
 libexec/dovecot/auth
@@ -727,6 +750,7 @@
 libexec/dovecot/lmtp
 libexec/dovecot/log
 libexec/dovecot/maildirlock
+libexec/dovecot/old-stats
 libexec/dovecot/pop3
 libexec/dovecot/pop3-login
 libexec/dovecot/quota-status
@@ -734,8 +758,9 @@
 libexec/dovecot/replicator
 libexec/dovecot/script
 libexec/dovecot/script-login
-libexec/dovecot/ssl-params
 libexec/dovecot/stats
+libexec/dovecot/submission
+libexec/dovecot/submission-login
 libexec/dovecot/xml2text
 man/man1/deliver.1.gz
 man/man1/doveadm-acl.1.gz
@@ -763,7 +788,6 @@
 man/man1/doveadm-log.1.gz
 man/man1/doveadm-mailbox-cryptokey.1.gz
 man/man1/doveadm-mailbox.1.gz
-man/man1/doveadm-mount.1.gz
 man/man1/doveadm-move.1.gz
 man/man1/doveadm-penalty.1.gz
 man/man1/doveadm-proxy.1.gz
@@ -772,6 +796,7 @@
 man/man1/doveadm-quota.1.gz
 man/man1/doveadm-reload.1.gz
 man/man1/doveadm-replicator.1.gz
+man/man1/doveadm-save.1.gz
 man/man1/doveadm-search.1.gz
 man/man1/doveadm-stats.1.gz
 man/man1/doveadm-stop.1.gz
@@ -800,8 +825,6 @@
 %%DATADIR%%/stopwords/stopwords_ru.txt
 %%DATADIR%%/stopwords/stopwords_sv.txt
 %%LDAP%%include/dovecot/ldap-client.h
-%%LDAP%%lib/dovecot/dict/libdict_ldap.a
-%%LDAP%%lib/dovecot/dict/libdict_ldap.so
 %%LDAP%%lib/dovecot/libdovecot-ldap.a
 %%LDAP%%lib/dovecot/libdovecot-ldap.so
 %%LDAP%%lib/dovecot/libdovecot-ldap.so.0