mail/dovecot2: update to 2.2.5

- Update to 2.2.5 [1]
- Bump antispam plugin (pigeonhole update comming soon)
- Fix SSL pkg-plist
- Fix MAN1 list

Changes: http://www.dovecot.org/doc/NEWS-2.2

PR:		ports/181081 [1]
Submitted by:	Attila Nagy <bra fsn.hu> (maintainer)

3 files changed, 16 insertions, 9 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index ed984d7f8483..bb448a9a7e1d 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 
@@ -28,7 +28,6 @@ CONFLICTS=	dovecot-1.[0-9]*
 
 USES=		iconv
 USE_RC_SUBR=	dovecot
-MAKE_JOBS_SAFE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
@@ -94,7 +93,9 @@ CONFIGURE_ARGS+=--with-ioloop=kqueue
 #
 .if ${PORT_OPTIONS:MSSL}
 PROTOCOLS+=	imaps pop3s
+PLIST_SUB+=	SSL=""
 .else
+PLIST_SUB+=	SSL="@comment "
 CONFIGURE_ARGS+=--without-ssl
 .endif
 
@@ -203,8 +204,11 @@ MAN1=		deliver.1 \
 		doveadm-config.1 \
 		doveadm-director.1 \
 		doveadm-dump.1 \
+		doveadm-deduplicate.1 \
+		doveadm-exec.1 \
 		doveadm-expunge.1 \
 		doveadm-fetch.1 \
+		doveadm-flags.1 \
 		doveadm-force-resync.1 \
 		doveadm-help.1 \
 		doveadm-import.1 \
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 222b93c813a7..17dfbee51f53 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.2.4.tar.gz) = 018ffa5eb3a77772cb7ae932a67449536d92a3fa9781202481a4203c003dbdc4
-SIZE (dovecot-2.2.4.tar.gz) = 4335791
+SHA256 (dovecot-2.2.5.tar.gz) = 15b2cd607e6533f4805f471a61dd1c8bd81675cecc6ea6361504247dd9af5cf8
+SIZE (dovecot-2.2.5.tar.gz) = 4356745
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index b8dbb9bcaedc..83eeb5f9e2c7 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -76,6 +76,8 @@ 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
@@ -111,7 +113,10 @@ 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.h
 include/dovecot/http-response-parser.h
 include/dovecot/http-transfer.h
 include/dovecot/http-url.h
@@ -371,8 +376,6 @@ include/dovecot/rfc822-parser.h
 include/dovecot/safe-memset.h
 include/dovecot/safe-mkdir.h
 include/dovecot/safe-mkstemp.h
-include/dovecot/sasl-client-private.h
-include/dovecot/sasl-client.h
 include/dovecot/sasl-server.h
 include/dovecot/sdbox-file.h
 include/dovecot/sdbox-storage.h
@@ -529,9 +532,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
+%%SSL%%lib/dovecot/libssl_iostream_openssl.a
+%%SSL%%lib/dovecot/libssl_iostream_openssl.la
+%%SSL%%lib/dovecot/libssl_iostream_openssl.so
 libexec/dovecot/aggregator
 libexec/dovecot/anvil
 libexec/dovecot/auth