Update dovecot2-pigeonhole to 0.4.0.

v0.4.0 09-05-2013 Stephan Bosch <stephan@rename-it.nl>

+ Added doveadm-sieve plugin that provides the possibility to synch Sieve
  scripts using doveadm sync along with the user's mailboxes.
+ Added the Sieve extprograms plugin to the main Pigeonhole package. It is
  still a plugin, but it is now included so that a separate compile is no
  longer necessary and distributors are likely to include it. The extprograms
  plugin provides Sieve language extensions that allows executing
  (administrator-controlled) external programs for message delivery,
  message filtering and string manipulation. Refer to
  doc/plugins/sieve_extprograms.txt for more information.
+ Added debug message showing Pigeonhole version at initialization. Makes it
  very clear that the plugin is properly loaded.
+ Finished implementation of the Sieve include extension. It should now
  fully conform to RFC 6609. The main addition is the new :optional tag which
  makes the include command ignore missing included scripts without an error.
+ Finished implementation of the Sieve environment extension as much as
  possible. Environment items "location", "phase" and "domain" now also
  return a usable value.

4 files changed, 19 insertions, 15 deletions

diff --git a/mail/dovecot2-pigeonhole/Makefile b/mail/dovecot2-pigeonhole/Makefile
index 85b89845ca4..afb7325c436 100644
--- a/mail/dovecot2-pigeonhole/Makefile
+++ b/mail/dovecot2-pigeonhole/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2013/02/06 23:22:42 jperkin Exp $
+# $NetBSD: Makefile,v 1.14 2013/05/14 15:49:52 taca Exp $
 
-DISTNAME=	dovecot-2.1-pigeonhole-0.3.3
-PKGNAME=	${DISTNAME:S/-2.1-/-/}
-PKGREVISION=	1
+DISTNAME=	dovecot-2.2-pigeonhole-0.4.0
+PKGNAME=	${DISTNAME:S/-2.2-/-/}
 CATEGORIES=	mail
-MASTER_SITES=	http://www.rename-it.nl/dovecot/2.1/
+MASTER_SITES=	http://www.rename-it.nl/dovecot/2.2/
 
 MAINTAINER=	adam@NetBSD.org
 HOMEPAGE=	http://www.dovecot.org/
diff --git a/mail/dovecot2-pigeonhole/PLIST b/mail/dovecot2-pigeonhole/PLIST
index 78e58279240..57a1e65d57b 100644
--- a/mail/dovecot2-pigeonhole/PLIST
+++ b/mail/dovecot2-pigeonhole/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2012/05/26 11:48:01 ghen Exp $
+@comment $NetBSD: PLIST,v 1.5 2013/05/14 15:49:52 taca Exp $
 bin/sieve-dump
 bin/sieve-filter
 bin/sieve-test
@@ -49,10 +49,12 @@ 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.la
 lib/dovecot/lib90_sieve_plugin.la
 lib/dovecot/libdovecot-sieve.la
 lib/dovecot/settings/libmanagesieve_login_settings.la
 lib/dovecot/settings/libmanagesieve_settings.la
+lib/dovecot/sieve/lib90_sieve_extprograms_plugin.la
 libexec/dovecot/managesieve
 libexec/dovecot/managesieve-login
 man/man1/sieve-dump.1
@@ -63,4 +65,5 @@ man/man1/sieved.1
 man/man7/pigeonhole.7
 share/doc/dovecot/sieve/script-location-dict.txt
 share/examples/dovecot/conf.d/20-managesieve.conf
+share/examples/dovecot/conf.d/90-sieve-extprograms.conf
 share/examples/dovecot/conf.d/90-sieve.conf
diff --git a/mail/dovecot2-pigeonhole/distinfo b/mail/dovecot2-pigeonhole/distinfo
index e13709fe7f7..ad376af608a 100644
--- a/mail/dovecot2-pigeonhole/distinfo
+++ b/mail/dovecot2-pigeonhole/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2012/10/01 07:10:58 ghen Exp $
+$NetBSD: distinfo,v 1.9 2013/05/14 15:49:52 taca Exp $
 
-SHA1 (dovecot-2.1-pigeonhole-0.3.3.tar.gz) = bdf9b4d5585dee748c8c0103a1964dd8425bd490
-RMD160 (dovecot-2.1-pigeonhole-0.3.3.tar.gz) = bb8b67abb23ad42931e22a5937ac3b21bc2e85ea
-Size (dovecot-2.1-pigeonhole-0.3.3.tar.gz) = 1078559 bytes
-SHA1 (patch-aa) = 97bcc7ae0c1b07508027e7c03247316de02badcf
+SHA1 (dovecot-2.2-pigeonhole-0.4.0.tar.gz) = 94ab5b803de8fd91c4e9691c54aadd8fd7c6c401
+RMD160 (dovecot-2.2-pigeonhole-0.4.0.tar.gz) = 49d10b1d20e9ba4bf6051bf73a18ef7b6da27677
+Size (dovecot-2.2-pigeonhole-0.4.0.tar.gz) = 1144018 bytes
+SHA1 (patch-aa) = 0bd3fcff71d4be51bb340111f52b7b9adfc269e6
diff --git a/mail/dovecot2-pigeonhole/patches/patch-aa b/mail/dovecot2-pigeonhole/patches/patch-aa
index 3b45bee9b4b..17dc4515687 100644
--- a/mail/dovecot2-pigeonhole/patches/patch-aa
+++ b/mail/dovecot2-pigeonhole/patches/patch-aa
@@ -1,8 +1,10 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/11/05 12:01:20 adam Exp $
+$NetBSD: patch-aa,v 1.2 2013/05/14 15:49:52 taca Exp $
 
---- doc/example-config/conf.d/Makefile.in.orig	2010-11-05 08:58:58.000000000 +0000
+Install example configuration files to examples directory of pkgsrc.
+
+--- doc/example-config/conf.d/Makefile.in.orig	2013-05-09 13:32:15.000000000 +0000
 +++ doc/example-config/conf.d/Makefile.in
-@@ -214,7 +214,7 @@ top_build_prefix = @top_build_prefix@
+@@ -231,7 +231,7 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  pkgsysconfdir = $(sysconfdir)/dovecot
@@ -10,4 +12,4 @@ $NetBSD: patch-aa,v 1.1.1.1 2010/11/05 12:01:20 adam Exp $
 +exampledir = $(datadir)/examples/dovecot/conf.d
  example_DATA = \
  	20-managesieve.conf \
- 	90-sieve.conf
+ 	90-sieve.conf \