Revert import during freeze.

13 files changed, 1 insertions, 860 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 09aa89daab9..7a2051930eb 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.334 2007/09/23 14:56:24 ghen Exp $
+# $NetBSD: Makefile,v 1.335 2007/09/23 15:00:27 ghen Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -59,7 +59,6 @@ SUBDIR+=	dk-milter
 SUBDIR+=	dkim-milter
 SUBDIR+=	dot-forward
 SUBDIR+=	dovecot
-SUBDIR+=	dovecot-devel
 SUBDIR+=	dovecot-sieve
 SUBDIR+=	drac
 SUBDIR+=	dspam
diff --git a/mail/dovecot-devel/DESCR b/mail/dovecot-devel/DESCR
deleted file mode 100644
index 4a9dd6b91b4..00000000000
--- a/mail/dovecot-devel/DESCR
+++ /dev/null
@@ -1,3 +0,0 @@
-Dovecot is an open source IMAP and POP3 server, written with security
-primarily in mind.  It supports Maildirs and mbox formats, and has
-complete IMAP4rev1 support, TLS/SSL support, and is IPv6 ready.
diff --git a/mail/dovecot-devel/Makefile b/mail/dovecot-devel/Makefile
deleted file mode 100644
index bedd27806c9..00000000000
--- a/mail/dovecot-devel/Makefile
+++ /dev/null
@@ -1,64 +0,0 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
-DISTNAME=		dovecot-1.1.beta1
-PKGNAME=		${DISTNAME:S/.beta/beta/}
-CATEGORIES=		mail
-MASTER_SITES=		http://www.dovecot.org/releases/1.1/beta/
-
-MAINTAINER=		ghen@NetBSD.org
-HOMEPAGE=		http://www.dovecot.org/
-COMMENT=		Secure IMAP and POP3 server
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-USE_LIBTOOL=		yes
-GNU_CONFIGURE=		yes
-USE_TOOLS+=		pkg-config
-USE_TOOLS+=		gmake
-USE_TOOLS+=		rpcgen
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
-CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
-CONFIGURE_ARGS+=	--with-ssldir=${SSLDIR:Q}
-CONFIGURE_ARGS+=	--enable-header-install
-
-.include "../../mk/bsd.prefs.mk"
-.include "options.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
-
-EGDIR=			${PREFIX}/share/examples/dovecot
-CONF_FILES=		${EGDIR}/dovecot.conf.default ${PKG_SYSCONFDIR}/dovecot.conf
-
-INSTALLATION_DIRS=	libexec/dovecot sbin share/doc/dovecot		\
-			share/examples/dovecot
-
-SUBST_CLASSES+=		paths
-SUBST_FILES.paths=	dovecot-example.conf
-SUBST_SED.paths+=	-e 's,@PREFIX@,${PREFIX},g'
-SUBST_STAGE.paths=	pre-configure
-
-post-build:
-	${SED} "s|/etc/ssl/|${SSLDIR}/|" ${WRKSRC}/dovecot-example.conf \
-						> ${WRKDIR}/dovecot-example.conf
-	${SED} "s|/etc/ssl|${SSLDIR}|" ${WRKSRC}/doc/mkcert.sh \
-						> ${WRKDIR}/mkcert.sh
-
-post-install:
-	${INSTALL_DATA} ${WRKDIR}/dovecot-example.conf ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/dovecot-* ${DESTDIR}${EGDIR}
-	${INSTALL_SCRIPT} ${WRKDIR}/mkcert.sh ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/src/lib/liblib.a ${DESTDIR}${PREFIX}/lib/dovecot
-
-.include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/dovecot-devel/PLIST b/mail/dovecot-devel/PLIST
deleted file mode 100644
index f2f8f22db18..00000000000
--- a/mail/dovecot-devel/PLIST
+++ /dev/null
@@ -1,447 +0,0 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-include/dovecot/config.h
-include/dovecot/src/auth/auth-cache.h
-include/dovecot/src/auth/auth-client-connection.h
-include/dovecot/src/auth/auth-client-interface.h
-include/dovecot/src/auth/auth-master-connection.h
-include/dovecot/src/auth/auth-master-interface.h
-include/dovecot/src/auth/auth-master-listener.h
-include/dovecot/src/auth/auth-request-handler.h
-include/dovecot/src/auth/auth-request.h
-include/dovecot/src/auth/auth-stream.h
-include/dovecot/src/auth/auth-worker-client.h
-include/dovecot/src/auth/auth-worker-server.h
-include/dovecot/src/auth/auth.h
-include/dovecot/src/auth/common.h
-include/dovecot/src/auth/db-ldap.h
-include/dovecot/src/auth/db-passwd-file.h
-include/dovecot/src/auth/db-sql.h
-include/dovecot/src/auth/mech.h
-include/dovecot/src/auth/mycrypt.h
-include/dovecot/src/auth/otp-skey-common.h
-include/dovecot/src/auth/passdb-blocking.h
-include/dovecot/src/auth/passdb-cache.h
-include/dovecot/src/auth/passdb.h
-include/dovecot/src/auth/password-scheme.h
-include/dovecot/src/auth/plain-common.h
-include/dovecot/src/auth/userdb-blocking.h
-include/dovecot/src/auth/userdb-static.h
-include/dovecot/src/auth/userdb-vpopmail.h
-include/dovecot/src/auth/userdb.h
-include/dovecot/src/deliver/auth-client.h
-include/dovecot/src/deliver/deliver.h
-include/dovecot/src/deliver/duplicate.h
-include/dovecot/src/deliver/mail-send.h
-include/dovecot/src/deliver/smtp-client.h
-include/dovecot/src/imap/client.h
-include/dovecot/src/imap/commands-util.h
-include/dovecot/src/imap/commands.h
-include/dovecot/src/imap/common.h
-include/dovecot/src/imap/imap-expunge.h
-include/dovecot/src/imap/imap-fetch.h
-include/dovecot/src/imap/imap-messageset.h
-include/dovecot/src/imap/imap-search.h
-include/dovecot/src/imap/imap-sort.h
-include/dovecot/src/imap/imap-status.h
-include/dovecot/src/imap/imap-sync.h
-include/dovecot/src/imap/imap-thread.h
-include/dovecot/src/lib-auth/auth-client.h
-include/dovecot/src/lib-auth/auth-server-connection.h
-include/dovecot/src/lib-auth/auth-server-request.h
-include/dovecot/src/lib-charset/charset-utf8.h
-include/dovecot/src/lib-dict/dict-client.h
-include/dovecot/src/lib-dict/dict-private.h
-include/dovecot/src/lib-dict/dict-sql.h
-include/dovecot/src/lib-dict/dict.h
-include/dovecot/src/lib-imap/imap-base-subject.h
-include/dovecot/src/lib-imap/imap-bodystructure.h
-include/dovecot/src/lib-imap/imap-date.h
-include/dovecot/src/lib-imap/imap-envelope.h
-include/dovecot/src/lib-imap/imap-match.h
-include/dovecot/src/lib-imap/imap-parser.h
-include/dovecot/src/lib-imap/imap-quote.h
-include/dovecot/src/lib-imap/imap-util.h
-include/dovecot/src/lib-index/mail-cache-private.h
-include/dovecot/src/lib-index/mail-cache.h
-include/dovecot/src/lib-index/mail-hash.h
-include/dovecot/src/lib-index/mail-index-private.h
-include/dovecot/src/lib-index/mail-index-sync-private.h
-include/dovecot/src/lib-index/mail-index-transaction-private.h
-include/dovecot/src/lib-index/mail-index-view-private.h
-include/dovecot/src/lib-index/mail-index.h
-include/dovecot/src/lib-index/mail-transaction-log-private.h
-include/dovecot/src/lib-index/mail-transaction-log.h
-include/dovecot/src/lib-index/mailbox-list-index-private.h
-include/dovecot/src/lib-index/mailbox-list-index.h
-include/dovecot/src/lib-mail/istream-header-filter.h
-include/dovecot/src/lib-mail/mail-types.h
-include/dovecot/src/lib-mail/message-address.h
-include/dovecot/src/lib-mail/message-date.h
-include/dovecot/src/lib-mail/message-decoder.h
-include/dovecot/src/lib-mail/message-header-decode.h
-include/dovecot/src/lib-mail/message-header-parser.h
-include/dovecot/src/lib-mail/message-id.h
-include/dovecot/src/lib-mail/message-parser.h
-include/dovecot/src/lib-mail/message-part-serialize.h
-include/dovecot/src/lib-mail/message-search.h
-include/dovecot/src/lib-mail/message-send.h
-include/dovecot/src/lib-mail/message-size.h
-include/dovecot/src/lib-mail/quoted-printable.h
-include/dovecot/src/lib-mail/rfc822-parser.h
-include/dovecot/src/lib-settings/settings.h
-include/dovecot/src/lib-sql/sql-api-private.h
-include/dovecot/src/lib-sql/sql-api.h
-include/dovecot/src/lib-sql/sql-pool.h
-include/dovecot/src/lib-storage/index/cydir/cydir-storage.h
-include/dovecot/src/lib-storage/index/cydir/cydir-sync.h
-include/dovecot/src/lib-storage/index/dbox/dbox-file.h
-include/dovecot/src/lib-storage/index/dbox/dbox-index.h
-include/dovecot/src/lib-storage/index/dbox/dbox-storage.h
-include/dovecot/src/lib-storage/index/dbox/dbox-sync.h
-include/dovecot/src/lib-storage/index/index-mail.h
-include/dovecot/src/lib-storage/index/index-sort.h
-include/dovecot/src/lib-storage/index/index-storage.h
-include/dovecot/src/lib-storage/index/index-sync-changes.h
-include/dovecot/src/lib-storage/index/maildir/maildir-filename.h
-include/dovecot/src/lib-storage/index/maildir/maildir-keywords.h
-include/dovecot/src/lib-storage/index/maildir/maildir-storage.h
-include/dovecot/src/lib-storage/index/maildir/maildir-sync.h
-include/dovecot/src/lib-storage/index/maildir/maildir-uidlist.h
-include/dovecot/src/lib-storage/index/mbox/istream-raw-mbox.h
-include/dovecot/src/lib-storage/index/mbox/mbox-file.h
-include/dovecot/src/lib-storage/index/mbox/mbox-from.h
-include/dovecot/src/lib-storage/index/mbox/mbox-lock.h
-include/dovecot/src/lib-storage/index/mbox/mbox-md5.h
-include/dovecot/src/lib-storage/index/mbox/mbox-storage.h
-include/dovecot/src/lib-storage/index/mbox/mbox-sync-private.h
-include/dovecot/src/lib-storage/list/index-mailbox-list.h
-include/dovecot/src/lib-storage/list/mailbox-list-fs.h
-include/dovecot/src/lib-storage/list/mailbox-list-maildir.h
-include/dovecot/src/lib-storage/list/mailbox-list-subscriptions.h
-include/dovecot/src/lib-storage/list/subscription-file.h
-include/dovecot/src/lib-storage/mail-copy.h
-include/dovecot/src/lib-storage/mail-error.h
-include/dovecot/src/lib-storage/mail-namespace.h
-include/dovecot/src/lib-storage/mail-search.h
-include/dovecot/src/lib-storage/mail-storage-private.h
-include/dovecot/src/lib-storage/mail-storage.h
-include/dovecot/src/lib-storage/mailbox-list-private.h
-include/dovecot/src/lib-storage/mailbox-list.h
-include/dovecot/src/lib-storage/mailbox-tree.h
-include/dovecot/src/lib/array-decl.h
-include/dovecot/src/lib/array.h
-include/dovecot/src/lib/backtrace-string.h
-include/dovecot/src/lib/base64.h
-include/dovecot/src/lib/bsearch-insert-pos.h
-include/dovecot/src/lib/buffer.h
-include/dovecot/src/lib/close-keep-errno.h
-include/dovecot/src/lib/compat.h
-include/dovecot/src/lib/crc32.h
-include/dovecot/src/lib/data-stack.h
-include/dovecot/src/lib/env-util.h
-include/dovecot/src/lib/failures.h
-include/dovecot/src/lib/fd-close-on-exec.h
-include/dovecot/src/lib/fd-set-nonblock.h
-include/dovecot/src/lib/fdpass.h
-include/dovecot/src/lib/file-cache.h
-include/dovecot/src/lib/file-copy.h
-include/dovecot/src/lib/file-dotlock.h
-include/dovecot/src/lib/file-lock.h
-include/dovecot/src/lib/file-set-size.h
-include/dovecot/src/lib/hash.h
-include/dovecot/src/lib/hex-binary.h
-include/dovecot/src/lib/hex-dec.h
-include/dovecot/src/lib/hmac-md5.h
-include/dovecot/src/lib/home-expand.h
-include/dovecot/src/lib/hostpid.h
-include/dovecot/src/lib/imem.h
-include/dovecot/src/lib/ioloop-internal.h
-include/dovecot/src/lib/ioloop-iolist.h
-include/dovecot/src/lib/ioloop-notify-fd.h
-include/dovecot/src/lib/ioloop.h
-include/dovecot/src/lib/iostream-internal.h
-include/dovecot/src/lib/istream-internal.h
-include/dovecot/src/lib/istream-seekable.h
-include/dovecot/src/lib/istream-tee.h
-include/dovecot/src/lib/istream.h
-include/dovecot/src/lib/lib-signals.h
-include/dovecot/src/lib/lib.h
-include/dovecot/src/lib/macros.h
-include/dovecot/src/lib/md4.h
-include/dovecot/src/lib/md5.h
-include/dovecot/src/lib/mempool.h
-include/dovecot/src/lib/mkdir-parents.h
-include/dovecot/src/lib/mmap-util.h
-include/dovecot/src/lib/module-context.h
-include/dovecot/src/lib/module-dir.h
-include/dovecot/src/lib/mountpoint.h
-include/dovecot/src/lib/network.h
-include/dovecot/src/lib/nfs-workarounds.h
-include/dovecot/src/lib/ostream-crlf.h
-include/dovecot/src/lib/ostream-internal.h
-include/dovecot/src/lib/ostream.h
-include/dovecot/src/lib/primes.h
-include/dovecot/src/lib/printf-format-fix.h
-include/dovecot/src/lib/process-title.h
-include/dovecot/src/lib/randgen.h
-include/dovecot/src/lib/read-full.h
-include/dovecot/src/lib/restrict-access.h
-include/dovecot/src/lib/restrict-process-size.h
-include/dovecot/src/lib/safe-memset.h
-include/dovecot/src/lib/safe-mkdir.h
-include/dovecot/src/lib/safe-mkstemp.h
-include/dovecot/src/lib/sendfile-util.h
-include/dovecot/src/lib/seq-range-array.h
-include/dovecot/src/lib/sha1.h
-include/dovecot/src/lib/sha2.h
-include/dovecot/src/lib/str-find.h
-include/dovecot/src/lib/str-sanitize.h
-include/dovecot/src/lib/str.h
-include/dovecot/src/lib/strescape.h
-include/dovecot/src/lib/strfuncs.h
-include/dovecot/src/lib/unichar.h
-include/dovecot/src/lib/unix-socket-create.h
-include/dovecot/src/lib/unlink-directory.h
-include/dovecot/src/lib/unlink-lockfiles.h
-include/dovecot/src/lib/utc-mktime.h
-include/dovecot/src/lib/utc-offset.h
-include/dovecot/src/lib/var-expand.h
-include/dovecot/src/lib/write-full.h
-include/dovecot/src/pop3/capability.h
-include/dovecot/src/pop3/client.h
-include/dovecot/src/pop3/commands.h
-include/dovecot/src/pop3/common.h
-lib/dovecot/dovecot-config
-lib/dovecot/imap/lib01_acl_plugin.so
-lib/dovecot/imap/lib02_lazy_expunge_plugin.so
-lib/dovecot/imap/lib10_quota_plugin.so
-lib/dovecot/imap/lib11_imap_quota_plugin.la
-lib/dovecot/imap/lib11_trash_plugin.so
-lib/dovecot/imap/lib20_convert_plugin.so
-lib/dovecot/imap/lib20_expire_plugin.so
-lib/dovecot/imap/lib20_fts_plugin.so
-lib/dovecot/imap/lib20_mail_log_plugin.so
-lib/dovecot/imap/lib20_mbox_snarf_plugin.so
-lib/dovecot/imap/lib20_zlib_plugin.la
-lib/dovecot/imap/lib21_fts_squat_plugin.so
-lib/dovecot/lda/lib01_acl_plugin.so
-lib/dovecot/lda/lib10_quota_plugin.so
-lib/dovecot/lda/lib11_trash_plugin.so
-lib/dovecot/lda/lib20_convert_plugin.so
-lib/dovecot/lda/lib20_expire_plugin.so
-lib/dovecot/lda/lib20_fts_plugin.so
-lib/dovecot/lda/lib20_mail_log_plugin.so
-lib/dovecot/lda/lib21_fts_squat_plugin.so
-lib/dovecot/lib01_acl_plugin.la
-lib/dovecot/lib02_lazy_expunge_plugin.la
-lib/dovecot/lib10_quota_plugin.la
-lib/dovecot/lib11_trash_plugin.la
-lib/dovecot/lib20_convert_plugin.la
-lib/dovecot/lib20_expire_plugin.la
-lib/dovecot/lib20_fts_plugin.la
-lib/dovecot/lib20_mail_log_plugin.la
-lib/dovecot/lib20_mbox_snarf_plugin.la
-lib/dovecot/lib21_fts_squat_plugin.la
-lib/dovecot/liblib.a
-lib/dovecot/pop3/lib02_lazy_expunge_plugin.so
-lib/dovecot/pop3/lib10_quota_plugin.so
-lib/dovecot/pop3/lib20_convert_plugin.so
-lib/dovecot/pop3/lib20_expire_plugin.so
-lib/dovecot/pop3/lib20_mail_log_plugin.so
-lib/dovecot/pop3/lib20_mbox_snarf_plugin.so
-libexec/dovecot/checkpassword-reply
-libexec/dovecot/convert-tool
-libexec/dovecot/deliver
-libexec/dovecot/dict
-libexec/dovecot/dovecot-auth
-libexec/dovecot/expire-tool
-libexec/dovecot/gdbhelper
-libexec/dovecot/idxview
-libexec/dovecot/imap
-libexec/dovecot/imap-login
-libexec/dovecot/listview
-libexec/dovecot/logview
-libexec/dovecot/pop3
-libexec/dovecot/pop3-login
-libexec/dovecot/rawlog
-libexec/dovecot/ssl-build-param
-sbin/dovecot
-sbin/dovecotpw
-share/doc/dovecot/auth-protocol.txt
-share/doc/dovecot/documentation.txt
-share/doc/dovecot/securecoding.txt
-share/doc/dovecot/wiki/ACL.txt
-share/doc/dovecot/wiki/AixPluginsSupport.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.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.Thunderbird.txt
-share/doc/dovecot/wiki/Design.AuthProcess.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.MailProcess.txt
-share/doc/dovecot/wiki/Design.Processes.txt
-share/doc/dovecot/wiki/Design.txt
-share/doc/dovecot/wiki/FindMailLocation.txt
-share/doc/dovecot/wiki/FinishBasicConfiguration.txt
-share/doc/dovecot/wiki/HowTo.EximAndDovecotSASL.txt
-share/doc/dovecot/wiki/HowTo.PostfixAndDovecotSASL.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.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/MboxLocking.txt
-share/doc/dovecot/wiki/MboxProblems.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.UW.txt
-share/doc/dovecot/wiki/Migration.Vm(2d)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.CheckPassword.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.Convert.txt
-share/doc/dovecot/wiki/Plugins.Expire.txt
-share/doc/dovecot/wiki/Plugins.Lazyexpunge.txt
-share/doc/dovecot/wiki/Plugins.MailLog.txt
-share/doc/dovecot/wiki/Plugins.Trash.txt
-share/doc/dovecot/wiki/Plugins.txt
-share/doc/dovecot/wiki/PopBSMTPAndDovecot.txt
-share/doc/dovecot/wiki/PopRelay.txt
-share/doc/dovecot/wiki/PostLoginScripting.txt
-share/doc/dovecot/wiki/QuickConfiguration.txt
-share/doc/dovecot/wiki/Quota.Dict.txt
-share/doc/dovecot/wiki/Quota.Dirsize.txt
-share/doc/dovecot/wiki/Quota.FS.txt
-share/doc/dovecot/wiki/Quota.Maildir.txt
-share/doc/dovecot/wiki/Quota.New.txt
-share/doc/dovecot/wiki/Quota.txt
-share/doc/dovecot/wiki/Rootless.txt
-share/doc/dovecot/wiki/RunningDovecot.txt
-share/doc/dovecot/wiki/SSL.CertificateClientImporting.txt
-share/doc/dovecot/wiki/SSL.CertificateCreation.txt
-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.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/UpgradingDovecot.txt
-share/doc/dovecot/wiki/UserDatabase.ExtraFields.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.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/dovecot-example.conf
-share/examples/dovecot/dovecot-ldap-example.conf
-share/examples/dovecot/dovecot-openssl.cnf
-share/examples/dovecot/dovecot-sql-example.conf
-share/examples/dovecot/mkcert.sh
-share/examples/rc.d/dovecot
-@dirrm share/examples/dovecot
-@dirrm share/doc/dovecot/wiki
-@dirrm share/doc/dovecot
-@dirrm libexec/dovecot
-@dirrm lib/dovecot/pop3
-@dirrm lib/dovecot/lda
-@dirrm lib/dovecot/imap
-@exec ${MKDIR} %D/lib/dovecot/auth
-@dirrm lib/dovecot/auth
-@dirrm lib/dovecot
-@dirrm include/dovecot/src/pop3
-@dirrm include/dovecot/src/lib-storage/list
-@dirrm include/dovecot/src/lib-storage/index/mbox
-@dirrm include/dovecot/src/lib-storage/index/maildir
-@dirrm include/dovecot/src/lib-storage/index/dbox
-@dirrm include/dovecot/src/lib-storage/index/cydir
-@dirrm include/dovecot/src/lib-storage/index
-@dirrm include/dovecot/src/lib-storage
-@dirrm include/dovecot/src/lib-sql
-@dirrm include/dovecot/src/lib-settings
-@dirrm include/dovecot/src/lib-mail
-@dirrm include/dovecot/src/lib-index
-@dirrm include/dovecot/src/lib-imap
-@dirrm include/dovecot/src/lib-dict
-@dirrm include/dovecot/src/lib-charset
-@dirrm include/dovecot/src/lib-auth
-@dirrm include/dovecot/src/lib
-@dirrm include/dovecot/src/imap
-@dirrm include/dovecot/src/deliver
-@dirrm include/dovecot/src/auth
-@dirrm include/dovecot/src
-@dirrm include/dovecot
diff --git a/mail/dovecot-devel/buildlink3.mk b/mail/dovecot-devel/buildlink3.mk
deleted file mode 100644
index 8b259e7fe83..00000000000
--- a/mail/dovecot-devel/buildlink3.mk
+++ /dev/null
@@ -1,24 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH}+
-OPENLDAP_BUILDLINK3_MK:=		${OPENLDAP_BUILDLINK3_MK}+
-
-.include "../../mk/bsd.fast.prefs.mk"
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=			dovecot
-.endif
-
-BUILDLINK_PACKAGES:=			${BUILDLINK_PACKAGES:Ndovecot}
-BUILDLINK_PACKAGES+=			dovecot
-BUILDLINK_ORDER:=			${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}dovecot
-
-.if !empty(OPENLDAP_BUILDLINK3_MK:M+)
-BUILDLINK_API_DEPENDS.dovecot+=		dovecot>1.0.99
-BUILDLINK_PKGSRCDIR.dovecot?=		../../mail/dovecot-devel
-.endif
-
-pkgbase := dovecot
-.include "../../mk/pkg-build-options.mk"
-
-BUILDLINK_DEPTH:=			${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/dovecot-devel/distinfo b/mail/dovecot-devel/distinfo
deleted file mode 100644
index 0dca96fc53c..00000000000
--- a/mail/dovecot-devel/distinfo
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
-SHA1 (dovecot-1.1.beta1.tar.gz) = 841e6d89bbf9c5c4005f68f88308e5960416fa67
-RMD160 (dovecot-1.1.beta1.tar.gz) = 2aea7f2f8c37cfcc42623a162d4118d1925c51af
-Size (dovecot-1.1.beta1.tar.gz) = 2106756 bytes
-SHA1 (patch-aa) = 6258057d49add91f06d4dd51ded72e42f6774354
-SHA1 (patch-ab) = 61e32a491d9990ea1b53be8c8208ef4abf321d5a
-SHA1 (patch-ac) = 55d54585f4cd5028d8c1b16c21ae354e9f1d3027
-SHA1 (patch-ag) = bd180441a0983ceccc898024370a3bdefdc11b1f
diff --git a/mail/dovecot-devel/files/dovecot.sh b/mail/dovecot-devel/files/dovecot.sh
deleted file mode 100755
index b691cee647e..00000000000
--- a/mail/dovecot-devel/files/dovecot.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dovecot.sh,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-#
-
-# PROVIDE: dovecot
-# REQUIRE: DAEMON LOGIN
-
-. /etc/rc.subr
-
-name="dovecot"
-rcvar=$name
-command="@PREFIX@/sbin/${name}"
-required_files="@PKG_SYSCONFDIR@/$name.conf"
-extra_commands="reload"
-
-load_rc_config $name
-run_rc_command "$1"
diff --git a/mail/dovecot-devel/hacks.mk b/mail/dovecot-devel/hacks.mk
deleted file mode 100644
index 5a76b053f4c..00000000000
--- a/mail/dovecot-devel/hacks.mk
+++ /dev/null
@@ -1,9 +0,0 @@
-# $NetBSD: hacks.mk,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
-.include "../../mk/compiler.mk"
-
-# Avoid an ICE in gcc2 on sparc64
-.if !empty(CC_VERSION:Mgcc-*)
-PKG_HACKS+=		sparc64-gcc2-ice
-CONFIGURE_ENV+=		F77=${FALSE:Q}
-.endif
diff --git a/mail/dovecot-devel/options.mk b/mail/dovecot-devel/options.mk
deleted file mode 100644
index 828d44cbf03..00000000000
--- a/mail/dovecot-devel/options.mk
+++ /dev/null
@@ -1,100 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.dovecot
-PKG_SUPPORTED_OPTIONS=	gssapi inet6 kqueue ldap mysql pam pgsql sasl sqlite
-PKG_OPTIONS_OPTIONAL_GROUPS= ssl
-PKG_OPTIONS_GROUP.ssl=	gnutls ssl
-PKG_SUGGESTED_OPTIONS=	ssl
-
-.ifdef 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"
-.  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
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.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/dovecot-devel/patches/patch-aa b/mail/dovecot-devel/patches/patch-aa
deleted file mode 100644
index 6dfabaa0f1d..00000000000
--- a/mail/dovecot-devel/patches/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
---- Makefile.in.orig	2006-10-09 20:53:16.000000000 +0200
-+++ Makefile.in
-@@ -220,7 +220,7 @@ SUBDIRS = \
- 	$(DOCS)
- 
- confdir = $(sysconfdir)
--conf_DATA = dovecot-example.conf
-+conf_DATA = 
- EXTRA_DIST = \
- 	COPYING.LGPL \
- 	COPYING.MIT \
diff --git a/mail/dovecot-devel/patches/patch-ab b/mail/dovecot-devel/patches/patch-ab
deleted file mode 100644
index 46b4a21abc5..00000000000
--- a/mail/dovecot-devel/patches/patch-ab
+++ /dev/null
@@ -1,143 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
---- dovecot-example.conf.orig	2007-08-07 14:17:35.000000000 +0200
-+++ dovecot-example.conf
-@@ -10,17 +10,14 @@
- # value inside quotes, eg.: key = "# char and trailing whitespace  "
- 
- # Default values are shown for each setting, it's not required to uncomment
--# any of the lines. Exception to this are paths, they're 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
-+# any of the lines. 
- 
- # Base directory where to store runtime data.
- #base_dir = /var/run/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".
--#protocols = imap imaps
-+protocols = imap pop3
- 
- # A space separated list of IP or host addresses where to listen in for
- # connections. "*" listens in all IPv4 interfaces. "[::]" listens in all IPv6
-@@ -85,7 +82,7 @@
- #ssl_listen =
- 
- # Disable SSL/TLS support.
--#ssl_disable = no
-+ssl_disable = yes
- 
- # 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
-@@ -489,19 +486,19 @@
- 
- 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 ~/dovecot.rawlog/ directory:
--  #   mail_executable = /usr/libexec/dovecot/rawlog /usr/libexec/dovecot/imap
-+  #   mail_executable = @PREFIX@/libexec/dovecot/rawlog @PREFIX@/libexec/dovecot/imap
-   #
-   # 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
-@@ -515,7 +512,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
- 
-   # Send IMAP capabilities in greeting message. This makes it unnecessary for
-   # clients to request it with CAPABILITY command, so it saves one round-trip.
-@@ -558,11 +555,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
-@@ -622,7 +619,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:
-@@ -650,14 +647,14 @@ 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.
-   #quota_full_tempfail = no
- 
-   # Binary to use for sending mails.
--  #sendmail_path = /usr/lib/sendmail
-+  #sendmail_path = /usr/sbin/sendmail
- 
-   # Human readable error message for rejection mails. Use can use variables:
-   #  %n = CRLF, %r = reason, %s = subject, %t = recipient
-@@ -672,7 +669,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
-@@ -802,7 +799,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]
-     # [cache_key=<key>] [<service name>]
-     #
-@@ -831,15 +828,15 @@ 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
-   # configured in /etc/nsswitch.conf. <doc/wiki/AuthDatabase.Passwd.txt>
--  #passdb passwd {
-+  passdb passwd {
-     # [blocking=yes] - See userdb passwd for explanation
-     #args = 
--  #}
-+  }
- 
-   # Shadow passwords for system users (NSS, /etc/shadow or similiar).
-   # Deprecated by PAM nowadays.
diff --git a/mail/dovecot-devel/patches/patch-ac b/mail/dovecot-devel/patches/patch-ac
deleted file mode 100644
index e26141f53ad..00000000000
--- a/mail/dovecot-devel/patches/patch-ac
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
---- doc/Makefile.in.orig	2007-09-23 15:12:13.000000000 +0200
-+++ doc/Makefile.in
-@@ -232,9 +232,7 @@ sysconfdir = @sysconfdir@
- target_alias = @target_alias@
- SUBDIRS = wiki
- confdir = $(sysconfdir)
--conf_DATA = \
--	dovecot-ldap-example.conf \
--	dovecot-sql-example.conf
-+conf_DATA =
- 
- doc_DATA = \
- 	auth-protocol.txt \
diff --git a/mail/dovecot-devel/patches/patch-ag b/mail/dovecot-devel/patches/patch-ag
deleted file mode 100644
index 2a9347fc6b9..00000000000
--- a/mail/dovecot-devel/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1.1.1 2007/09/23 14:55:52 ghen Exp $
-
---- src/deliver/deliver.c.orig	2006-11-02 21:03:30.000000000 +0100
-+++ src/deliver/deliver.c
-@@ -30,7 +30,7 @@
- 
- #define DEFAULT_CONFIG_FILE SYSCONFDIR"/dovecot.conf"
- #define DEFAULT_AUTH_SOCKET_PATH PKG_RUNDIR"/auth-master"
--#define DEFAULT_SENDMAIL_PATH "/usr/lib/sendmail"
-+#define DEFAULT_SENDMAIL_PATH "/usr/sbin/sendmail"
- #define DEFAULT_ENVELOPE_SENDER "MAILER-DAEMON"
- 
- /* After buffer grows larger than this, create a temporary file to /tmp