6 files changed, 30 insertions, 12 deletions

diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 0a401bb70520..596046f113f6 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dovecot-pigeonhole
-PORTVERSION=	0.2.2
-PORTREVISION=	2
+PORTVERSION=	0.2.3
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -35,7 +34,7 @@ MAN7=		pigeonhole.7
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/-/\//}
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS COPYING COPYING.LGPL INSTALL NEWS README TODO spamtest-virustest.txt
+PORTDOCS=	AUTHORS COPYING COPYING.LGPL INSTALL NEWS README TODO spamtest-virustest.txt vacation.txt
 .endif
 
 post-patch:
@@ -43,11 +42,8 @@ post-patch:
 		s!/doc/$${PACKAGE_TARNAME}!/doc/${PORTNAME:S/-/\//}!g;\
 		s!$${docdir}/dovecot/sieve!$${docdir}!g;\
 		' ${WRKSRC}/configure
-	@${REINPLACE_CMD} -E -e '\
-		/^docfiles = spamtest-virustest.txt$$/D;\
-		/^[[:space:]]+test -z "\$$\(sieve_docdir\)" \|\| \$$\(MKDIR_P\) "\$$\(DESTDIR\)\$$\(sieve_docdir\)"$$/D;\
-		' ${WRKSRC}/doc/Makefile.in
 	@${LN} -f ${WRKSRC}/doc/spamtest-virustest.txt ${WRKSRC}/
+	@${LN} -f ${WRKSRC}/doc/vacation.txt ${WRKSRC}/
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/mail/dovecot2-pigeonhole/distinfo b/mail/dovecot2-pigeonhole/distinfo
index f0d316b020f3..2c071f759a40 100644
--- a/mail/dovecot2-pigeonhole/distinfo
+++ b/mail/dovecot2-pigeonhole/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.0-pigeonhole-0.2.2.tar.gz) = 3c5fdbf8002f1571457b0dbd714107c83245ac8df997c8a6ba594bf809392f4e
-SIZE (dovecot-2.0-pigeonhole-0.2.2.tar.gz) = 1199973
+SHA256 (dovecot-2.0-pigeonhole-0.2.3.tar.gz) = 5f6f95f8e504e19c574d9d65fce382a2b3f8709ccf2d86beb709b09bf337b113
+SIZE (dovecot-2.0-pigeonhole-0.2.3.tar.gz) = 1213027
diff --git a/mail/dovecot2-pigeonhole/files/patch-doc_Makefile_in b/mail/dovecot2-pigeonhole/files/patch-doc_Makefile_in
new file mode 100644
index 000000000000..cc3b579679ba
--- /dev/null
+++ b/mail/dovecot2-pigeonhole/files/patch-doc_Makefile_in
@@ -0,0 +1,20 @@
+--- doc/Makefile.in.orig	2011-08-04 22:57:55.866970694 +0100
++++ doc/Makefile.in	2011-08-04 22:58:55.250588677 +0100
+@@ -254,9 +254,6 @@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = man example-config
+-docfiles = \
+-	vacation.txt \
+-	spamtest-virustest.txt
+ 
+ @BUILD_DOCS_TRUE@sieve_doc_DATA = $(docfiles)
+ EXTRA_DIST = \
+@@ -305,7 +302,6 @@
+ 	-rm -rf .libs _libs
+ install-sieve_docDATA: $(sieve_doc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	test -z "$(sieve_docdir)" || $(MKDIR_P) "$(DESTDIR)$(sieve_docdir)"
+ 	@list='$(sieve_doc_DATA)'; test -n "$(sieve_docdir)" || list=; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
diff --git a/mail/dovecot2-pigeonhole/pkg-plist b/mail/dovecot2-pigeonhole/pkg-plist
index 2350ab65ea57..dbd851d533c9 100644
--- a/mail/dovecot2-pigeonhole/pkg-plist
+++ b/mail/dovecot2-pigeonhole/pkg-plist
@@ -19,6 +19,7 @@ include/dovecot/sieve/sieve-config.h
 include/dovecot/sieve/sieve-dump.h
 include/dovecot/sieve/sieve-error-private.h
 include/dovecot/sieve/sieve-error.h
+include/dovecot/sieve/sieve-ext-copy.h
 include/dovecot/sieve/sieve-ext-enotify.h
 include/dovecot/sieve/sieve-ext-environment.h
 include/dovecot/sieve/sieve-ext-variables.h
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
index b76ec9a9c700..e90976980360 100644
--- a/mail/dovecot2/Makefile
+++ b/mail/dovecot2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	dovecot
-PORTVERSION=	2.0.12
+PORTVERSION=	2.0.13
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://www.dovecot.org/releases/${PORTVERSION:R}/
 
@@ -171,6 +171,7 @@ MAN1=		deliver.1 \
 		doveadm-force-resync.1 \
 		doveadm-help.1 \
 		doveadm-import.1 \
+		doveadm-index.1 \
 		doveadm-kick.1 \
 		doveadm-log.1 \
 		doveadm-mailbox.1 \
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
index f3dc1a074513..0e2cfb061bd6 100644
--- a/mail/dovecot2/distinfo
+++ b/mail/dovecot2/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.0.12.tar.gz) = 05322d7378d19991c098f231b9bc0296d53e499d3b12b91ab92a3e2d10ab43d6
-SIZE (dovecot-2.0.12.tar.gz) = 3257165
+SHA256 (dovecot-2.0.13.tar.gz) = 2b512263ec05bbd74cde5c697ad12250d9268eba1c8ce4a8144adea69308675d
+SIZE (dovecot-2.0.13.tar.gz) = 3272542