3 files changed, 47 insertions, 50 deletions

diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index 7d7022eb3d91..7ce3d5547b78 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot
-PORTVERSION=	2.2.5
+PORTVERSION=	2.2.6
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 
@@ -55,7 +55,6 @@ VPOPMAIL_DESC=	vpopmail support
 LUCENE_DESC=	CLucene FTS support
 SOLR_DESC=	Solr FTS support
 
-NO_STAGE=	yes
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "arm"
@@ -133,7 +132,7 @@ PLIST_SUB+=	LDAP="@comment "
 #
 .if ${PORT_OPTIONS:MLUCENE}
 CONFIGURE_ARGS+=--with-lucene
-LIB_DEPENDS+=	clucene-core:${PORTSDIR}/textproc/clucene
+LIB_DEPENDS+=	libclucene-core.so:${PORTSDIR}/textproc/clucene
 PLIST_SUB+=	LUCENE=""
 .else
 PLIST_SUB+=	LUCENE="@comment "
@@ -179,7 +178,7 @@ PLIST_SUB+=	SQL="@comment "
 .if ${PORT_OPTIONS:MSOLR}
 CONFIGURE_ARGS+=--with-solr
 BUILD_DEPENDS+=	curl:${PORTSDIR}/ftp/curl
-LIB_DEPENDS+=	expat:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS+=	libexpat.so:${PORTSDIR}/textproc/expat2
 PLIST_SUB+=	SOLR=""
 .else
 CONFIGURE_ARGS+=--without-solr
@@ -199,43 +198,6 @@ PLIST_SUB+=	LIBWRAP="@comment "
 SUB_LIST=	REQUIRE="${_REQUIRE}"
 SUB_FILES=	pkg-deinstall pkg-message
 
-MAN1=		deliver.1 \
-		doveadm-altmove.1 \
-		doveadm-auth.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 \
-		doveadm-index.1 \
-		doveadm-instance.1 \
-		doveadm-kick.1 \
-		doveadm-log.1 \
-		doveadm-mailbox.1 \
-		doveadm-mount.1 \
-		doveadm-move.1 \
-		doveadm-penalty.1 \
-		doveadm-purge.1 \
-		doveadm-pw.1 \
-		doveadm-quota.1 \
-		doveadm-reload.1 \
-		doveadm-search.1 \
-		doveadm-stop.1 \
-		doveadm-user.1 \
-		doveadm-who.1 \
-		doveadm.1 \
-		doveconf.1 \
-		dovecot-lda.1 \
-		dovecot.1 \
-		dsync.1
-MAN7=		doveadm-search-query.7
-
 post-patch:
 	@${REINPLACE_CMD} -E -e '${REINPLACE}' \
 		${WRKSRC}/doc/example-config/dovecot.conf
@@ -245,13 +207,10 @@ post-patch:
 		' ${WRKSRC}/*/Makefile.in ${WRKSRC}/Makefile.in
 
 post-install:
-.if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	cd ${WRKSRC}/doc && ${INSTALL_SCRIPT} dovecot-openssl.cnf mkcert.sh ${EXAMPLESDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	cd ${WRKSRC}/doc && ${INSTALL_SCRIPT} dovecot-openssl.cnf mkcert.sh ${STAGEDIR}${EXAMPLESDIR}
 .if ${PORT_OPTIONS:MDOCS}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${STAGEDIR}${DOCSDIR}
 .endif
-	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index 17dfbee51f53..f66cd756e69f 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.2.5.tar.gz) = 15b2cd607e6533f4805f471a61dd1c8bd81675cecc6ea6361504247dd9af5cf8
-SIZE (dovecot-2.2.5.tar.gz) = 4356745
+SHA256 (dovecot-2.2.6.tar.gz) = 62272bce0ba4b992f44b6eaf72543860ecd21694032243af009b9da2c0d3d6e5
+SIZE (dovecot-2.2.6.tar.gz) = 4483169
diff --git a/mail/dovecot2/pkg-plist b/mail/dovecot2/pkg-plist
index 83eeb5f9e2c7..8a2567d5f67a 100644
--- a/mail/dovecot2/pkg-plist
+++ b/mail/dovecot2/pkg-plist
@@ -112,9 +112,11 @@ include/dovecot/hostpid.h
 include/dovecot/http-client-private.h
 include/dovecot/http-client.h
 include/dovecot/http-date.h
+include/dovecot/http-header.h
 include/dovecot/http-header-parser.h
 include/dovecot/http-message-parser.h
 include/dovecot/http-parser.h
+include/dovecot/http-request.h
 include/dovecot/http-request-parser.h
 include/dovecot/http-response.h
 include/dovecot/http-response-parser.h
@@ -198,6 +200,7 @@ include/dovecot/istream-chain.h
 include/dovecot/istream-concat.h
 include/dovecot/istream-crlf.h
 include/dovecot/istream-dot.h
+include/dovecot/istream-hash.h
 include/dovecot/istream-header-filter.h
 include/dovecot/istream-jsonstr.h
 include/dovecot/istream-mail.h
@@ -570,6 +573,42 @@ libexec/dovecot/ssl-params
 libexec/dovecot/stats
 %%LIBWRAP%%libexec/dovecot/tcpwrap
 libexec/dovecot/xml2text
+man/man1/deliver.1.gz
+man/man1/doveadm-altmove.1.gz
+man/man1/doveadm-auth.1.gz
+man/man1/doveadm-config.1.gz
+man/man1/doveadm-deduplicate.1.gz
+man/man1/doveadm-director.1.gz
+man/man1/doveadm-dump.1.gz
+man/man1/doveadm-exec.1.gz
+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-help.1.gz
+man/man1/doveadm-import.1.gz
+man/man1/doveadm-index.1.gz
+man/man1/doveadm-instance.1.gz
+man/man1/doveadm-kick.1.gz
+man/man1/doveadm-log.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-purge.1.gz
+man/man1/doveadm-pw.1.gz
+man/man1/doveadm-quota.1.gz
+man/man1/doveadm-reload.1.gz
+man/man1/doveadm-search.1.gz
+man/man1/doveadm-stop.1.gz
+man/man1/doveadm-user.1.gz
+man/man1/doveadm-who.1.gz
+man/man1/doveadm.1.gz
+man/man1/doveconf.1.gz
+man/man1/dovecot-lda.1.gz
+man/man1/dovecot.1.gz
+man/man1/dsync.1.gz
+man/man7/doveadm-search-query.7.gz
 sbin/dovecot
 share/aclocal/dovecot.m4
 @dirrm libexec/dovecot
@@ -578,4 +617,3 @@ share/aclocal/dovecot.m4
 @dirrm lib/dovecot
 @dirrm include/dovecot
 @dirrmtry %%ETCDIR%%
-%%PORTDOCS%%@dirrmtry %%DOCSDIR%%