Here is an update to Dovecot 2.2.5 and the associated ports.

Looking for any testing and feedback.

-- 
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/Makefile,v
retrieving revision 1.209
diff -u -p -r1.209 Makefile
--- Makefile    18 Jul 2013 20:07:10 -0000      1.209
+++ Makefile    10 Aug 2013 04:49:28 -0000
@@ -8,8 +8,8 @@ COMMENT-mysql=  MySQL authentication / di
 COMMENT-postgresql= PostgreSQL authentication / dictionary support for Dovecot
 
 # Bump dovecot-pigeonhole every time you update to a new Dovecot version.
-V_MAJOR=       2.1
-V_DOVECOT=     2.1.17
+V_MAJOR=       2.2
+V_DOVECOT=     2.2.5
 
 DISTNAME=      dovecot-${V_DOVECOT}
 PKGNAME=       dovecot-${V_DOVECOT}
@@ -17,16 +17,15 @@ PKGNAME-server=     dovecot-${V_DOVECOT}
 PKGNAME-ldap=  dovecot-ldap-${V_DOVECOT}
 PKGNAME-mysql= dovecot-mysql-${V_DOVECOT}
 PKGNAME-postgresql= dovecot-postgresql-${V_DOVECOT}
-REVISION-postgresql=1
 CATEGORIES=    mail
 MASTER_SITES=  ${HOMEPAGE}releases/${V_MAJOR}/
 
-SHARED_LIBS=   dovecot-lda     1.0 \
-               dovecot-login   1.0 \
-               dovecot-sql     1.0 \
-               dovecot-ssl     0.0 \
-               dovecot-storage 1.0 \
-               dovecot         1.0
+SHARED_LIBS=   dovecot-compression 0.0 \
+               dovecot-lda     2.0 \
+               dovecot-login   2.0 \
+               dovecot-sql     2.0 \
+               dovecot-storage 2.0 \
+               dovecot         2.0
 
 HOMEPAGE=      http://www.dovecot.org/
 
@@ -51,8 +50,6 @@ RUN_DEPENDS-mysql= ${BASE_PKGPATH}=${V_D
 LIB_DEPENDS-postgresql= databases/postgresql
 RUN_DEPENDS-postgresql= ${BASE_PKGPATH}=${V_DOVECOT}
 
-# Fails to find static library while linking as used for the Kerberos 
workaround
-USE_LIBTOOL=   gnu
 CONFIGURE_STYLE= gnu
 CONFIGURE_ARGS=        --with-gssapi \
                --with-rundir=/var/dovecot \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/distinfo,v
retrieving revision 1.108
diff -u -p -r1.108 distinfo
--- distinfo    18 Jul 2013 20:07:10 -0000      1.108
+++ distinfo    10 Aug 2013 02:28:26 -0000
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.1.17.tar.gz) = 9Zyzn/WDm62vc/ooAGw3t5g5tI54K68lbIDVzFbRQho=
-SIZE (dovecot-2.1.17.tar.gz) = 3908153
+SHA256 (dovecot-2.2.5.tar.gz) = FbLNYH5lM/SAX0caYd0ci9gWdc7MbqY2FQQkfdmvXPg=
+SIZE (dovecot-2.2.5.tar.gz) = 4356745
Index: patches/patch-doc_example-config_Makefile_in
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-doc_example-config_Makefile_in
--- patches/patch-doc_example-config_Makefile_in        1 Feb 2013 07:59:03 
-0000       1.5
+++ patches/patch-doc_example-config_Makefile_in        17 Jun 2013 03:33:33 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_example-config_Makefile_in,v 1.5 2013/02/01 07:59:03 brad 
Exp $
---- doc/example-config/Makefile.in.orig        Wed Jan 30 16:25:35 2013
-+++ doc/example-config/Makefile.in     Thu Jan 31 08:50:46 2013
-@@ -318,7 +318,7 @@ top_srcdir = @top_srcdir@
+--- doc/example-config/Makefile.in.orig        Sun Jun 16 17:30:14 2013
++++ doc/example-config/Makefile.in     Sun Jun 16 23:33:26 2013
+@@ -321,7 +321,7 @@ top_srcdir = @top_srcdir@
  SUBDIRS = conf.d
  pkgsysconfdir = $(sysconfdir)/dovecot
  nodist_pkgsysconf_DATA = README
@@ -9,4 +9,4 @@ $OpenBSD: patch-doc_example-config_Makef
 +exampledir = $(prefix)/share/examples/dovecot/example-config
  example_DATA = \
        dovecot.conf \
-       dovecot-db.conf.ext \
+       dovecot-dict-auth.conf.ext \
Index: patches/patch-doc_example-config_conf_d_10-auth_conf
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_10-auth_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_conf_d_10-auth_conf
--- patches/patch-doc_example-config_conf_d_10-auth_conf        23 May 2011 
22:54:38 -0000      1.1
+++ patches/patch-doc_example-config_conf_d_10-auth_conf        23 Apr 2013 
06:08:01 -0000
@@ -1,10 +1,10 @@
 $OpenBSD: patch-doc_example-config_conf_d_10-auth_conf,v 1.1 2011/05/23 
22:54:38 sthen Exp $
---- doc/example-config/conf.d/10-auth.conf.orig        Tue Mar 22 15:12:29 2011
-+++ doc/example-config/conf.d/10-auth.conf     Tue Mar 22 15:12:35 2011
-@@ -6,7 +6,7 @@
- # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
+--- doc/example-config/conf.d/10-auth.conf.orig        Tue Aug 14 02:18:46 2012
++++ doc/example-config/conf.d/10-auth.conf     Tue Apr 23 02:07:47 2013
+@@ -7,7 +7,7 @@
  # matches the local IP (ie. you're connecting from the same computer), the
  # connection is considered secure and plaintext authentication is allowed.
+ # See also ssl=required setting.
 -#disable_plaintext_auth = yes
 +disable_plaintext_auth = yes
  
Index: patches/patch-doc_example-config_conf_d_10-mail_conf
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_10-mail_conf,v
retrieving revision 1.3
diff -u -p -r1.3 patch-doc_example-config_conf_d_10-mail_conf
--- patches/patch-doc_example-config_conf_d_10-mail_conf        27 Jan 2013 
09:29:37 -0000      1.3
+++ patches/patch-doc_example-config_conf_d_10-mail_conf        23 Apr 2013 
06:08:01 -0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_example-config_conf_d_10-mail_conf,v 1.3 2013/01/27 
09:29:37 ajacoutot Exp $
---- doc/example-config/conf.d/10-mail.conf.orig        Fri May  4 23:14:02 2012
-+++ doc/example-config/conf.d/10-mail.conf     Sun Jan 27 09:54:31 2013
-@@ -129,8 +129,9 @@ namespace inbox {
+--- doc/example-config/conf.d/10-mail.conf.orig        Sun Apr  7 11:33:06 2013
++++ doc/example-config/conf.d/10-mail.conf     Tue Apr 23 02:03:41 2013
+@@ -133,8 +133,9 @@ namespace inbox {
  ##
  
  # Don't use mmap() at all. This is required if you store indexes to shared
@@ -13,7 +13,7 @@ $OpenBSD: patch-doc_example-config_conf_
  
  # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
  # since version 3, so this should be safe to use nowadays by default.
-@@ -161,7 +162,7 @@ namespace inbox {
+@@ -165,7 +166,7 @@ namespace inbox {
  # to make sure that users can't log in as daemons or other system users.
  # Note that denying root logins is hardcoded to dovecot binary and can't
  # be done even if first_valid_uid is set to 0.
@@ -22,7 +22,7 @@ $OpenBSD: patch-doc_example-config_conf_
  #last_valid_uid = 0
  
  # Valid GID range for users, defaults to non-root/wheel. Users having
-@@ -194,10 +195,10 @@ namespace inbox {
+@@ -198,10 +199,10 @@ namespace inbox {
  
  # UNIX socket path to master authentication server to find users.
  # This is used by imap (for shared users) and lda.
@@ -35,7 +35,7 @@ $OpenBSD: patch-doc_example-config_conf_
  
  # Space separated list of plugins to load for all services. Plugins specific 
to
  # IMAP, LDA, etc. are added to this list in their own .conf files.
-@@ -277,7 +278,7 @@ namespace inbox {
+@@ -285,7 +286,7 @@ namespace inbox {
  # locking methods as well. Some operating systems don't allow using some of
  # them simultaneously.
  #mbox_read_locks = fcntl
Index: patches/patch-doc_example-config_conf_d_20-imap_conf
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_20-imap_conf,v
retrieving revision 1.1
diff -u -p -r1.1 patch-doc_example-config_conf_d_20-imap_conf
--- patches/patch-doc_example-config_conf_d_20-imap_conf        23 May 2011 
22:54:38 -0000      1.1
+++ patches/patch-doc_example-config_conf_d_20-imap_conf        21 May 2013 
21:46:23 -0000
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_example-config_conf_d_20-imap_conf,v 1.1 2011/05/23 
22:54:38 sthen Exp $
---- doc/example-config/conf.d/20-imap.conf.orig        Wed Mar 16 11:46:51 2011
-+++ doc/example-config/conf.d/20-imap.conf     Fri May 13 17:04:17 2011
-@@ -54,5 +54,5 @@ protocol imap {
-   #     greyed out, instead of only later giving "not selectable" popup error.
-   #
-   # The list is space-separated.
--  #imap_client_workarounds = 
-+  imap_client_workarounds = delay-newmail tb-extra-mailbox-sep tb-lsub-flags
- }
+--- doc/example-config/conf.d/20-imap.conf.orig        Tue May 14 09:43:30 2013
++++ doc/example-config/conf.d/20-imap.conf     Tue May 21 17:45:31 2013
+@@ -46,7 +46,7 @@
+ #     greyed out, instead of only later giving "not selectable" popup error.
+ #
+ # The list is space-separated.
+-#imap_client_workarounds = 
++imap_client_workarounds = delay-newmail tb-extra-mailbox-sep tb-lsub-flags
+ 
+ # Host allowed in URLAUTH URLs sent by client. "*" allows all.
+ #imap_urlauth_host =
Index: patches/patch-doc_example-config_conf_d_20-pop3_conf
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_20-pop3_conf,v
retrieving revision 1.2
diff -u -p -r1.2 patch-doc_example-config_conf_d_20-pop3_conf
--- patches/patch-doc_example-config_conf_d_20-pop3_conf        8 Jun 2012 
22:04:10 -0000       1.2
+++ patches/patch-doc_example-config_conf_d_20-pop3_conf        21 May 2013 
21:46:18 -0000
@@ -1,10 +1,12 @@
 $OpenBSD: patch-doc_example-config_conf_d_20-pop3_conf,v 1.2 2012/06/08 
22:04:10 sthen Exp $
---- doc/example-config/conf.d/20-pop3.conf.orig        Mon May 14 14:07:32 2012
-+++ doc/example-config/conf.d/20-pop3.conf     Fri Jun  1 16:26:41 2012
-@@ -87,5 +87,5 @@ protocol pop3 {
-   #     Outlook Express and Netscape Mail breaks if end of headers-line is
-   #     missing. This option simply sends it if it's missing.
-   # The list is space-separated.
--  #pop3_client_workarounds = 
-+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
- }
+--- doc/example-config/conf.d/20-pop3.conf.orig        Tue May 14 09:43:37 2013
++++ doc/example-config/conf.d/20-pop3.conf     Tue May 21 17:46:01 2013
+@@ -86,7 +86,7 @@
+ #     Outlook Express and Netscape Mail breaks if end of headers-line is
+ #     missing. This option simply sends it if it's missing.
+ # The list is space-separated.
+-#pop3_client_workarounds = 
++pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+ 
+ protocol pop3 {
+   # Space separated list of plugins to load (default is global mail_plugins).
Index: patches/patch-doc_example-config_conf_d_Makefile_in
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_conf_d_Makefile_in,v
retrieving revision 1.5
diff -u -p -r1.5 patch-doc_example-config_conf_d_Makefile_in
--- patches/patch-doc_example-config_conf_d_Makefile_in 1 Feb 2013 07:59:03 
-0000       1.5
+++ patches/patch-doc_example-config_conf_d_Makefile_in 17 Jun 2013 03:33:32 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_example-config_conf_d_Makefile_in,v 1.5 2013/02/01 
07:59:03 brad Exp $
---- doc/example-config/conf.d/Makefile.in.orig Wed Jan 30 16:25:35 2013
-+++ doc/example-config/conf.d/Makefile.in      Thu Jan 31 08:50:46 2013
-@@ -275,7 +275,7 @@ top_build_prefix = @top_build_prefix@
+--- doc/example-config/conf.d/Makefile.in.orig Sun Jun 16 17:30:14 2013
++++ doc/example-config/conf.d/Makefile.in      Sun Jun 16 23:33:26 2013
+@@ -278,7 +278,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  pkgsysconfdir = $(sysconfdir)/dovecot
Index: patches/patch-doc_example-config_dovecot_conf
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-doc_example-config_dovecot_conf,v
retrieving revision 1.3
diff -u -p -r1.3 patch-doc_example-config_dovecot_conf
--- patches/patch-doc_example-config_dovecot_conf       8 Jun 2012 22:04:10 
-0000       1.3
+++ patches/patch-doc_example-config_dovecot_conf       23 Apr 2013 06:08:02 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-doc_example-config_dovecot_conf,v 1.3 2012/06/08 22:04:10 
sthen Exp $
---- doc/example-config/dovecot.conf.orig       Thu Mar 15 10:12:46 2012
-+++ doc/example-config/dovecot.conf    Sat May 12 22:47:31 2012
-@@ -26,7 +26,7 @@
+--- doc/example-config/dovecot.conf.orig       Mon Jan  7 02:50:26 2013
++++ doc/example-config/dovecot.conf    Tue Apr 23 02:03:41 2013
+@@ -30,7 +30,7 @@
  #listen = *, ::
  
  # Base directory where to store runtime data.
Index: patches/patch-src_auth_passdb-bsdauth_c
===================================================================
RCS file: patches/patch-src_auth_passdb-bsdauth_c
diff -N patches/patch-src_auth_passdb-bsdauth_c
--- patches/patch-src_auth_passdb-bsdauth_c     25 Nov 2012 00:58:38 -0000      
1.3
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,21 +0,0 @@
-$OpenBSD: patch-src_auth_passdb-bsdauth_c,v 1.3 2012/11/25 00:58:38 halex Exp $
---- src/auth/passdb-bsdauth.c.orig     Sun Feb 12 17:55:54 2012
-+++ src/auth/passdb-bsdauth.c  Mon Oct 29 22:42:37 2012
-@@ -18,6 +18,7 @@ bsdauth_verify_plain(struct auth_request *request, con
-                   verify_plain_callback_t *callback)
- {
-       struct passwd pw;
-+      const char *type;
-       int result;
- 
-       auth_request_log_debug(request, "bsdauth", "lookup");
-@@ -35,7 +36,8 @@ bsdauth_verify_plain(struct auth_request *request, con
-       }
- 
-       /* check if the password is valid */
--      result = auth_userokay(request->user, NULL, NULL,
-+      type = t_strdup_printf("auth-%s", request->service);
-+      result = auth_userokay(request->user, NULL, t_strdup_noconst(type),
-                              t_strdup_noconst(password));
- 
-       /* clear the passwords from memory */
Index: patches/patch-src_master_master-settings_c
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot/patches/patch-src_master_master-settings_c,v
retrieving revision 1.15
diff -u -p -r1.15 patch-src_master_master-settings_c
--- patches/patch-src_master_master-settings_c  8 Jun 2012 22:04:10 -0000       
1.15
+++ patches/patch-src_master_master-settings_c  23 Apr 2013 06:08:01 -0000
@@ -3,9 +3,9 @@ $OpenBSD: patch-src_master_master-settin
 changed settings are also present in src/config/all-settings.c; this file
 is rebuilt as part of the Dovecot build.
 
---- src/master/master-settings.c.orig  Mon Apr 23 08:35:06 2012
-+++ src/master/master-settings.c       Sat May 12 22:47:31 2012
-@@ -217,8 +217,8 @@ static const struct master_settings master_default_set
+--- src/master/master-settings.c.orig  Mon Mar 18 16:20:35 2013
++++ src/master/master-settings.c       Tue Apr 23 02:03:41 2013
+@@ -219,8 +219,8 @@ static const struct master_settings master_default_set
        .protocols = "imap pop3 lmtp",
        .listen = "*, ::",
        .ssl = "yes:no:required",
Index: pkg/PLIST-server
===================================================================
RCS file: /home/cvs/ports/mail/dovecot/pkg/PLIST-server,v
retrieving revision 1.39
diff -u -p -r1.39 PLIST-server
--- pkg/PLIST-server    8 Apr 2013 18:53:54 -0000       1.39
+++ pkg/PLIST-server    10 Aug 2013 03:29:47 -0000
@@ -37,6 +37,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
@@ -45,7 +46,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
@@ -56,8 +57,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
@@ -78,14 +79,25 @@ 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/dsasl-client-private.h
+include/dovecot/dsasl-client.h
 include/dovecot/duplicate.h
 include/dovecot/eacces-error.h
 include/dovecot/env-util.h
@@ -106,16 +118,28 @@ 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-message-parser.h
+include/dovecot/http-parser.h
+include/dovecot/http-request-parser.h
+include/dovecot/http-response-parser.h
+include/dovecot/http-response.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
@@ -128,7 +152,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
@@ -138,6 +166,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
@@ -152,6 +186,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
@@ -168,22 +203,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
@@ -232,8 +279,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
@@ -256,6 +308,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
@@ -278,6 +332,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
@@ -287,7 +342,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
@@ -296,13 +350,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
@@ -369,6 +427,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
@@ -388,7 +447,6 @@ lib/dovecot/doveadm/
 lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
 lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
 lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
-lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.so
 lib/dovecot/doveadm/lib20_doveadm_fts_plugin.so
 lib/dovecot/dovecot-config
 lib/dovecot/lib01_acl_plugin.so
@@ -413,13 +471,14 @@ lib/dovecot/lib21_fts_squat_plugin.so
 lib/dovecot/lib30_imap_zlib_plugin.so
 lib/dovecot/lib90_stats_plugin.so
 lib/dovecot/lib95_imap_stats_plugin.so
+@lib lib/dovecot/libdovecot-compression.so.${LIBdovecot-compression_VERSION}
 @lib lib/dovecot/libdovecot-lda.so.${LIBdovecot-lda_VERSION}
 @lib lib/dovecot/libdovecot-login.so.${LIBdovecot-login_VERSION}
 @lib lib/dovecot/libdovecot-sql.so.${LIBdovecot-sql_VERSION}
-@lib lib/dovecot/libdovecot-ssl.so.${LIBdovecot-ssl_VERSION}
 @lib lib/dovecot/libdovecot-storage.so.${LIBdovecot-storage_VERSION}
 @lib lib/dovecot/libdovecot.so.${LIBdovecot_VERSION}
 lib/dovecot/libdriver_sqlite.so
+lib/dovecot/libssl_iostream_openssl.so
 libexec/dovecot/
 @bin libexec/dovecot/aggregator
 @bin libexec/dovecot/anvil
@@ -436,6 +495,9 @@ libexec/dovecot/deliver
 @bin libexec/dovecot/gdbhelper
 @bin libexec/dovecot/imap
 @bin libexec/dovecot/imap-login
+@bin libexec/dovecot/imap-urlauth
+@bin libexec/dovecot/imap-urlauth-login
+@bin libexec/dovecot/imap-urlauth-worker
 @bin libexec/dovecot/indexer
 @bin libexec/dovecot/indexer-worker
 @bin libexec/dovecot/ipc
@@ -456,10 +518,13 @@ libexec/dovecot/deliver
 @man man/man1/doveadm-altmove.1
 @man man/man1/doveadm-auth.1
 @man man/man1/doveadm-config.1
+@man man/man1/doveadm-deduplicate.1
 @man man/man1/doveadm-director.1
 @man man/man1/doveadm-dump.1
+@man man/man1/doveadm-exec.1
 @man man/man1/doveadm-expunge.1
 @man man/man1/doveadm-fetch.1
+@man man/man1/doveadm-flags.1
 @man man/man1/doveadm-force-resync.1
 @man man/man1/doveadm-help.1
 @man man/man1/doveadm-import.1
@@ -535,6 +600,7 @@ share/doc/dovecot/wiki/Design.AuthProces
 share/doc/dovecot/wiki/Design.AuthProtocol.txt
 share/doc/dovecot/wiki/Design.Buffers.txt
 share/doc/dovecot/wiki/Design.Code.txt
+share/doc/dovecot/wiki/Design.DoveadmProtocol.txt
 share/doc/dovecot/wiki/Design.Dsync.txt
 share/doc/dovecot/wiki/Design.Indexes.Cache.txt
 share/doc/dovecot/wiki/Design.Indexes.MailIndexApi.txt
@@ -582,6 +648,7 @@ share/doc/dovecot/wiki/LDA.Postfix.txt
 share/doc/dovecot/wiki/LDA.Qmail.txt
 share/doc/dovecot/wiki/LDA.Sendmail.txt
 share/doc/dovecot/wiki/LDA.txt
+share/doc/dovecot/wiki/LMTP.Exim.txt
 share/doc/dovecot/wiki/LMTP.txt
 share/doc/dovecot/wiki/Logging.txt
 share/doc/dovecot/wiki/LoginProcess.txt
@@ -601,6 +668,7 @@ share/doc/dovecot/wiki/MailboxFormat.mai
 share/doc/dovecot/wiki/MailboxFormat.mbox.txt
 share/doc/dovecot/wiki/MailboxFormat.mbx.txt
 share/doc/dovecot/wiki/MailboxFormat.txt
+share/doc/dovecot/wiki/MailboxSettings.txt
 share/doc/dovecot/wiki/MboxChildFolders.txt
 share/doc/dovecot/wiki/MboxLocking.txt
 share/doc/dovecot/wiki/MboxProblems.txt
@@ -608,6 +676,7 @@ share/doc/dovecot/wiki/Migration.BincIMA
 share/doc/dovecot/wiki/Migration.Courier.txt
 share/doc/dovecot/wiki/Migration.Cyrus.txt
 share/doc/dovecot/wiki/Migration.Dsync.txt
+share/doc/dovecot/wiki/Migration.Gmail.txt
 share/doc/dovecot/wiki/Migration.Linuxconf.txt
 share/doc/dovecot/wiki/Migration.MailFormat.txt
 share/doc/dovecot/wiki/Migration.Online.txt
@@ -667,6 +736,7 @@ share/doc/dovecot/wiki/Plugins.MailLog.t
 share/doc/dovecot/wiki/Plugins.MailboxAlias.txt
 share/doc/dovecot/wiki/Plugins.Notify.txt
 share/doc/dovecot/wiki/Plugins.Snarf.txt
+share/doc/dovecot/wiki/Plugins.Stats.txt
 share/doc/dovecot/wiki/Plugins.Trash.txt
 share/doc/dovecot/wiki/Plugins.Virtual.txt
 share/doc/dovecot/wiki/Plugins.Zlib.txt
@@ -685,6 +755,7 @@ share/doc/dovecot/wiki/RunningDovecot.tx
 share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
 share/doc/dovecot/wiki/SSL.CertificateCreation.txt
 share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt
+share/doc/dovecot/wiki/SSL.SNIClientSupport.txt
 share/doc/dovecot/wiki/SSL.txt
 share/doc/dovecot/wiki/Sasl.txt
 share/doc/dovecot/wiki/SecurityTuning.txt
@@ -757,6 +828,8 @@ share/examples/dovecot/example-config/co
 @sample ${SYSCONFDIR}/dovecot/conf.d/auth-checkpassword.conf.ext
 share/examples/dovecot/example-config/conf.d/auth-deny.conf.ext
 @sample ${SYSCONFDIR}/dovecot/conf.d/auth-deny.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-dict.conf.ext
+@sample ${SYSCONFDIR}/dovecot/conf.d/auth-dict.conf.ext
 share/examples/dovecot/example-config/conf.d/auth-ldap.conf.ext
 @sample ${SYSCONFDIR}/dovecot/conf.d/auth-ldap.conf.ext
 share/examples/dovecot/example-config/conf.d/auth-master.conf.ext
@@ -771,8 +844,6 @@ share/examples/dovecot/example-config/co
 @sample ${SYSCONFDIR}/dovecot/conf.d/auth-system.conf.ext
 share/examples/dovecot/example-config/conf.d/auth-vpopmail.conf.ext
 @sample ${SYSCONFDIR}/dovecot/conf.d/auth-vpopmail.conf.ext
-share/examples/dovecot/example-config/dovecot-db.conf.ext
-@sample ${SYSCONFDIR}/dovecot/dovecot-db.conf.ext
 share/examples/dovecot/example-config/dovecot-dict-auth.conf.ext
 @sample ${SYSCONFDIR}/dovecot/dovecot-dict-auth.conf.ext
 share/examples/dovecot/example-config/dovecot-dict-sql.conf.ext
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/Makefile,v
retrieving revision 1.28
diff -u -p -r1.28 Makefile
--- Makefile    18 Jul 2013 20:19:04 -0000      1.28
+++ Makefile    10 Aug 2013 04:04:56 -0000
@@ -4,18 +4,17 @@ SHARED_ONLY=  Yes
 
 COMMENT=       Sieve mail filtering for Dovecot
 
-V_SIEVE=       0.3.5
-V_DOVECOT=     2.1
-V_DOVECOT_FULL=        2.1.17
+V_SIEVE=       0.4.1
+V_DOVECOT=     2.2
+V_DOVECOT_FULL=        2.2.5
 
 DISTNAME=      dovecot-${V_DOVECOT}-pigeonhole-${V_SIEVE}
-REVISION=      0
 EPOCH=         0
 CATEGORIES=    mail
 PKGNAME=       dovecot-pigeonhole-${V_SIEVE}
 MASTER_SITES=  http://www.rename-it.nl/dovecot/${V_DOVECOT}/
 
-SHARED_LIBS=   dovecot-sieve   1.0
+SHARED_LIBS=   dovecot-sieve   2.0
 
 HOMEPAGE=      http://pigeonhole.dovecot.org/
 
@@ -24,9 +23,9 @@ MAINTAINER=   Brad Smith <[email protected]
 # LGPLv2.1
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=       ${MODLIBICONV_WANTLIB} c crypto ssl \
-               lib/dovecot/dovecot-lda lib/dovecot/dovecot-login \
-               lib/dovecot/dovecot-storage lib/dovecot/dovecot
+WANTLIB=       lib/dovecot/dovecot lib/dovecot/dovecot-lda \
+               lib/dovecot/dovecot-login lib/dovecot/dovecot-storage \
+               c crypto ssl ${MODLIBICONV_WANTLIB}
 
 MODULES=       converters/libiconv
 LIB_DEPENDS=   mail/dovecot=${V_DOVECOT_FULL}
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo    29 May 2013 21:11:45 -0000      1.9
+++ distinfo    18 Jul 2013 23:59:29 -0000
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.1-pigeonhole-0.3.5.tar.gz) = 
JOlxuniTkydhLKw0hPxHGGSmWhH/xHZ9N0fkGESEggM=
-SIZE (dovecot-2.1-pigeonhole-0.3.5.tar.gz) = 1090467
+SHA256 (dovecot-2.2-pigeonhole-0.4.1.tar.gz) = 
Nhz2HBtsikLYQdaUc22smca7W1Fm4FCpXBhRGTmcaW4=
+SIZE (dovecot-2.2-pigeonhole-0.4.1.tar.gz) = 1156858
Index: patches/patch-src_managesieve-login_Makefile_in
===================================================================
RCS file: 
/home/cvs/ports/mail/dovecot-pigeonhole/patches/patch-src_managesieve-login_Makefile_in,v
retrieving revision 1.3
diff -u -p -r1.3 patch-src_managesieve-login_Makefile_in
--- patches/patch-src_managesieve-login_Makefile_in     8 Jun 2012 22:05:03 
-0000       1.3
+++ patches/patch-src_managesieve-login_Makefile_in     10 May 2013 02:50:11 
-0000
@@ -1,7 +1,7 @@
 $OpenBSD: patch-src_managesieve-login_Makefile_in,v 1.3 2012/06/08 22:05:03 
sthen Exp $
---- src/managesieve-login/Makefile.in.orig     Fri May 25 17:32:08 2012
-+++ src/managesieve-login/Makefile.in  Fri Jun  1 16:43:42 2012
-@@ -284,7 +284,7 @@ libmanagesieve_login_settings_la_CFLAGS = \
+--- src/managesieve-login/Makefile.in.orig     Thu May  9 09:32:16 2013
++++ src/managesieve-login/Makefile.in  Thu May  9 22:50:02 2013
+@@ -291,7 +291,7 @@ libmanagesieve_login_settings_la_CFLAGS = \
  libs = \
        $(top_builddir)/src/lib-managesieve/libmanagesieve.a
  
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-pigeonhole/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   8 Jun 2012 22:05:03 -0000       1.3
+++ pkg/PLIST   10 May 2013 02:49:45 -0000
@@ -58,11 +58,14 @@ include/dovecot/sieve/sieve-stringlist.h
 include/dovecot/sieve/sieve-types.h
 include/dovecot/sieve/sieve-validator.h
 include/dovecot/sieve/sieve.h
+lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.so
 lib/dovecot/lib90_sieve_plugin.so
 @lib lib/dovecot/libdovecot-sieve.so.${LIBdovecot-sieve_VERSION}
 lib/dovecot/settings/
 lib/dovecot/settings/libmanagesieve_login_settings.so
 lib/dovecot/settings/libmanagesieve_settings.so
+lib/dovecot/sieve/
+lib/dovecot/sieve/lib90_sieve_extprograms_plugin.so
 @bin libexec/dovecot/managesieve
 @bin libexec/dovecot/managesieve-login
 @man man/man1/sieve-dump.1
@@ -75,6 +78,8 @@ share/doc/dovecot/example-config/
 share/doc/dovecot/example-config/conf.d/
 share/doc/dovecot/example-config/conf.d/20-managesieve.conf
 @sample ${SYSCONFDIR}/dovecot/conf.d/20-managesieve.conf
+share/doc/dovecot/example-config/conf.d/90-sieve-extprograms.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/90-sieve-extprograms.conf
 share/doc/dovecot/example-config/conf.d/90-sieve.conf
 @sample ${SYSCONFDIR}/dovecot/conf.d/90-sieve.conf
 share/doc/dovecot/sieve/
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-antispam/Makefile,v
retrieving revision 1.19
diff -u -p -r1.19 Makefile
--- Makefile    18 Jul 2013 20:19:04 -0000      1.19
+++ Makefile    10 Aug 2013 03:52:42 -0000
@@ -4,11 +4,10 @@ SHARED_ONLY=  Yes
 
 COMMENT=       anti-spam plugin for Dovecot
 
-V_DOVECOT_FULL= 2.1.17
+V_DOVECOT_FULL=        2.2.5
 
-DISTNAME=      dovecot-antispam-plugin-5e8351bcfb29
-PKGNAME=       dovecot-antispam-2.1
-REVISION=      11
+DISTNAME=      dovecot-antispam-plugin-5ebc6aae4d7c
+PKGNAME=       dovecot-antispam-2.2
 CATEGORIES=    mail
 
 # http://hg.dovecot.org/dovecot-antispam-plugin/
@@ -20,22 +19,12 @@ MAINTAINER= Anil Madhavapeddy <avsm@open
 # GPLv2
 PERMIT_PACKAGE_CDROM=  Yes
 
-WANTLIB=       lib/dovecot/dovecot-lda lib/dovecot/dovecot-login \
-               lib/dovecot/dovecot-storage lib/dovecot/dovecot crypto ssl
+WANTLIB=       lib/dovecot/dovecot lib/dovecot/dovecot-storage
 
-AUTOCONF_VERSION= 2.68
-AUTOMAKE_VERSION= 1.11
-BUILD_DEPENDS= ${MODGNU_AUTOCONF_DEPENDS} \
-               ${MODGNU_AUTOMAKE_DEPENDS} \
-               lang/gawk
-LIB_DEPENDS=    mail/dovecot=${V_DOVECOT_FULL}
+BUILD_DEPENDS= lang/gawk
+LIB_DEPENDS=   mail/dovecot=${V_DOVECOT_FULL}
 
 USE_GMAKE=     Yes
 CONFIGURE_STYLE= gnu
-
-pre-configure:
-       @cd ${WRKSRC}; AUTOCONF_VERSION=${AUTOCONF_VERSION} \
-           AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
-           ./autogen.sh
 
 .include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/mail/dovecot-antispam/distinfo,v
retrieving revision 1.3
diff -u -p -r1.3 distinfo
--- distinfo    25 Sep 2012 20:08:22 -0000      1.3
+++ distinfo    18 Jul 2013 23:43:25 -0000
@@ -1,2 +1,2 @@
-SHA256 (dovecot-antispam-plugin-5e8351bcfb29.tar.gz) = 
Vb3kZMc4GAa4gUMeDmxnVJPi26WbQ+0q7e3FxO4jU58=
-SIZE (dovecot-antispam-plugin-5e8351bcfb29.tar.gz) = 62162
+SHA256 (dovecot-antispam-plugin-5ebc6aae4d7c.tar.gz) = 
Ebry9rCS6wl9h+8dnlMynzDNthgRD86THnFgjrszmgY=
+SIZE (dovecot-antispam-plugin-5ebc6aae4d7c.tar.gz) = 448498

Reply via email to