Remove cyrus-imapd21, unsupported version by upstream.

22 files changed, 1 insertions, 735 deletions

diff --git a/mail/Makefile b/mail/Makefile
index c2a906985b3..3726e1b8728 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.412 2011/08/11 03:50:13 jnemeth Exp $
+# $NetBSD: Makefile,v 1.413 2011/09/16 12:07:32 obache Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -55,7 +55,6 @@ SUBDIR+=	courier-mta
 SUBDIR+=	cucipop
 SUBDIR+=	cue
 SUBDIR+=	cyrus-imapd
-SUBDIR+=	cyrus-imapd21
 SUBDIR+=	cyrus-imapd23
 SUBDIR+=	cyrus-imapd24
 SUBDIR+=	dbmail
diff --git a/mail/cyrus-imapd21/DEINSTALL b/mail/cyrus-imapd21/DEINSTALL
deleted file mode 100644
index 8bddff0e61b..00000000000
--- a/mail/cyrus-imapd21/DEINSTALL
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2004/07/31 03:28:32 jlam Exp $
-
-IMAPDCONF=@IMAPDCONF@
-
-case ${STAGE} in
-DEINSTALL)
-	if [ -f ${IMAPDCONF} ]; then
-		IMAPDIRS=`
-			${AWK} '/configdirectory:/      { print $2 };	\
-				/partition-.*:/         { print $2 };	\
-				/sievedir:/             { print $2 }'	\
-				${IMAPDCONF} | ${SORT} -ur`
-		_IMAPDIRS=
-		for dir in ${IMAPDIRS}; do
-			${RMDIR} -p ${dir} 2>/dev/null || ${TRUE}
-			if [ -d ${dir} ]; then
-				_IMAPDIRS="${_IMAPDIRS} ${dir}"
-			fi
-		done
-		if [ -n "${_IMAPDIRS}" ]; then
-			${CAT} << EOF
-===========================================================================
-If you won't be using ${PKGNAME} any longer, you may want to remove
-the following directories:
-
-EOF
-			for dir in ${_IMAPDIRS}; do
-				if [ -d "${dir}" ]; then
-					${ECHO} "	${dir}"
-				fi
-			done
-                	${CAT} << EOF
-===========================================================================
-EOF
-		fi
-	fi
-	;;
-esac
diff --git a/mail/cyrus-imapd21/DESCR b/mail/cyrus-imapd21/DESCR
deleted file mode 100644
index e742d558a95..00000000000
--- a/mail/cyrus-imapd21/DESCR
+++ /dev/null
@@ -1,7 +0,0 @@
-IMAP (Internet Message Access Protocol) is an Internet standards-track
-protocol for accessing messages (mail, bboards, news, etc). The Cyrus
-IMAP server differs from other IMAP server implementations in that it
-is generally intended to be run on "sealed" servers, where normal users
-are not permitted to log in. The mailbox database is stored in parts of
-the filesystem that are private to the Cyrus IMAP system. All user
-access to mail is through the IMAP, POP3, or KPOP protocols.
diff --git a/mail/cyrus-imapd21/MESSAGE b/mail/cyrus-imapd21/MESSAGE
deleted file mode 100644
index 95aa36e98fc..00000000000
--- a/mail/cyrus-imapd21/MESSAGE
+++ /dev/null
@@ -1,19 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/02/14 18:28:25 snj Exp $
-
-Please also refer to:
-
-	${PREFIX}/share/doc/html/cyrus-imapd/install.html
-
-for more detailed instructions on setting up the environment before
-starting the Cyrus IMAP server.  In particular, several services will
-probably need to be added to /etc/services.
-
-Note anyone upgrading from an earlier version of cyrus should read:
-
-	${PREFIX}/share/doc/html/cyrus-imapd/install-upgrade.html
-
-Also note that cyrus-imapd now uses saslauthd rather then pwcheck by
-default.
-
-===========================================================================
diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile
deleted file mode 100644
index cf323ff7248..00000000000
--- a/mail/cyrus-imapd21/Makefile
+++ /dev/null
@@ -1,179 +0,0 @@
-# $NetBSD: Makefile,v 1.50 2011/08/14 13:25:21 obache Exp $
-
-DISTNAME=		cyrus-imapd-2.1.18
-PKGREVISION=		8
-SVR4_PKGNAME=		cimap
-CATEGORIES=		mail
-MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-			ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
-
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://cyrusimap.web.cmu.edu/imapd/
-COMMENT=		Cyrus IMAP server
-
-PKG_INSTALLATION_TYPES=	overwrite pkgviews
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-GNU_CONFIGURE=		yes
-PERL5_CONFIGURE=	no
-USE_TOOLS+=		autoconf213
-
-.include "../../mk/bsd.prefs.mk"
-
-# CYRUS_USER		username of the Cyrus administrator
-# CYRUS_GROUP		group of the Cyrus administrator
-#
-CYRUS_USER?=		cyrus
-CYRUS_GROUP?=		mail
-
-PKG_GROUPS_VARS+=	CYRUS_GROUP
-PKG_USERS_VARS+=	CYRUS_USER
-FILES_SUBST+=		CYRUS_USER=${CYRUS_USER:Q}
-FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP:Q}
-
-CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER:Q}
-CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP:Q}
-CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
-CONFIGURE_ARGS+=	--with-statedir=${VARBASE}/run
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE:Q}
-CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=	--with-perl=${PERL5:Q}
-CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
-
-CONFIGURE_ARGS+=	--enable-netscapehack
-CONFIGURE_ARGS+=	--without-notify
-CONFIGURE_ARGS+=	--without-ucdsnmp
-CONFIGURE_ARGS+=	--without-zephyr
-
-# Ensure that we use the db3 library, even if the db4 one gets pulled in
-# as an indirect dependency.
-#
-.include "../../databases/db3/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-bdb-libdir=${BUILDLINK_PREFIX.db3}/lib
-CONFIGURE_ARGS+=	--with-bdb-incdir=${BUILDLINK_PREFIX.db3}/include/db3
-.for _var_ in db_4_1 db4_1 db41 db_4_0 db4_0 db_4 db40 db4
-CONFIGURE_ENV+=		ac_cv_lib_${_var_}_db_create=no
-.endfor
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
-PKG_SUPPORTED_OPTIONS=	gssapi inet6 kerberos kerberos4 recommended-db
-
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Minet6)
-PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	cyrus-imapd-2.1.16-ipv6-20031121.diff.gz
-.endif
-
-.if !empty(PKG_OPTIONS:Mrecommended-db)
-#
-# Follow the recommended methods for database types to use.  I'm not
-# 100% ready to override the defaults till I've checked any side effects
-# - chris@nb.org
-#
-CONFIGURE_ARGS+=	--with-duplicate-db=db3_nosync
-CONFIGURE_ARGS+=	--with-mboxlist-db=skiplist
-CONFIGURE_ARGS+=	--with-seen-db=skiplist
-CONFIGURE_ARGS+=	--with-subs-db=flat
-CONFIGURE_ARGS+=	--with-tls-db=db3_nosync
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos)
-.  if empty(PKG_OPTIONS:Mgssapi)
-PKG_OPTIONS+=	gssapi
-.  endif
-.endif
-
-.if !empty(PKG_OPTIONS:Mkerberos4)
-.  if exists(/usr/include/kerberosIV/krb.h)
-CRYPTO+=		uses Kerberos encryption code
-CONFIGURE_ARGS+=	--with-auth=krb
-CONFIGURE_ARGS+=	--with-krb=/usr
-.  endif
-.elif !empty(PKG_OPTIONS:Mgssapi)
-.  include "../../mk/krb5.buildlink3.mk"
-CONFIGURE_ARGS+=	--with-auth=unix
-CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE:Q}
-CONFIGURE_ARGS+=	--with-gss_impl=${GSSIMPL.${KRB5_TYPE}}
-GSSIMPL.heimdal=	heimdal
-GSSIMPL.mit-krb5=	mit
-CONFIGURE_ENV+=		COMPILE_ET=${KRB5BASE}/bin/compile_et
-COMERRBASE=		${KRB5BASE}
-.else
-CONFIGURE_ARGS+=	--with-auth=unix
-CONFIGURE_ARGS+=	--without-krb
-CONFIGURE_ARGS+=	--disable-gssapi
-.endif
-
-.if exists(/usr/bin/compile_et)
-COMERRBASE?=		/usr
-.endif
-.if defined(COMERRBASE)
-.  if exists(${COMERRBASE}/include/krb5/com_err.h)
-CPPFLAGS+=		-I${COMERRBASE}/include/krb5
-.  endif
-CONFIGURE_ENV+=		COMPILE_ET=${COMERRBASE}/bin/compile_et
-.else
-CONFIGURE_ARGS+=	--with-com-err=yes
-.endif
-
-HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
-EGDIR=			${PREFIX}/share/examples/cyrus-imapd
-CONF_FILES=		${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
-CONF_FILES+=		${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
-RCD_SCRIPTS=		cyrus
-FILES_SUBST+=		IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
-
-PERL5_PACKLIST= \
-	auto/Cyrus/IMAP/.packlist			\
-	auto/Cyrus/SIEVE/managesieve/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-
-# Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
-# manpage conflicts with other packages.  Also change references to
-# "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf".
-#
-post-patch:
-	cd ${WRKSRC}/man;						\
-	set --	deliver 8 imapd 8 master 8 pop3d 8;			\
-	while [ $$# -gt 0 ]; do						\
-		man=$$1.$$2;						\
-		for file in Makefile.in *.[0-9]; do			\
-			${SED}	-e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \
-				-e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \
-				$$file > $$file.fixed;			\
-			${MV} -f $$file.fixed $$file;			\
-		done;							\
-		if [ -f $$man ]; then					\
-			${MV} $$man cyrus-$$man;			\
-		fi;							\
-		shift 2;						\
-	done
-	${FIND} ${WRKSRC} -type f -print |				\
-	${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \
-	while read file; do						\
-		${SED}	-e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
-			-e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
-			$${file} > $${file}.fixed;			\
-		${MV} -f $${file}.fixed $${file};			\
-	done
-
-pre-configure:
-	cd ${WRKSRC} && autoheader && autoconf
-
-INSTALLATION_DIRS+=	${EGDIR} ${HTMLDIR}
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${DESTDIR}${PREFIX}/cyrus/bin
-	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/master/conf/*.conf ${DESTDIR}${EGDIR};			\
-	${INSTALL_DATA} ${WRKSRC}/doc/*.html ${WRKSRC}/doc/cyrusv2.mc ${DESTDIR}${HTMLDIR}
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd21/PLIST b/mail/cyrus-imapd21/PLIST
deleted file mode 100644
index 8b71cc0c33f..00000000000
--- a/mail/cyrus-imapd21/PLIST
+++ /dev/null
@@ -1,139 +0,0 @@
-@comment $NetBSD: PLIST,v 1.7 2009/06/14 18:04:30 joerg Exp $
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/pop3test
-bin/sieveshell
-bin/sivtest
-bin/smtptest
-cyrus/bin/arbitron
-cyrus/bin/chk_cyrus
-cyrus/bin/ctl_cyrusdb
-cyrus/bin/ctl_deliver
-cyrus/bin/ctl_mboxlist
-cyrus/bin/cvt_cyrusdb
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
-cyrus/bin/fud
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/rehash
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/translatesieve
-include/cyrus/acap.h
-include/cyrus/acl.h
-include/cyrus/assert.h
-include/cyrus/auth.h
-include/cyrus/bsearch.h
-include/cyrus/charset.h
-include/cyrus/cyrusdb.h
-include/cyrus/glob.h
-include/cyrus/gmtoff.h
-include/cyrus/hash.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/lock.h
-include/cyrus/lsort.h
-include/cyrus/map.h
-include/cyrus/mkgmtime.h
-include/cyrus/mpool.h
-include/cyrus/nonblock.h
-include/cyrus/parseaddr.h
-include/cyrus/prot.h
-include/cyrus/retry.h
-include/cyrus/rfc822date.h
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libacap.a
-lib/libcyrus.a
-man/man1/imtest.1
-man/man1/installsieve.1
-man/man1/lmtptest.1
-man/man1/mupdatetest.1
-man/man1/pop3test.1
-man/man1/sieveshell.1
-man/man1/sivtest.1
-man/man1/smtptest.1
-man/man3/imclient.3
-man/man5/cyrus.conf.5
-man/man5/imapd.conf.5
-man/man5/krb.equiv.5
-man/man8/arbitron.8
-man/man8/chk_cyrus.8
-man/man8/collectnews.8
-man/man8/ctl_cyrusdb.8
-man/man8/ctl_deliver.8
-man/man8/ctl_mboxlist.8
-man/man8/cvt_cyrusdb.8
-man/man8/cyrus-deliver.8
-man/man8/cyrus-imapd.8
-man/man8/cyrus-master.8
-man/man8/cyrus-pop3d.8
-man/man8/fud.8
-man/man8/idled.8
-man/man8/ipurge.8
-man/man8/lmtpd.8
-man/man8/mbexamine.8
-man/man8/mbpath.8
-man/man8/notifyd.8
-man/man8/quota.8
-man/man8/reconstruct.8
-man/man8/rmnews.8
-man/man8/squatter.8
-man/man8/syncnews.8
-man/man8/timsieved.8
-man/man8/tls_prune.8
-share/doc/html/cyrus-imapd/altnamespace.html
-share/doc/html/cyrus-imapd/anoncvs.html
-share/doc/html/cyrus-imapd/bugs.html
-share/doc/html/cyrus-imapd/changes.html
-share/doc/html/cyrus-imapd/cyrusv2.mc
-share/doc/html/cyrus-imapd/faq.html
-share/doc/html/cyrus-imapd/feedback.html
-share/doc/html/cyrus-imapd/index.html
-share/doc/html/cyrus-imapd/install-admin-mb.html
-share/doc/html/cyrus-imapd/install-auth.html
-share/doc/html/cyrus-imapd/install-compile.html
-share/doc/html/cyrus-imapd/install-configure.html
-share/doc/html/cyrus-imapd/install-murder.html
-share/doc/html/cyrus-imapd/install-perf.html
-share/doc/html/cyrus-imapd/install-prereq.html
-share/doc/html/cyrus-imapd/install-sieve.html
-share/doc/html/cyrus-imapd/install-snmpmon.html
-share/doc/html/cyrus-imapd/install-testing.html
-share/doc/html/cyrus-imapd/install-upgrade.html
-share/doc/html/cyrus-imapd/install.html
-share/doc/html/cyrus-imapd/mailing-list.html
-share/doc/html/cyrus-imapd/man.html
-share/doc/html/cyrus-imapd/notes.html
-share/doc/html/cyrus-imapd/os.html
-share/doc/html/cyrus-imapd/overview.html
-share/doc/html/cyrus-imapd/questions.html
-share/doc/html/cyrus-imapd/readme.html
-share/doc/html/cyrus-imapd/sieve-protocol.html
-share/doc/html/cyrus-imapd/sieve.html
-share/doc/html/cyrus-imapd/specs.html
-share/examples/cyrus-imapd/cmu-backend.conf
-share/examples/cyrus-imapd/cmu-frontend.conf
-share/examples/cyrus-imapd/imapd.conf
-share/examples/cyrus-imapd/normal.conf
-share/examples/cyrus-imapd/prefork.conf
-share/examples/cyrus-imapd/small.conf
-share/examples/rc.d/cyrus
diff --git a/mail/cyrus-imapd21/distinfo b/mail/cyrus-imapd21/distinfo
deleted file mode 100644
index bcc00d6dfdb..00000000000
--- a/mail/cyrus-imapd21/distinfo
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: distinfo,v 1.13 2006/07/07 01:57:43 minskim Exp $
-
-SHA1 (cyrus-imapd-2.1.18.tar.gz) = 2f587645d8589fb876bb6633ae4a7a93f451b89c
-RMD160 (cyrus-imapd-2.1.18.tar.gz) = 87e521c9fc01e42c4e54b4e2ffb1492abb9f9130
-Size (cyrus-imapd-2.1.18.tar.gz) = 1711522 bytes
-SHA1 (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 390aeae9306fcd3bed1e96a6b2bb82775b347f66
-RMD160 (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = e32d5f4f146f83db5b2ff966ae145b54e8dea390
-Size (cyrus-imapd-2.1.16-ipv6-20031121.diff.gz) = 33500 bytes
-SHA1 (patch-aa) = c474ede286e7976b3dfa7fcb3a5a7e308842239f
-SHA1 (patch-ab) = c1c5cfa6b43d206224fa6107be9b4eae3302bb7f
-SHA1 (patch-ac) = 44ec55f4811af1942872b4d276a0a2f57a803ef2
-SHA1 (patch-ad) = 80329b5a72cb7aa6890304cd89912096f3a66df3
-SHA1 (patch-ae) = 003d6ecc2caf0bf2985a871691ba970c6a6f4755
-SHA1 (patch-af) = 0441995df180d9b20ffee88bf880fc711afa2558
-SHA1 (patch-ag) = 55e7bbd00f8fe4b47d48fad3a06e3ad0aa835a4a
-SHA1 (patch-ah) = 99e25634852897f8df72b9af5f35789a0ef4b892
-SHA1 (patch-ai) = df0551cd295d660dcd12601cb1aa2d930f85d2f1
-SHA1 (patch-aj) = fcf0ce2c630459ea27c3d950a31ed907f5884de6
-SHA1 (patch-ak) = b0c8916d8e427c06625013595c06842544ef2125
-SHA1 (patch-ca) = 953c17733c8802cf965871a11c53e25185aa5935
-SHA1 (patch-cb) = 86a34c56e6494e59b8d9f27a95e435e5e1e62d26
diff --git a/mail/cyrus-imapd21/files/cyrus.sh b/mail/cyrus-imapd21/files/cyrus.sh
deleted file mode 100644
index e556f55ca48..00000000000
--- a/mail/cyrus-imapd21/files/cyrus.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: cyrus.sh,v 1.3 2004/07/31 03:29:38 jlam Exp $
-#
-# PROVIDE: cyrus
-# REQUIRE: DAEMON
-#
-# To start cyrus-imapd at startup, copy this script to /etc/rc.d and set
-# cyrus=YES in /etc/rc.conf.
-
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
-
-rcd_dir=`@DIRNAME@ $0`
-
-name="cyrus"
-rcvar=$name
-command="@PREFIX@/cyrus/bin/master"
-command_args="-d"
-pidfile="/var/run/cyrus-master.pid"
-required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@"
-extra_commands="mkimap reload"
-
-mkimap_cmd="cyrus_mkimap"
-start_precmd="cyrus_prestart"
-
-cyrus_prestart()
-{
-	# Check to see if "configdirectory" is present before we start
-	# the Cyrus IMAP server.  Otherwise, we run mkimap to generate
-	# the necessary directories.
-	#
-	if [ -f @IMAPDCONF@ ]; then
-		configdir=`						\
-			@AWK@ '/^configdirectory:/ { print $2; exit };'	\
-			      @IMAPDCONF@				\
-		`
-		if [ -z "$configdir" ]; then
-			@ECHO@ "@IMAPDCONF@ missing 'configdirectory' setting"
-			exit 1
-		fi
-		if [ ! -d "$configdir" ]; then
-			$rcd_dir/cyrus mkimap
-		fi
-	fi
-}
-
-cyrus_mkimap()
-{
-	# Generate the prerequisite directory structure for Cyrus IMAP.
-	if [ -f @IMAPDCONF@ ]; then
-		@AWK@ '/^configdirectory:/	{ print $2 };		\
-		       /^partition-.*:/		{ print $2 };		\
-		       /^sievedir:/		{ print $2 }'		\
-		      @IMAPDCONF@ |					\
-		while read dir; do
-			if [ ! -d "$dir" ]; then
-				@MKDIR@ "$dir"
-				@CHMOD@ 750 "$dir"
-				@CHOWN@ @CYRUS_USER@ "$dir"
-				@CHGRP@ @CYRUS_GROUP@ "$dir"
-			fi
-		done
-		@SU@ -m @CYRUS_USER@ -c "@PREFIX@/cyrus/bin/mkimap"
-	fi
-}
-
-if [ -f /etc/rc.subr -a -f /etc/rc.conf \
-     -a -d /etc/rc.d -a -f /etc/rc.d/DAEMON ]; then
-	load_rc_config $name
-	run_rc_command "$1"
-else
-	@ECHO@ -n " ${name}"
-	eval ${start_precmd}
-	${command} ${cyrus_flags} ${command_args}
-fi
diff --git a/mail/cyrus-imapd21/files/imapd.conf b/mail/cyrus-imapd21/files/imapd.conf
deleted file mode 100644
index cad17e45a2c..00000000000
--- a/mail/cyrus-imapd21/files/imapd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: imapd.conf,v 1.2 2003/09/15 09:01:18 jlam Exp $
-#
-# Cyrus IMAP server configuration file.  Refer to imapd.conf(5) for
-# more options.
-
-configdirectory: /var/imap
-partition-default: /var/spool/imap
-sieveusehomedir: true
-hashimapspool: false
-
-admins: cyrus
-
-# Use the saslauthd daemon to verify plaintext passwords.  Please ensure that
-# the saslauthd daemon is running before trying to authenticate.
-#
-sasl_pwcheck_method: saslauthd
-
-# The server certificate and key files must be specified for the
-# server to repond to IMAPS or POP3S requests.  See imapd.conf(5) for
-# a complete listing of tls_* options.
-#
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
diff --git a/mail/cyrus-imapd21/patches/patch-aa b/mail/cyrus-imapd21/patches/patch-aa
deleted file mode 100644
index c6a61b60aea..00000000000
--- a/mail/cyrus-imapd21/patches/patch-aa
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2006/07/07 01:57:43 minskim Exp $
-
---- imap/imapd.h.orig	2003-02-13 20:15:25.000000000 +0000
-+++ imap/imapd.h
-@@ -54,18 +54,9 @@ extern char *imapd_userid;
- /* Authorization state for logged in userid */
- extern struct auth_state *imapd_authstate;
- 
--/* True if user is an admin */
--extern int imapd_userisadmin;
--
--/* Currently open mailbox */
--extern struct mailbox *imapd_mailbox;
--
- /* Number of messages in currently open mailbox */
- extern int imapd_exists;
- 
--/* Name of client host */
--extern char imapd_clienthost[];
--
- /* List of strings, for fetch and search argument blocks */
- struct strlist {
-     char *s;			/* String */
diff --git a/mail/cyrus-imapd21/patches/patch-ab b/mail/cyrus-imapd21/patches/patch-ab
deleted file mode 100644
index 2dc4ec2bb11..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/09/13 23:03:18 jlam Exp $
-
---- acconfig.h.orig	Sat Sep 13 16:49:05 2003
-+++ acconfig.h	Sat Sep 13 17:01:59 2003
-@@ -270,8 +270,16 @@
- #define shutdown(fd, mode) 0
- #endif
- 
-+#ifdef HAVE_PATHS_H
-+#include <paths.h>
-+#endif
-+
- /* sendmail configuration parameters */
-+#if defined(_PATH_SENDMAIL)
-+#define DEFAULT_SENDMAIL (_PATH_SENDMAIL)
-+#else
- #define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#endif
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd21/patches/patch-ac b/mail/cyrus-imapd21/patches/patch-ac
deleted file mode 100644
index 1b73ceca1e0..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ac
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-ac,v 1.4 2003/09/13 23:03:18 jlam Exp $
-
---- imap/imapd.c.orig	Sat Sep 13 16:49:05 2003
-+++ imap/imapd.c	Sat Sep 13 16:49:22 2003
-@@ -5838,7 +5838,7 @@
- {
-     int i=0, j=0;
-     char tagbuf[128];
--    char c;
-+    int c;
-     struct buf tag, cmd, tmp, user;
-     int r = 0;
- 
-@@ -5953,7 +5953,7 @@
- 		   char *mailbox, char *acl_in) 
- {
-     int r = 0;
--    char c;
-+    int c;
-     char tag[128];
-     int tagnum = 1;
-     char *rights, *nextid;
diff --git a/mail/cyrus-imapd21/patches/patch-ad b/mail/cyrus-imapd21/patches/patch-ad
deleted file mode 100644
index acb26f2a2c6..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2003/05/26 06:53:07 martti Exp $
-
---- imap/mbpath.c.orig	2003-02-13 22:15:28.000000000 +0200
-+++ imap/mbpath.c	2003-05-21 10:20:05.000000000 +0300
-@@ -96,7 +96,7 @@
- {
-   char *path;
-   int rc, i, quiet = 0, stop_on_error=0;
--  char opt;
-+  int opt;
-   char *alt_config = NULL;
- 
-   while ((opt = getopt(argc, argv, "C:qs")) != EOF) {
diff --git a/mail/cyrus-imapd21/patches/patch-ae b/mail/cyrus-imapd21/patches/patch-ae
deleted file mode 100644
index 9b9596a0a46..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2003/05/26 06:53:08 martti Exp $
-
---- imap/ipurge.c.orig	2003-04-22 20:39:41.000000000 +0300
-+++ imap/ipurge.c	2003-05-21 10:20:46.000000000 +0300
-@@ -105,7 +105,7 @@
- void print_stats(mbox_stats_t *stats);
- 
- int main (int argc, char *argv[]) {
--  char option;
-+  int option;
-   char buf[MAX_MAILBOX_PATH+1];
-   char *alt_config = NULL;
-   int r;
diff --git a/mail/cyrus-imapd21/patches/patch-af b/mail/cyrus-imapd21/patches/patch-af
deleted file mode 100644
index 62e98ccbc3e..00000000000
--- a/mail/cyrus-imapd21/patches/patch-af
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-af,v 1.5 2003/09/13 23:03:18 jlam Exp $
-
---- configure.in.orig	Sat Sep 13 16:49:05 2003
-+++ configure.in	Sat Sep 13 16:59:11 2003
-@@ -260,6 +260,9 @@
- dnl for et routines
- AC_FUNC_CHECK(strerror,AC_DEFINE(HAS_STRERROR),AC_DEFINE(NEED_SYS_ERRLIST))
- 
-+dnl for path to sendmail
-+AC_CHECK_HEADERS(paths.h)
-+
- dnl for master fd limits
- AC_CHECK_HEADERS(sys/resource.h)
- AC_CHECK_FUNCS(setrlimit)
-@@ -898,6 +901,10 @@
- dnl and compile perl/cyradm
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-+dnl add perl cccdlflags when building libraries
-+    eval `${PERL} -V:cccdlflags`
-+    PERL_CCCDLFLAGS="$cccdlflags"
-+    AC_SUBST(PERL_CCCDLFLAGS)
- fi
- 
- dnl for timsieved
diff --git a/mail/cyrus-imapd21/patches/patch-ag b/mail/cyrus-imapd21/patches/patch-ag
deleted file mode 100644
index 8758d40fb84..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2002/11/15 11:49:08 seb Exp $
-
---- sieve/Makefile.in.orig	Tue Feb 19 19:09:45 2002
-+++ sieve/Makefile.in
-@@ -35,7 +35,7 @@ COMPILE_ET = @COMPILE_ET@
- 
- DEFS = @DEFS@
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd21/patches/patch-ah b/mail/cyrus-imapd21/patches/patch-ah
deleted file mode 100644
index 6fd3ef09e59..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ah
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ah,v 1.1 2002/11/15 11:49:08 seb Exp $
-
---- perl/sieve/lib/Makefile.in.orig	Sat May 25 21:57:50 2002
-+++ perl/sieve/lib/Makefile.in
-@@ -55,8 +55,8 @@ LIBS = ../../../lib/libcyrus.a @LIB_DYN_
- IMAP_LIBS = @IMAP_LIBS@
- DEPLIBS = ../../../lib/libcyrus.a @DEPLIBS@
- 
--CFLAGS = -g
--LDFLAGS = -g @LDFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
-+LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
- MAKEDEPEND = @MAKEDEPEND@
diff --git a/mail/cyrus-imapd21/patches/patch-ai b/mail/cyrus-imapd21/patches/patch-ai
deleted file mode 100644
index db3646508b0..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ai
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2002/11/15 11:49:08 seb Exp $
-
---- lib/Makefile.in.orig	Sat May 25 21:57:47 2002
-+++ lib/Makefile.in
-@@ -60,7 +60,7 @@ DEFS = @DEFS@
- CPPFLAGS = -I.. @CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd21/patches/patch-aj b/mail/cyrus-imapd21/patches/patch-aj
deleted file mode 100644
index 94e5b5271e0..00000000000
--- a/mail/cyrus-imapd21/patches/patch-aj
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2003/02/27 13:21:52 seb Exp $
-
---- acap/Makefile.in.orig	Tue Dec 10 00:52:37 2002
-+++ acap/Makefile.in
-@@ -54,7 +54,7 @@ DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I.. -I$(srcdir) -I$(srcdir)/../lib
- LIBS = @LIBS@
- 
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
diff --git a/mail/cyrus-imapd21/patches/patch-ak b/mail/cyrus-imapd21/patches/patch-ak
deleted file mode 100644
index 38b68019077..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ak
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2003/08/16 09:23:59 recht Exp $
-
---- imap/ctl_cyrusdb.c.orig	2003-05-02 17:23:05.000000000 +0200
-+++ imap/ctl_cyrusdb.c	2003-07-26 14:21:45.000000000 +0200
-@@ -231,9 +231,9 @@
- 
-     /* create the names of the backup directories */
-     strcpy(backup1, dirname);
--    strcat(backup1, ".backup1/");
-+    strcat(backup1, ".backup1");
-     strcpy(backup2, dirname);
--    strcat(backup2, ".backup2/");
-+    strcat(backup2, ".backup2");
- 
-     syslog(LOG_NOTICE, "%s", msg);
- 
-@@ -289,6 +289,7 @@
- 		struct dirent *dirent;
- 
- 		tail = backup2 + strlen(backup2);
-+		*tail++ = '/';
- 
- 		/* remove db.backup2 */
- 		dirp = opendir(backup2);
-@@ -302,7 +303,7 @@
- 
- 		    closedir(dirp);
- 		}
--		*tail = '\0';
-+		tail[-1] = '\0';
- 		r2 = rmdir(backup2);
- 
- 		/* move db.backup1 to db.backup2 */
diff --git a/mail/cyrus-imapd21/patches/patch-ca b/mail/cyrus-imapd21/patches/patch-ca
deleted file mode 100644
index aaa648a9df7..00000000000
--- a/mail/cyrus-imapd21/patches/patch-ca
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ca,v 1.1 2005/08/08 16:50:59 jlam Exp $
-
---- perl/Makefile.in.orig	2003-01-02 12:27:35.000000000 -0500
-+++ perl/Makefile.in
-@@ -80,7 +80,7 @@ imap/Makefile: imap/Makefile.PL
- 	(cd imap; \
- 	 OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- 	 SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
--	   $(PERL) Makefile.PL PREFIX=$(prefix))
-+	   $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix))
- 
- install::
- 	@for d in  $(SUBDIRS); \
diff --git a/mail/cyrus-imapd21/patches/patch-cb b/mail/cyrus-imapd21/patches/patch-cb
deleted file mode 100644
index f0778922f60..00000000000
--- a/mail/cyrus-imapd21/patches/patch-cb
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-cb,v 1.1 2005/08/08 16:50:59 jlam Exp $
-
---- perl/sieve/Makefile.in.orig	2002-07-22 12:16:09.000000000 -0400
-+++ perl/sieve/Makefile.in
-@@ -78,7 +78,7 @@ all::
- 			if [ -f Makefile.PL ]; then \
- 			   OPENSSL_LIB="$(OPENSSL_LIB)" OPENSSL_INC="$(OPENSSL_INC)" \
- 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
--			     $(PERL) Makefile.PL PREFIX=$(prefix); \
-+			     $(PERL) Makefile.PL INSTALLDIRS=vendor PREFIX=$(prefix); \
- 			fi; \
- 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
- 	done