Merge ommitted stuff from mail/dovecot package, most importantly the

dovecot-sieve option (managesieve support is now included with sieve).
Create additional "dovenull" user for login processes.  Add MESSAGE
with upgrade notes.  Grab maintainership.

Major changes since 1.2:

* Dovecot uses two system users for internal purposes now by default:
  dovenull and dovecot. You need to create the dovenull user or change
  default_login_user setting.
* Global ACLs are now looked up using namespace prefixes. For example
  if you previously had INBOX. namespace prefix and a global ACL for
  "INBOX.Sent", it's now looked up from "INBOX.Sent" file instead of
  "Sent" as before.
* Maildir: File permissions are no longer based on dovecot-shared file,
  but the mailbox directory.

+ Redesigned master process. It's now more modular and there is less
code running as root.
+ Configuration supports now per-local/remote ip/network settings.
+ dsync utility does a two-way mailbox synchronization.
+ LMTP server and proxying.
+ Added mdbox (multi-dbox) mail storage backend.
+ doveadm utility can be used to do all kinds of administration
  functions. Old dovecotpw and *view utilities now exist in its
  subcommands.
+ imap and pop3 processes can now handle multiple connections.
+ IMAP: COMPRESS=DEFLATE is supported by imap_zlib plugin
+ director service helps NFS installations to redirect users always
  to same server to avoid corruption

2 files changed, 1 insertions, 23 deletions

diff --git a/mail/dovecot2/patches/patch-aa b/mail/dovecot2/patches/patch-aa
index e10e99f7d3b..2a8efbd36bd 100644
--- a/mail/dovecot2/patches/patch-aa
+++ b/mail/dovecot2/patches/patch-aa
@@ -1,16 +1,7 @@
-$NetBSD: patch-aa,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+$NetBSD: patch-aa,v 1.2 2010/11/09 15:23:11 ghen Exp $
 
 --- doc/example-config/Makefile.in.orig	2010-10-21 17:37:01.000000000 +0000
 +++ doc/example-config/Makefile.in
-@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
- SUBDIRS = conf.d
- pkgsysconfdir = $(sysconfdir)/dovecot
- nodist_pkgsysconf_DATA = README
--exampledir = $(docdir)/example-config
-+exampledir = $(datadir)/examples/dovecot
- example_DATA = \
- 	dovecot.conf \
- 	dovecot-db.conf.ext \
 @@ -623,8 +623,7 @@ info: info-recursive
  
  info-am:
diff --git a/mail/dovecot2/patches/patch-af b/mail/dovecot2/patches/patch-af
deleted file mode 100644
index 592c39cf740..00000000000
--- a/mail/dovecot2/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
-
---- doc/example-config/conf.d/Makefile.in.orig	2010-11-04 14:32:20.000000000 +0000
-+++ doc/example-config/conf.d/Makefile.in
-@@ -237,7 +237,7 @@ top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- pkgsysconfdir = $(sysconfdir)/dovecot
--exampledir = $(docdir)/example-config/conf.d
-+exampledir = $(datadir)/examples/dovecot/conf.d
- example_DATA = \
- 	auth-checkpassword.conf.ext \
- 	auth-deny.conf.ext \