Moved cyrus-imapd22 to cyrus-imapd.

16 files changed, 1 insertions, 648 deletions

diff --git a/mail/Makefile b/mail/Makefile
index 400631038e4..2b30a1ec8ff 100644
--- a/mail/Makefile
+++ b/mail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.249 2005/03/02 16:05:26 wiz Exp $
+# $NetBSD: Makefile,v 1.250 2005/03/02 21:43:48 wiz Exp $
 #
 
 COMMENT=	Electronic mail utilities
@@ -25,7 +25,6 @@ SUBDIR+=	cucipop
 SUBDIR+=	cue
 SUBDIR+=	cyrus-imapd
 SUBDIR+=	cyrus-imapd21
-SUBDIR+=	cyrus-imapd22
 SUBDIR+=	dbmail
 SUBDIR+=	deliver
 SUBDIR+=	demime
diff --git a/mail/cyrus-imapd22/DEINSTALL b/mail/cyrus-imapd22/DEINSTALL
deleted file mode 100644
index 26871ca2b64..00000000000
--- a/mail/cyrus-imapd22/DEINSTALL
+++ /dev/null
@@ -1,38 +0,0 @@
-# $NetBSD: DEINSTALL,v 1.3 2004/07/30 23:03:58 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-imapd22/DESCR b/mail/cyrus-imapd22/DESCR
deleted file mode 100644
index e742d558a95..00000000000
--- a/mail/cyrus-imapd22/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-imapd22/MESSAGE b/mail/cyrus-imapd22/MESSAGE
deleted file mode 100644
index 735614e7241..00000000000
--- a/mail/cyrus-imapd22/MESSAGE
+++ /dev/null
@@ -1,17 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/05/27 05:06:43 jlam Exp $
-
-Please 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 may
-need to be added to /etc/services.
-
-Anyone upgrading from an earlier version of the Cyrus IMAP server should
-read:
-
-	${PREFIX}/share/doc/html/cyrus-imapd/install-upgrade.html
-
-===========================================================================
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
deleted file mode 100644
index 2eb3e0e2a22..00000000000
--- a/mail/cyrus-imapd22/Makefile
+++ /dev/null
@@ -1,179 +0,0 @@
-# $NetBSD: Makefile,v 1.33 2005/02/25 10:21:15 adrianp Exp $
-
-DISTNAME=	cyrus-imapd-2.2.12
-CATEGORIES=	mail
-MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
-		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
-
-MAINTAINER=	recht@NetBSD.org
-HOMEPAGE=	http://asg.web.cmu.edu/cyrus/imapd/
-COMMENT=	Cyrus IMAP server
-
-USE_BUILDLINK3=		yes
-USE_PKGLOCALEDIR=	yes
-GNU_CONFIGURE=		yes
-PERL5_CONFIGURE=	no
-BDB_ACCEPTED=		db4 db3
-
-USE_PKGINSTALL=		yes
-DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
-
-.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
-
-BUILD_DEFS+=		CYRUS_USER CYRUS_GROUP
-FILES_SUBST+=		CYRUS_USER=${CYRUS_USER}
-FILES_SUBST+=		CYRUS_GROUP=${CYRUS_GROUP}
-
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
-CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
-CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
-CONFIGURE_ARGS+=	--with-statedir=${VARBASE}/run
-CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
-CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=	--with-perl=${PERL5}
-CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
-CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
-
-CONFIGURE_ARGS+=	--enable-listext
-CONFIGURE_ARGS+=	--enable-murder
-CONFIGURE_ARGS+=	--enable-nntp
-CONFIGURE_ARGS+=	--without-zephyr
-CONFIGURE_ARGS+=	--without-ucdsnmp
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.cyrus-imapd
-PKG_SUPPORTED_OPTIONS=	gssapi kerberos kerberos4
-.include "../../mk/bsd.options.mk"
-
-.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=krb5
-CONFIGURE_ARGS+=	--enable-gssapi=${KRB5BASE}
-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
-
-# CYRUS_IDLE selects the method used to implement IMAP IDLE.  Valid values
-# are "poll", "idled" or "no".  The default is "poll".
-#
-CYRUS_IDLE?=		poll
-BUILD_DEFS+=		CYRUS_IDLE
-.if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \
-    (${CYRUS_IDLE} != "no")
-PKG_FAIL_REASON+=	"CYRUS_IDLE must be poll, idled or no"
-.endif
-CONFIGURE_ARGS+=	--with-idle=${CYRUS_IDLE}
-.if ${CYRUS_IDLE} == "idled"
-PLIST_SUBST+=		IDLED=
-.else
-PLIST_SUBST+=		IDLED="@comment "
-.endif
-
-MAKE_ENV+=		PERL=${PERL5}
-
-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= \
-	${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist			\
-	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/managesieve/.packlist
-
-.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl2/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-.include "../../mk/bdb.buildlink3.mk"
-
-# Only imap/mupdate needs to be build with pthreads support, so selectively
-# enable it via patches for just that one program.
-#
-.include "../../mk/pthread.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 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8	\
-		nntpd 8	notifyd 8 pop3d 8 quota 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
-
-post-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec ${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap ${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/mknewsgroups ${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/translatesieve ${PREFIX}/cyrus/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/tools/rehash ${PREFIX}/cyrus/bin
-	${INSTALL_DATA_DIR} ${EGDIR}
-	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
-	cd ${WRKSRC}/master/conf; for file in *.conf; do		\
-		${INSTALL_DATA} $$file ${EGDIR};			\
-	done
-	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do		\
-		${INSTALL_DATA} $$file ${HTMLDIR};			\
-	done
-
-.include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd22/PLIST b/mail/cyrus-imapd22/PLIST
deleted file mode 100644
index aa5aa703cdc..00000000000
--- a/mail/cyrus-imapd22/PLIST
+++ /dev/null
@@ -1,165 +0,0 @@
-@comment $NetBSD: PLIST,v 1.5 2005/01/11 03:58:22 kim Exp $
-bin/imtest
-bin/installsieve
-bin/lmtptest
-bin/mupdatetest
-bin/nntptest
-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/cyr_expire
-cyrus/bin/cyrdump
-cyrus/bin/deliver
-cyrus/bin/fetchnews
-cyrus/bin/fud
-${IDLED}cyrus/bin/idled
-cyrus/bin/imapd
-cyrus/bin/ipurge
-cyrus/bin/lmtpd
-cyrus/bin/lmtpproxyd
-cyrus/bin/masssievec
-cyrus/bin/master
-cyrus/bin/mbexamine
-cyrus/bin/mbpath
-cyrus/bin/mkimap
-cyrus/bin/mknewsgroups
-cyrus/bin/mupdate
-cyrus/bin/nntpd
-cyrus/bin/notifyd
-cyrus/bin/pop3d
-cyrus/bin/pop3proxyd
-cyrus/bin/proxyd
-cyrus/bin/quota
-cyrus/bin/reconstruct
-cyrus/bin/rehash
-cyrus/bin/sievec
-cyrus/bin/smmapd
-cyrus/bin/squatter
-cyrus/bin/timsieved
-cyrus/bin/tls_prune
-cyrus/bin/translatesieve
-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/imapopts.h
-include/cyrus/imapurl.h
-include/cyrus/imclient.h
-include/cyrus/imparse.h
-include/cyrus/iptostring.h
-include/cyrus/libconfig.h
-include/cyrus/libcyr_cfg.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/strhash.h
-include/cyrus/strhash.o
-include/cyrus/stristr.h
-include/cyrus/sysexits.h
-include/cyrus/util.h
-include/cyrus/xmalloc.h
-lib/libcyrus.a
-lib/libcyrus_min.a
-man/man1/imtest.1
-man/man1/installsieve.1
-man/man1/lmtptest.1
-man/man1/mupdatetest.1
-man/man1/nntptest.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/ctl_cyrusdb.8
-man/man8/ctl_deliver.8
-man/man8/ctl_mboxlist.8
-man/man8/cvt_cyrusdb.8
-man/man8/cyr_expire.8
-man/man8/cyrus-deliver.8
-man/man8/cyrus-fetchnews.8
-man/man8/cyrus-idled.8
-man/man8/cyrus-imapd.8
-man/man8/cyrus-lmtpd.8
-man/man8/cyrus-master.8
-man/man8/cyrus-nntpd.8
-man/man8/cyrus-notifyd.8
-man/man8/cyrus-pop3d.8
-man/man8/cyrus-quota.8
-man/man8/fud.8
-man/man8/ipurge.8
-man/man8/mbexamine.8
-man/man8/mbpath.8
-man/man8/reconstruct.8
-man/man8/rmnews.8
-man/man8/smmapd.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-netnews.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-virtdomains.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
-@dirrm share/examples/cyrus-imapd
-@dirrm share/doc/html/cyrus-imapd
-@dirrm include/cyrus
-@dirrm cyrus/bin
-@dirrm cyrus
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
deleted file mode 100644
index 94247b97a1b..00000000000
--- a/mail/cyrus-imapd22/distinfo
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: distinfo,v 1.17 2005/02/25 10:21:15 adrianp Exp $
-
-SHA1 (cyrus-imapd-2.2.12.tar.gz) = 08adc5dfde1288c0d9e7de44e7ea4d17a7940d06
-RMD160 (cyrus-imapd-2.2.12.tar.gz) = ff4a95e519ea066ed9b21b515b18bdacaf0d1852
-Size (cyrus-imapd-2.2.12.tar.gz) = 1961161 bytes
-SHA1 (patch-af) = 3bd6217395161e84b0191c24fbe93ad28d6291f0
-SHA1 (patch-al) = 6fa8967eb97f7cfdb93de86a45aa90ab3a1bd129
-SHA1 (patch-am) = 0804e6fa6694ed820861b740ac1bead29b3eeb4b
-SHA1 (patch-ap) = 95b987e83ddd53065f7ffe503d0f07694f9bcd6b
-SHA1 (patch-ba) = 98bea064fa4d97b0bb1ba2d1fcb4d30611ac706e
-SHA1 (patch-bb) = 8725d9008617acb392b904d76a353b8829fdfb33
-SHA1 (patch-bc) = 3266d52067aef8f4835670cba1be6c190ff94f15
diff --git a/mail/cyrus-imapd22/files/cyrus.sh b/mail/cyrus-imapd22/files/cyrus.sh
deleted file mode 100644
index 95aa628da13..00000000000
--- a/mail/cyrus-imapd22/files/cyrus.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: cyrus.sh,v 1.3 2004/08/11 20:52:24 jlam Exp $
-#
-# PROVIDE: cyrus
-# REQUIRE: DAEMON
-# BEFORE: mail
-#
-# 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-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
deleted file mode 100644
index a2d5a20ad04..00000000000
--- a/mail/cyrus-imapd22/files/imapd.conf
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: imapd.conf,v 1.1.1.1 2004/01/18 12:42:12 recht 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-imapd22/patches/patch-af b/mail/cyrus-imapd22/patches/patch-af
deleted file mode 100644
index def399bd4dc..00000000000
--- a/mail/cyrus-imapd22/patches/patch-af
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-af,v 1.5 2004/11/28 14:34:07 recht Exp $
-
---- configure.orig	Tue Nov 23 19:55:47 2004
-+++ configure	Sun Nov 28 14:34:29 2004
-@@ -13532,6 +13532,7 @@
-     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
-     PERL_SUBDIRS="imap"
-     PERL="${with_perl}"
-+    eval `${PERL} -V:cccdlflags`
-     PERL_CCCDLFLAGS="$cccdlflags"
- 
- fi
diff --git a/mail/cyrus-imapd22/patches/patch-al b/mail/cyrus-imapd22/patches/patch-al
deleted file mode 100644
index 2a49c6cbe66..00000000000
--- a/mail/cyrus-imapd22/patches/patch-al
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-al,v 1.2 2004/11/28 14:34:07 recht Exp $
-
---- imtest/imtest.c.orig	Wed Aug  4 15:03:18 2004
-+++ imtest/imtest.c	Sun Nov 28 15:12:44 2004
-@@ -47,7 +47,9 @@
- #include <sys/time.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
- #include <sys/stat.h>
- #include <fcntl.h>
- 
-@@ -71,6 +73,10 @@
- #include <sys/file.h>
- #include <netinet/in.h>
- #include <netdb.h>
-+
-+#ifdef HAVE_SYS_PARAM_H
-+#include <sys/param.h>
-+#endif
- 
- #include <sasl/sasl.h>
- #include <sasl/saslutil.h>
diff --git a/mail/cyrus-imapd22/patches/patch-am b/mail/cyrus-imapd22/patches/patch-am
deleted file mode 100644
index c74a5908852..00000000000
--- a/mail/cyrus-imapd22/patches/patch-am
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-am,v 1.4 2004/11/28 14:34:07 recht Exp $
-
---- configure.in.orig	Mon Nov 22 22:27:07 2004
-+++ configure.in	Sun Nov 28 14:36:32 2004
-@@ -944,7 +944,7 @@
- dnl add perl cccdlflags when building libraries -- this ensures that the
- dnl libraries will be compiled as PIC if perl requires PIC objects
- dnl -- this is needed on NetBSD, but seems to cause problems on atleast Solaris --
--dnl    eval `${PERL} -V:cccdlflags`
-+    eval `${PERL} -V:cccdlflags`
-     PERL_CCCDLFLAGS="$cccdlflags"
-     AC_SUBST(PERL_CCCDLFLAGS)
- fi
diff --git a/mail/cyrus-imapd22/patches/patch-ap b/mail/cyrus-imapd22/patches/patch-ap
deleted file mode 100644
index 7ef846cede6..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ap
+++ /dev/null
@@ -1,35 +0,0 @@
-$NetBSD: patch-ap,v 1.1 2004/11/17 21:16:45 jlam Exp $
-
---- imap/Makefile.in.orig	2004-05-28 14:03:02.000000000 -0400
-+++ imap/Makefile.in
-@@ -185,6 +185,9 @@ mupdate_err.c: mupdate_err.et
- 
- mupdate_err.h: mupdate_err.c
- 
-+mutex_pthread.o: mutex_pthread.c
-+	$(CC) -c $(CPPFLAGS) $(DEFS) $(CFLAGS) $(PTHREAD_CFLAGS) $<
-+
- ### Services
- idled: idled.o mutex_fake.o libimap.a $(DEPLIBS)
- 	$(CC) $(LDFLAGS) -o idled \
-@@ -241,16 +244,16 @@ proxyd.pure: $(PROXYDOBJS) mutex_fake.o 
- 
- mupdate: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o tls.o \
- 	libimap.a $(DEPLIBS)
--	$(CC) $(LDFLAGS) -o mupdate \
-+	$(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
- 	 mutex_pthread.o tls.o libimap.a \
--	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- mupdate.pure: mupdate.o mupdate-slave.o mupdate-client.o mutex_pthread.o \
- 	libimap.a $(DEPLIBS)
--	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) -o mupdate.pure \
-+	$(PURIFY) $(PUREOPT) $(CC) $(LDFLAGS) $(PTHREAD_LDFLAGS) -o mupdate.pure \
- 	 $(SERVICETHREAD) mupdate.o mupdate-slave.o mupdate-client.o \
--	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) -lpthread
-+	 mutex_pthread.o libimap.a $(DEPLIBS) $(LIBS) $(LIB_WRAP) $(PTHREAD_LIBS)
- 
- pop3d: pop3d.o backend.o tls.o mutex_fake.o libimap.a $(DEPLIBS) $(SERVICE)
- 	$(CC) $(LDFLAGS) -o pop3d pop3d.o backend.o tls.o $(SERVICE) \
diff --git a/mail/cyrus-imapd22/patches/patch-ba b/mail/cyrus-imapd22/patches/patch-ba
deleted file mode 100644
index ef5365bd6a1..00000000000
--- a/mail/cyrus-imapd22/patches/patch-ba
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ba,v 1.3 2004/11/28 14:34:07 recht Exp $
-
---- imap/mboxlist.c.orig	Sun Nov 28 15:04:44 2004
-+++ imap/mboxlist.c	Sun Nov 28 15:05:06 2004
-@@ -60,7 +60,9 @@
- #include <syslog.h>
- 
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
- 
- #include "acl.h"
- #include "annotate.h"
diff --git a/mail/cyrus-imapd22/patches/patch-bb b/mail/cyrus-imapd22/patches/patch-bb
deleted file mode 100644
index 26d6243bf8a..00000000000
--- a/mail/cyrus-imapd22/patches/patch-bb
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bb,v 1.3 2004/11/28 14:34:07 recht Exp $
-
---- imap/cvt_cyrusdb.c.orig	Sun Nov 28 15:09:29 2004
-+++ imap/cvt_cyrusdb.c	Sun Nov 28 15:10:33 2004
-@@ -60,7 +60,9 @@
- #include <syslog.h>
- 
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
- 
- #include "acl.h"
- #include "assert.h"
diff --git a/mail/cyrus-imapd22/patches/patch-bc b/mail/cyrus-imapd22/patches/patch-bc
deleted file mode 100644
index 8aadf72c711..00000000000
--- a/mail/cyrus-imapd22/patches/patch-bc
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-bc,v 1.1 2004/11/28 14:34:07 recht Exp $
-
---- perl/sieve/lib/request.c.orig	Sun Nov 28 15:14:46 2004
-+++ perl/sieve/lib/request.c	Sun Nov 28 15:14:47 2004
-@@ -51,7 +51,9 @@
- #include <sys/stat.h>
- #include <sys/types.h>
- #include <sys/ipc.h>
-+#if !defined(__APPLE__)
- #include <sys/msg.h>
-+#endif
- 
- #include <stdlib.h>
- #include <stdio.h>