Update dovecot to 2.0.13, joint work between pea@, Brad and myself, ok pea@

This is a major update and configuration changes are required -
see http://wiki2.dovecot.org/Upgrading/2.0 for more

mail/dovecot/Makefile

@@ -1,166 +1,101 @@
-# $OpenBSD: Makefile,v 1.163 2011/05/11 12:57:47 jasper Exp $
+# $OpenBSD: Makefile,v 1.164 2011/05/23 22:54:38 sthen Exp $
+
+#
+# Dont forget to bump the Sieve package when you
+# update Dovecot !!
+# When the Dovecot V_MAJOR will change, dont forget
+# to report it in mail/dovecot-pigeonhole
+#
 
 SHARED_ONLY=	Yes
 
-COMMENT-server= compact IMAP/POP3 server
-COMMENT-sieve=	Sieve mail filtering for Dovecot
+COMMENT= compact IMAP/POP3 server
 
-V_MAJOR=	1.2
-V_DOVECOT=	1.2.16
-V_SIEVE=	0.1.18
-V_MANAGESIEVE=	0.11.12
-
-PKGNAME=	dovecot-${V_DOVECOT}
-PKGNAME-server=	dovecot-${V_DOVECOT}
-REVISION-server=5
-FULLPKGNAME-sieve= dovecot-sieve-${V_SIEVE}
-REVISION-sieve=	0
-EPOCH-sieve=	0
-FULLPKGPATH-sieve= ${PKGPATH},-sieve
+V_MAJOR=	2.0
+V_DOVECOT=	2.0.13
 
 DISTNAME=	dovecot-${V_DOVECOT}
 CATEGORIES=	mail
 MASTER_SITES=	${HOMEPAGE}releases/${V_MAJOR}/
-MASTER_SITES0=	http://www.rename-it.nl/dovecot/${V_MAJOR}/
 
-DISTFILES=	dovecot-${V_DOVECOT}.tar.gz \
-		dovecot-${V_MAJOR}-sieve-${V_SIEVE}.tar.gz:0 \
-		dovecot-${V_MAJOR}-managesieve-${V_MANAGESIEVE}.tar.gz:0 \
-		${DIST_MANAGESIEVE}:0
-
-DIST_MANAGESIEVE= dovecot-${V_DOVECOT}-managesieve-${V_MANAGESIEVE}.diff.gz
+SHARED_LIBS=	dovecot-lda	0.0 \
+		dovecot-login	0.0 \
+		dovecot-sql	0.0 \
+		dovecot-storage	0.0 \
+		dovecot		0.0
 
 HOMEPAGE=	http://www.dovecot.org/
 
 MAINTAINER=	Brad Smith <brad@comstyle.com>
 
-# MIT/LGPLv2.1
+# LGPLv2.1 and MIT
 PERMIT_PACKAGE_CDROM=	Yes
 PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
-
-WANTLIB-server=		${MODLIBICONV_WANTLIB} bz2 c crypto gssapi krb5 ssl z
-WANTLIB-sieve=		${MODLIBICONV_WANTLIB} c crypto ssl
+WANTLIB=	${MODLIBICONV_WANTLIB} bz2 c crypto gssapi krb5 ssl z
 
 MODULES=	converters/libiconv
 LIB_DEPENDS+=	archivers/bzip2
 
-MULTI_PACKAGES=	-server
-SUBPACKAGE?=	-server
+CPPFLAGS=	-I/usr/include/kerberosV -I${LOCALBASE}/include
+
+USE_LIBTOOL=	Yes
+AUTOCONF_VERSION= 2.67
+CONFIGURE_STYLE= autoconf
+CONFIGURE_ARGS=	--localstatedir=/var \
+		--with-gssapi \
+		--with-pam=no \
+		--with-shadow=no \
+		--with-vpopmail=no \
+		--with-rundir=/var/dovecot \
+		--with-statedir=/var/dovecot
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
-PSEUDO_FLAVORS=	no_sieve
 FLAVORS=	bdb ldap mysql postgresql sqlite
 FLAVOR?=
 
-CFLAGS+=	-I/usr/include/kerberosV -I${LOCALBASE}/include
-
-USE_LIBTOOL=		Yes
-AUTOCONF_VERSION=	2.65
-CONFIGURE_STYLE=	autoconf
-CONFIGURE_ARGS+=	--localstatedir=/var \
-			--with-gssapi \
-			--with-pam=no \
-			--with-shadow=no \
-			--with-vpopmail=no
-CONFIGURE_ENV=		LDFLAGS="-L${LOCALBASE}/lib"
-
-.if !${FLAVOR:L:Mno_sieve}
-# XXX The produced dovecot-sieve package ends up linked to any
-# other library (database/ldap) used in the build thus producing
-# bad packages in bulk build. Temporarily work around this in a
-# nasty way by knocking out the sieve subpackage if another
-# flavor is used. This means you have to build without FLAVORS
-# to get the -sieve subpackage.
-.if ${FLAVOR} == ""
-MULTI_PACKAGES+=	-sieve
-.endif
-SIEVE_DIR=		${WRKDIR}/dovecot-${V_MAJOR}-sieve-${V_SIEVE}
-MANAGESIEVE_DIR=	${WRKDIR}/dovecot-${V_MAJOR}-managesieve-${V_MANAGESIEVE}
-AUTOCONF_DIR+=		${WRKSRC} ${MANAGESIEVE_DIR}
-RUN_DEPENDS-sieve=	${PKGPATH}
-LIB_DEPENDS-sieve=	${MODLIBICONV_LIB_DEPENDS}
-PATCH_LIST=		patch-* managesieve-patch-*
-.else
-PATCH_LIST=		patch-* nosieve-patch-*
-.endif
-
 .if ${FLAVOR:L:Mbdb}
-CONFIGURE_ARGS+=	--with-db
-LIB_DEPENDS+=		databases/db/v4
-WANTLIB-server+=	db>=5
-CFLAGS+=		-I${LOCALBASE}/include/db4
+CONFIGURE_ARGS+=--with-db
+LIB_DEPENDS+=	databases/db/v4
+WANTLIB+=	db>=5
+CPPFLAGS+=	-I${LOCALBASE}/include/db4
 .endif
 
 .if ${FLAVOR:L:Mldap}
-CONFIGURE_ARGS+=	--with-ldap
-LIB_DEPENDS+=		databases/openldap
-WANTLIB-server+=	lber ldap sasl2 asn1 com_err
+CONFIGURE_ARGS+=--with-ldap
+LIB_DEPENDS+=	databases/openldap
+WANTLIB+=	lber ldap sasl2 asn1 com_err
 .endif
 
 .if ${FLAVOR:L:Mmysql}
-CONFIGURE_ARGS+=	--with-mysql
-LIB_DEPENDS+=		databases/mysql
-WANTLIB-server+=	m lib/mysql/mysqlclient>=10
+CONFIGURE_ARGS+=--with-mysql
+LIB_DEPENDS+=	databases/mysql
+WANTLIB+=	m lib/mysql/mysqlclient>=10
 .endif
 
 .if ${FLAVOR:L:Mpostgresql}
-CONFIGURE_ARGS+=	--with-pgsql
-LIB_DEPENDS+=		databases/postgresql
-WANTLIB-server+=	pq>=4
+CONFIGURE_ARGS+=--with-pgsql
+LIB_DEPENDS+=	databases/postgresql
+WANTLIB+=	pq>=4
 .endif
 
 .if ${FLAVOR:L:Msqlite}
-CONFIGURE_ARGS+=	--with-sqlite
-LIB_DEPENDS+=		databases/sqlite3
-WANTLIB-server+=	sqlite3
-.endif
-
-.if !${FLAVOR:L:Mno_sieve}
-pre-patch:
-	@cd ${WRKSRC} && \
-	gunzip -c ${DISTDIR}/${DIST_MANAGESIEVE} | \
-		patch -z.managesieve.orig -p1 2> /dev/null
-
-post-configure:
-	@(cd ${WRKSRC}; ${MAKE_PROGRAM} dovecot-config)
-	@(cd ${SIEVE_DIR}; ${SETENV} ${CONFIGURE_ENV} \
-		./configure --with-dovecot=${WRKSRC} \
-		--mandir=${PREFIX}/man --docdir=${PREFIX}/share/doc/)
-	@(cd ${MANAGESIEVE_DIR}; ${SETENV} ${CONFIGURE_ENV} \
-		./configure --with-dovecot=${WRKSRC} \
-		--with-dovecot-sieve=${SIEVE_DIR})
+CONFIGURE_ARGS+=--with-sqlite
+LIB_DEPENDS+=	databases/sqlite3
+WANTLIB+=	sqlite3
 .endif
 
 pre-build:
-	@${SUBST_CMD} ${WRKSRC}/dovecot-example.conf
-
-.if !${FLAVOR:L:Mno_sieve}
-post-build:
-	(cd ${SIEVE_DIR}; ${MAKE_PROGRAM} ${MAKE_FLAGS})
-	(cd ${MANAGESIEVE_DIR}; ${MAKE_PROGRAM} ${MAKE_FLAGS})
-.endif
+	@${SUBST_CMD} ${WRKSRC}/doc/example-config/conf.d/10-mail.conf
 
 post-install:
-	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/dovecot
 	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf \
-		${WRKSRC}/doc/dovecot-sql-example.conf \
-		${WRKSRC}/doc/dovecot-ldap-example.conf \
-		${WRKSRC}/doc/dovecot-db-example.conf \
-		${WRKSRC}/dovecot-example.conf \
-		${WRKSRC}/doc/dovecot-dict-sql-example.conf \
 		${PREFIX}/share/examples/dovecot
 	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh \
 		${PREFIX}/sbin/dovecot-mkcert.sh
-.if !${FLAVOR:L:Mno_sieve}
-	cd ${SIEVE_DIR} &&  env -i ${MAKE_ENV} \
-		PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST} \
-		TRUEPREFIX=${PREFIX} \
-		${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
-	cd ${MANAGESIEVE_DIR} && env -i ${MAKE_ENV} \
-		PREFIX=${WRKINST}${PREFIX} ${DESTDIRNAME}=${WRKINST} \
-		TRUEPREFIX=${PREFIX} \
-		${MAKE_PROGRAM} ${ALL_FAKE_FLAGS} -f ${MAKE_FILE} ${FAKE_TARGET}
-.endif
+	@find ${PREFIX}/lib/dovecot -name '*.a' -print | xargs rm
+	@find ${PREFIX}/lib/dovecot -name '*.la' -print | xargs rm
 
 .include <bsd.port.mk>

mail/dovecot/distinfo

@@ -1,20 +1,5 @@
-MD5 (dovecot-1.2-managesieve-0.11.12.tar.gz) = OeMB2ayId7X4cOBmM0BtFg==
-MD5 (dovecot-1.2-sieve-0.1.18.tar.gz) = 5/KE4MGUUlMc09fO/hBz3Q==
-MD5 (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = QNGizeQO49cIGnu5YJMX7w==
-MD5 (dovecot-1.2.16.tar.gz) = i7306W4uD1dJQyypyyCaOA==
-RMD160 (dovecot-1.2-managesieve-0.11.12.tar.gz) = +Rof0FnOvLPJNBkvHbV+t16kuqY=
-RMD160 (dovecot-1.2-sieve-0.1.18.tar.gz) = 9hsewD2GG5ZGZqN0qMQqe5jB+6E=
-RMD160 (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = WDaQVujw8JT9KK32TU3k2tokqVU=
-RMD160 (dovecot-1.2.16.tar.gz) = UPuuyKeiWL4XkS6pYsr6pRtOi8c=
-SHA1 (dovecot-1.2-managesieve-0.11.12.tar.gz) = xjLHS/xeDAwKAMFEWmXLASQjzro=
-SHA1 (dovecot-1.2-sieve-0.1.18.tar.gz) = 5mGmq3mymH3t7B7YTL2Vd1WIKt4=
-SHA1 (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = VAADkORdDTl4FYMiq2N395zYf6A=
-SHA1 (dovecot-1.2.16.tar.gz) = hCRr4cKF3pNbvnZJsZIO/qkbEtY=
-SHA256 (dovecot-1.2-managesieve-0.11.12.tar.gz) = xD0tKrSr96ulBhmE8B3UiAEYUEwQG2RRvVMKftuOP2o=
-SHA256 (dovecot-1.2-sieve-0.1.18.tar.gz) = Sjm99g1TDMJ6G8ET/Tyx9622zIV1eK2jcg5AOFwsx/4=
-SHA256 (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = 8qkzQFNhhWqYMjWuxeAT34QbzDL8DcCvovD58y0WwlE=
-SHA256 (dovecot-1.2.16.tar.gz) = K0KaihZmzMl9FZzg30CK6bUk3Lcs/8ejqr/Bxtpd+0w=
-SIZE (dovecot-1.2-managesieve-0.11.12.tar.gz) = 406261
-SIZE (dovecot-1.2-sieve-0.1.18.tar.gz) = 1052057
-SIZE (dovecot-1.2.16-managesieve-0.11.12.diff.gz) = 6459
-SIZE (dovecot-1.2.16.tar.gz) = 2949818
+MD5 (dovecot-2.0.13.tar.gz) = /YoHAidaYTMttzU9rf8Pkg==
+RMD160 (dovecot-2.0.13.tar.gz) = LA7dA6unk15tsYrxOEomvwtbQy4=
+SHA1 (dovecot-2.0.13.tar.gz) = MdVWvRZZ+xDl7bRbq4lRkRFRu/s=
+SHA256 (dovecot-2.0.13.tar.gz) = K1EiY+wFu9dM3lxpetEiUNkmjrocjOSoFEreppMIZ10=
+SIZE (dovecot-2.0.13.tar.gz) = 3272542

mail/dovecot/patches/managesieve-patch-dovecot-example_conf

@@ -1,284 +0,0 @@
-$OpenBSD: managesieve-patch-dovecot-example_conf,v 1.2 2011/03/03 00:40:05 sthen Exp $
---- dovecot-example.conf.orig	Thu Mar  3 00:10:38 2011
-+++ dovecot-example.conf	Thu Mar  3 00:11:58 2011
-@@ -12,12 +12,11 @@
- # Default values are shown for each setting, it's not required to uncomment
- # those. These are exceptions to this though: No sections (e.g. namespace {})
- # or plugin settings are added by default, they're listed only as examples.
--# Paths are also just examples with the real defaults being based on configure
--# options. The paths listed here are for configure --prefix=/usr
--# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
- 
-+# *** NOTE *** Some values HAVE been changed for OpenBSD use.
-+
- # Base directory where to store runtime data.
--#base_dir = /var/run/dovecot/
-+base_dir = /var/dovecot/
- 
- # Protocols we want to be serving: imap imaps pop3 pop3s managesieve
- # If you only want to use dovecot-auth, you can set this to "none".
-@@ -43,13 +42,13 @@
- #     listen = *:12000
- #     ..
- #   }
--#listen = *
-+listen = *, [::]
- 
- # Disable LOGIN command and all other plaintext authentications unless
- # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
- # matches the local IP (ie. you're connecting from the same computer), the
- # connection is considered secure and plaintext authentication is allowed.
--#disable_plaintext_auth = yes
-+disable_plaintext_auth = yes
- 
- # Should all IMAP and POP3 processes be killed when Dovecot master process
- # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -96,7 +95,7 @@
- # dropping root privileges, so keep the key file unreadable by anyone but
- # root. Included doc/mkcert.sh can be used to easily generate self-signed
- # certificate, just make sure to update the domains in dovecot-openssl.cnf
--#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-+ssl_cert_file = /etc/ssl/dovecotcert.pem
- #ssl_key_file = /etc/ssl/private/dovecot.pem
- 
- # If key file is password protected, give the password here. Alternatively
-@@ -140,7 +139,7 @@
- # which login needs to be able to connect to. The sockets are created when
- # running as root, so you don't have to worry about permissions. Note that
- # everything in this directory is deleted when Dovecot is started.
--#login_dir = /var/run/dovecot/login
-+login_dir = /var/dovecot/login
- 
- # chroot login process to the login_dir. Only reason not to do this is if you
- # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt>
-@@ -150,7 +149,7 @@
- # and don't use it anywhere else. The user must also belong to a group where
- # only it has access, it's used to control access for authentication process.
- # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
--#login_user = dovecot
-+login_user = _dovecot
- 
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
-@@ -340,8 +339,9 @@
- #mail_log_max_lines_per_sec = 10
- 
- # Don't use mmap() at all. This is required if you store indexes to shared
--# filesystems (NFS or clustered filesystem).
--#mmap_disable = no
-+# filesystems (NFS or clustered filesystem) or for some operating systems
-+# which use a separate cache for mmap, such as OpenBSD.
-+mmap_disable = yes
- 
- # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
- # since version 3, so this should be safe to use nowadays by default.
-@@ -486,7 +486,7 @@
- # locking methods as well. Some operating systems don't allow using some of
- # them simultaneously.
- #mbox_read_locks = fcntl
--#mbox_write_locks = dotlock fcntl
-+mbox_write_locks = fcntl
- 
- # Maximum time in seconds to wait for lock (all of them) before aborting.
- #mbox_lock_timeout = 300
-@@ -541,20 +541,20 @@
- 
- protocol imap {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/imap-login
-+  #login_executable = ${PREFIX}/libexec/dovecot/imap-login
- 
-   # IMAP executable location. Changing this allows you to execute other
-   # binaries before the imap process is executed.
-   #
-   # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists:
--  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+  #   mail_executable = ${PREFIX}/libexec/dovecot/rawlog ${PREFIX}/libexec/dovecot/imap
-   # <doc/wiki/Debugging/Rawlog.txt>
-   #
-   # This would attach gdb into the imap process and write backtraces into
-   # /tmp/gdbhelper.* files:
--  #   mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+  #   mail_executable = ${PREFIX}/libexec/dovecot/gdbhelper ${PREFIX}/libexec/dovecot/imap
-   #
--  #mail_executable = /usr/libexec/dovecot/imap
-+  #mail_executable = ${PREFIX}/libexec/dovecot/imap
- 
-   # 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
-@@ -568,7 +568,7 @@ protocol imap {
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/imap
-+  #mail_plugin_dir = ${PREFIX}/lib/dovecot/imap
- 
-   # IMAP logout format string:
-   #  %i - total number of bytes read from client
-@@ -609,7 +609,7 @@ protocol imap {
-   #     but not both. Thunderbird separates these two by forcing server to
-   #     accept '/' suffix in mailbox names in subscriptions list.
-   # The list is space-separated.
--  #imap_client_workarounds = 
-+  imap_client_workarounds = delay-newmail netscape-eoh tb-extra-mailbox-sep
- }
-   
- ##
-@@ -618,11 +618,11 @@ protocol imap {
- 
- protocol pop3 {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/pop3-login
-+  #login_executable = ${PREFIX}/libexec/dovecot/pop3-login
- 
-   # POP3 executable location. See IMAP's mail_executable above for examples
-   # how this could be changed.
--  #mail_executable = /usr/libexec/dovecot/pop3
-+  #mail_executable = ${PREFIX}/libexec/dovecot/pop3
- 
-   # 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
-@@ -686,7 +686,7 @@ protocol pop3 {
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/pop3
-+  #mail_plugin_dir = ${PREFIX}/lib/dovecot/pop3
- 
-   # Workarounds for various client bugs:
-   #   outlook-no-nuls:
-@@ -696,7 +696,7 @@ protocol pop3 {
-   #     Outlook Express and Netscape Mail breaks if end of headers-line is
-   #     missing. This option simply sends it if it's missing.
-   # The list is space-separated.
--  #pop3_client_workarounds = 
-+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
- }
- 
- ##
-@@ -705,11 +705,11 @@ protocol pop3 {
- 
- protocol managesieve {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/managesieve-login
-+  #login_executable = ${PREFIX}/libexec/dovecot/managesieve-login
- 
-   # ManageSieve executable location. See IMAP's mail_executable above for 
-   # examples how this could be changed.
--  #mail_executable = /usr/libexec/dovecot/managesieve
-+  #mail_executable = ${PREFIX}/libexec/dovecot/managesieve
- 
-   # Maximum ManageSieve command line length in bytes. This setting is 
-   # directly borrowed from IMAP. But, since long command lines are very
-@@ -750,7 +750,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.
-@@ -764,7 +764,7 @@ protocol lda {
-   #deliver_log_format = msgid=%m: %$
- 
-   # Binary to use for sending mails.
--  #sendmail_path = /usr/lib/sendmail
-+  #sendmail_path = /usr/sbin/sendmail
- 
-   # Subject: header to use for rejection mails. You can use the same variables
-   # as for rejection_reason below.
-@@ -775,7 +775,7 @@ protocol lda {
-   #rejection_reason = Your message to <%t> was automatically rejected:%n%r
- 
-   # UNIX socket path to master authentication server to find users.
--  #auth_socket_path = /var/run/dovecot/auth-master
-+  #auth_socket_path = /var/dovecot/auth-master
- }
- 
- ##
-@@ -783,7 +783,7 @@ protocol lda {
- ##
- 
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = ${PREFIX}/libexec/dovecot/dovecot-auth
- 
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -912,7 +912,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 {
-     # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
-     # [cache_key=<key>] [<service name>]
-     #
-@@ -945,7 +945,7 @@ auth default {
-     #   args = session=yes %Ls
-     #   args = cache_key=%u dovecot
-     #args = dovecot
--  }
-+  #}
- 
-   # System users (NSS, /etc/passwd, or similiar)
-   # In many systems nowadays this uses Name Service Switch, which is
-@@ -965,10 +965,10 @@ auth default {
- 
-   # PAM-like authentication for OpenBSD.
-   # <doc/wiki/PasswordDatabase.BSDAuth.txt>
--  #passdb bsdauth {
-+  passdb bsdauth {
-     # [cache_key=<key>] - See cache_key in PAM for explanation.
-     #args =
--  #}
-+  }
- 
-   # passwd-like file with specified location
-   # <doc/wiki/AuthDatabase.PasswdFile.txt>
-@@ -1110,7 +1110,7 @@ auth default {
-       # Master socket provides access to userdb information. It's typically
-       # used to give Dovecot's local delivery agent access to userdb so it
-       # can find mailbox locations.
--      #path = /var/run/dovecot/auth-master
-+      #path = /var/dovecot/auth-master
-       #mode = 0600
-       # Default user/group is the one who started dovecot-auth (root)
-       #user = 
-@@ -1120,7 +1120,7 @@ auth default {
-       # The client socket is generally safe to export to everyone. Typical use
-       # is to export it to your SMTP server so it can do SMTP AUTH lookups
-       # using it.
--      #path = /var/run/dovecot/auth-client
-+      #path = /var/dovecot/auth-client
-       #mode = 0660
-     #}
-   #}
-@@ -1134,7 +1134,7 @@ auth default {
- #auth external {
- #  socket connect {
- #    master {
--#      path = /var/run/dovecot/auth-master
-+#      path = /var/dovecot/auth-master
- #    }
- #  }
- #}
-@@ -1232,7 +1232,7 @@ plugin {
-   # a dictionary so it can be quickly determined which mailboxes contain
-   # expired mails. The actual expunging is done in a nightly cronjob, which
-   # you must set up:
--  #   dovecot --exec-mail ext /usr/libexec/dovecot/expire-tool
-+  #   dovecot --exec-mail ext ${PREFIX}/libexec/dovecot/expire-tool
-   #expire = Trash 7 Spam 30
-   #expire_dict = proxy::expire
- 
-@@ -1261,6 +1261,8 @@ plugin {
-   # The path to the directory where the personal Sieve scripts are stored. For 
-   # ManageSieve this is where the uploaded scripts are stored.
-   #sieve_dir=~/sieve
-+
-+  #sieve_extensions=+imapflags
- }
- 
- # Config files can also be included. deliver doesn't support them currently.

mail/dovecot/patches/nosieve-patch-dovecot-example_conf

@@ -1,252 +0,0 @@
-$OpenBSD: nosieve-patch-dovecot-example_conf,v 1.2 2011/03/03 00:40:05 sthen Exp $
---- dovecot-example.conf.orig	Mon May 24 16:01:14 2010
-+++ dovecot-example.conf	Thu Mar  3 00:22:42 2011
-@@ -12,12 +12,11 @@
- # Default values are shown for each setting, it's not required to uncomment
- # those. These are exceptions to this though: No sections (e.g. namespace {})
- # or plugin settings are added by default, they're listed only as examples.
--# Paths are also just examples with the real defaults being based on configure
--# options. The paths listed here are for configure --prefix=/usr
--# --sysconfdir=/etc --localstatedir=/var --with-ssldir=/etc/ssl
- 
-+# *** NOTE *** Some values HAVE been changed for OpenBSD use.
-+
- # Base directory where to store runtime data.
--#base_dir = /var/run/dovecot/
-+base_dir = /var/dovecot/
- 
- # Protocols we want to be serving: imap imaps pop3 pop3s
- # If you only want to use dovecot-auth, you can set this to "none".
-@@ -39,13 +38,13 @@
- #     listen = *:10100
- #     ..
- #   }
--#listen = *
-+listen = *, [::]
- 
- # Disable LOGIN command and all other plaintext authentications unless
- # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
- # matches the local IP (ie. you're connecting from the same computer), the
- # connection is considered secure and plaintext authentication is allowed.
--#disable_plaintext_auth = yes
-+disable_plaintext_auth = yes
- 
- # Should all IMAP and POP3 processes be killed when Dovecot master process
- # shuts down. Setting this to "no" means that Dovecot can be upgraded without
-@@ -92,7 +91,7 @@
- # dropping root privileges, so keep the key file unreadable by anyone but
- # root. Included doc/mkcert.sh can be used to easily generate self-signed
- # certificate, just make sure to update the domains in dovecot-openssl.cnf
--#ssl_cert_file = /etc/ssl/certs/dovecot.pem
-+ssl_cert_file = /etc/ssl/dovecotcert.pem
- #ssl_key_file = /etc/ssl/private/dovecot.pem
- 
- # If key file is password protected, give the password here. Alternatively
-@@ -136,7 +135,7 @@
- # which login needs to be able to connect to. The sockets are created when
- # running as root, so you don't have to worry about permissions. Note that
- # everything in this directory is deleted when Dovecot is started.
--#login_dir = /var/run/dovecot/login
-+login_dir = /var/dovecot/login
- 
- # chroot login process to the login_dir. Only reason not to do this is if you
- # wish to run the whole Dovecot without roots. <doc/wiki/Rootless.txt>
-@@ -146,7 +145,7 @@
- # and don't use it anywhere else. The user must also belong to a group where
- # only it has access, it's used to control access for authentication process.
- # Note that this user is NOT used to access mails. <doc/wiki/UserIds.txt>
--#login_user = dovecot
-+login_user = _dovecot
- 
- # Set max. process size in megabytes. If you don't use
- # login_process_per_connection you might need to grow this.
-@@ -336,8 +335,9 @@
- #mail_log_max_lines_per_sec = 10
- 
- # Don't use mmap() at all. This is required if you store indexes to shared
--# filesystems (NFS or clustered filesystem).
--#mmap_disable = no
-+# filesystems (NFS or clustered filesystem) or for some operating systems
-+# which use a separate cache for mmap, such as OpenBSD.
-+mmap_disable = yes
- 
- # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
- # since version 3, so this should be safe to use nowadays by default.
-@@ -482,7 +482,7 @@
- # locking methods as well. Some operating systems don't allow using some of
- # them simultaneously.
- #mbox_read_locks = fcntl
--#mbox_write_locks = dotlock fcntl
-+mbox_write_locks = fcntl
- 
- # Maximum time in seconds to wait for lock (all of them) before aborting.
- #mbox_lock_timeout = 300
-@@ -537,20 +537,20 @@
- 
- protocol imap {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/imap-login
-+  #login_executable = ${PREFIX}/libexec/dovecot/imap-login
- 
-   # IMAP executable location. Changing this allows you to execute other
-   # binaries before the imap process is executed.
-   #
-   # This would write rawlogs into user's ~/dovecot.rawlog/, if it exists:
--  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+  #   mail_executable = ${PREFIX}/libexec/dovecot/rawlog ${PREFIX}/libexec/dovecot/imap
-   # <doc/wiki/Debugging/Rawlog.txt>
-   #
-   # This would attach gdb into the imap process and write backtraces into
-   # /tmp/gdbhelper.* files:
--  #   mail_executable = /usr/libexec/dovecot/gdbhelper /usr/libexec/dovecot/imap
-+  #   mail_executable = ${PREFIX}/libexec/dovecot/gdbhelper ${PREFIX}/libexec/dovecot/imap
-   #
--  #mail_executable = /usr/libexec/dovecot/imap
-+  #mail_executable = ${PREFIX}/libexec/dovecot/imap
- 
-   # 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
-@@ -564,7 +564,7 @@ protocol imap {
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/imap
-+  #mail_plugin_dir = ${PREFIX}/lib/dovecot/imap
- 
-   # IMAP logout format string:
-   #  %i - total number of bytes read from client
-@@ -605,7 +605,7 @@ protocol imap {
-   #     but not both. Thunderbird separates these two by forcing server to
-   #     accept '/' suffix in mailbox names in subscriptions list.
-   # The list is space-separated.
--  #imap_client_workarounds = 
-+  imap_client_workarounds = delay-newmail netscape-eoh tb-extra-mailbox-sep
- }
-   
- ##
-@@ -614,11 +614,11 @@ protocol imap {
- 
- protocol pop3 {
-   # Login executable location.
--  #login_executable = /usr/libexec/dovecot/pop3-login
-+  #login_executable = ${PREFIX}/libexec/dovecot/pop3-login
- 
-   # POP3 executable location. See IMAP's mail_executable above for examples
-   # how this could be changed.
--  #mail_executable = /usr/libexec/dovecot/pop3
-+  #mail_executable = ${PREFIX}/libexec/dovecot/pop3
- 
-   # 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
-@@ -682,7 +682,7 @@ protocol pop3 {
-   # Support for dynamically loadable plugins. mail_plugins is a space separated
-   # list of plugins to load.
-   #mail_plugins = 
--  #mail_plugin_dir = /usr/lib/dovecot/pop3
-+  #mail_plugin_dir = ${PREFIX}/lib/dovecot/pop3
- 
-   # Workarounds for various client bugs:
-   #   outlook-no-nuls:
-@@ -692,7 +692,7 @@ protocol pop3 {
-   #     Outlook Express and Netscape Mail breaks if end of headers-line is
-   #     missing. This option simply sends it if it's missing.
-   # The list is space-separated.
--  #pop3_client_workarounds = 
-+  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
- }
- 
- ##
-@@ -710,7 +710,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.
-@@ -724,7 +724,7 @@ protocol lda {
-   #deliver_log_format = msgid=%m: %$
- 
-   # Binary to use for sending mails.
--  #sendmail_path = /usr/lib/sendmail
-+  #sendmail_path = /usr/sbin/sendmail
- 
-   # Subject: header to use for rejection mails. You can use the same variables
-   # as for rejection_reason below.
-@@ -735,7 +735,7 @@ protocol lda {
-   #rejection_reason = Your message to <%t> was automatically rejected:%n%r
- 
-   # UNIX socket path to master authentication server to find users.
--  #auth_socket_path = /var/run/dovecot/auth-master
-+  #auth_socket_path = /var/dovecot/auth-master
- }
- 
- ##
-@@ -743,7 +743,7 @@ protocol lda {
- ##
- 
- # Executable location
--#auth_executable = /usr/libexec/dovecot/dovecot-auth
-+#auth_executable = ${PREFIX}/libexec/dovecot/dovecot-auth
- 
- # Set max. process size in megabytes.
- #auth_process_size = 256
-@@ -872,7 +872,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 {
-     # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
-     # [cache_key=<key>] [<service name>]
-     #
-@@ -905,7 +905,7 @@ auth default {
-     #   args = session=yes %Ls
-     #   args = cache_key=%u dovecot
-     #args = dovecot
--  }
-+  #}
- 
-   # System users (NSS, /etc/passwd, or similiar)
-   # In many systems nowadays this uses Name Service Switch, which is
-@@ -925,10 +925,10 @@ auth default {
- 
-   # PAM-like authentication for OpenBSD.
-   # <doc/wiki/PasswordDatabase.BSDAuth.txt>
--  #passdb bsdauth {
-+  passdb bsdauth {
-     # [cache_key=<key>] - See cache_key in PAM for explanation.
-     #args =
--  #}
-+  }
- 
-   # passwd-like file with specified location
-   # <doc/wiki/AuthDatabase.PasswdFile.txt>
-@@ -1070,7 +1070,7 @@ auth default {
-       # Master socket provides access to userdb information. It's typically
-       # used to give Dovecot's local delivery agent access to userdb so it
-       # can find mailbox locations.
--      #path = /var/run/dovecot/auth-master
-+      #path = /var/dovecot/auth-master
-       #mode = 0600
-       # Default user/group is the one who started dovecot-auth (root)
-       #user = 
-@@ -1080,7 +1080,7 @@ auth default {
-       # The client socket is generally safe to export to everyone. Typical use
-       # is to export it to your SMTP server so it can do SMTP AUTH lookups
-       # using it.
--      #path = /var/run/dovecot/auth-client
-+      #path = /var/dovecot/auth-client
-       #mode = 0660
-     #}
-   #}
-@@ -1094,7 +1094,7 @@ auth default {
- #auth external {
- #  socket connect {
- #    master {
--#      path = /var/run/dovecot/auth-master
-+#      path = /var/dovecot/auth-master
- #    }
- #  }
- #}

mail/dovecot/patches/patch-Makefile_in

@@ -1,12 +0,0 @@
-$OpenBSD: patch-Makefile_in,v 1.23 2010/05/05 02:07:44 sthen Exp $
---- Makefile.in.orig	Mon Mar  8 12:31:13 2010
-+++ Makefile.in	Sun May  2 16:56:25 2010
-@@ -756,7 +756,7 @@ install-data: install-data-recursive
- uninstall: uninstall-recursive
- 
- install-am: all-am
--	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am
- 
- installcheck: installcheck-recursive
- install-strip:

mail/dovecot/patches/patch-configure_in

@@ -1,16 +1,16 @@
-$OpenBSD: patch-configure_in,v 1.22 2010/03/23 21:32:07 pea Exp $
---- configure.in.orig	Tue Nov 10 03:33:36 2009
-+++ configure.in	Wed Nov 18 10:05:38 2009
-@@ -1759,112 +1759,16 @@ fi
+$OpenBSD: patch-configure_in,v 1.23 2011/05/23 22:54:38 sthen Exp $
+--- configure.in.orig	Sun Mar  6 23:34:52 2011
++++ configure.in	Tue Mar  8 13:54:49 2011
+@@ -1873,112 +1873,16 @@ fi
  
  have_gssapi=no
  if test $want_gssapi != no; then
--	AC_CHECK_PROG(KRB5CONFIG, krb5-config, YES, NO)
--	if test $KRB5CONFIG = YES; then
--		if ! krb5-config --version gssapi 2>/dev/null > /dev/null; then
+-	AC_CHECK_PROG(KRB5CONFIG, krb5-config, krb5-config, NO)
+-	if test $KRB5CONFIG != NO; then
+-		if ! $KRB5CONFIG --version gssapi 2>/dev/null > /dev/null; then
 -		  # krb5-config doesn't support gssapi.
--		  KRB5_LIBS="`krb5-config --libs`"
--		  KRB5_CFLAGS=`krb5-config --cflags`
+-		  KRB5_LIBS="`$KRB5CONFIG --libs`"
+-		  KRB5_CFLAGS=`$KRB5CONFIG --cflags`
 -		  AC_CHECK_LIB(gss, gss_acquire_cred, [
 -		    # Solaris
 -		    KRB5_LIBS="$KRB5_LIBS -lgss"
@@ -19,8 +19,8 @@ $OpenBSD: patch-configure_in,v 1.22 2010/03/23 21:32:07 pea Exp $
 -		    KRB5_LIBS=
 -		  ], $KRB5_LIBS)
 -		else
--		  KRB5_LIBS=`krb5-config --libs gssapi`
--		  KRB5_CFLAGS=`krb5-config --cflags gssapi`
+-		  KRB5_LIBS=`$KRB5CONFIG --libs gssapi`
+-		  KRB5_CFLAGS=`$KRB5CONFIG --cflags gssapi`
 -		fi
 -		if test "$KRB5_LIBS" != ""; then
 -			AC_SUBST(KRB5_LIBS)

mail/dovecot/patches/patch-doc_example-config_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_example-config_Makefile_in,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/Makefile.in.orig	Wed May 11 10:35:51 2011
++++ doc/example-config/Makefile.in	Wed May 11 20:26:49 2011
+@@ -285,7 +285,7 @@ top_srcdir = @top_srcdir@
+ SUBDIRS = conf.d
+ pkgsysconfdir = $(sysconfdir)/dovecot
+ nodist_pkgsysconf_DATA = README
+-exampledir = $(docdir)/example-config
++exampledir = $(prefix)/share/examples/dovecot/example-config
+ example_DATA = \
+ 	dovecot.conf \
+ 	dovecot-db.conf.ext \

mail/dovecot/patches/patch-doc_example-config_conf_d_10-auth_conf

@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_example-config_conf_d_10-auth_conf,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/10-auth.conf.orig	Tue Mar 22 15:12:29 2011
++++ doc/example-config/conf.d/10-auth.conf	Tue Mar 22 15:12:35 2011
+@@ -6,7 +6,7 @@
+ # SSL/TLS is used (LOGINDISABLED capability). Note that if the remote IP
+ # matches the local IP (ie. you're connecting from the same computer), the
+ # connection is considered secure and plaintext authentication is allowed.
+-#disable_plaintext_auth = yes
++disable_plaintext_auth = yes
+ 
+ # Authentication cache size (e.g. 10M). 0 means it's disabled. Note that
+ # bsdauth, PAM and vpopmail require cache_key to be set for caching to be used.

mail/dovecot/patches/patch-doc_example-config_conf_d_10-mail_conf

@@ -0,0 +1,37 @@
+$OpenBSD: patch-doc_example-config_conf_d_10-mail_conf,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/10-mail.conf.orig	Thu Dec 30 10:42:54 2010
++++ doc/example-config/conf.d/10-mail.conf	Tue Mar 22 15:11:14 2011
+@@ -132,8 +132,9 @@
+ ##
+ 
+ # Don't use mmap() at all. This is required if you store indexes to shared
+-# filesystems (NFS or clustered filesystem).
+-#mmap_disable = no
++# filesystems (NFS or clustered filesystem) or for some operating systems
++# which use a separate cache for mmap, such as OpenBSD.
++mmap_disable = yes
+ 
+ # Rely on O_EXCL to work when creating dotlock files. NFS supports O_EXCL
+ # since version 3, so this should be safe to use nowadays by default.
+@@ -197,10 +198,10 @@
+ 
+ # UNIX socket path to master authentication server to find users.
+ # This is used by imap (for shared users) and lda.
+-#auth_socket_path = /var/run/dovecot/auth-userdb
++#auth_socket_path = /var/dovecot/auth-userdb
+ 
+ # Directory where to look up mail plugins.
+-#mail_plugin_dir = /usr/lib/dovecot
++mail_plugin_dir = ${PREFIX}/lib/dovecot
+ 
+ # Space separated list of plugins to load for all services. Plugins specific to
+ # IMAP, LDA, etc. are added to this list in their own .conf files.
+@@ -266,7 +267,7 @@
+ # locking methods as well. Some operating systems don't allow using some of
+ # them simultaneously.
+ #mbox_read_locks = fcntl
+-#mbox_write_locks = dotlock fcntl
++mbox_write_locks = fcntl
+ 
+ # Maximum time to wait for lock (all of them) before aborting.
+ #mbox_lock_timeout = 5 mins

mail/dovecot/patches/patch-doc_example-config_conf_d_10-master_conf

@@ -0,0 +1,17 @@
+$OpenBSD: patch-doc_example-config_conf_d_10-master_conf,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/10-master.conf.orig	Thu Dec 30 10:42:54 2010
++++ doc/example-config/conf.d/10-master.conf	Tue Mar 22 15:23:22 2011
+@@ -8,11 +8,11 @@
+ 
+ # Login user is internally used by login processes. This is the most untrusted
+ # user in Dovecot system. It shouldn't have access to anything at all.
+-#default_login_user = dovenull
++default_login_user = _dovenull
+ 
+ # Internal user is used by unprivileged processes. It should be separate from
+ # login user, so that login processes can't disturb other processes.
+-#default_internal_user = dovecot
++default_internal_user = _dovecot
+ 
+ service imap-login {
+   inet_listener imap {

mail/dovecot/patches/patch-doc_example-config_conf_d_10-ssl_conf

@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_example-config_conf_d_10-ssl_conf,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/10-ssl.conf.orig	Thu Mar 10 14:39:31 2011
++++ doc/example-config/conf.d/10-ssl.conf	Thu Mar 10 14:40:01 2011
+@@ -9,7 +9,7 @@
+ # dropping root privileges, so keep the key file unreadable by anyone but
+ # root. Included doc/mkcert.sh can be used to easily generate self-signed
+ # certificate, just make sure to update the domains in dovecot-openssl.cnf
+-ssl_cert = </etc/ssl/certs/dovecot.pem
++ssl_cert = </etc/ssl/dovecotcert.pem
+ ssl_key = </etc/ssl/private/dovecot.pem
+ 
+ # If key file is password protected, give the password here. Alternatively

mail/dovecot/patches/patch-doc_example-config_conf_d_20-imap_conf

@@ -0,0 +1,10 @@
+$OpenBSD: patch-doc_example-config_conf_d_20-imap_conf,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/20-imap.conf.orig	Wed Mar 16 11:46:51 2011
++++ doc/example-config/conf.d/20-imap.conf	Fri May 13 17:04:17 2011
+@@ -54,5 +54,5 @@ protocol imap {
+   #     greyed out, instead of only later giving "not selectable" popup error.
+   #
+   # The list is space-separated.
+-  #imap_client_workarounds = 
++  imap_client_workarounds = delay-newmail tb-extra-mailbox-sep tb-lsub-flags
+ }

mail/dovecot/patches/patch-doc_example-config_conf_d_20-pop3_conf

@@ -0,0 +1,10 @@
+$OpenBSD: patch-doc_example-config_conf_d_20-pop3_conf,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/20-pop3.conf.orig	Tue Mar 22 15:09:10 2011
++++ doc/example-config/conf.d/20-pop3.conf	Tue Mar 22 15:09:44 2011
+@@ -82,5 +82,5 @@ protocol pop3 {
+   #     Outlook Express and Netscape Mail breaks if end of headers-line is
+   #     missing. This option simply sends it if it's missing.
+   # The list is space-separated.
+-  #pop3_client_workarounds = 
++  pop3_client_workarounds = outlook-no-nuls oe-ns-eoh
+ }

mail/dovecot/patches/patch-doc_example-config_conf_d_Makefile_in

@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_example-config_conf_d_Makefile_in,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/Makefile.in.orig	Wed May 11 10:35:51 2011
++++ doc/example-config/conf.d/Makefile.in	Wed May 11 20:26:49 2011
+@@ -242,7 +242,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 = $(prefix)/share/examples/dovecot/example-config/conf.d
+ example_DATA = \
+ 	auth-checkpassword.conf.ext \
+ 	auth-deny.conf.ext \

mail/dovecot/patches/patch-doc_example-config_conf_d_auth-system_conf_ext

@@ -0,0 +1,34 @@
+$OpenBSD: patch-doc_example-config_conf_d_auth-system_conf_ext,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/conf.d/auth-system.conf.ext.orig	Wed Mar 16 16:40:19 2011
++++ doc/example-config/conf.d/auth-system.conf.ext	Wed Mar 16 16:40:39 2011
+@@ -7,12 +7,12 @@
+ # PAM is typically used with either userdb passwd or userdb static.
+ # REMEMBER: You'll need /etc/pam.d/dovecot file created for PAM
+ # authentication to actually work. <doc/wiki/PasswordDatabase.PAM.txt>
+-passdb {
+-  driver = pam
++#passdb {
++  #driver = pam
+   # [session=yes] [setcred=yes] [failure_show_msg=yes] [max_requests=<n>]
+   # [cache_key=<key>] [<service name>]
+   #args = dovecot
+-}
++#}
+ 
+ # System users (NSS, /etc/passwd, or similiar).
+ # In many systems nowadays this uses Name Service Switch, which is
+@@ -34,11 +34,11 @@ passdb {
+ 
+ # PAM-like authentication for OpenBSD.
+ # <doc/wiki/PasswordDatabase.BSDAuth.txt>
+-#passdb {
+-  #driver = bsdauth
++passdb {
++  driver = bsdauth
+   # [blocking=no] [cache_key=<key>]
+   #args =
+-#}
++}
+ 
+ ##
+ ## User databases

mail/dovecot/patches/patch-doc_example-config_dovecot_conf

@@ -0,0 +1,12 @@
+$OpenBSD: patch-doc_example-config_dovecot_conf,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- doc/example-config/dovecot.conf.orig	Wed Mar  9 12:03:07 2011
++++ doc/example-config/dovecot.conf	Wed Mar  9 12:03:19 2011
+@@ -26,7 +26,7 @@
+ #listen = *, ::
+ 
+ # Base directory where to store runtime data.
+-#base_dir = /var/run/dovecot/
++#base_dir = /var/dovecot/
+ 
+ # Greeting message for clients.
+ #login_greeting = Dovecot ready.

mail/dovecot/patches/patch-src_deliver_deliver_c

@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_deliver_deliver_c,v 1.4 2010/05/05 02:07:44 sthen Exp $
---- src/deliver/deliver.c.orig	Sun Feb 28 08:38:09 2010
-+++ src/deliver/deliver.c	Sun May  2 16:56:18 2010
-@@ -46,7 +46,7 @@
- #include <syslog.h>
- 
- #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
--#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
-+#define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail"
- #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
- 
- /* After buffer grows larger than this, create a temporary file to /tmp

mail/dovecot/patches/patch-src_imap-login_imap-proxy_c

@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_imap-login_imap-proxy_c,v 1.3 2011/01/04 13:59:17 pea Exp $
---- src/imap-login/imap-proxy.c.orig	Thu Dec  9 17:39:21 2010
-+++ src/imap-login/imap-proxy.c	Thu Dec  9 17:41:00 2010
-@@ -436,6 +436,11 @@ int imap_proxy_new(struct imap_client *client, const c
- 		client_send_tagline(client, PROXY_FAILURE_MSG);
- 		return -1;
- 	}
-+	if (host == NULL || *host == '\0') {
-+		client_syslog_err(&client->common, "proxy: host not given");
-+		client_send_tagline(client, PROXY_FAILURE_MSG);
-+		return -1;
-+	}
- 
- 	i_assert(client->refcount > 1);
- 	connection_queue_add(1);

mail/dovecot/patches/patch-src_imap_imap-search_c

@@ -1,11 +0,0 @@
-$OpenBSD: patch-src_imap_imap-search_c,v 1.1 2011/01/04 13:59:17 pea Exp $
---- src/imap/imap-search.c.orig	Thu Dec  9 17:37:18 2010
-+++ src/imap/imap-search.c	Thu Dec  9 17:37:44 2010
-@@ -283,6 +283,7 @@ static void imap_search_send_result(struct imap_search
- 	}
- 	str_append(str, "\r\n");
- 	o_stream_send(client->output, str_data(str), str_len(str));
-+	str_free(&str);
- }
- 
- static void search_update_mail(struct imap_search_context *ctx)

mail/dovecot/patches/patch-src_lib-index_mail-index-sync-update_c

@@ -1,20 +0,0 @@
-$OpenBSD: patch-src_lib-index_mail-index-sync-update_c,v 1.1 2011/01/04 13:59:17 pea Exp $
---- src/lib-index/mail-index-sync-update.c.orig	Sun Dec  5 18:18:06 2010
-+++ src/lib-index/mail-index-sync-update.c	Sun Dec  5 18:18:45 2010
-@@ -528,8 +528,15 @@ int mail_index_sync_record(struct mail_index_sync_map_
- 			break;
- 		}
- 		end = CONST_PTR_OFFSET(data, hdr->size);
--		for (; rec != end; rec++)
-+		for (; rec != end; rec++) {
-+			if (rec->uid == 0) {
-+				mail_index_sync_set_corrupted(ctx,
-+					"Expunge-guid for invalid uid=%u",
-+					rec->uid);
-+				break;
-+			}
- 			sync_expunge(ctx, rec->uid, rec->uid);
-+		}
- 		break;
- 	}
- 	case MAIL_TRANSACTION_FLAG_UPDATE: {

mail/dovecot/patches/patch-src_lib_ipwd_c

@@ -0,0 +1,16 @@
+$OpenBSD: patch-src_lib_ipwd_c,v 1.1 2011/05/23 22:54:38 sthen Exp $
+--- src/lib/ipwd.c.orig	Wed May 11 20:27:44 2011
++++ src/lib/ipwd.c	Wed May 11 20:28:24 2011
+@@ -31,12 +31,8 @@ static void gr_init(void)
+ 	long size;
+ 
+ 	if (grbuf == NULL) {
+-		/* OpenBSD (up to 4.8 at least) reports too low value in
+-		   sysconf() */
+-#ifndef __OpenBSD__
+ 		size = sysconf(_SC_GETGR_R_SIZE_MAX);
+ 		if (size < 0)
+-#endif
+ 			size = DEFAULT_GRBUF_SIZE;
+ 
+ 		grbuf_size = size;

mail/dovecot/patches/patch-src_master_master-settings_c

@@ -1,22 +0,0 @@
-$OpenBSD: patch-src_master_master-settings_c,v 1.11 2011/03/03 00:40:05 sthen Exp $
---- src/master/master-settings.c.orig	Mon May 24 16:01:15 2010
-+++ src/master/master-settings.c	Thu Mar  3 00:21:58 2011
-@@ -633,7 +633,8 @@ static void unlink_auth_sockets(const char *path, cons
- 				i_error("lstat(%s) failed: %m", str_c(str));
- 			continue;
- 		}
--		if (!S_ISSOCK(st.st_mode))
-+		/* delete also FIFOs created by v2.0 */
-+		if (!S_ISSOCK(st.st_mode) && !S_ISFIFO(st.st_mode))
- 			continue;
- 
- 		/* try to avoid unlinking sockets if someone's already
-@@ -641,7 +642,7 @@ static void unlink_auth_sockets(const char *path, cons
- 		   when SIGHUPing a child process might catch the new
- 		   connection before it notices that it's supposed
- 		   to die. null_fd == -1 check is a bit kludgy, but works.. */
--		if (null_fd == -1) {
-+		if (null_fd == -1 && S_ISSOCK(st.st_mode)) {
- 			int fd = net_connect_unix(str_c(str));
- 			if (fd != -1 || errno != ECONNREFUSED) {
- 				i_fatal("Dovecot is already running? "

mail/dovecot/patches/patch-src_pop3-login_pop3-proxy_c

@@ -1,15 +0,0 @@
-$OpenBSD: patch-src_pop3-login_pop3-proxy_c,v 1.3 2011/01/04 13:59:17 pea Exp $
---- src/pop3-login/pop3-proxy.c.orig	Thu Dec  9 17:41:09 2010
-+++ src/pop3-login/pop3-proxy.c	Thu Dec  9 17:41:24 2010
-@@ -271,6 +271,11 @@ int pop3_proxy_new(struct pop3_client *client, const c
- 		client_send_line(client, PROXY_FAILURE_MSG);
- 		return -1;
- 	}
-+	if (host == NULL || *host == '\0') {
-+		client_syslog_err(&client->common, "proxy: host not given");
-+		client_send_line(client, PROXY_FAILURE_MSG);
-+		return -1;
-+	}
- 
- 	i_assert(client->refcount > 1);
- 	connection_queue_add(1);

mail/dovecot/pkg/DESCR-sieve

@@ -1 +0,0 @@
-Sieve mail filtering for Dovecot

mail/dovecot/pkg/PLIST

@@ -0,0 +1,699 @@
+@comment $OpenBSD: PLIST,v 1.22 2011/05/23 22:54:38 sthen Exp $
+@pkgpath mail/dovecot,-server
+@pkgpath mail/dovecot,-server,bdb
+@pkgpath mail/dovecot,-server,ldap
+@pkgpath mail/dovecot,-server,mysql
+@pkgpath mail/dovecot,-server,postgresql
+@pkgpath mail/dovecot,-server,sqlite
+@pkgpath mail/dovecot,-server,bdb,ldap,mysql,postgresql,sqlite
+@pkgpath mail/dovecot
+@pkgpath mail/dovecot,bdb
+@pkgpath mail/dovecot,ldap
+@pkgpath mail/dovecot,mysql
+@pkgpath mail/dovecot,postgresql
+@pkgpath mail/dovecot,sqlite
+@pkgpath mail/dovecot,bdb,ldap,mysql,postgresql,sqlite
+@ask-update dovecot-<2.0 You will need to change your conf
+@newgroup _dovecot:518
+@newgroup _dovenull:666
+@newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
+@newuser _dovenull:666:_dovenull:daemon:Dovecot Login User:/nonexistent:/sbin/nologin
+@extraunexec rm -rf /var/dovecot/*
+@bin bin/doveadm
+@bin bin/doveconf
+@bin bin/dsync
+include/dovecot/
+include/dovecot/abspath.h
+include/dovecot/access-lookup.h
+include/dovecot/anvil-client.h
+include/dovecot/aqueue.h
+include/dovecot/array-decl.h
+include/dovecot/array.h
+include/dovecot/askpass.h
+include/dovecot/auth-cache.h
+include/dovecot/auth-client-connection.h
+include/dovecot/auth-client-interface.h
+include/dovecot/auth-client-private.h
+include/dovecot/auth-client-request.h
+include/dovecot/auth-client.h
+include/dovecot/auth-common.h
+include/dovecot/auth-master-connection.h
+include/dovecot/auth-master.h
+include/dovecot/auth-penalty.h
+include/dovecot/auth-request-handler.h
+include/dovecot/auth-request.h
+include/dovecot/auth-server-connection.h
+include/dovecot/auth-settings.h
+include/dovecot/auth-stream.h
+include/dovecot/auth-worker-client.h
+include/dovecot/auth-worker-server.h
+include/dovecot/auth.h
+include/dovecot/backtrace-string.h
+include/dovecot/base64.h
+include/dovecot/bsearch-insert-pos.h
+include/dovecot/buffer.h
+include/dovecot/charset-utf8.h
+include/dovecot/child-wait.h
+include/dovecot/client-common.h
+include/dovecot/close-keep-errno.h
+include/dovecot/compat.h
+include/dovecot/config-filter.h
+include/dovecot/config-parser-private.h
+include/dovecot/config-parser.h
+include/dovecot/config-request.h
+include/dovecot/config.h
+include/dovecot/crc32.h
+include/dovecot/cydir-storage.h
+include/dovecot/cydir-sync.h
+include/dovecot/data-stack.h
+include/dovecot/db-checkpassword.h
+include/dovecot/db-ldap.h
+include/dovecot/db-passwd-file.h
+include/dovecot/db-sql.h
+include/dovecot/dbox-attachment.h
+include/dovecot/dbox-file.h
+include/dovecot/dbox-mail.h
+include/dovecot/dbox-save.h
+include/dovecot/dbox-storage.h
+include/dovecot/dbox-sync-rebuild.h
+include/dovecot/dict-client.h
+include/dovecot/dict-private.h
+include/dovecot/dict-sql-settings.h
+include/dovecot/dict-sql.h
+include/dovecot/dict.h
+include/dovecot/dns-lookup.h
+include/dovecot/dovecot-version.h
+include/dovecot/duplicate.h
+include/dovecot/eacces-error.h
+include/dovecot/env-util.h
+include/dovecot/execv-const.h
+include/dovecot/failures.h
+include/dovecot/fd-close-on-exec.h
+include/dovecot/fd-set-nonblock.h
+include/dovecot/fdatasync-path.h
+include/dovecot/fdpass.h
+include/dovecot/file-cache.h
+include/dovecot/file-copy.h
+include/dovecot/file-dotlock.h
+include/dovecot/file-lock.h
+include/dovecot/file-set-size.h
+include/dovecot/fs-api-private.h
+include/dovecot/fs-api.h
+include/dovecot/fs-sis-common.h
+include/dovecot/fsync-mode.h
+include/dovecot/hash-format.h
+include/dovecot/hash-method.h
+include/dovecot/hash.h
+include/dovecot/hash2.h
+include/dovecot/hex-binary.h
+include/dovecot/hex-dec.h
+include/dovecot/hmac-md5.h
+include/dovecot/home-expand.h
+include/dovecot/hostpid.h
+include/dovecot/imap-arg.h
+include/dovecot/imap-base-subject.h
+include/dovecot/imap-bodystructure.h
+include/dovecot/imap-client.h
+include/dovecot/imap-commands-util.h
+include/dovecot/imap-commands.h
+include/dovecot/imap-common.h
+include/dovecot/imap-date.h
+include/dovecot/imap-envelope.h
+include/dovecot/imap-expunge.h
+include/dovecot/imap-fetch.h
+include/dovecot/imap-id.h
+include/dovecot/imap-match.h
+include/dovecot/imap-parser.h
+include/dovecot/imap-quote.h
+include/dovecot/imap-resp-code.h
+include/dovecot/imap-search-args.h
+include/dovecot/imap-search.h
+include/dovecot/imap-seqset.h
+include/dovecot/imap-settings.h
+include/dovecot/imap-status.h
+include/dovecot/imap-sync.h
+include/dovecot/imap-utf7.h
+include/dovecot/imap-util.h
+include/dovecot/imem.h
+include/dovecot/index-attachment.h
+include/dovecot/index-mail.h
+include/dovecot/index-mailbox-list.h
+include/dovecot/index-search-result.h
+include/dovecot/index-sort-private.h
+include/dovecot/index-sort.h
+include/dovecot/index-storage.h
+include/dovecot/index-sync-changes.h
+include/dovecot/index-sync-private.h
+include/dovecot/index-thread-private.h
+include/dovecot/ioloop-internal.h
+include/dovecot/ioloop-iolist.h
+include/dovecot/ioloop-notify-fd.h
+include/dovecot/ioloop.h
+include/dovecot/iostream-internal.h
+include/dovecot/ipwd.h
+include/dovecot/istream-attachment.h
+include/dovecot/istream-base64-encoder.h
+include/dovecot/istream-concat.h
+include/dovecot/istream-crlf.h
+include/dovecot/istream-dot.h
+include/dovecot/istream-header-filter.h
+include/dovecot/istream-internal.h
+include/dovecot/istream-mail-stats.h
+include/dovecot/istream-raw-mbox.h
+include/dovecot/istream-seekable.h
+include/dovecot/istream-tee.h
+include/dovecot/istream.h
+include/dovecot/lda-settings.h
+include/dovecot/lib-signals.h
+include/dovecot/lib.h
+include/dovecot/llist.h
+include/dovecot/lmtp-client.h
+include/dovecot/login-common.h
+include/dovecot/login-proxy-state.h
+include/dovecot/login-proxy.h
+include/dovecot/login-settings.h
+include/dovecot/macros.h
+include/dovecot/mail-cache-private.h
+include/dovecot/mail-cache.h
+include/dovecot/mail-copy.h
+include/dovecot/mail-deliver.h
+include/dovecot/mail-error.h
+include/dovecot/mail-index-alloc-cache.h
+include/dovecot/mail-index-modseq.h
+include/dovecot/mail-index-private.h
+include/dovecot/mail-index-strmap.h
+include/dovecot/mail-index-sync-private.h
+include/dovecot/mail-index-transaction-private.h
+include/dovecot/mail-index-util.h
+include/dovecot/mail-index-view-private.h
+include/dovecot/mail-index.h
+include/dovecot/mail-namespace.h
+include/dovecot/mail-search-build.h
+include/dovecot/mail-search-parser-private.h
+include/dovecot/mail-search-parser.h
+include/dovecot/mail-search-register.h
+include/dovecot/mail-search.h
+include/dovecot/mail-send.h
+include/dovecot/mail-storage-hooks.h
+include/dovecot/mail-storage-private.h
+include/dovecot/mail-storage-service.h
+include/dovecot/mail-storage-settings.h
+include/dovecot/mail-storage.h
+include/dovecot/mail-thread.h
+include/dovecot/mail-transaction-log-private.h
+include/dovecot/mail-transaction-log-view-private.h
+include/dovecot/mail-transaction-log.h
+include/dovecot/mail-types.h
+include/dovecot/mail-user.h
+include/dovecot/mailbox-list-delete.h
+include/dovecot/mailbox-list-fs.h
+include/dovecot/mailbox-list-index-private.h
+include/dovecot/mailbox-list-index.h
+include/dovecot/mailbox-list-maildir.h
+include/dovecot/mailbox-list-private.h
+include/dovecot/mailbox-list-subscriptions.h
+include/dovecot/mailbox-list.h
+include/dovecot/mailbox-log.h
+include/dovecot/mailbox-search-result-private.h
+include/dovecot/mailbox-tree.h
+include/dovecot/mailbox-uidvalidity.h
+include/dovecot/maildir-filename.h
+include/dovecot/maildir-keywords.h
+include/dovecot/maildir-settings.h
+include/dovecot/maildir-storage.h
+include/dovecot/maildir-sync.h
+include/dovecot/maildir-uidlist.h
+include/dovecot/master-auth.h
+include/dovecot/master-interface.h
+include/dovecot/master-login-auth.h
+include/dovecot/master-login.h
+include/dovecot/master-service-private.h
+include/dovecot/master-service-settings-cache.h
+include/dovecot/master-service-settings.h
+include/dovecot/master-service.h
+include/dovecot/mbox-file.h
+include/dovecot/mbox-from.h
+include/dovecot/mbox-lock.h
+include/dovecot/mbox-md5.h
+include/dovecot/mbox-settings.h
+include/dovecot/mbox-storage.h
+include/dovecot/mbox-sync-private.h
+include/dovecot/md4.h
+include/dovecot/md5.h
+include/dovecot/mdbox-file.h
+include/dovecot/mdbox-map-private.h
+include/dovecot/mdbox-map.h
+include/dovecot/mdbox-settings.h
+include/dovecot/mdbox-storage-rebuild.h
+include/dovecot/mdbox-storage.h
+include/dovecot/mdbox-sync.h
+include/dovecot/mech-otp-skey-common.h
+include/dovecot/mech-plain-common.h
+include/dovecot/mech.h
+include/dovecot/mempool.h
+include/dovecot/message-address.h
+include/dovecot/message-date.h
+include/dovecot/message-decoder.h
+include/dovecot/message-header-decode.h
+include/dovecot/message-header-encode.h
+include/dovecot/message-header-parser.h
+include/dovecot/message-id.h
+include/dovecot/message-parser.h
+include/dovecot/message-part-serialize.h
+include/dovecot/message-search.h
+include/dovecot/message-send.h
+include/dovecot/message-size.h
+include/dovecot/mkdir-parents.h
+include/dovecot/mmap-util.h
+include/dovecot/module-context.h
+include/dovecot/module-dir.h
+include/dovecot/mountpoint.h
+include/dovecot/mycrypt.h
+include/dovecot/network.h
+include/dovecot/nfs-workarounds.h
+include/dovecot/notify-plugin-private.h
+include/dovecot/notify-plugin.h
+include/dovecot/ostream-cmp.h
+include/dovecot/ostream-internal.h
+include/dovecot/ostream.h
+include/dovecot/passdb-blocking.h
+include/dovecot/passdb-cache.h
+include/dovecot/passdb.h
+include/dovecot/password-scheme.h
+include/dovecot/pop3-capability.h
+include/dovecot/pop3-client.h
+include/dovecot/pop3-commands.h
+include/dovecot/pop3-common.h
+include/dovecot/pop3-settings.h
+include/dovecot/primes.h
+include/dovecot/printf-format-fix.h
+include/dovecot/priorityq.h
+include/dovecot/process-title.h
+include/dovecot/quoted-printable.h
+include/dovecot/randgen.h
+include/dovecot/raw-storage.h
+include/dovecot/raw-sync.h
+include/dovecot/read-full.h
+include/dovecot/restrict-access.h
+include/dovecot/restrict-process-size.h
+include/dovecot/rfc2231-parser.h
+include/dovecot/rfc822-parser.h
+include/dovecot/safe-memset.h
+include/dovecot/safe-mkdir.h
+include/dovecot/safe-mkstemp.h
+include/dovecot/sasl-server.h
+include/dovecot/sdbox-file.h
+include/dovecot/sdbox-storage.h
+include/dovecot/sdbox-sync.h
+include/dovecot/sendfile-util.h
+include/dovecot/seq-range-array.h
+include/dovecot/service-settings.h
+include/dovecot/settings-parser.h
+include/dovecot/settings.h
+include/dovecot/sha1.h
+include/dovecot/sha2.h
+include/dovecot/shared-storage.h
+include/dovecot/smtp-client.h
+include/dovecot/sql-api-private.h
+include/dovecot/sql-api.h
+include/dovecot/sql-db-cache.h
+include/dovecot/ssl-proxy.h
+include/dovecot/str-find.h
+include/dovecot/str-sanitize.h
+include/dovecot/str.h
+include/dovecot/strescape.h
+include/dovecot/strfuncs.h
+include/dovecot/strnum.h
+include/dovecot/subscription-file.h
+include/dovecot/syslog-util.h
+include/dovecot/test-common.h
+include/dovecot/time-util.h
+include/dovecot/unichar.h
+include/dovecot/unix-socket-create.h
+include/dovecot/unlink-directory.h
+include/dovecot/unlink-old-files.h
+include/dovecot/userdb-blocking.h
+include/dovecot/userdb-static.h
+include/dovecot/userdb-vpopmail.h
+include/dovecot/userdb.h
+include/dovecot/utc-mktime.h
+include/dovecot/utc-offset.h
+include/dovecot/var-expand.h
+include/dovecot/wildcard-match.h
+include/dovecot/write-full.h
+lib/dovecot/
+lib/dovecot/auth/
+lib/dovecot/doveadm/
+lib/dovecot/doveadm/lib10_doveadm_acl_plugin.so
+lib/dovecot/doveadm/lib10_doveadm_expire_plugin.so
+lib/dovecot/doveadm/lib10_doveadm_quota_plugin.so
+lib/dovecot/doveadm/lib10_doveadm_zlib_plugin.so
+lib/dovecot/dovecot-config
+lib/dovecot/lib01_acl_plugin.so
+lib/dovecot/lib02_imap_acl_plugin.so
+lib/dovecot/lib02_lazy_expunge_plugin.so
+lib/dovecot/lib05_snarf_plugin.so
+lib/dovecot/lib10_quota_plugin.so
+lib/dovecot/lib11_imap_quota_plugin.so
+lib/dovecot/lib11_trash_plugin.so
+lib/dovecot/lib15_notify_plugin.so
+lib/dovecot/lib20_autocreate_plugin.so
+lib/dovecot/lib20_expire_plugin.so
+lib/dovecot/lib20_fts_plugin.so
+lib/dovecot/lib20_listescape_plugin.so
+lib/dovecot/lib20_mail_log_plugin.so
+lib/dovecot/lib20_virtual_plugin.so
+lib/dovecot/lib20_zlib_plugin.so
+lib/dovecot/lib21_fts_squat_plugin.so
+lib/dovecot/lib30_imap_zlib_plugin.so
+@lib lib/dovecot/libdovecot-lda.so.${LIBdovecot-lda_VERSION}
+@lib lib/dovecot/libdovecot-login.so.${LIBdovecot-login_VERSION}
+@lib lib/dovecot/libdovecot-sql.so.${LIBdovecot-sql_VERSION}
+@lib lib/dovecot/libdovecot-storage.so.${LIBdovecot-storage_VERSION}
+@lib lib/dovecot/libdovecot.so.${LIBdovecot_VERSION}
+libexec/dovecot/
+@bin libexec/dovecot/anvil
+@bin libexec/dovecot/auth
+@bin libexec/dovecot/checkpassword-reply
+@bin libexec/dovecot/config
+libexec/dovecot/deliver
+@bin libexec/dovecot/dict
+@bin libexec/dovecot/director
+@bin libexec/dovecot/dns-client
+@bin libexec/dovecot/doveadm-server
+@bin libexec/dovecot/dovecot-lda
+@bin libexec/dovecot/gdbhelper
+@bin libexec/dovecot/imap
+@bin libexec/dovecot/imap-login
+@bin libexec/dovecot/listview
+@bin libexec/dovecot/lmtp
+@bin libexec/dovecot/log
+@bin libexec/dovecot/maildirlock
+@bin libexec/dovecot/pop3
+@bin libexec/dovecot/pop3-login
+@bin libexec/dovecot/rawlog
+@bin libexec/dovecot/script
+@bin libexec/dovecot/script-login
+@bin libexec/dovecot/ssl-params
+@man man/man1/deliver.1
+@man man/man1/doveadm-altmove.1
+@man man/man1/doveadm-auth.1
+@man man/man1/doveadm-config.1
+@man man/man1/doveadm-director.1
+@man man/man1/doveadm-dump.1
+@man man/man1/doveadm-expunge.1
+@man man/man1/doveadm-fetch.1
+@man man/man1/doveadm-force-resync.1
+@man man/man1/doveadm-help.1
+@man man/man1/doveadm-import.1
+@man man/man1/doveadm-index.1
+@man man/man1/doveadm-kick.1
+@man man/man1/doveadm-log.1
+@man man/man1/doveadm-mailbox.1
+@man man/man1/doveadm-penalty.1
+@man man/man1/doveadm-purge.1
+@man man/man1/doveadm-pw.1
+@man man/man1/doveadm-quota.1
+@man man/man1/doveadm-reload.1
+@man man/man1/doveadm-search.1
+@man man/man1/doveadm-stop.1
+@man man/man1/doveadm-user.1
+@man man/man1/doveadm-who.1
+@man man/man1/doveadm.1
+@man man/man1/doveconf.1
+@man man/man1/dovecot-lda.1
+@man man/man1/dovecot.1
+@man man/man1/dsync.1
+@man man/man7/doveadm-search-query.7
+@bin sbin/dovecot
+sbin/dovecot-mkcert.sh
+share/aclocal/
+share/aclocal/dovecot.m4
+share/doc/dovecot/
+share/doc/dovecot/auth-protocol.txt
+share/doc/dovecot/documentation.txt
+@sample ${SYSCONFDIR}/dovecot/
+@sample ${SYSCONFDIR}/dovecot/conf.d/
+share/doc/dovecot/securecoding.txt
+share/doc/dovecot/thread-refs.txt
+share/doc/dovecot/wiki/
+share/doc/dovecot/wiki/ACL.txt
+share/doc/dovecot/wiki/AixPluginsSupport.txt
+share/doc/dovecot/wiki/AuthDatabase.CheckPassword.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.AuthBinds.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.PasswordLookups.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.Userdb.txt
+share/doc/dovecot/wiki/AuthDatabase.LDAP.txt
+share/doc/dovecot/wiki/AuthDatabase.Passwd.txt
+share/doc/dovecot/wiki/AuthDatabase.PasswdFile.txt
+share/doc/dovecot/wiki/AuthDatabase.SQL.txt
+share/doc/dovecot/wiki/AuthDatabase.VPopMail.txt
+share/doc/dovecot/wiki/AuthDatabase.txt
+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
+share/doc/dovecot/wiki/Authentication.PasswordSchemes.txt
+share/doc/dovecot/wiki/Authentication.RestrictAccess.txt
+share/doc/dovecot/wiki/Authentication.txt
+share/doc/dovecot/wiki/BasicConfiguration.txt
+share/doc/dovecot/wiki/Chrooting.txt
+share/doc/dovecot/wiki/Clients.NegativeUIDs.txt
+share/doc/dovecot/wiki/Clients.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.Arrays.txt
+share/doc/dovecot/wiki/Design.AuthProcess.txt
+share/doc/dovecot/wiki/Design.Buffers.txt
+share/doc/dovecot/wiki/Design.Dsync.txt
+share/doc/dovecot/wiki/Design.Indexes.Cache.txt
+share/doc/dovecot/wiki/Design.Indexes.MailIndexApi.txt
+share/doc/dovecot/wiki/Design.Indexes.MainIndex.txt
+share/doc/dovecot/wiki/Design.Indexes.TransactionLog.txt
+share/doc/dovecot/wiki/Design.Indexes.txt
+share/doc/dovecot/wiki/Design.InputStreams.txt
+share/doc/dovecot/wiki/Design.MailProcess.txt
+share/doc/dovecot/wiki/Design.Memory.txt
+share/doc/dovecot/wiki/Design.OutputStreams.txt
+share/doc/dovecot/wiki/Design.Plugins.txt
+share/doc/dovecot/wiki/Design.Processes.txt
+share/doc/dovecot/wiki/Design.Storage.ErrorHandling.txt
+share/doc/dovecot/wiki/Design.Storage.Mail.txt
+share/doc/dovecot/wiki/Design.Storage.MailNamespace.txt
+share/doc/dovecot/wiki/Design.Storage.MailStorage.txt
+share/doc/dovecot/wiki/Design.Storage.MailUser.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Save.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Search.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Sync.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.Transaction.txt
+share/doc/dovecot/wiki/Design.Storage.Mailbox.txt
+share/doc/dovecot/wiki/Design.Storage.MailboxList.txt
+share/doc/dovecot/wiki/Design.Storage.Plugins.txt
+share/doc/dovecot/wiki/Design.Strings.txt
+share/doc/dovecot/wiki/Design.txt
+share/doc/dovecot/wiki/Dict.txt
+share/doc/dovecot/wiki/Director.txt
+share/doc/dovecot/wiki/DomainLost.txt
+share/doc/dovecot/wiki/Errors.ChgrpNoPerm.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
+share/doc/dovecot/wiki/LDA.Exim.txt
+share/doc/dovecot/wiki/LDA.Indexing.txt
+share/doc/dovecot/wiki/LDA.Postfix.txt
+share/doc/dovecot/wiki/LDA.Qmail.txt
+share/doc/dovecot/wiki/LDA.Sendmail.txt
+share/doc/dovecot/wiki/LDA.txt
+share/doc/dovecot/wiki/LMTP.txt
+share/doc/dovecot/wiki/Logging.txt
+share/doc/dovecot/wiki/LoginProcess.txt
+share/doc/dovecot/wiki/MDA.txt
+share/doc/dovecot/wiki/MTA.txt
+share/doc/dovecot/wiki/MailLocation.LocalDisk.txt
+share/doc/dovecot/wiki/MailLocation.Maildir.txt
+share/doc/dovecot/wiki/MailLocation.SharedDisk.txt
+share/doc/dovecot/wiki/MailLocation.dbox.txt
+share/doc/dovecot/wiki/MailLocation.mbox.txt
+share/doc/dovecot/wiki/MailLocation.txt
+share/doc/dovecot/wiki/MailboxFormat.Cydir.txt
+share/doc/dovecot/wiki/MailboxFormat.MH.txt
+share/doc/dovecot/wiki/MailboxFormat.Maildir.txt
+share/doc/dovecot/wiki/MailboxFormat.dbox.txt
+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/MboxChildFolders.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.Online.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
+share/doc/dovecot/wiki/MissingMailboxes.txt
+share/doc/dovecot/wiki/NFS.txt
+share/doc/dovecot/wiki/Namespaces.txt
+share/doc/dovecot/wiki/OSCompatibility.txt
+share/doc/dovecot/wiki/POP3Server.txt
+share/doc/dovecot/wiki/PasswordDatabase.BSDAuth.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.AllowNets.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Host.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoDelay.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoLogin.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Proxy.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.User.txt
+share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.txt
+share/doc/dovecot/wiki/PasswordDatabase.PAM.txt
+share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
+share/doc/dovecot/wiki/PasswordDatabase.Static.txt
+share/doc/dovecot/wiki/PasswordDatabase.txt
+share/doc/dovecot/wiki/PerformanceTuning.txt
+share/doc/dovecot/wiki/Pigeonhole.Installation.txt
+share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Clients.txt
+share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Configuration.txt
+share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Install.txt
+share/doc/dovecot/wiki/Pigeonhole.ManageSieve.Troubleshooting.txt
+share/doc/dovecot/wiki/Pigeonhole.ManageSieve.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Configuration.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Examples.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.SpamtestVirustest.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.Vacation.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Extensions.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.Extdata.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Plugins.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.Usage.txt
+share/doc/dovecot/wiki/Pigeonhole.Sieve.txt
+share/doc/dovecot/wiki/Pigeonhole.txt
+share/doc/dovecot/wiki/Plugins.Autocreate.txt
+share/doc/dovecot/wiki/Plugins.Compress.txt
+share/doc/dovecot/wiki/Plugins.Expire.txt
+share/doc/dovecot/wiki/Plugins.FTS.Lucene.txt
+share/doc/dovecot/wiki/Plugins.FTS.Solr.txt
+share/doc/dovecot/wiki/Plugins.FTS.Squat.txt
+share/doc/dovecot/wiki/Plugins.FTS.txt
+share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
+share/doc/dovecot/wiki/Plugins.Listescape.txt
+share/doc/dovecot/wiki/Plugins.MailLog.txt
+share/doc/dovecot/wiki/Plugins.Snarf.txt
+share/doc/dovecot/wiki/Plugins.Trash.txt
+share/doc/dovecot/wiki/Plugins.Virtual.txt
+share/doc/dovecot/wiki/Plugins.Zlib.txt
+share/doc/dovecot/wiki/Plugins.txt
+share/doc/dovecot/wiki/PostLoginScripting.txt
+share/doc/dovecot/wiki/PreAuth.txt
+share/doc/dovecot/wiki/QuickConfiguration.txt
+share/doc/dovecot/wiki/Quota.Configuration.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.txt
+share/doc/dovecot/wiki/RunningDovecot.txt
+share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
+share/doc/dovecot/wiki/SSL.CertificateCreation.txt
+share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt
+share/doc/dovecot/wiki/SSL.txt
+share/doc/dovecot/wiki/Sasl.txt
+share/doc/dovecot/wiki/SecurityTuning.txt
+share/doc/dovecot/wiki/SharedMailboxes.Permissions.txt
+share/doc/dovecot/wiki/SharedMailboxes.Public.txt
+share/doc/dovecot/wiki/SharedMailboxes.Shared.txt
+share/doc/dovecot/wiki/SharedMailboxes.Symlinks.txt
+share/doc/dovecot/wiki/SharedMailboxes.txt
+share/doc/dovecot/wiki/SystemUsers.txt
+share/doc/dovecot/wiki/TestInstallation.txt
+share/doc/dovecot/wiki/TestPop3Installation.txt
+share/doc/dovecot/wiki/TimeMovedBackwards.txt
+share/doc/dovecot/wiki/Upgrading.1.0.txt
+share/doc/dovecot/wiki/Upgrading.1.1.txt
+share/doc/dovecot/wiki/Upgrading.1.2.txt
+share/doc/dovecot/wiki/Upgrading.2.0.txt
+share/doc/dovecot/wiki/Upgrading.txt
+share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
+share/doc/dovecot/wiki/UserDatabase.NSS.txt
+share/doc/dovecot/wiki/UserDatabase.Prefetch.txt
+share/doc/dovecot/wiki/UserDatabase.Static.txt
+share/doc/dovecot/wiki/UserDatabase.txt
+share/doc/dovecot/wiki/UserIds.txt
+share/doc/dovecot/wiki/Variables.txt
+share/doc/dovecot/wiki/VirtualUsers.Home.txt
+share/doc/dovecot/wiki/VirtualUsers.txt
+share/doc/dovecot/wiki/WhyDoesItNotWork.txt
+share/doc/dovecot/wiki/maildrop.txt
+share/doc/dovecot/wiki/mutt.txt
+share/doc/dovecot/wiki/uw2dovecot.sh.txt
+share/examples/dovecot/
+share/examples/dovecot/dovecot-openssl.cnf
+@sample /etc/ssl/dovecot-openssl.cnf
+share/examples/dovecot/example-config/
+share/examples/dovecot/example-config/conf.d/
+share/examples/dovecot/example-config/conf.d/10-auth.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/10-auth.conf
+share/examples/dovecot/example-config/conf.d/10-director.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/10-director.conf
+share/examples/dovecot/example-config/conf.d/10-logging.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/10-logging.conf
+share/examples/dovecot/example-config/conf.d/10-mail.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/10-mail.conf
+share/examples/dovecot/example-config/conf.d/10-master.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/10-master.conf
+share/examples/dovecot/example-config/conf.d/10-ssl.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/10-ssl.conf
+share/examples/dovecot/example-config/conf.d/15-lda.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/15-lda.conf
+share/examples/dovecot/example-config/conf.d/20-imap.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/20-imap.conf
+share/examples/dovecot/example-config/conf.d/20-lmtp.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/20-lmtp.conf
+share/examples/dovecot/example-config/conf.d/20-pop3.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/20-pop3.conf
+share/examples/dovecot/example-config/conf.d/90-acl.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/90-acl.conf
+share/examples/dovecot/example-config/conf.d/90-plugin.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/90-plugin.conf
+share/examples/dovecot/example-config/conf.d/90-quota.conf
+@sample ${SYSCONFDIR}/dovecot/conf.d/90-quota.conf
+share/examples/dovecot/example-config/conf.d/auth-checkpassword.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-deny.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-ldap.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-master.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-passwdfile.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-sql.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-static.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-system.conf.ext
+@sample ${SYSCONFDIR}/dovecot/conf.d/auth-system.conf.ext
+share/examples/dovecot/example-config/conf.d/auth-vpopmail.conf.ext
+share/examples/dovecot/example-config/dovecot-db.conf.ext
+share/examples/dovecot/example-config/dovecot-dict-sql.conf.ext
+share/examples/dovecot/example-config/dovecot-ldap.conf.ext
+share/examples/dovecot/example-config/dovecot-sql.conf.ext
+share/examples/dovecot/example-config/dovecot.conf
+@sample ${SYSCONFDIR}/dovecot/dovecot.conf
+@mode 755
+@sample /var/dovecot/
+@mode 750
+@group _dovecot
+@sample /var/dovecot/login/
+@extra /etc/ssl/dovecotcert.pem
+@extra /etc/ssl/private/dovecot.pem
+@rcscript ${RCDIR}/dovecot

mail/dovecot/pkg/PLIST-server

@@ -1,336 +0,0 @@
-@comment $OpenBSD: PLIST-server,v 1.17 2011/05/11 12:57:48 jasper Exp $
-@pkgpath ${BASE_PKGPATH}
-@newgroup _dovecot:518
-@newuser _dovecot:518:_dovecot:daemon:Dovecot Account:/nonexistent:/sbin/nologin
-@extraunexec rm -rf /var/dovecot/*
-lib/dovecot/
-lib/dovecot/auth/
-lib/dovecot/imap/
-lib/dovecot/imap/lib01_acl_plugin.so
-@comment lib/dovecot/imap/lib02_imap_acl_plugin.a
-@comment lib/dovecot/imap/lib02_imap_acl_plugin.la
-lib/dovecot/imap/lib02_imap_acl_plugin.so
-lib/dovecot/imap/lib02_lazy_expunge_plugin.so
-lib/dovecot/imap/lib10_quota_plugin.so
-@comment lib/dovecot/imap/lib11_imap_quota_plugin.a
-@comment lib/dovecot/imap/lib11_imap_quota_plugin.la
-lib/dovecot/imap/lib11_imap_quota_plugin.so
-lib/dovecot/imap/lib11_trash_plugin.so
-lib/dovecot/imap/lib20_autocreate_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_listescape_plugin.so
-lib/dovecot/imap/lib20_mail_log_plugin.so
-lib/dovecot/imap/lib20_mbox_snarf_plugin.so
-lib/dovecot/imap/lib20_virtual_plugin.so
-lib/dovecot/imap/lib20_zlib_plugin.so
-lib/dovecot/imap/lib21_fts_squat_plugin.so
-lib/dovecot/lda/
-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_autocreate_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_listescape_plugin.so
-lib/dovecot/lda/lib20_mail_log_plugin.so
-lib/dovecot/lda/lib20_virtual_plugin.so
-lib/dovecot/lda/lib21_fts_squat_plugin.so
-@comment lib/dovecot/lib01_acl_plugin.a
-@comment lib/dovecot/lib01_acl_plugin.la
-lib/dovecot/lib01_acl_plugin.so
-@comment lib/dovecot/lib02_lazy_expunge_plugin.a
-@comment lib/dovecot/lib02_lazy_expunge_plugin.la
-lib/dovecot/lib02_lazy_expunge_plugin.so
-@comment lib/dovecot/lib10_quota_plugin.a
-@comment lib/dovecot/lib10_quota_plugin.la
-lib/dovecot/lib10_quota_plugin.so
-@comment lib/dovecot/lib11_trash_plugin.a
-@comment lib/dovecot/lib11_trash_plugin.la
-lib/dovecot/lib11_trash_plugin.so
-@comment lib/dovecot/lib20_autocreate_plugin.a
-@comment lib/dovecot/lib20_autocreate_plugin.la
-lib/dovecot/lib20_autocreate_plugin.so
-@comment lib/dovecot/lib20_convert_plugin.a
-@comment lib/dovecot/lib20_convert_plugin.la
-lib/dovecot/lib20_convert_plugin.so
-@comment lib/dovecot/lib20_expire_plugin.a
-@comment lib/dovecot/lib20_expire_plugin.la
-lib/dovecot/lib20_expire_plugin.so
-@comment lib/dovecot/lib20_fts_plugin.a
-@comment lib/dovecot/lib20_fts_plugin.la
-lib/dovecot/lib20_fts_plugin.so
-@comment lib/dovecot/lib20_listescape_plugin.a
-@comment lib/dovecot/lib20_listescape_plugin.la
-lib/dovecot/lib20_listescape_plugin.so
-@comment lib/dovecot/lib20_mail_log_plugin.a
-@comment lib/dovecot/lib20_mail_log_plugin.la
-lib/dovecot/lib20_mail_log_plugin.so
-@comment lib/dovecot/lib20_mbox_snarf_plugin.a
-@comment lib/dovecot/lib20_mbox_snarf_plugin.la
-lib/dovecot/lib20_mbox_snarf_plugin.so
-@comment lib/dovecot/lib20_virtual_plugin.a
-@comment lib/dovecot/lib20_virtual_plugin.la
-lib/dovecot/lib20_virtual_plugin.so
-@comment lib/dovecot/lib20_zlib_plugin.a
-@comment lib/dovecot/lib20_zlib_plugin.la
-lib/dovecot/lib20_zlib_plugin.so
-@comment lib/dovecot/lib21_fts_squat_plugin.a
-@comment lib/dovecot/lib21_fts_squat_plugin.la
-lib/dovecot/lib21_fts_squat_plugin.so
-lib/dovecot/pop3/
-lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
-lib/dovecot/pop3/lib10_quota_plugin.so
-lib/dovecot/pop3/lib20_autocreate_plugin.so
-lib/dovecot/pop3/lib20_convert_plugin.so
-lib/dovecot/pop3/lib20_expire_plugin.so
-lib/dovecot/pop3/lib20_fts_plugin.so
-lib/dovecot/pop3/lib20_listescape_plugin.so
-lib/dovecot/pop3/lib20_mail_log_plugin.so
-lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
-lib/dovecot/pop3/lib20_virtual_plugin.so
-lib/dovecot/pop3/lib20_zlib_plugin.so
-lib/dovecot/pop3/lib21_fts_squat_plugin.so
-libexec/dovecot/
-@bin libexec/dovecot/authtest
-@bin libexec/dovecot/checkpassword-reply
-@bin libexec/dovecot/convert-tool
-@bin libexec/dovecot/deliver
-@bin libexec/dovecot/dict
-@bin libexec/dovecot/dovecot-auth
-@bin libexec/dovecot/expire-tool
-@bin libexec/dovecot/gdbhelper
-@bin libexec/dovecot/idxview
-@bin libexec/dovecot/imap
-@bin libexec/dovecot/imap-login
-@bin libexec/dovecot/imap-utf7
-@bin libexec/dovecot/listview
-@bin libexec/dovecot/logview
-@bin libexec/dovecot/maildirlock
-@bin libexec/dovecot/pop3
-@bin libexec/dovecot/pop3-login
-@bin libexec/dovecot/rawlog
-@bin libexec/dovecot/ssl-build-param
-@bin libexec/dovecot/threadview
-@bin sbin/dovecot
-sbin/dovecot-mkcert.sh
-@bin sbin/dovecotpw
-share/doc/dovecot/
-share/doc/dovecot/auth-protocol.txt
-share/doc/dovecot/documentation.txt
-share/doc/dovecot/securecoding.txt
-share/doc/dovecot/thread-refs.txt
-share/doc/dovecot/wiki/
-share/doc/dovecot/wiki/ACL.txt
-share/doc/dovecot/wiki/AixPluginsSupport.txt
-share/doc/dovecot/wiki/AuthDatabase.CheckPassword.txt
-share/doc/dovecot/wiki/AuthDatabase.LDAP.AuthBinds.txt
-share/doc/dovecot/wiki/AuthDatabase.LDAP.PasswordLookups.txt
-share/doc/dovecot/wiki/AuthDatabase.LDAP.Userdb.txt
-share/doc/dovecot/wiki/AuthDatabase.LDAP.txt
-share/doc/dovecot/wiki/AuthDatabase.Passwd.txt
-share/doc/dovecot/wiki/AuthDatabase.PasswdFile.txt
-share/doc/dovecot/wiki/AuthDatabase.SQL.txt
-share/doc/dovecot/wiki/AuthDatabase.VPopMail.txt
-share/doc/dovecot/wiki/AuthDatabase.txt
-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
-share/doc/dovecot/wiki/Authentication.PasswordSchemes.txt
-share/doc/dovecot/wiki/Authentication.RestrictAccess.txt
-share/doc/dovecot/wiki/Authentication.txt
-share/doc/dovecot/wiki/BasicConfiguration.txt
-share/doc/dovecot/wiki/Chrooting.txt
-share/doc/dovecot/wiki/Clients.NegativeUIDs.txt
-share/doc/dovecot/wiki/Clients.txt
-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.Arrays.txt
-share/doc/dovecot/wiki/Design.AuthProcess.txt
-share/doc/dovecot/wiki/Design.Buffers.txt
-share/doc/dovecot/wiki/Design.Indexes.Cache.txt
-share/doc/dovecot/wiki/Design.Indexes.MailIndexApi.txt
-share/doc/dovecot/wiki/Design.Indexes.MainIndex.txt
-share/doc/dovecot/wiki/Design.Indexes.TransactionLog.txt
-share/doc/dovecot/wiki/Design.Indexes.txt
-share/doc/dovecot/wiki/Design.InputStreams.txt
-share/doc/dovecot/wiki/Design.MailProcess.txt
-share/doc/dovecot/wiki/Design.Memory.txt
-share/doc/dovecot/wiki/Design.OutputStreams.txt
-share/doc/dovecot/wiki/Design.Plugins.txt
-share/doc/dovecot/wiki/Design.Processes.txt
-share/doc/dovecot/wiki/Design.Storage.ErrorHandling.txt
-share/doc/dovecot/wiki/Design.Storage.Mail.txt
-share/doc/dovecot/wiki/Design.Storage.MailNamespace.txt
-share/doc/dovecot/wiki/Design.Storage.MailStorage.txt
-share/doc/dovecot/wiki/Design.Storage.MailUser.txt
-share/doc/dovecot/wiki/Design.Storage.Mailbox.Save.txt
-share/doc/dovecot/wiki/Design.Storage.Mailbox.Search.txt
-share/doc/dovecot/wiki/Design.Storage.Mailbox.Sync.txt
-share/doc/dovecot/wiki/Design.Storage.Mailbox.Transaction.txt
-share/doc/dovecot/wiki/Design.Storage.Mailbox.txt
-share/doc/dovecot/wiki/Design.Storage.MailboxList.txt
-share/doc/dovecot/wiki/Design.Storage.Plugins.txt
-share/doc/dovecot/wiki/Design.Strings.txt
-share/doc/dovecot/wiki/Design.txt
-share/doc/dovecot/wiki/DomainLost.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
-share/doc/dovecot/wiki/InetdInstall.txt
-share/doc/dovecot/wiki/Iptables.txt
-share/doc/dovecot/wiki/LDA.Exim.txt
-share/doc/dovecot/wiki/LDA.Indexing.txt
-share/doc/dovecot/wiki/LDA.Postfix.txt
-share/doc/dovecot/wiki/LDA.Qmail.txt
-share/doc/dovecot/wiki/LDA.Sendmail.txt
-share/doc/dovecot/wiki/LDA.Sieve.CMU.txt
-share/doc/dovecot/wiki/LDA.Sieve.Dovecot.txt
-share/doc/dovecot/wiki/LDA.Sieve.txt
-share/doc/dovecot/wiki/LDA.txt
-share/doc/dovecot/wiki/Logging.txt
-share/doc/dovecot/wiki/LoginProcess.txt
-share/doc/dovecot/wiki/MDA.txt
-share/doc/dovecot/wiki/MTA.txt
-share/doc/dovecot/wiki/MailLocation.LocalDisk.txt
-share/doc/dovecot/wiki/MailLocation.Maildir.txt
-share/doc/dovecot/wiki/MailLocation.Mbox.txt
-share/doc/dovecot/wiki/MailLocation.SharedDisk.txt
-share/doc/dovecot/wiki/MailLocation.txt
-share/doc/dovecot/wiki/MailboxFormat.Cydir.txt
-share/doc/dovecot/wiki/MailboxFormat.MH.txt
-share/doc/dovecot/wiki/MailboxFormat.Maildir.txt
-share/doc/dovecot/wiki/MailboxFormat.dbox.txt
-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.Clients.txt
-share/doc/dovecot/wiki/ManageSieve.Configuration.txt
-share/doc/dovecot/wiki/ManageSieve.Install.1.0.txt
-share/doc/dovecot/wiki/ManageSieve.Install.txt
-share/doc/dovecot/wiki/ManageSieve.Troubleshooting.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
-share/doc/dovecot/wiki/MissingMailboxes.txt
-share/doc/dovecot/wiki/NFS.txt
-share/doc/dovecot/wiki/Namespaces.txt
-share/doc/dovecot/wiki/OSCompatibility.txt
-share/doc/dovecot/wiki/POP3Server.txt
-share/doc/dovecot/wiki/PasswordDatabase.BSDAuth.txt
-share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.AllowNets.txt
-share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Host.txt
-share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoDelay.txt
-share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.NoLogin.txt
-share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.Proxy.txt
-share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.User.txt
-share/doc/dovecot/wiki/PasswordDatabase.ExtraFields.txt
-share/doc/dovecot/wiki/PasswordDatabase.PAM.txt
-share/doc/dovecot/wiki/PasswordDatabase.Shadow.txt
-share/doc/dovecot/wiki/PasswordDatabase.txt
-share/doc/dovecot/wiki/PerformanceTuning.txt
-share/doc/dovecot/wiki/Plugins.Autocreate.txt
-share/doc/dovecot/wiki/Plugins.Convert.txt
-share/doc/dovecot/wiki/Plugins.Expire.txt
-share/doc/dovecot/wiki/Plugins.FTS.Lucene.txt
-share/doc/dovecot/wiki/Plugins.FTS.Solr.txt
-share/doc/dovecot/wiki/Plugins.FTS.Squat.txt
-share/doc/dovecot/wiki/Plugins.FTS.txt
-share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
-share/doc/dovecot/wiki/Plugins.Listescape.txt
-share/doc/dovecot/wiki/Plugins.MailLog.txt
-share/doc/dovecot/wiki/Plugins.MboxSnarf.txt
-share/doc/dovecot/wiki/Plugins.Trash.txt
-share/doc/dovecot/wiki/Plugins.Virtual.txt
-share/doc/dovecot/wiki/Plugins.Zlib.txt
-share/doc/dovecot/wiki/Plugins.txt
-share/doc/dovecot/wiki/PostLoginScripting.txt
-share/doc/dovecot/wiki/PreAuth.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.txt
-share/doc/dovecot/wiki/RunningDovecot.txt
-share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
-share/doc/dovecot/wiki/SSL.CertificateCreation.txt
-share/doc/dovecot/wiki/SSL.DovecotConfiguration.txt
-share/doc/dovecot/wiki/SSL.txt
-share/doc/dovecot/wiki/Sasl.txt
-share/doc/dovecot/wiki/SecurityTuning.txt
-share/doc/dovecot/wiki/SharedMailboxes.Permissions.txt
-share/doc/dovecot/wiki/SharedMailboxes.Public.txt
-share/doc/dovecot/wiki/SharedMailboxes.Shared.txt
-share/doc/dovecot/wiki/SharedMailboxes.Symlinks.txt
-share/doc/dovecot/wiki/SharedMailboxes.txt
-share/doc/dovecot/wiki/SystemUsers.txt
-share/doc/dovecot/wiki/TestInstallation.txt
-share/doc/dovecot/wiki/TestPop3Installation.txt
-share/doc/dovecot/wiki/TimeMovedBackwards.txt
-share/doc/dovecot/wiki/Upgrading.1.0.txt
-share/doc/dovecot/wiki/Upgrading.1.1.txt
-share/doc/dovecot/wiki/Upgrading.1.2.txt
-share/doc/dovecot/wiki/Upgrading.txt
-share/doc/dovecot/wiki/UserDatabase.ExtraFields.txt
-share/doc/dovecot/wiki/UserDatabase.NSS.txt
-share/doc/dovecot/wiki/UserDatabase.Prefetch.txt
-share/doc/dovecot/wiki/UserDatabase.Static.txt
-share/doc/dovecot/wiki/UserDatabase.txt
-share/doc/dovecot/wiki/UserIds.txt
-share/doc/dovecot/wiki/VarMailDotLock.txt
-share/doc/dovecot/wiki/Variables.txt
-share/doc/dovecot/wiki/VirtualUsers.Home.txt
-share/doc/dovecot/wiki/VirtualUsers.txt
-share/doc/dovecot/wiki/WhyDoesItNotWork.txt
-share/doc/dovecot/wiki/maildrop.txt
-share/doc/dovecot/wiki/mutt.txt
-share/doc/dovecot/wiki/uw2dovecot.sh.txt
-share/examples/dovecot/
-share/examples/dovecot/dovecot-db-example.conf
-share/examples/dovecot/dovecot-dict-sql-example.conf
-share/examples/dovecot/dovecot-example.conf
-@sample ${SYSCONFDIR}/dovecot.conf
-share/examples/dovecot/dovecot-ldap-example.conf
-share/examples/dovecot/dovecot-openssl.cnf
-@sample /etc/ssl/dovecot-openssl.cnf
-@mode 755
-@sample /var/dovecot/
-@mode 750
-@group _dovecot
-@sample /var/dovecot/login/
-@mode
-@group
-share/examples/dovecot/dovecot-sql-example.conf
-@extra /etc/ssl/dovecotcert.pem
-@extra /etc/ssl/private/dovecot.pem
-@rcscript ${RCDIR}/dovecot

mail/dovecot/pkg/PLIST-sieve

@@ -1,19 +0,0 @@
-@comment $OpenBSD: PLIST-sieve,v 1.6 2010/04/30 14:40:58 pea Exp $
-@pkgpath mail/dovecot,-sieve,ldap
-@pkgpath mail/dovecot,-sieve,ldap,mysql,postgresql,sqlite,bdb
-@pkgpath mail/dovecot,-sieve,mysql
-@pkgpath mail/dovecot,-sieve,postgresql
-@pkgpath mail/dovecot,-sieve,sqlite
-@bin bin/sieve-test
-@bin bin/sievec
-@bin bin/sieved
-@comment lib/dovecot/lda/lib90_sieve_plugin.a
-@comment lib/dovecot/lda/lib90_sieve_plugin.la
-lib/dovecot/lda/lib90_sieve_plugin.so
-@bin libexec/dovecot/managesieve
-@bin libexec/dovecot/managesieve-login
-@man man/man1/sieve-test.1
-@man man/man1/sievec.1
-@man man/man1/sieved.1
-share/doc/dovecot/sieve/
-share/doc/dovecot/sieve/spamtest-virustest.txt