Update to Dovecot 1.1.1. Beta's and RC's have been tracked in pkgsrc-wip,

copy from there.

Update the Sieve plugin accordingly to 1.1.5.

Major changes since 1.0:

	* After Dovecot v1.1 has modified index or dovecot-uidlist files,
	  they can't be opened anymore with Dovecot versions earlier than
	  v1.0.2.
	* See doc/wiki/Upgrading.1.1.txt (or for latest changes,
	  http://wiki.dovecot.org/Upgrading/1.1) for list of changes since
	  v1.0 that you should be aware of when upgrading.

	+ IMAP: Added support for UIDPLUS and LIST-EXTENDED extensions.
	+ IMAP SORT: Sort keys are indexed, which makes SORT commands faster.
	+ When saving messages, update cache file immediately with the data
	  that we expect client to fetch later.
	+ NFS caches are are flushed whenever needed. See mail_nfs_storage and
	  mail_nfs_index settings.
	+ Out of order command execution (SEARCH, FETCH, LIST), nonstandard
	  command cancellation (X-CANCEL <tag>)
	+ IMAP: STATUS-IN-LIST draft implementation
	+ Expire plugin can be used to keep track of oldest messages in
	  specific mailboxes. A nightly run can then quickly expunge old
	  messages from the mailboxes that have them. The tracking is done
	  using lib-dict, so you can use either Berkeley DB or SQL database.
	+ Namespaces are supported everywhere now.
	+ Namespaces have new list and subscriptions settings.
	+ Full text search indexing support with Lucene and Squat backends.
	+ OTP and S/KEY authentication mechanisms (by Andrey Panin).
	+ mbox and Maildir works with both Maildir++ and FS layouts. You can
	  change these by appending :LAYOUT=3Dmaildir++ or :LAYOUT=3Dfs to
	  mail_location.
	+ LDAP: Support templates in pass_attrs and user_attrs
	+ Support for listening in multiple IPs/ports.
	+ Quota plugin rewrite: Support for multiple quota roots, warnings,
	  allow giving storage size in bytes or kilo/mega/giga/terabytes,
	  per-mailbox quota rules.
	+ Filesystem quota backend supports inode limits, group quota and
	  RPC quota for NFS.
	+ SEARCH and SORT finally compare non-ASCII characters
	  case-insensitively. We use i;unicode-casemap algorithm.
	+ Config files support splitting values to multiple lines with \

15 files changed, 144 insertions, 78 deletions

diff --git a/mail/dovecot-sieve/Makefile b/mail/dovecot-sieve/Makefile
index ab69b13c22a..1651a561956 100644
--- a/mail/dovecot-sieve/Makefile
+++ b/mail/dovecot-sieve/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2008/05/16 19:51:07 ghen Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/22 17:41:23 ghen Exp $
 
-DISTNAME=		dovecot-sieve-1.0.3
+DISTNAME=		dovecot-sieve-1.1.5
 CATEGORIES=		mail
 MASTER_SITES=		http://www.dovecot.org/releases/sieve/
 
diff --git a/mail/dovecot-sieve/distinfo b/mail/dovecot-sieve/distinfo
index b0237849afc..ea298c997c5 100644
--- a/mail/dovecot-sieve/distinfo
+++ b/mail/dovecot-sieve/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2008/05/16 19:51:08 ghen Exp $
+$NetBSD: distinfo,v 1.3 2008/06/22 17:41:23 ghen Exp $
 
-SHA1 (dovecot-sieve-1.0.3.tar.gz) = 48f67c33c08689c50a254bc6faeecba407d12294
-RMD160 (dovecot-sieve-1.0.3.tar.gz) = b575a1181fb2389a47db4cdd2815a47a2fe30b91
-Size (dovecot-sieve-1.0.3.tar.gz) = 455806 bytes
-SHA1 (patch-aa) = 9226392bc0299f4f4933d1598f6fd581ffd127bf
+SHA1 (dovecot-sieve-1.1.5.tar.gz) = 672adf0a2f1627d96f97fc63fecaf024dd9f7a42
+RMD160 (dovecot-sieve-1.1.5.tar.gz) = 825a8ec07d49527d8551cb5f3f86b638fddbafbd
+Size (dovecot-sieve-1.1.5.tar.gz) = 468913 bytes
+SHA1 (patch-aa) = 128e1905dd750d7191dba916057dc0803fc52661
diff --git a/mail/dovecot-sieve/patches/patch-aa b/mail/dovecot-sieve/patches/patch-aa
index 72bd499d657..a0ed835ca45 100644
--- a/mail/dovecot-sieve/patches/patch-aa
+++ b/mail/dovecot-sieve/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/08/27 10:40:50 ghen Exp $
+$NetBSD: patch-aa,v 1.2 2008/06/22 17:41:23 ghen Exp $
 
---- src/libsieve/Makefile.in.orig	2007-07-20 10:19:20.000000000 +0200
+--- src/libsieve/Makefile.in.orig	2007-09-23 16:59:48.000000000 +0200
 +++ src/libsieve/Makefile.in
 @@ -38,8 +38,8 @@ PRE_UNINSTALL = :
  POST_UNINSTALL = :
@@ -26,11 +26,11 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/08/27 10:40:50 ghen Exp $
  @HAVE_DOVECOT_LIBS_TRUE@	$(dovecotdir)/src/lib/liblib.a
 +@HAVE_DOVECOT_LIBS_FALSE@sievec_DEPENDENCIES = libsieve.la \
 +@HAVE_DOVECOT_LIBS_FALSE@	$(dovecotdir)/liblib.a
- am__sieved_SOURCES_DIST = sieved.c ../map.c
+ am__sieved_SOURCES_DIST = sieved.c ../map.c ../imparse.c
 -@HAVE_DOVECOT_LIBS_TRUE@am_sieved_OBJECTS = sieved.$(OBJEXT) \
--@HAVE_DOVECOT_LIBS_TRUE@	map.$(OBJEXT)
+-@HAVE_DOVECOT_LIBS_TRUE@	map.$(OBJEXT) imparse.$(OBJEXT)
 +am_sieved_OBJECTS = sieved.$(OBJEXT) \
-+	map.$(OBJEXT)
++	map.$(OBJEXT) imparse.$(OBJEXT)
  sieved_OBJECTS = $(am_sieved_OBJECTS)
  @HAVE_DOVECOT_LIBS_TRUE@sieved_DEPENDENCIES = libsieve.la \
  @HAVE_DOVECOT_LIBS_TRUE@	$(dovecotdir)/src/lib/liblib.a
@@ -39,7 +39,7 @@ $NetBSD: patch-aa,v 1.1.1.1 2007/08/27 10:40:50 ghen Exp $
  DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
-@@ -266,10 +270,16 @@ noinst_HEADERS = \
+@@ -267,10 +271,16 @@ noinst_HEADERS = \
  @HAVE_DOVECOT_LIBS_TRUE@sievec_LDADD = \
  @HAVE_DOVECOT_LIBS_TRUE@	libsieve.la \
  @HAVE_DOVECOT_LIBS_TRUE@	$(dovecotdir)/src/lib/liblib.a
diff --git a/mail/dovecot/MESSAGE b/mail/dovecot/MESSAGE
index a15ecad309f..54f473c47c4 100644
--- a/mail/dovecot/MESSAGE
+++ b/mail/dovecot/MESSAGE
@@ -1,8 +1,7 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2007/09/23 18:07:17 ghen Exp $
+$NetBSD: MESSAGE,v 1.3 2008/06/22 17:41:23 ghen Exp $
 
-The Dovecot configuration file format has changed between 0.99.x
-and 1.0.  If you are upgrading from 0.99.x, be sure to read
-http://wiki.dovecot.org/Upgrading/1.0 to avoid any issues.
+If you are upgrading from Dovecot 1.0.x to 1.1.x, you can find some
+update notes on http://wiki.dovecot.org/Upgrading/1.1
 
 ===========================================================================
diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile
index 5825a46d3a0..dc206b324e3 100644
--- a/mail/dovecot/Makefile
+++ b/mail/dovecot/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.116 2008/06/03 05:52:10 ghen Exp $
+# $NetBSD: Makefile,v 1.117 2008/06/22 17:41:23 ghen Exp $
 
-DISTNAME=		dovecot-1.0.14
+DISTNAME=		dovecot-1.1.1
 CATEGORIES=		mail
-MASTER_SITES=		http://www.dovecot.org/releases/1.0/
+MASTER_SITES=		http://www.dovecot.org/releases/1.1/
 
 MAINTAINER=		ghen@NetBSD.org
 HOMEPAGE=		http://www.dovecot.org/
@@ -14,6 +14,7 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		pkg-config
+USE_TOOLS+=		rpcgen
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
diff --git a/mail/dovecot/PLIST b/mail/dovecot/PLIST
index c0e557f262f..eab3cdefd35 100644
--- a/mail/dovecot/PLIST
+++ b/mail/dovecot/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2007/11/28 15:11:50 ghen Exp $
+@comment $NetBSD: PLIST,v 1.20 2008/06/22 17:41:23 ghen Exp $
 include/dovecot/config.h
 include/dovecot/src/auth/auth-cache.h
 include/dovecot/src/auth/auth-client-connection.h
@@ -6,7 +6,6 @@ include/dovecot/src/auth/auth-client-interface.h
 include/dovecot/src/auth/auth-master-connection.h
 include/dovecot/src/auth/auth-master-interface.h
 include/dovecot/src/auth/auth-master-listener.h
-include/dovecot/src/auth/auth-module.h
 include/dovecot/src/auth/auth-request-handler.h
 include/dovecot/src/auth/auth-request.h
 include/dovecot/src/auth/auth-stream.h
@@ -19,11 +18,14 @@ include/dovecot/src/auth/db-passwd-file.h
 include/dovecot/src/auth/db-sql.h
 include/dovecot/src/auth/mech.h
 include/dovecot/src/auth/mycrypt.h
+include/dovecot/src/auth/otp-skey-common.h
 include/dovecot/src/auth/passdb-blocking.h
 include/dovecot/src/auth/passdb-cache.h
 include/dovecot/src/auth/passdb.h
 include/dovecot/src/auth/password-scheme.h
+include/dovecot/src/auth/plain-common.h
 include/dovecot/src/auth/userdb-blocking.h
+include/dovecot/src/auth/userdb-static.h
 include/dovecot/src/auth/userdb-vpopmail.h
 include/dovecot/src/auth/userdb.h
 include/dovecot/src/deliver/auth-client.h
@@ -40,9 +42,9 @@ include/dovecot/src/imap/imap-fetch.h
 include/dovecot/src/imap/imap-messageset.h
 include/dovecot/src/imap/imap-search.h
 include/dovecot/src/imap/imap-sort.h
+include/dovecot/src/imap/imap-status.h
 include/dovecot/src/imap/imap-sync.h
 include/dovecot/src/imap/imap-thread.h
-include/dovecot/src/imap/namespace.h
 include/dovecot/src/lib-auth/auth-client.h
 include/dovecot/src/lib-auth/auth-server-connection.h
 include/dovecot/src/lib-auth/auth-server-request.h
@@ -68,17 +70,20 @@ include/dovecot/src/lib-index/mail-index-view-private.h
 include/dovecot/src/lib-index/mail-index.h
 include/dovecot/src/lib-index/mail-transaction-log-private.h
 include/dovecot/src/lib-index/mail-transaction-log.h
-include/dovecot/src/lib-index/mail-transaction-util.h
+include/dovecot/src/lib-index/mailbox-list-index-private.h
+include/dovecot/src/lib-index/mailbox-list-index.h
 include/dovecot/src/lib-mail/istream-header-filter.h
 include/dovecot/src/lib-mail/mail-types.h
+include/dovecot/src/lib-mail/mbox-from.h
 include/dovecot/src/lib-mail/message-address.h
-include/dovecot/src/lib-mail/message-body-search.h
-include/dovecot/src/lib-mail/message-content-parser.h
 include/dovecot/src/lib-mail/message-date.h
+include/dovecot/src/lib-mail/message-decoder.h
 include/dovecot/src/lib-mail/message-header-decode.h
-include/dovecot/src/lib-mail/message-header-search.h
+include/dovecot/src/lib-mail/message-header-parser.h
+include/dovecot/src/lib-mail/message-id.h
 include/dovecot/src/lib-mail/message-parser.h
 include/dovecot/src/lib-mail/message-part-serialize.h
+include/dovecot/src/lib-mail/message-search.h
 include/dovecot/src/lib-mail/message-send.h
 include/dovecot/src/lib-mail/message-size.h
 include/dovecot/src/lib-mail/quoted-printable.h
@@ -86,30 +91,47 @@ include/dovecot/src/lib-mail/rfc822-parser.h
 include/dovecot/src/lib-settings/settings.h
 include/dovecot/src/lib-sql/sql-api-private.h
 include/dovecot/src/lib-sql/sql-api.h
+include/dovecot/src/lib-sql/sql-pool.h
+include/dovecot/src/lib-storage/index/cydir/cydir-storage.h
+include/dovecot/src/lib-storage/index/cydir/cydir-sync.h
+include/dovecot/src/lib-storage/index/dbox/dbox-file-maildir.h
 include/dovecot/src/lib-storage/index/dbox/dbox-file.h
-include/dovecot/src/lib-storage/index/dbox/dbox-format.h
-include/dovecot/src/lib-storage/index/dbox/dbox-keywords.h
+include/dovecot/src/lib-storage/index/dbox/dbox-index.h
 include/dovecot/src/lib-storage/index/dbox/dbox-storage.h
 include/dovecot/src/lib-storage/index/dbox/dbox-sync.h
-include/dovecot/src/lib-storage/index/dbox/dbox-uidlist.h
 include/dovecot/src/lib-storage/index/index-mail.h
+include/dovecot/src/lib-storage/index/index-sort-private.h
+include/dovecot/src/lib-storage/index/index-sort.h
 include/dovecot/src/lib-storage/index/index-storage.h
+include/dovecot/src/lib-storage/index/index-sync-changes.h
+include/dovecot/src/lib-storage/index/maildir/maildir-filename.h
 include/dovecot/src/lib-storage/index/maildir/maildir-keywords.h
 include/dovecot/src/lib-storage/index/maildir/maildir-storage.h
+include/dovecot/src/lib-storage/index/maildir/maildir-sync.h
 include/dovecot/src/lib-storage/index/maildir/maildir-uidlist.h
 include/dovecot/src/lib-storage/index/mbox/istream-raw-mbox.h
 include/dovecot/src/lib-storage/index/mbox/mbox-file.h
-include/dovecot/src/lib-storage/index/mbox/mbox-from.h
 include/dovecot/src/lib-storage/index/mbox/mbox-lock.h
 include/dovecot/src/lib-storage/index/mbox/mbox-md5.h
 include/dovecot/src/lib-storage/index/mbox/mbox-storage.h
 include/dovecot/src/lib-storage/index/mbox/mbox-sync-private.h
+include/dovecot/src/lib-storage/index/raw/raw-storage.h
+include/dovecot/src/lib-storage/index/raw/raw-sync.h
+include/dovecot/src/lib-storage/list/index-mailbox-list.h
+include/dovecot/src/lib-storage/list/mailbox-list-fs.h
+include/dovecot/src/lib-storage/list/mailbox-list-maildir.h
+include/dovecot/src/lib-storage/list/mailbox-list-subscriptions.h
+include/dovecot/src/lib-storage/list/subscription-file.h
 include/dovecot/src/lib-storage/mail-copy.h
+include/dovecot/src/lib-storage/mail-error.h
+include/dovecot/src/lib-storage/mail-namespace.h
 include/dovecot/src/lib-storage/mail-search.h
 include/dovecot/src/lib-storage/mail-storage-private.h
 include/dovecot/src/lib-storage/mail-storage.h
+include/dovecot/src/lib-storage/mailbox-list-private.h
+include/dovecot/src/lib-storage/mailbox-list.h
 include/dovecot/src/lib-storage/mailbox-tree.h
-include/dovecot/src/lib-storage/subscription-file/subscription-file.h
+include/dovecot/src/lib/aqueue.h
 include/dovecot/src/lib/array-decl.h
 include/dovecot/src/lib/array.h
 include/dovecot/src/lib/backtrace-string.h
@@ -118,11 +140,13 @@ include/dovecot/src/lib/bsearch-insert-pos.h
 include/dovecot/src/lib/buffer.h
 include/dovecot/src/lib/close-keep-errno.h
 include/dovecot/src/lib/compat.h
+include/dovecot/src/lib/crc32.h
 include/dovecot/src/lib/data-stack.h
 include/dovecot/src/lib/env-util.h
 include/dovecot/src/lib/failures.h
 include/dovecot/src/lib/fd-close-on-exec.h
 include/dovecot/src/lib/fd-set-nonblock.h
+include/dovecot/src/lib/fdatasync-path.h
 include/dovecot/src/lib/fdpass.h
 include/dovecot/src/lib/file-cache.h
 include/dovecot/src/lib/file-copy.h
@@ -138,28 +162,34 @@ include/dovecot/src/lib/hostpid.h
 include/dovecot/src/lib/imem.h
 include/dovecot/src/lib/ioloop-internal.h
 include/dovecot/src/lib/ioloop-iolist.h
+include/dovecot/src/lib/ioloop-notify-fd.h
 include/dovecot/src/lib/ioloop.h
 include/dovecot/src/lib/iostream-internal.h
+include/dovecot/src/lib/istream-concat.h
+include/dovecot/src/lib/istream-crlf.h
 include/dovecot/src/lib/istream-internal.h
 include/dovecot/src/lib/istream-seekable.h
+include/dovecot/src/lib/istream-tee.h
 include/dovecot/src/lib/istream.h
 include/dovecot/src/lib/lib-signals.h
 include/dovecot/src/lib/lib.h
+include/dovecot/src/lib/llist.h
 include/dovecot/src/lib/macros.h
 include/dovecot/src/lib/md4.h
 include/dovecot/src/lib/md5.h
 include/dovecot/src/lib/mempool.h
 include/dovecot/src/lib/mkdir-parents.h
 include/dovecot/src/lib/mmap-util.h
+include/dovecot/src/lib/module-context.h
 include/dovecot/src/lib/module-dir.h
 include/dovecot/src/lib/mountpoint.h
 include/dovecot/src/lib/network.h
 include/dovecot/src/lib/nfs-workarounds.h
-include/dovecot/src/lib/ostream-crlf.h
 include/dovecot/src/lib/ostream-internal.h
 include/dovecot/src/lib/ostream.h
 include/dovecot/src/lib/primes.h
-include/dovecot/src/lib/printf-upper-bound.h
+include/dovecot/src/lib/printf-format-fix.h
+include/dovecot/src/lib/priorityq.h
 include/dovecot/src/lib/process-title.h
 include/dovecot/src/lib/randgen.h
 include/dovecot/src/lib/read-full.h
@@ -167,16 +197,20 @@ include/dovecot/src/lib/restrict-access.h
 include/dovecot/src/lib/restrict-process-size.h
 include/dovecot/src/lib/safe-memset.h
 include/dovecot/src/lib/safe-mkdir.h
+include/dovecot/src/lib/safe-mkstemp.h
 include/dovecot/src/lib/sendfile-util.h
 include/dovecot/src/lib/seq-range-array.h
 include/dovecot/src/lib/sha1.h
+include/dovecot/src/lib/sha2.h
+include/dovecot/src/lib/str-find.h
 include/dovecot/src/lib/str-sanitize.h
 include/dovecot/src/lib/str.h
 include/dovecot/src/lib/strescape.h
 include/dovecot/src/lib/strfuncs.h
+include/dovecot/src/lib/unichar.h
 include/dovecot/src/lib/unix-socket-create.h
 include/dovecot/src/lib/unlink-directory.h
-include/dovecot/src/lib/unlink-lockfiles.h
+include/dovecot/src/lib/unlink-old-files.h
 include/dovecot/src/lib/utc-mktime.h
 include/dovecot/src/lib/utc-offset.h
 include/dovecot/src/lib/var-expand.h
@@ -192,32 +226,48 @@ lib/dovecot/imap/lib10_quota_plugin.so
 lib/dovecot/imap/lib11_imap_quota_plugin.la
 lib/dovecot/imap/lib11_trash_plugin.so
 lib/dovecot/imap/lib20_convert_plugin.so
+lib/dovecot/imap/lib20_expire_plugin.so
+lib/dovecot/imap/lib20_fts_plugin.so
 lib/dovecot/imap/lib20_mail_log_plugin.so
+lib/dovecot/imap/lib20_mbox_snarf_plugin.so
 lib/dovecot/imap/lib20_zlib_plugin.la
+lib/dovecot/imap/lib21_fts_squat_plugin.so
 lib/dovecot/lda/lib01_acl_plugin.so
 lib/dovecot/lda/lib10_quota_plugin.so
 lib/dovecot/lda/lib11_trash_plugin.so
 lib/dovecot/lda/lib20_convert_plugin.so
+lib/dovecot/lda/lib20_expire_plugin.so
+lib/dovecot/lda/lib20_fts_plugin.so
 lib/dovecot/lda/lib20_mail_log_plugin.so
+lib/dovecot/lda/lib21_fts_squat_plugin.so
 lib/dovecot/lib01_acl_plugin.la
 lib/dovecot/lib02_lazy_expunge_plugin.la
 lib/dovecot/lib10_quota_plugin.la
 lib/dovecot/lib11_trash_plugin.la
 lib/dovecot/lib20_convert_plugin.la
+lib/dovecot/lib20_expire_plugin.la
+lib/dovecot/lib20_fts_plugin.la
 lib/dovecot/lib20_mail_log_plugin.la
+lib/dovecot/lib20_mbox_snarf_plugin.la
+lib/dovecot/lib21_fts_squat_plugin.la
 lib/dovecot/liblib.a
 lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
 lib/dovecot/pop3/lib10_quota_plugin.so
 lib/dovecot/pop3/lib20_convert_plugin.so
+lib/dovecot/pop3/lib20_expire_plugin.so
 lib/dovecot/pop3/lib20_mail_log_plugin.so
+lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
 libexec/dovecot/checkpassword-reply
+libexec/dovecot/convert-tool
 libexec/dovecot/deliver
 libexec/dovecot/dict
 libexec/dovecot/dovecot-auth
+libexec/dovecot/expire-tool
 libexec/dovecot/gdbhelper
 libexec/dovecot/idxview
 libexec/dovecot/imap
 libexec/dovecot/imap-login
+libexec/dovecot/listview
 libexec/dovecot/logview
 libexec/dovecot/pop3
 libexec/dovecot/pop3-login
@@ -240,6 +290,7 @@ share/doc/dovecot/wiki/Authentication.Caching.txt
 share/doc/dovecot/wiki/Authentication.Kerberos.txt
 share/doc/dovecot/wiki/Authentication.MasterUsers.txt
 share/doc/dovecot/wiki/Authentication.Mechanisms.DigestMD5.txt
+share/doc/dovecot/wiki/Authentication.Mechanisms.NTLM.txt
 share/doc/dovecot/wiki/Authentication.Mechanisms.Winbind.txt
 share/doc/dovecot/wiki/Authentication.Mechanisms.txt
 share/doc/dovecot/wiki/Authentication.MultipleDatabases.txt
@@ -254,6 +305,7 @@ share/doc/dovecot/wiki/CommandLine.txt
 share/doc/dovecot/wiki/CompilingSource.txt
 share/doc/dovecot/wiki/Debugging.Authentication.txt
 share/doc/dovecot/wiki/Debugging.ProcessTracing.txt
+share/doc/dovecot/wiki/Debugging.Rawlog.txt
 share/doc/dovecot/wiki/Debugging.Thunderbird.txt
 share/doc/dovecot/wiki/Design.AuthProcess.txt
 share/doc/dovecot/wiki/Design.Indexes.Cache.txt
@@ -267,7 +319,10 @@ share/doc/dovecot/wiki/Design.txt
 share/doc/dovecot/wiki/FindMailLocation.txt
 share/doc/dovecot/wiki/FinishBasicConfiguration.txt
 share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
+share/doc/dovecot/wiki/HowTo.PopBSMTPAndDovecot.txt
+share/doc/dovecot/wiki/HowTo.PopRelay.txt
 share/doc/dovecot/wiki/HowTo.PostfixAndDovecotSASL.txt
+share/doc/dovecot/wiki/HowTo.Rootless.txt
 share/doc/dovecot/wiki/HowTo.SimpleVirtualInstall.txt
 share/doc/dovecot/wiki/HowTo.txt
 share/doc/dovecot/wiki/IndexFiles.txt
@@ -297,12 +352,15 @@ share/doc/dovecot/wiki/MailboxFormat.mailstore.txt
 share/doc/dovecot/wiki/MailboxFormat.mbox.txt
 share/doc/dovecot/wiki/MailboxFormat.mbx.txt
 share/doc/dovecot/wiki/MailboxFormat.txt
+share/doc/dovecot/wiki/ManageSieve.txt
 share/doc/dovecot/wiki/MboxLocking.txt
 share/doc/dovecot/wiki/MboxProblems.txt
+share/doc/dovecot/wiki/Migration.BincIMAP.txt
 share/doc/dovecot/wiki/Migration.Courier.txt
 share/doc/dovecot/wiki/Migration.Cyrus.txt
 share/doc/dovecot/wiki/Migration.Linuxconf.txt
 share/doc/dovecot/wiki/Migration.MailFormat.txt
+share/doc/dovecot/wiki/Migration.Teapop.txt
 share/doc/dovecot/wiki/Migration.UW.txt
 share/doc/dovecot/wiki/Migration.Vm-pop3d.txt
 share/doc/dovecot/wiki/Migration.txt
@@ -331,17 +389,14 @@ share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
 share/doc/dovecot/wiki/Plugins.MailLog.txt
 share/doc/dovecot/wiki/Plugins.Trash.txt
 share/doc/dovecot/wiki/Plugins.txt
-share/doc/dovecot/wiki/PopBSMTPAndDovecot.txt
-share/doc/dovecot/wiki/PopRelay.txt
 share/doc/dovecot/wiki/PostLoginScripting.txt
 share/doc/dovecot/wiki/QuickConfiguration.txt
+share/doc/dovecot/wiki/Quota.1.1.txt
 share/doc/dovecot/wiki/Quota.Dict.txt
 share/doc/dovecot/wiki/Quota.Dirsize.txt
 share/doc/dovecot/wiki/Quota.FS.txt
 share/doc/dovecot/wiki/Quota.Maildir.txt
-share/doc/dovecot/wiki/Quota.New.txt
 share/doc/dovecot/wiki/Quota.txt
-share/doc/dovecot/wiki/Rootless.txt
 share/doc/dovecot/wiki/RunningDovecot.txt
 share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
 share/doc/dovecot/wiki/SSL.CertificateCreation.txt
@@ -350,6 +405,7 @@ share/doc/dovecot/wiki/SSL.txt
 share/doc/dovecot/wiki/Sasl.txt
 share/doc/dovecot/wiki/SecurityTuning.txt
 share/doc/dovecot/wiki/SharedMailboxes.txt
+share/doc/dovecot/wiki/ShellEasyConf.txt
 share/doc/dovecot/wiki/SystemUsers.txt
 share/doc/dovecot/wiki/TestInstallation.txt
 share/doc/dovecot/wiki/TestPop3Installation.txt
@@ -382,12 +438,16 @@ share/examples/rc.d/dovecot
 @dirrm lib/dovecot/pop3
 @dirrm lib/dovecot/lda
 @dirrm lib/dovecot/imap
+@exec ${MKDIR} %D/lib/dovecot/auth
+@dirrm lib/dovecot/auth
 @dirrm lib/dovecot
 @dirrm include/dovecot/src/pop3
-@dirrm include/dovecot/src/lib-storage/subscription-file
+@dirrm include/dovecot/src/lib-storage/list
+@dirrm include/dovecot/src/lib-storage/index/raw
 @dirrm include/dovecot/src/lib-storage/index/mbox
 @dirrm include/dovecot/src/lib-storage/index/maildir
 @dirrm include/dovecot/src/lib-storage/index/dbox
+@dirrm include/dovecot/src/lib-storage/index/cydir
 @dirrm include/dovecot/src/lib-storage/index
 @dirrm include/dovecot/src/lib-storage
 @dirrm include/dovecot/src/lib-sql
diff --git a/mail/dovecot/buildlink3.mk b/mail/dovecot/buildlink3.mk
index 0c796149677..d0928d8f8af 100644
--- a/mail/dovecot/buildlink3.mk
+++ b/mail/dovecot/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.2 2007/10/15 12:46:09 ghen Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2008/06/22 17:41:23 ghen Exp $
 
 BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
 DOVECOT_BUILDLINK3_MK:=			${DOVECOT_BUILDLINK3_MK}+
@@ -14,7 +14,7 @@ BUILDLINK_PACKAGES+=			dovecot
 BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dovecot
 
 .if !empty(DOVECOT_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=1.0.3nb1
+BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=1.1beta16
 BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot
 .endif
 
diff --git a/mail/dovecot/distinfo b/mail/dovecot/distinfo
index b505199842e..7aae9bae61d 100644
--- a/mail/dovecot/distinfo
+++ b/mail/dovecot/distinfo
@@ -1,9 +1,10 @@
-$NetBSD: distinfo,v 1.81 2008/06/03 05:52:10 ghen Exp $
+$NetBSD: distinfo,v 1.82 2008/06/22 17:41:23 ghen Exp $
 
-SHA1 (dovecot-1.0.14.tar.gz) = e7ce639720c39f578c8dcc41bd875210b8c76cd8
-RMD160 (dovecot-1.0.14.tar.gz) = 119edbc18d81be46d6901d2a5b3b50b708980c64
-Size (dovecot-1.0.14.tar.gz) = 1781681 bytes
+SHA1 (dovecot-1.1.1.tar.gz) = 039993d8769237dd7d1c0c3ef277734f7013c66b
+RMD160 (dovecot-1.1.1.tar.gz) = be522b080f221dbf655d9afa1f3fb1a786d4c3b2
+Size (dovecot-1.1.1.tar.gz) = 2273779 bytes
 SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = 5d45a1617dd5ee7ce07fe89b526a6fb273057bb5
-SHA1 (patch-ac) = 377da4719b5dca91a0b2fa7b3e11170cd2ea8d59
-SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
+SHA1 (patch-ab) = e298616fa4b88da4f0748b025deeedd36b5a49dd
+SHA1 (patch-ac) = 1c539de145258fce4da636698fd13015ca60ca8d
+SHA1 (patch-ag) = c9989f71bdfd9ae22883450b85fc55a215594df1
+SHA1 (patch-am) = 6c85ee0097e9054712c4385637d1b445f3bbc015
diff --git a/mail/dovecot/files/dovecot.sh b/mail/dovecot/files/dovecot.sh
index 6a7c179bebd..0fdb7f8ad0a 100755
--- a/mail/dovecot/files/dovecot.sh
+++ b/mail/dovecot/files/dovecot.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dovecot.sh,v 1.2 2007/05/16 07:34:47 ghen Exp $
+# $NetBSD: dovecot.sh,v 1.3 2008/06/22 17:41:23 ghen Exp $
 #
 
 # PROVIDE: dovecot
diff --git a/mail/dovecot/hacks.mk b/mail/dovecot/hacks.mk
index f397b35e85f..f1b33e17c14 100644
--- a/mail/dovecot/hacks.mk
+++ b/mail/dovecot/hacks.mk
@@ -1,4 +1,4 @@
-# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:50:29 rillig Exp $
+# $NetBSD: hacks.mk,v 1.3 2008/06/22 17:41:23 ghen Exp $
 
 .include "../../mk/compiler.mk"
 
diff --git a/mail/dovecot/options.mk b/mail/dovecot/options.mk
index 9be08c7cba2..10e7e89d503 100644
--- a/mail/dovecot/options.mk
+++ b/mail/dovecot/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.20 2008/01/03 14:06:20 ghen Exp $
+# $NetBSD: options.mk,v 1.21 2008/06/22 17:41:23 ghen Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
 PKG_SUPPORTED_OPTIONS=	gssapi inet6 kqueue ldap mysql pam pgsql sasl sqlite
diff --git a/mail/dovecot/patches/patch-aa b/mail/dovecot/patches/patch-aa
index 046a6b08b54..7cba6c798f1 100644
--- a/mail/dovecot/patches/patch-aa
+++ b/mail/dovecot/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.7 2006/10/09 19:06:57 ghen Exp $
+$NetBSD: patch-aa,v 1.8 2008/06/22 17:41:23 ghen Exp $
 
 --- Makefile.in.orig	2006-10-09 20:53:16.000000000 +0200
 +++ Makefile.in
diff --git a/mail/dovecot/patches/patch-ab b/mail/dovecot/patches/patch-ab
index 58d291a0350..b0a274fe5b3 100644
--- a/mail/dovecot/patches/patch-ab
+++ b/mail/dovecot/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
+$NetBSD: patch-ab,v 1.23 2008/06/22 17:41:23 ghen Exp $
 
---- dovecot-example.conf.orig	2007-06-13 02:47:39.000000000 +0200
+--- dovecot-example.conf.orig	2007-12-09 19:14:26.000000000 +0100
 +++ dovecot-example.conf
 @@ -10,17 +10,14 @@
  # value inside quotes, eg.: key = "# char and trailing whitespace  "
@@ -20,8 +20,8 @@ $NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
 -#protocols = imap imaps
 +protocols = imap pop3
  
- # IP or host address where to listen in for connections. It's not currently
- # possible to specify multiple addresses. "*" listens in all IPv4 interfaces.
+ # A space separated list of IP or host addresses where to listen in for
+ # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
 @@ -85,7 +82,7 @@
  #ssl_listen =
  
@@ -31,7 +31,7 @@ $NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
  
  # PEM encoded X.509 SSL/TLS certificate and private key. They're opened before
  # dropping root privileges, so keep the key file unreadable by anyone but
-@@ -498,19 +495,19 @@
+@@ -495,19 +492,19 @@
  
  protocol imap {
    # Login executable location.
@@ -55,7 +55,7 @@ $NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
  
    # Maximum IMAP command line length in bytes. Some clients generate very long
    # command lines with huge mailboxes, so you may need to raise this if you get
-@@ -520,7 +517,7 @@ protocol imap {
+@@ -521,7 +518,7 @@ protocol imap {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -64,7 +64,7 @@ $NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
  
    # Send IMAP capabilities in greeting message. This makes it unnecessary for
    # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -563,11 +560,11 @@ protocol imap {
+@@ -564,11 +561,11 @@ protocol imap {
  
  protocol pop3 {
    # Login executable location.
@@ -78,7 +78,7 @@ $NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
  
    # Don't try to set mails non-recent or seen with POP3 sessions. This is
    # mostly intended to reduce disk I/O. With maildir it doesn't move files
-@@ -627,7 +624,7 @@ protocol pop3 {
+@@ -628,7 +625,7 @@ protocol pop3 {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
@@ -87,20 +87,25 @@ $NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
  
    # Workarounds for various client bugs:
    #   outlook-no-nuls:
-@@ -655,10 +652,10 @@ protocol lda {
+@@ -656,7 +653,7 @@ protocol lda {
    # Support for dynamically loadable plugins. mail_plugins is a space separated
    # list of plugins to load.
    #mail_plugins = 
 -  #mail_plugin_dir = /usr/lib/dovecot/lda
 +  #mail_plugin_dir = @PREFIX@/lib/dovecot/lda
  
+   # If user is over quota, return with temporary failure instead of
+   # bouncing the mail.
+@@ -670,7 +667,7 @@ protocol lda {
+   #deliver_log_format = msgid=%m: %$
+ 
    # Binary to use for sending mails.
 -  #sendmail_path = /usr/lib/sendmail
 +  #sendmail_path = /usr/sbin/sendmail
  
-   # UNIX socket path to master authentication server to find users.
-   #auth_socket_path = /var/run/dovecot/auth-master
-@@ -669,7 +666,7 @@ protocol lda {
+   # Human readable error message for rejection mails. Use can use variables:
+   #  %n = CRLF, %r = reason, %s = subject, %t = recipient
+@@ -685,7 +682,7 @@ protocol lda {
  ##
  
  # Executable location
@@ -109,17 +114,17 @@ $NetBSD: patch-ab,v 1.22 2007/06/16 15:01:17 ghen Exp $
  
  # Set max. process size in megabytes.
  #auth_process_size = 256
-@@ -785,7 +782,7 @@ auth default {
+@@ -815,7 +812,7 @@ auth default {
    # database (passwd usually), you can use static userdb.
    # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
    # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
 -  passdb pam {
 +  #passdb pam {
-     # [blocking=yes] [session=yes] [setcred=yes]
+     # [session=yes] [setcred=yes] [failure_show_msg=yes]
      # [cache_key=<key>] [<service name>]
      #
-@@ -818,15 +815,15 @@ auth default {
-     #   args = session=yes *
+@@ -844,15 +841,15 @@ auth default {
+     #   args = session=yes %Ls
      #   args = cache_key=%u dovecot
      #args = dovecot
 -  }
diff --git a/mail/dovecot/patches/patch-ac b/mail/dovecot/patches/patch-ac
index d60199f49fa..1b6b75b7674 100644
--- a/mail/dovecot/patches/patch-ac
+++ b/mail/dovecot/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.7 2007/06/16 15:01:18 ghen Exp $
+$NetBSD: patch-ac,v 1.8 2008/06/22 17:41:23 ghen Exp $
 
---- doc/Makefile.in.orig	2007-06-11 19:06:53.000000000 +0200
+--- doc/Makefile.in.orig	2008-05-05 00:02:25.000000000 +0200
 +++ doc/Makefile.in
-@@ -202,9 +202,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -209,9 +209,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
  SUBDIRS = wiki
  confdir = $(sysconfdir)
 -conf_DATA = \
 -	dovecot-ldap-example.conf \
 -	dovecot-sql-example.conf
-+conf_DATA = 
++conf_DATA =
  
  doc_DATA = \
  	auth-protocol.txt \
diff --git a/mail/dovecot/patches/patch-ag b/mail/dovecot/patches/patch-ag
index a365b51afc6..02fc7febc11 100644
--- a/mail/dovecot/patches/patch-ag
+++ b/mail/dovecot/patches/patch-ag
@@ -1,11 +1,11 @@
-$NetBSD: patch-ag,v 1.3 2006/11/04 21:44:03 ghen Exp $
+$NetBSD: patch-ag,v 1.4 2008/06/22 17:41:23 ghen Exp $
 
---- src/deliver/deliver.c.orig	2006-11-02 21:03:30.000000000 +0100
+--- src/deliver/deliver.c.orig	2008-01-20 13:54:08.000000000 +0100
 +++ src/deliver/deliver.c
-@@ -30,7 +30,7 @@
+@@ -41,7 +41,7 @@
+ #include <syslog.h>
  
  #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
- #define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master"
 -#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
 +#define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail"
  #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"