Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems,

written with security primarily in mind. Dovecot is an excellent choice for both
small and large installations. It's fast, simple to set up, requires no special
administration and it uses very little memory.

17 files changed, 1073 insertions, 0 deletions

diff --git a/mail/dovecot2/DESCR b/mail/dovecot2/DESCR
new file mode 100644
index 00000000000..19ae5693f7e
--- /dev/null
+++ b/mail/dovecot2/DESCR
@@ -0,0 +1,4 @@
+Dovecot is an open source IMAP and POP3 server for Linux/UNIX-like systems,
+written with security primarily in mind. Dovecot is an excellent choice for both
+small and large installations. It's fast, simple to set up, requires no special
+administration and it uses very little memory.
diff --git a/mail/dovecot2/Makefile b/mail/dovecot2/Makefile
new file mode 100644
index 00000000000..b36fea77860
--- /dev/null
+++ b/mail/dovecot2/Makefile
@@ -0,0 +1,85 @@
+# $NetBSD: Makefile,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+DISTNAME=	dovecot-2.0.6
+CATEGORIES=	mail
+MASTER_SITES=	http://www.dovecot.org/releases/2.0/
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.dovecot.org/
+COMMENT=	Secure IMAP and POP3 server
+LICENSE=	mit AND gnu-lgpl-v2.1 AND modified-bsd
+
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+PKG_DESTDIR_SUPPORT=	user-destdir
+
+USE_TOOLS+=		pkg-config rpcgen
+USE_LIBTOOL=		yes
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR}
+
+.include "../../mk/bsd.prefs.mk"
+
+RCD_SCRIPTS=		dovecot
+
+DOVECOT_USER?=		dovecot
+DOVECOT_GROUP?=		dovecot
+PKG_GROUPS=		${DOVECOT_GROUP}
+PKG_USERS=		${DOVECOT_USER}:${DOVECOT_GROUP}
+PKG_GROUPS_VARS+=	DOVECOT_GROUP
+PKG_USERS_VARS=		DOVECOT_USER
+
+PKG_GECOS.${DOVECOT_USER}=	Dovecot IMAP/POP3 user
+
+SUBST_CLASSES+=		ssldir
+SUBST_MESSAGE.ssldir=	Fixing SSLDIR
+SUBST_FILES.ssldir=	doc/example-config/conf.d/10-ssl.conf
+SUBST_STAGE.ssldir=	pre-configure
+SUBST_SED.ssldir=	-e 's,/etc/ssl,${SSLDIR},'
+
+EGDIR=		${PREFIX}/share/examples/dovecot
+CONFD=		${PKG_SYSCONFDIR}/dovecot/conf.d
+MAKE_DIRS+=	${CONFD}
+CONF_FILES+=	${EGDIR}/dovecot.conf ${PKG_SYSCONFDIR}/dovecot/dovecot.conf
+CONF_FILES+=	${EGDIR}/dovecot-db.conf.ext ${PKG_SYSCONFDIR}/dovecot/dovecot-db.conf.ext
+CONF_FILES+=	${EGDIR}/dovecot-dict-sql.conf.ext ${PKG_SYSCONFDIR}/dovecot/dovecot-dict-sql.conf.ext
+CONF_FILES+=	${EGDIR}/dovecot-ldap.conf.ext ${PKG_SYSCONFDIR}/dovecot/dovecot-ldap.conf.ext
+CONF_FILES+=	${EGDIR}/dovecot-sql.conf.ext ${PKG_SYSCONFDIR}/dovecot/dovecot-sql.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/10-auth.conf ${CONFD}/10-auth.conf
+CONF_FILES+=	${EGDIR}/conf.d/10-director.conf ${CONFD}/10-director.conf
+CONF_FILES+=	${EGDIR}/conf.d/10-logging.conf ${CONFD}/10-logging.conf
+CONF_FILES+=	${EGDIR}/conf.d/10-mail.conf ${CONFD}/10-mail.conf
+CONF_FILES+=	${EGDIR}/conf.d/10-master.conf ${CONFD}/10-master.conf
+CONF_FILES+=	${EGDIR}/conf.d/10-ssl.conf ${CONFD}/10-ssl.conf
+CONF_FILES+=	${EGDIR}/conf.d/15-lda.conf ${CONFD}/15-lda.conf
+CONF_FILES+=	${EGDIR}/conf.d/20-imap.conf ${CONFD}/20-imap.conf
+CONF_FILES+=	${EGDIR}/conf.d/20-lmtp.conf ${CONFD}/20-lmtp.conf
+CONF_FILES+=	${EGDIR}/conf.d/20-pop3.conf ${CONFD}/20-pop3.conf
+CONF_FILES+=	${EGDIR}/conf.d/90-acl.conf ${CONFD}/90-acl.conf
+CONF_FILES+=	${EGDIR}/conf.d/90-plugin.conf ${CONFD}/90-plugin.conf
+CONF_FILES+=	${EGDIR}/conf.d/90-quota.conf ${CONFD}/90-quota.conf
+CONF_FILES+=	${EGDIR}/conf.d/auth-checkpassword.conf.ext ${CONFD}/auth-checkpassword.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-deny.conf.ext ${CONFD}/auth-deny.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-ldap.conf.ext ${CONFD}/auth-ldap.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-master.conf.ext ${CONFD}/auth-master.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-passwdfile.conf.ext ${CONFD}/auth-passwdfile.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-sql.conf.ext ${CONFD}/auth-sql.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-static.conf.ext ${CONFD}/auth-static.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-system.conf.ext ${CONFD}/auth-system.conf.ext
+CONF_FILES+=	${EGDIR}/conf.d/auth-vpopmail.conf.ext ${CONFD}/auth-vpopmail.conf.ext
+
+INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot
+INSTALLATION_DIRS+=	share/examples/dovecot share/examples/dovecot/conf.d
+
+BUILD_DEFS+=		VARBASE
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-openssl.cnf ${DESTDIR}${EGDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/doc/mkcert.sh ${DESTDIR}${EGDIR}
+
+.include "options.mk"
+
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dovecot2/PLIST b/mail/dovecot2/PLIST
new file mode 100644
index 00000000000..8635f9c1617
--- /dev/null
+++ b/mail/dovecot2/PLIST
@@ -0,0 +1,625 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+bin/doveadm
+bin/doveconf
+bin/dsync
+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/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
+@pkgdir lib/dovecot/auth
+lib/dovecot/doveadm/lib10_doveadm_expire_plugin.la
+lib/dovecot/doveadm/lib10_doveadm_quota_plugin.la
+lib/dovecot/dovecot-config
+lib/dovecot/lib01_acl_plugin.la
+lib/dovecot/lib02_imap_acl_plugin.la
+lib/dovecot/lib02_lazy_expunge_plugin.la
+lib/dovecot/lib10_quota_plugin.la
+lib/dovecot/lib11_imap_quota_plugin.la
+lib/dovecot/lib11_trash_plugin.la
+lib/dovecot/lib15_notify_plugin.la
+lib/dovecot/lib20_autocreate_plugin.la
+lib/dovecot/lib20_expire_plugin.la
+lib/dovecot/lib20_fts_plugin.la
+lib/dovecot/lib20_listescape_plugin.la
+lib/dovecot/lib20_mail_log_plugin.la
+lib/dovecot/lib20_mbox_snarf_plugin.la
+lib/dovecot/lib20_virtual_plugin.la
+lib/dovecot/lib20_zlib_plugin.la
+lib/dovecot/lib21_fts_squat_plugin.la
+lib/dovecot/lib30_imap_zlib_plugin.la
+lib/dovecot/libdovecot-lda.la
+lib/dovecot/libdovecot-login.la
+lib/dovecot/libdovecot-storage.la
+lib/dovecot/libdovecot.la
+libexec/dovecot/anvil
+libexec/dovecot/auth
+libexec/dovecot/checkpassword-reply
+libexec/dovecot/config
+libexec/dovecot/deliver
+libexec/dovecot/dict
+libexec/dovecot/director
+libexec/dovecot/dns-client
+libexec/dovecot/doveadm-server
+libexec/dovecot/dovecot-lda
+libexec/dovecot/gdbhelper
+libexec/dovecot/imap
+libexec/dovecot/imap-login
+libexec/dovecot/listview
+libexec/dovecot/lmtp
+libexec/dovecot/log
+libexec/dovecot/maildirlock
+libexec/dovecot/pop3
+libexec/dovecot/pop3-login
+libexec/dovecot/rawlog
+libexec/dovecot/script
+libexec/dovecot/script-login
+libexec/dovecot/ssl-params
+man/man1/deliver.1
+man/man1/doveadm-altmove.1
+man/man1/doveadm-auth.1
+man/man1/doveadm-config.1
+man/man1/doveadm-director.1
+man/man1/doveadm-dump.1
+man/man1/doveadm-expunge.1
+man/man1/doveadm-fetch.1
+man/man1/doveadm-force-resync.1
+man/man1/doveadm-help.1
+man/man1/doveadm-import.1
+man/man1/doveadm-kick.1
+man/man1/doveadm-log.1
+man/man1/doveadm-mailbox.1
+man/man1/doveadm-penalty.1
+man/man1/doveadm-purge.1
+man/man1/doveadm-pw.1
+man/man1/doveadm-quota.1
+man/man1/doveadm-reload.1
+man/man1/doveadm-search.1
+man/man1/doveadm-stop.1
+man/man1/doveadm-user.1
+man/man1/doveadm-who.1
+man/man1/doveadm.1
+man/man1/doveconf.1
+man/man1/dovecot-lda.1
+man/man1/dovecot.1
+man/man1/dsync.1
+man/man7/doveadm-search-query.7
+sbin/dovecot
+share/aclocal/dovecot.m4
+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/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/Director.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/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.Dovecot.txt
+share/doc/dovecot/wiki/LDA.Sieve.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.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/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.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.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/conf.d/10-auth.conf
+share/examples/dovecot/conf.d/10-director.conf
+share/examples/dovecot/conf.d/10-logging.conf
+share/examples/dovecot/conf.d/10-mail.conf
+share/examples/dovecot/conf.d/10-master.conf
+share/examples/dovecot/conf.d/10-ssl.conf
+share/examples/dovecot/conf.d/15-lda.conf
+share/examples/dovecot/conf.d/20-imap.conf
+share/examples/dovecot/conf.d/20-lmtp.conf
+share/examples/dovecot/conf.d/20-pop3.conf
+share/examples/dovecot/conf.d/90-acl.conf
+share/examples/dovecot/conf.d/90-plugin.conf
+share/examples/dovecot/conf.d/90-quota.conf
+share/examples/dovecot/conf.d/auth-checkpassword.conf.ext
+share/examples/dovecot/conf.d/auth-deny.conf.ext
+share/examples/dovecot/conf.d/auth-ldap.conf.ext
+share/examples/dovecot/conf.d/auth-master.conf.ext
+share/examples/dovecot/conf.d/auth-passwdfile.conf.ext
+share/examples/dovecot/conf.d/auth-sql.conf.ext
+share/examples/dovecot/conf.d/auth-static.conf.ext
+share/examples/dovecot/conf.d/auth-system.conf.ext
+share/examples/dovecot/conf.d/auth-vpopmail.conf.ext
+share/examples/dovecot/dovecot-db.conf.ext
+share/examples/dovecot/dovecot-dict-sql.conf.ext
+share/examples/dovecot/dovecot-ldap.conf.ext
+share/examples/dovecot/dovecot-openssl.cnf
+share/examples/dovecot/dovecot-sql.conf.ext
+share/examples/dovecot/dovecot.conf
+share/examples/dovecot/mkcert.sh
+share/examples/rc.d/dovecot
diff --git a/mail/dovecot2/buildlink3.mk b/mail/dovecot2/buildlink3.mk
new file mode 100644
index 00000000000..fc6ea764be0
--- /dev/null
+++ b/mail/dovecot2/buildlink3.mk
@@ -0,0 +1,19 @@
+# $NetBSD: buildlink3.mk,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+.include "../../mk/bsd.fast.prefs.mk"
+
+BUILDLINK_TREE+=	dovecot
+
+.if !defined(DOVECOT_BUILDLINK3_MK)
+DOVECOT_BUILDLINK3_MK:=
+
+BUILDLINK_API_DEPENDS.dovecot+=		dovecot>=2.0.6
+BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot2
+
+pkgbase:=	dovecot
+.include "../../mk/pkg-build-options.mk"
+.include "../../archivers/bzip2/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
+.endif # DOVECOT_BUILDLINK3_MK
+
+BUILDLINK_TREE+=	-dovecot
diff --git a/mail/dovecot2/distinfo b/mail/dovecot2/distinfo
new file mode 100644
index 00000000000..b6dae8babf9
--- /dev/null
+++ b/mail/dovecot2/distinfo
@@ -0,0 +1,15 @@
+$NetBSD: distinfo,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+SHA1 (dovecot-2.0.6.tar.gz) = 70b4f58d00f6c5e6e0a129544119c88c13db62d5
+RMD160 (dovecot-2.0.6.tar.gz) = a41f0b774f3f11a28587f6f9e6a134cc4dd958a6
+Size (dovecot-2.0.6.tar.gz) = 3155389 bytes
+SHA1 (patch-aa) = b7e2923ead1ad1eacd3b8b1a37111325794135d2
+SHA1 (patch-ab) = 43361741cf68d1ad5d6e1073cfb9746acf497868
+SHA1 (patch-ac) = dc5db4870b14bf2424f0c957f5cf7f1a289fefe6
+SHA1 (patch-ad) = 5a11ece1ea86ec775d73bd2d305fb927f8669ba5
+SHA1 (patch-ae) = 51d8cb998cc2ded8bfc767710e465b752c50e656
+SHA1 (patch-af) = 691cb36fcd5d71e1dea1812da5ed3e93a9ca029a
+SHA1 (patch-ag) = 1f78984359bb6fcf939c540b54d1dc56317931b4
+SHA1 (patch-ah) = 2c2ed68bbc475398a0247e08673be5a5db08d3c4
+SHA1 (patch-ai) = 7ceb18222b47b496099f6634ca4cb4c3edcbf943
+SHA1 (patch-aj) = 9e7970d29d11c097b9588ad16611f6d0e48235c2
diff --git a/mail/dovecot2/files/dovecot.sh b/mail/dovecot2/files/dovecot.sh
new file mode 100755
index 00000000000..06577331eea
--- /dev/null
+++ b/mail/dovecot2/files/dovecot.sh
@@ -0,0 +1,32 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dovecot.sh,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+#
+
+# PROVIDE: dovecot
+# REQUIRE: DAEMON LOGIN ntpdate
+
+. /etc/rc.subr
+
+name="dovecot"
+rcvar=$name
+command="@PREFIX@/sbin/${name}"
+required_files="@PKG_SYSCONFDIR@/dovecot/$name.conf"
+extra_commands="reload"
+
+load_rc_config $name
+dovecot_fdlimit=${dovecot_fdlimit-"768"}
+
+# A default limit of 64 (at least on NetBSD) may be too low for many people
+SOFT_FDLIMIT=`ulimit -S -n`
+HARD_FDLIMIT=`ulimit -H -n`
+
+if [ ${dovecot_fdlimit} -gt ${SOFT_FDLIMIT} ]; then
+  if [ ${dovecot_fdlimit} -le ${HARD_FDLIMIT} ]; then
+    ulimit -S -n ${dovecot_fdlimit}
+  else
+    ulimit -S -n ${HARD_FDLIMIT}
+  fi
+fi
+
+run_rc_command "$1"
diff --git a/mail/dovecot2/options.mk b/mail/dovecot2/options.mk
new file mode 100644
index 00000000000..1bb51d40a7f
--- /dev/null
+++ b/mail/dovecot2/options.mk
@@ -0,0 +1,92 @@
+# $NetBSD: options.mk,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
+PKG_SUPPORTED_OPTIONS=	gssapi kqueue ldap mysql pam pgsql sqlite
+PKG_OPTIONS_OPTIONAL_GROUPS= ssl
+PKG_OPTIONS_GROUP.ssl=	gnutls ssl
+PKG_SUGGESTED_OPTIONS=	ssl
+
+.if defined(PKG_HAVE_KQUEUE)
+PKG_SUGGESTED_OPTIONS+=	kqueue
+.endif
+
+.include "../../mk/bsd.options.mk"
+
+###
+### Build with OpenSSL or GNU TLS as the underlying crypto library
+###
+.if !empty(PKG_OPTIONS:Mssl)
+CONFIGURE_ARGS+=	--with-ssl=openssl
+CONFIGURE_ENV+=		SSL_CFLAGS="-I${BUILDLINK_PREFIX.openssl}/include"
+CONFIGURE_ENV+=		SSL_LIBS="-lssl -lcrypto"
+BUILDLINK_API_DEPENDS.openssl+=openssl>=0.9.8a
+.  include "../../security/openssl/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+=	--with-ssl=gnutls
+.  include "../../security/gnutls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-ssl
+.endif
+
+###
+### MySQL support
+###
+.if !empty(PKG_OPTIONS:Mmysql)
+CONFIGURE_ARGS+=	--with-mysql
+.  include "../../mk/mysql.buildlink3.mk"
+.endif
+
+###
+### PostgreSQL support
+###
+.if !empty(PKG_OPTIONS:Mpgsql)
+CONFIGURE_ARGS+=	--with-pgsql
+CPPFLAGS+=		-I${BUILDLINK_DIR}/include/pgsql
+.  include "../../mk/pgsql.buildlink3.mk"
+.endif
+
+###
+### LDAP directory support
+###
+.if !empty(PKG_OPTIONS:Mldap)
+CONFIGURE_ARGS+=	--with-ldap
+.  include "../../databases/openldap-client/buildlink3.mk"
+.endif
+
+###
+### PAM support
+###
+.if !empty(PKG_OPTIONS:Mpam)
+CONFIGURE_ARGS+=	--with-pam
+.  include "../../mk/pam.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-pam
+.endif
+
+###
+### SQLite support
+###
+.if !empty(PKG_OPTIONS:Msqlite)
+CONFIGURE_ARGS+=	--with-sqlite
+.  include "../../databases/sqlite3/buildlink3.mk"
+.endif
+
+###
+### kqueue support
+###
+.if !empty(PKG_OPTIONS:Mkqueue)
+CONFIGURE_ARGS+=	--with-ioloop=kqueue
+CONFIGURE_ARGS+=	--with-notify=kqueue
+.else
+# use the defaults
+.endif
+
+###
+### GSSAPI support
+###
+.if !empty(PKG_OPTIONS:Mgssapi)
+CONFIGURE_ARGS+=	--with-gssapi
+.  include "../../mk/krb5.buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--without-gssapi
+.endif
diff --git a/mail/dovecot2/patches/patch-aa b/mail/dovecot2/patches/patch-aa
new file mode 100644
index 00000000000..e10e99f7d3b
--- /dev/null
+++ b/mail/dovecot2/patches/patch-aa
@@ -0,0 +1,23 @@
+$NetBSD: patch-aa,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- doc/example-config/Makefile.in.orig	2010-10-21 17:37:01.000000000 +0000
++++ doc/example-config/Makefile.in
+@@ -280,7 +280,7 @@ top_srcdir = @top_srcdir@
+ SUBDIRS = conf.d
+ pkgsysconfdir = $(sysconfdir)/dovecot
+ nodist_pkgsysconf_DATA = README
+-exampledir = $(docdir)/example-config
++exampledir = $(datadir)/examples/dovecot
+ example_DATA = \
+ 	dovecot.conf \
+ 	dovecot-db.conf.ext \
+@@ -623,8 +623,7 @@ info: info-recursive
+ 
+ info-am:
+ 
+-install-data-am: install-data-local install-exampleDATA \
+-	install-nodist_pkgsysconfDATA
++install-data-am: install-data-local install-exampleDATA
+ 
+ install-dvi: install-dvi-recursive
+ 
diff --git a/mail/dovecot2/patches/patch-ab b/mail/dovecot2/patches/patch-ab
new file mode 100644
index 00000000000..260e96a3556
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ab
@@ -0,0 +1,23 @@
+$NetBSD: patch-ab,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- doc/example-config/dovecot.conf.orig	2010-07-23 19:37:44.000000000 +0000
++++ doc/example-config/dovecot.conf
+@@ -12,9 +12,6 @@
+ # 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
+ 
+ # Most of the actual configuration gets included below. The filenames are
+ # first sorted by their ASCII value and parsed in that order. The 00-prefixes
+@@ -22,7 +19,7 @@
+ !include conf.d/*.conf
+ 
+ # Protocols we want to be serving.
+-#protocols = imap pop3 lmtp
++protocols = imap pop3 lmtp
+ 
+ # A comma separated list of IPs or hosts where to listen in for connections. 
+ # "*" listens in all IPv4 interfaces, "::" listens in all IPv6 interfaces.
diff --git a/mail/dovecot2/patches/patch-ac b/mail/dovecot2/patches/patch-ac
new file mode 100644
index 00000000000..d3444fe34e6
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ac
@@ -0,0 +1,22 @@
+$NetBSD: patch-ac,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- doc/example-config/conf.d/10-ssl.conf.orig	2010-05-24 14:35:40.000000000 +0000
++++ doc/example-config/conf.d/10-ssl.conf
+@@ -3,14 +3,14 @@
+ ##
+ 
+ # SSL/TLS support: yes, no, required. <doc/wiki/SSL.txt>
+-#ssl = yes
++#ssl = no
+ 
+ # 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
+ # 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_key = </etc/ssl/private/dovecot.pem
++#ssl_cert = /etc/ssl/certs/dovecot.pem
++#ssl_key = /etc/ssl/private/dovecot.pem
+ 
+ # If key file is password protected, give the password here. Alternatively
+ # give it when starting dovecot with -p parameter. Since this file is often
diff --git a/mail/dovecot2/patches/patch-ad b/mail/dovecot2/patches/patch-ad
new file mode 100644
index 00000000000..1b001210a17
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- doc/example-config/conf.d/15-lda.conf.orig	2010-11-04 13:33:36.000000000 +0000
++++ doc/example-config/conf.d/15-lda.conf
+@@ -15,7 +15,7 @@
+ #quota_full_tempfail = no
+ 
+ # 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.
diff --git a/mail/dovecot2/patches/patch-ae b/mail/dovecot2/patches/patch-ae
new file mode 100644
index 00000000000..542ea11c9b0
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ae
@@ -0,0 +1,32 @@
+$NetBSD: patch-ae,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- doc/example-config/conf.d/auth-system.conf.ext.orig	2010-11-04 13:34:46.000000000 +0000
++++ doc/example-config/conf.d/auth-system.conf.ext
+@@ -7,21 +7,21 @@
+ # 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
+ # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
+-#passdb {
+-  #driver = passwd
++passdb {
++  driver = passwd
+   # [blocking=no]
+   #args = 
+-#}
++}
+ 
+ # Shadow passwords for system users (NSS, /etc/shadow or similiar).
+ # Deprecated by PAM nowadays.
diff --git a/mail/dovecot2/patches/patch-af b/mail/dovecot2/patches/patch-af
new file mode 100644
index 00000000000..592c39cf740
--- /dev/null
+++ b/mail/dovecot2/patches/patch-af
@@ -0,0 +1,13 @@
+$NetBSD: patch-af,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- doc/example-config/conf.d/Makefile.in.orig	2010-11-04 14:32:20.000000000 +0000
++++ doc/example-config/conf.d/Makefile.in
+@@ -237,7 +237,7 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ pkgsysconfdir = $(sysconfdir)/dovecot
+-exampledir = $(docdir)/example-config/conf.d
++exampledir = $(datadir)/examples/dovecot/conf.d
+ example_DATA = \
+ 	auth-checkpassword.conf.ext \
+ 	auth-deny.conf.ext \
diff --git a/mail/dovecot2/patches/patch-ag b/mail/dovecot2/patches/patch-ag
new file mode 100644
index 00000000000..8fbab0c1416
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ag
@@ -0,0 +1,16 @@
+$NetBSD: patch-ag,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- src/lib-settings/settings-parser.c.orig	2010-09-23 18:41:53.000000000 +0000
++++ src/lib-settings/settings-parser.c
+@@ -942,7 +942,11 @@ static int environ_cmp(char *const *s1, 
+ 
+ int settings_parse_environ(struct setting_parser_context *ctx)
+ {
++#ifdef __APPLE__
++	char **environ = *_NSGetEnviron();
++#else
+ 	extern char **environ;
++#endif
+ 	ARRAY_TYPE(string) sorted_envs_arr;
+ 	const char *key, *value;
+ 	char *const *sorted_envs;
diff --git a/mail/dovecot2/patches/patch-ah b/mail/dovecot2/patches/patch-ah
new file mode 100644
index 00000000000..92528351c92
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ah
@@ -0,0 +1,28 @@
+$NetBSD: patch-ah,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- src/lib/env-util.c.orig	2010-11-05 08:18:43.000000000 +0000
++++ src/lib/env-util.c
+@@ -55,7 +55,11 @@ void env_clean(void)
+ 	if (clearenv() < 0)
+ 		i_fatal("clearenv() failed");
+ #else
++#ifdef __APPLE__
++	char **environ = *_NSGetEnviron();
++#else
+ 	extern char **environ;
++#endif
+ 
+ 	/* Try to clear the environment.
+ 
+@@ -73,7 +77,11 @@ void env_clean(void)
+ struct env_backup *env_backup_save(void)
+ {
+ 	struct env_backup *env;
++#ifdef __APPLE__
++	char **environ = *_NSGetEnviron();
++#else
+ 	extern char **environ;
++#endif
+ 	unsigned int i, count;
+ 	pool_t pool;
+ 
diff --git a/mail/dovecot2/patches/patch-ai b/mail/dovecot2/patches/patch-ai
new file mode 100644
index 00000000000..c70bc5de762
--- /dev/null
+++ b/mail/dovecot2/patches/patch-ai
@@ -0,0 +1,16 @@
+$NetBSD: patch-ai,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- src/lib/process-title.c.orig	2010-11-05 08:26:04.000000000 +0000
++++ src/lib/process-title.c
+@@ -115,7 +115,11 @@ static void proctitle_hack_set(const cha
+ void process_title_init(char **argv[])
+ {
+ #ifdef PROCTITLE_HACK
++#ifdef __APPLE__
++	char **environ = *_NSGetEnviron();
++#else
+ 	extern char **environ;
++#endif
+ 	char **orig_argv = *argv;
+ 	char **orig_environ = environ;
+ 
diff --git a/mail/dovecot2/patches/patch-aj b/mail/dovecot2/patches/patch-aj
new file mode 100644
index 00000000000..935cd72f279
--- /dev/null
+++ b/mail/dovecot2/patches/patch-aj
@@ -0,0 +1,15 @@
+$NetBSD: patch-aj,v 1.1.1.1 2010/11/05 12:00:39 adam Exp $
+
+--- src/lib/lib.h.orig	2010-11-05 08:41:11.000000000 +0000
++++ src/lib/lib.h
+@@ -6,6 +6,10 @@
+ #  include "config.h"
+ #endif
+ 
++#ifdef __APPLE__
++#include <crt_externs.h>
++#endif
++
+ /* default system includes - keep these at minimum.. */
+ #include <stddef.h> /* Solaris defines NULL wrong unless this is used */
+ #include <string.h> /* strcmp() etc. */