3 files changed, 88 insertions, 77 deletions

diff --git a/mail/dovecot-pigeonhole/Makefile b/mail/dovecot-pigeonhole/Makefile
index 2f536f17f9de..d3a1c9252e07 100644
--- a/mail/dovecot-pigeonhole/Makefile
+++ b/mail/dovecot-pigeonhole/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	dovecot-pigeonhole
-PORTVERSION=	0.5.9
-PORTREVISION=	2
+PORTVERSION=	0.5.10
 CATEGORIES=	mail
 MASTER_SITES=	http://pigeonhole.dovecot.org/releases/${DOVECOTVERSION}/
 DISTNAME=	${PORTNAME:C/-/-${DOVECOTVERSION}-/}-${PORTVERSION}
@@ -20,7 +19,6 @@ DOVECOTVERSION=	2.3
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--exec-prefix=${PREFIX} \
-		--without-dovecot-install-dirs \
 		--docdir=${DOCSDIR} \
 		--with-dovecot="${LOCALBASE}/lib/dovecot"
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/mail/dovecot-pigeonhole/distinfo b/mail/dovecot-pigeonhole/distinfo
index 49be622ab670..ced55127f750 100644
--- a/mail/dovecot-pigeonhole/distinfo
+++ b/mail/dovecot-pigeonhole/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1575481505
-SHA256 (dovecot-2.3-pigeonhole-0.5.9.tar.gz) = 36da68aae5157b83e21383f711b8977e5b6f5477f369f71e7e22e76a738bbd05
-SIZE (dovecot-2.3-pigeonhole-0.5.9.tar.gz) = 1897060
+TIMESTAMP = 1583764476
+SHA256 (dovecot-2.3-pigeonhole-0.5.10.tar.gz) = 48c89cc9f3caa9c5f2454f9dcca74fe251a99749a38062bfab7e5017d329605e
+SIZE (dovecot-2.3-pigeonhole-0.5.10.tar.gz) = 1899237
diff --git a/mail/dovecot-pigeonhole/pkg-plist b/mail/dovecot-pigeonhole/pkg-plist
index 5ec367ca2b4e..980310bea615 100644
--- a/mail/dovecot-pigeonhole/pkg-plist
+++ b/mail/dovecot-pigeonhole/pkg-plist
@@ -1,88 +1,84 @@
-%%DOCSDIR%%/example-config/conf.d/20-managesieve.conf
-%%DOCSDIR%%/example-config/conf.d/90-sieve-extprograms.conf
-%%DOCSDIR%%/example-config/conf.d/90-sieve.conf
-%%DOCSDIR%%/example-config/sieve-ldap.conf
+%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_login_settings.a
+%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_login_settings.so
+%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_settings.a
+%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_settings.so
+%%MANAGESIEVE%%libexec/dovecot/managesieve
+%%MANAGESIEVE%%libexec/dovecot/managesieve-login
 bin/sieve-dump
 bin/sieve-filter
 bin/sieve-test
 bin/sievec
-include/dovecot-2.3-pigeonhole/sieve/edit-mail.h
-include/dovecot-2.3-pigeonhole/sieve/mail-raw.h
-include/dovecot-2.3-pigeonhole/sieve/pigeonhole-config.h
-include/dovecot-2.3-pigeonhole/sieve/pigeonhole-version.h
-include/dovecot-2.3-pigeonhole/sieve/rfc2822.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-actions.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-address-parts.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-address-source.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-address.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-ast.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-binary-dumper.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-binary-private.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-binary.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-code-dumper.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-code.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-commands.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-common.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-comparators.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-config.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-dump.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-error-private.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-error.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-execute.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-ext-copy.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-ext-enotify.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-ext-environment.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-ext-imap4flags.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-ext-mailbox.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-ext-variables.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-extensions.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-generator.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-interpreter.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-lexer.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-limits.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-match-types.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-match.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-message.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-objects.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-parser.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-plugins.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-result.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-runtime-trace.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-runtime.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-script-private.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-script.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-settings.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-smtp.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-storage-private.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-storage.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-stringlist.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-types.h
-include/dovecot-2.3-pigeonhole/sieve/sieve-validator.h
-include/dovecot-2.3-pigeonhole/sieve/sieve.h
-lib/dovecot-2.3-pigeonhole/libdovecot-sieve.a
-lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so
-lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so.0
-lib/dovecot-2.3-pigeonhole/libdovecot-sieve.so.0.0.0
+include/dovecot/sieve/edit-mail.h
+include/dovecot/sieve/mail-raw.h
+include/dovecot/sieve/pigeonhole-config.h
+include/dovecot/sieve/pigeonhole-version.h
+include/dovecot/sieve/rfc2822.h
+include/dovecot/sieve/sieve-actions.h
+include/dovecot/sieve/sieve-address-parts.h
+include/dovecot/sieve/sieve-address-source.h
+include/dovecot/sieve/sieve-address.h
+include/dovecot/sieve/sieve-ast.h
+include/dovecot/sieve/sieve-binary-dumper.h
+include/dovecot/sieve/sieve-binary-private.h
+include/dovecot/sieve/sieve-binary.h
+include/dovecot/sieve/sieve-code-dumper.h
+include/dovecot/sieve/sieve-code.h
+include/dovecot/sieve/sieve-commands.h
+include/dovecot/sieve/sieve-common.h
+include/dovecot/sieve/sieve-comparators.h
+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-execute.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-imap4flags.h
+include/dovecot/sieve/sieve-ext-mailbox.h
+include/dovecot/sieve/sieve-ext-variables.h
+include/dovecot/sieve/sieve-extensions.h
+include/dovecot/sieve/sieve-generator.h
+include/dovecot/sieve/sieve-interpreter.h
+include/dovecot/sieve/sieve-lexer.h
+include/dovecot/sieve/sieve-limits.h
+include/dovecot/sieve/sieve-match-types.h
+include/dovecot/sieve/sieve-match.h
+include/dovecot/sieve/sieve-message.h
+include/dovecot/sieve/sieve-objects.h
+include/dovecot/sieve/sieve-parser.h
+include/dovecot/sieve/sieve-plugins.h
+include/dovecot/sieve/sieve-result.h
+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-settings.h
+include/dovecot/sieve/sieve-smtp.h
+include/dovecot/sieve/sieve-storage-private.h
+include/dovecot/sieve/sieve-storage.h
+include/dovecot/sieve/sieve-stringlist.h
+include/dovecot/sieve/sieve-types.h
+include/dovecot/sieve/sieve-validator.h
+include/dovecot/sieve/sieve.h
 lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.a
 lib/dovecot/doveadm/lib10_doveadm_sieve_plugin.so
+lib/dovecot/lib90_sieve_plugin.a
+lib/dovecot/lib90_sieve_plugin.so
 lib/dovecot/lib95_imap_filter_sieve_plugin.a
 lib/dovecot/lib95_imap_filter_sieve_plugin.so
 lib/dovecot/lib95_imap_sieve_plugin.a
 lib/dovecot/lib95_imap_sieve_plugin.so
-lib/dovecot/sieve/lib90_sieve_imapsieve_plugin.a
-lib/dovecot/sieve/lib90_sieve_imapsieve_plugin.so
-lib/dovecot/lib90_sieve_plugin.a
-lib/dovecot/lib90_sieve_plugin.so
-%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_login_settings.a
-%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_login_settings.so
-%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_settings.a
-%%MANAGESIEVE%%lib/dovecot/settings/libmanagesieve_settings.so
+lib/dovecot/libdovecot-sieve.a
+lib/dovecot/libdovecot-sieve.so
+lib/dovecot/libdovecot-sieve.so.0
+lib/dovecot/libdovecot-sieve.so.0.0.0
 lib/dovecot/settings/libpigeonhole_settings.a
 lib/dovecot/settings/libpigeonhole_settings.so
 lib/dovecot/sieve/lib90_sieve_extprograms_plugin.a
 lib/dovecot/sieve/lib90_sieve_extprograms_plugin.so
-%%MANAGESIEVE%%libexec/dovecot/managesieve
-%%MANAGESIEVE%%libexec/dovecot/managesieve-login
+lib/dovecot/sieve/lib90_sieve_imapsieve_plugin.a
+lib/dovecot/sieve/lib90_sieve_imapsieve_plugin.so
 man/man1/doveadm-sieve.1.gz
 man/man1/sieve-dump.1.gz
 man/man1/sieve-filter.1.gz
@@ -91,3 +87,20 @@ man/man1/sievec.1.gz
 man/man1/sieved.1.gz
 man/man7/pigeonhole.7.gz
 share/aclocal/dovecot-pigeonhole.m4
+share/doc/dovecot/example-config/conf.d/20-managesieve.conf
+share/doc/dovecot/example-config/conf.d/90-sieve-extprograms.conf
+share/doc/dovecot/example-config/conf.d/90-sieve.conf
+share/doc/dovecot/example-config/sieve-ldap.conf
+share/doc/dovecot/sieve/extensions/duplicate.txt
+share/doc/dovecot/sieve/extensions/editheader.txt
+share/doc/dovecot/sieve/extensions/include.txt
+share/doc/dovecot/sieve/extensions/spamtest-virustest.txt
+share/doc/dovecot/sieve/extensions/vacation.txt
+share/doc/dovecot/sieve/extensions/vnd.dovecot.environment.txt
+share/doc/dovecot/sieve/extensions/vnd.dovecot.report.txt
+share/doc/dovecot/sieve/locations/dict.txt
+share/doc/dovecot/sieve/locations/file.txt
+share/doc/dovecot/sieve/locations/ldap.txt
+share/doc/dovecot/sieve/plugins/imap_filter_sieve.txt
+share/doc/dovecot/sieve/plugins/imapsieve.txt
+share/doc/dovecot/sieve/plugins/sieve_extprograms.txt