3 files changed, 76 insertions, 19 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 4ca7a9f94bb4..1d7a0ee0b502 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot
-PORTVERSION=	2.1.16
+PORTVERSION=	2.2.2
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 3e210f1918eb..42318c4416bd 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.1.16.tar.gz) = a61d5fa774615849f6e754232c41a7a87dd0de619f1089627c3682180fa9b447
-SIZE (dovecot-2.1.16.tar.gz) = 3866802
+SHA256 (dovecot-2.2.2.tar.gz) = 30c98e8f9e40d7397d451a8679359b70031702f205aefbff1a6e27656fb63b9a
+SIZE (dovecot-2.2.2.tar.gz) = 4282339
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index 2d6c1bdbcfc6..2998c5cc2f34 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -17,6 +17,7 @@ include/dovecot/auth-client-private.h
 include/dovecot/auth-client-request.h
 include/dovecot/auth-client.h
 include/dovecot/auth-common.h
+include/dovecot/auth-fields.h
 include/dovecot/auth-master-connection.h
 include/dovecot/auth-master.h
 include/dovecot/auth-penalty.h
@@ -25,7 +26,7 @@ include/dovecot/auth-request-handler.h
 include/dovecot/auth-request.h
 include/dovecot/auth-server-connection.h
 include/dovecot/auth-settings.h
-include/dovecot/auth-stream.h
+include/dovecot/auth-token.h
 include/dovecot/auth-worker-client.h
 include/dovecot/auth-worker-server.h
 include/dovecot/auth.h
@@ -36,8 +37,8 @@ include/dovecot/buffer.h
 include/dovecot/charset-utf8.h
 include/dovecot/child-wait.h
 include/dovecot/client-common.h
-include/dovecot/close-keep-errno.h
 include/dovecot/compat.h
+include/dovecot/compression.h
 include/dovecot/config-filter.h
 include/dovecot/config-parser-private.h
 include/dovecot/config-parser.h
@@ -58,13 +59,22 @@ include/dovecot/dbox-file.h
 include/dovecot/dbox-mail.h
 include/dovecot/dbox-save.h
 include/dovecot/dbox-storage.h
-include/dovecot/dbox-sync-rebuild.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
+include/dovecot/doveadm-dump.h
+include/dovecot/doveadm-mail-iter.h
+include/dovecot/doveadm-mail.h
+include/dovecot/doveadm-mailbox-list-iter.h
+include/dovecot/doveadm-print-private.h
+include/dovecot/doveadm-print.h
+include/dovecot/doveadm-settings.h
+include/dovecot/doveadm-util.h
+include/dovecot/doveadm.h
 include/dovecot/dovecot-version.h
 include/dovecot/duplicate.h
 include/dovecot/eacces-error.h
@@ -86,16 +96,25 @@ include/dovecot/fs-api.h
 include/dovecot/fs-sis-common.h
 include/dovecot/fsync-mode.h
 include/dovecot/guid.h
+include/dovecot/hash-decl.h
 include/dovecot/hash-format.h
 include/dovecot/hash-method.h
 include/dovecot/hash.h
 include/dovecot/hash2.h
 include/dovecot/hex-binary.h
 include/dovecot/hex-dec.h
-include/dovecot/hmac-md5.h
-include/dovecot/hmac-sha1.h
+include/dovecot/hmac-cram-md5.h
+include/dovecot/hmac.h
 include/dovecot/home-expand.h
 include/dovecot/hostpid.h
+include/dovecot/http-client-private.h
+include/dovecot/http-client.h
+include/dovecot/http-date.h
+include/dovecot/http-header-parser.h
+include/dovecot/http-parser.h
+include/dovecot/http-response-parser.h
+include/dovecot/http-transfer.h
+include/dovecot/http-url.h
 include/dovecot/imap-arg.h
 include/dovecot/imap-base-subject.h
 include/dovecot/imap-bodystructure.h
@@ -108,7 +127,11 @@ include/dovecot/imap-envelope.h
 include/dovecot/imap-expunge.h
 include/dovecot/imap-fetch.h
 include/dovecot/imap-id.h
+include/dovecot/imap-list.h
 include/dovecot/imap-match.h
+include/dovecot/imap-msgpart-url.h
+include/dovecot/imap-msgpart.h
+include/dovecot/imap-notify.h
 include/dovecot/imap-parser.h
 include/dovecot/imap-quote.h
 include/dovecot/imap-resp-code.h
@@ -118,6 +141,12 @@ include/dovecot/imap-seqset.h
 include/dovecot/imap-settings.h
 include/dovecot/imap-status.h
 include/dovecot/imap-sync.h
+include/dovecot/imap-url.h
+include/dovecot/imap-urlauth-backend.h
+include/dovecot/imap-urlauth-connection.h
+include/dovecot/imap-urlauth-fetch.h
+include/dovecot/imap-urlauth-private.h
+include/dovecot/imap-urlauth.h
 include/dovecot/imap-utf7.h
 include/dovecot/imap-util.h
 include/dovecot/imapc-client-private.h
@@ -132,6 +161,7 @@ include/dovecot/imapc-sync.h
 include/dovecot/imem.h
 include/dovecot/index-attachment.h
 include/dovecot/index-mail.h
+include/dovecot/index-rebuild.h
 include/dovecot/index-search-private.h
 include/dovecot/index-search-result.h
 include/dovecot/index-sort-private.h
@@ -148,22 +178,34 @@ include/dovecot/iostream-openssl.h
 include/dovecot/iostream-private.h
 include/dovecot/iostream-rawlog-private.h
 include/dovecot/iostream-rawlog.h
+include/dovecot/iostream-ssl-private.h
 include/dovecot/iostream-ssl.h
+include/dovecot/iostream-temp.h
 include/dovecot/ipc-client.h
 include/dovecot/ipc-server.h
 include/dovecot/ipwd.h
-include/dovecot/istream-attachment.h
-include/dovecot/istream-base64-encoder.h
+include/dovecot/iso8601-date.h
+include/dovecot/istream-attachment-connector.h
+include/dovecot/istream-attachment-extractor.h
+include/dovecot/istream-base64.h
+include/dovecot/istream-binary-converter.h
+include/dovecot/istream-chain.h
 include/dovecot/istream-concat.h
 include/dovecot/istream-crlf.h
 include/dovecot/istream-dot.h
 include/dovecot/istream-header-filter.h
+include/dovecot/istream-jsonstr.h
 include/dovecot/istream-mail.h
+include/dovecot/istream-metawrap.h
+include/dovecot/istream-nonuls.h
 include/dovecot/istream-private.h
+include/dovecot/istream-qp.h
 include/dovecot/istream-raw-mbox.h
 include/dovecot/istream-rawlog.h
 include/dovecot/istream-seekable.h
+include/dovecot/istream-sized.h
 include/dovecot/istream-tee.h
+include/dovecot/istream-zlib.h
 include/dovecot/istream.h
 include/dovecot/json-parser.h
 include/dovecot/lda-settings.h
@@ -212,8 +254,13 @@ include/dovecot/mail-user.h
 include/dovecot/mailbox-guid-cache.h
 include/dovecot/mailbox-list-delete.h
 include/dovecot/mailbox-list-fs.h
+include/dovecot/mailbox-list-index-storage.h
+include/dovecot/mailbox-list-index-sync.h
 include/dovecot/mailbox-list-index.h
+include/dovecot/mailbox-list-iter.h
 include/dovecot/mailbox-list-maildir.h
+include/dovecot/mailbox-list-notify-tree.h
+include/dovecot/mailbox-list-notify.h
 include/dovecot/mailbox-list-private.h
 include/dovecot/mailbox-list-subscriptions.h
 include/dovecot/mailbox-list.h
@@ -236,6 +283,8 @@ include/dovecot/master-login.h
 include/dovecot/master-service-private.h
 include/dovecot/master-service-settings-cache.h
 include/dovecot/master-service-settings.h
+include/dovecot/master-service-ssl-settings.h
+include/dovecot/master-service-ssl.h
 include/dovecot/master-service.h
 include/dovecot/mbox-file.h
 include/dovecot/mbox-from.h
@@ -258,6 +307,7 @@ include/dovecot/mech-plain-common.h
 include/dovecot/mech.h
 include/dovecot/mempool.h
 include/dovecot/message-address.h
+include/dovecot/message-binary-part.h
 include/dovecot/message-date.h
 include/dovecot/message-decoder.h
 include/dovecot/message-header-decode.h
@@ -267,7 +317,6 @@ include/dovecot/message-id.h
 include/dovecot/message-parser.h
 include/dovecot/message-part-serialize.h
 include/dovecot/message-search.h
-include/dovecot/message-send.h
 include/dovecot/message-size.h
 include/dovecot/mkdir-parents.h
 include/dovecot/mmap-util.h
@@ -276,13 +325,17 @@ include/dovecot/module-dir.h
 include/dovecot/mountpoint-list.h
 include/dovecot/mountpoint.h
 include/dovecot/mycrypt.h
-include/dovecot/network.h
+include/dovecot/net.h
 include/dovecot/nfs-workarounds.h
 include/dovecot/notify-plugin-private.h
 include/dovecot/notify-plugin.h
+include/dovecot/numpack.h
 include/dovecot/ostream-cmp.h
+include/dovecot/ostream-hash.h
+include/dovecot/ostream-metawrap.h
 include/dovecot/ostream-private.h
 include/dovecot/ostream-rawlog.h
+include/dovecot/ostream-zlib.h
 include/dovecot/ostream.h
 include/dovecot/passdb-blocking.h
 include/dovecot/passdb-cache.h
@@ -349,6 +402,7 @@ include/dovecot/unichar.h
 include/dovecot/unix-socket-create.h
 include/dovecot/unlink-directory.h
 include/dovecot/unlink-old-files.h
+include/dovecot/uri-util.h
 include/dovecot/userdb-blocking.h
 include/dovecot/userdb-template.h
 include/dovecot/userdb-vpopmail.h
@@ -370,9 +424,6 @@ lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.a
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
-lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.a
-lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.la
-lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.so
 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.a
 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.la
 %%LUCENE%%lib/dovecot/doveadm/lib20_doveadm_fts_lucene_plugin.so
@@ -452,6 +503,10 @@ lib/dovecot/lib90_stats_plugin.so
 lib/dovecot/lib95_imap_stats_plugin.a
 lib/dovecot/lib95_imap_stats_plugin.la
 lib/dovecot/lib95_imap_stats_plugin.so
+lib/dovecot/libdovecot-compression.a
+lib/dovecot/libdovecot-compression.la
+lib/dovecot/libdovecot-compression.so
+lib/dovecot/libdovecot-compression.so.0
 lib/dovecot/libdovecot-lda.a
 lib/dovecot/libdovecot-lda.la
 lib/dovecot/libdovecot-lda.so
@@ -464,10 +519,6 @@ lib/dovecot/libdovecot-sql.a
 lib/dovecot/libdovecot-sql.la
 lib/dovecot/libdovecot-sql.so
 lib/dovecot/libdovecot-sql.so.0
-lib/dovecot/libdovecot-ssl.a
-lib/dovecot/libdovecot-ssl.la
-lib/dovecot/libdovecot-ssl.so
-lib/dovecot/libdovecot-ssl.so.0
 lib/dovecot/libdovecot-storage.a
 lib/dovecot/libdovecot-storage.la
 lib/dovecot/libdovecot-storage.so
@@ -476,6 +527,9 @@ lib/dovecot/libdovecot.a
 lib/dovecot/libdovecot.la
 lib/dovecot/libdovecot.so
 lib/dovecot/libdovecot.so.0
+lib/dovecot/libssl_iostream_openssl.a
+lib/dovecot/libssl_iostream_openssl.la
+lib/dovecot/libssl_iostream_openssl.so
 libexec/dovecot/aggregator
 libexec/dovecot/anvil
 libexec/dovecot/auth
@@ -491,6 +545,9 @@ libexec/dovecot/dovecot-lda
 libexec/dovecot/gdbhelper
 libexec/dovecot/imap
 libexec/dovecot/imap-login
+libexec/dovecot/imap-urlauth
+libexec/dovecot/imap-urlauth-login
+libexec/dovecot/imap-urlauth-worker
 libexec/dovecot/indexer
 libexec/dovecot/indexer-worker
 libexec/dovecot/ipc