4 files changed, 35 insertions, 35 deletions

diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 1fecec8dd741..127ffd1e3ab2 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dovecot-pigeonhole
-PORTVERSION=	0.3.0
-PORTREVISION=	1
+PORTVERSION=	0.3.1
 CATEGORIES=	mail
 MASTER_SITES=	http://www.rename-it.nl/dovecot/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -15,8 +14,10 @@ DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
 MAINTAINER=	bra@fsn.hu
 COMMENT=	A Sieve plugin for the Dovecot 'deliver' LDA and LMTP
 
-BUILD_DEPENDS=	dovecot>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot${DOVECOTVERSION:R}
-RUN_DEPENDS=	dovecot>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot${DOVECOTVERSION:R}
+LICENSE=	LGPL21
+
+BUILD_DEPENDS:=	dovecot>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot${DOVECOTVERSION:R}
+RUN_DEPENDS:=	dovecot>=${DOVECOTVERSION}:${PORTSDIR}/mail/dovecot${DOVECOTVERSION:R}
 
 DOVECOTVERSION=	2.1
 
@@ -34,23 +35,41 @@ MAN7=		pigeonhole.7
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/-/\//}
 
 .if !defined(NOPORTDOCS)
-PORTDOCS=	AUTHORS COPYING COPYING.LGPL INSTALL NEWS README TODO spamtest-virustest.txt vacation.txt
+EXTENSIONDOCS=	editheader.txt include.txt spamtest-virustest.txt \
+		vacation.txt vnd.dovecot.duplicate.txt
+PORTDOCS=	AUTHORS COPYING COPYING.LGPL INSTALL NEWS README TODO \
+		script-location-dict.txt ${EXTENSIONDOCS}
+.endif
+
+.if !defined(NOPORTEXAMPLES)
+EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:S/-/\//}
+PORTEXAMPLES=	*.sieve
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e '\
-		s!/doc/$${PACKAGE_TARNAME}!/doc/${PORTNAME:S/-/\//}!g;\
-		s!$${docdir}/dovecot/sieve!$${docdir}!g;\
-		' ${WRKSRC}/configure
-	@${LN} -f ${WRKSRC}/doc/spamtest-virustest.txt ${WRKSRC}/
-	@${LN} -f ${WRKSRC}/doc/vacation.txt ${WRKSRC}/
+	@${REINPLACE_CMD} -E '\
+		s!^(install-data-am:) install-sieve_docDATA!\1!; \
+		s!^(uninstall-am:) uninstall-sieve_docDATA!\1!;' \
+		${WRKSRC}/doc/Makefile.in
+.if !defined(NOPORTDOCS)
+.for f in ${EXTENSIONDOCS}
+	@${LN} -f ${WRKSRC}/doc/extensions/${f} ${WRKSRC}/
+.endfor
+	@${LN} -f ${WRKSRC}/doc/script-location-dict.txt ${WRKSRC}/
+.endif
 
 post-install:
 .if !defined(NOPORTDOCS)
-	${INSTALL} ${_SHROWNGRP} -m ${BINMODE} -d ${DOCSDIR}
+	@${INSTALL} ${_SHROWNGRP} -m ${BINMODE} -d ${DOCSDIR}
 .for f in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+	@${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
+	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}"
+.endif
+.if !defined(NOPORTEXAMPLES)
+	@${INSTALL} ${_SHROWNGRP} -m ${BINMODE} -d ${EXAMPLESDIR}
+	@${INSTALL_DATA} ${WRKSRC}/examples/*.sieve ${EXAMPLESDIR}
+	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}"
 .endif
 	@${CAT} ${PKGMESSAGE}
 
diff --git a/mail/dovecot2-pigeonhole/distinfo b/mail/dovecot2-pigeonhole/distinfo
index f4f621ff6208..63c1b7895168 100644
--- a/mail/dovecot2-pigeonhole/distinfo
+++ b/mail/dovecot2-pigeonhole/distinfo
@@ -1,2 +1,2 @@
-SHA256 (dovecot-2.1-pigeonhole-0.3.0.tar.gz) = 2aeee8aa6dc700483b0a5a3d31f535abce71698ed1d467f11e931aeace2b0ada
-SIZE (dovecot-2.1-pigeonhole-0.3.0.tar.gz) = 1277277
+SHA256 (dovecot-2.1-pigeonhole-0.3.1.tar.gz) = e95d86c5cd912c9a7e180414ffd5eee52e1b5dc8abef3d5762b950d1de86b5c7
+SIZE (dovecot-2.1-pigeonhole-0.3.1.tar.gz) = 1084148
diff --git a/mail/dovecot2-pigeonhole/files/patch-doc_Makefile_in b/mail/dovecot2-pigeonhole/files/patch-doc_Makefile_in
deleted file mode 100644
index a83a74df8ce2..000000000000
--- a/mail/dovecot2-pigeonhole/files/patch-doc_Makefile_in
+++ /dev/null
@@ -1,20 +0,0 @@
---- doc/Makefile.in.orig	2011-09-17 00:29:32.041186370 +0100
-+++ doc/Makefile.in	2011-09-17 00:30:18.168226616 +0100
-@@ -210,9 +210,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 = \
-@@ -260,7 +257,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)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
diff --git a/mail/dovecot2-pigeonhole/pkg-plist b/mail/dovecot2-pigeonhole/pkg-plist
index 635c5ed5046d..63855c0d0815 100644
--- a/mail/dovecot2-pigeonhole/pkg-plist
+++ b/mail/dovecot2-pigeonhole/pkg-plist
@@ -41,6 +41,7 @@ include/dovecot/sieve/sieve-runtime-trace.h
 include/dovecot/sieve/sieve-runtime.h
 include/dovecot/sieve/sieve-script-private.h
 include/dovecot/sieve/sieve-script.h
+include/dovecot/sieve/sieve-script-file.h
 include/dovecot/sieve/sieve-settings.h
 include/dovecot/sieve/sieve-smtp.h
 include/dovecot/sieve/sieve-stringlist.h