3 files changed, 5 insertions, 25 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 63611734e83e..fc527134dcc9 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -13,7 +13,7 @@
 ######################################################################
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.25
+PORTVERSION=	2.2.24
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 PKGNAMESUFFIX=	2
@@ -26,8 +26,9 @@ LICENSE_COMB=	dual
 
 CONFLICTS=	dovecot-1.[0-9]*
 
-USES=		cpe iconv libtool ssl
+USES=		cpe iconv libtool
 USE_RC_SUBR=	dovecot
+USE_OPENSSL=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=/var \
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 6ce560748957..09427e6e0417 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,3 +1,2 @@
-TIMESTAMP = 1467385503
-SHA256 (dovecot-2.2.25.tar.gz) = d8d9f32c846397f7c22749a84c5cf6f59c55ff7ded3dc9f07749a255182f9667
-SIZE (dovecot-2.2.25.tar.gz) = 5576235
+SHA256 (dovecot-2.2.24.tar.gz) = 71c86891ea8deb5703d3dbbc3ea31ce2cbf7638f1aa395d9e8794d3ff7aebeb7
+SIZE (dovecot-2.2.24.tar.gz) = 5345872
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index 8ffc9625af9b..7fa88abf6acb 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -56,7 +56,6 @@ include/dovecot/auth-fields.h
 include/dovecot/auth-master-connection.h
 include/dovecot/auth-master.h
 include/dovecot/auth-penalty.h
-include/dovecot/auth-policy.h
 include/dovecot/auth-postfix-connection.h
 include/dovecot/auth-request-handler.h
 include/dovecot/auth-request-stats.h
@@ -90,9 +89,6 @@ include/dovecot/crc32.h
 include/dovecot/cydir-storage.h
 include/dovecot/cydir-sync.h
 include/dovecot/data-stack.h
-include/dovecot/dcrypt-iostream-private.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
@@ -247,7 +243,6 @@ include/dovecot/imem.h
 include/dovecot/index-attachment.h
 include/dovecot/index-mail.h
 include/dovecot/index-mailbox-size.h
-include/dovecot/index-pop3-uidl.h
 include/dovecot/index-rebuild.h
 include/dovecot/index-search-private.h
 include/dovecot/index-search-result.h
@@ -282,7 +277,6 @@ include/dovecot/istream-callback.h
 include/dovecot/istream-chain.h
 include/dovecot/istream-concat.h
 include/dovecot/istream-crlf.h
-include/dovecot/istream-decrypt.h
 include/dovecot/istream-dot.h
 include/dovecot/istream-failure-at.h
 include/dovecot/istream-file-private.h
@@ -441,7 +435,6 @@ include/dovecot/notify-plugin.h
 include/dovecot/numpack.h
 include/dovecot/ostream-cmp.h
 include/dovecot/ostream-dot.h
-include/dovecot/ostream-encrypt.h
 include/dovecot/ostream-escaped.h
 include/dovecot/ostream-failure-at.h
 include/dovecot/ostream-hash.h
@@ -456,7 +449,6 @@ include/dovecot/passdb-cache.h
 include/dovecot/passdb-template.h
 include/dovecot/passdb.h
 include/dovecot/password-scheme.h
-include/dovecot/pkcs5.h
 include/dovecot/pop3-capability.h
 include/dovecot/pop3-client.h
 include/dovecot/pop3-commands.h
@@ -618,9 +610,6 @@ 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/lib99_welcome_plugin.a
-lib/dovecot/lib99_welcome_plugin.so
-lib/dovecot/libdcrypt_openssl.so
 lib/dovecot/libdovecot-compression.a
 lib/dovecot/libdovecot-compression.so
 lib/dovecot/libdovecot-compression.so.0
@@ -710,7 +699,6 @@ man/man1/doveadm-expunge.1.gz
 man/man1/doveadm-fetch.1.gz
 man/man1/doveadm-flags.1.gz
 man/man1/doveadm-force-resync.1.gz
-man/man1/doveadm-fs.1.gz
 man/man1/doveadm-fts.1.gz
 man/man1/doveadm-help.1.gz
 man/man1/doveadm-import.1.gz
@@ -742,18 +730,10 @@ 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
 %%LIBWRAP%%libexec/dovecot/tcpwrap
 %%LDAP%%include/dovecot/ldap-client.h