Update to 2.2.12, i.e. copy the contents of mail/cyrus-imapd22 here.

27 files changed, 363 insertions, 398 deletions

diff --git a/mail/cyrus-imapd/DEINSTALL b/mail/cyrus-imapd/DEINSTALL
index 707b1d2532b..3c275cc0a14 100644
--- a/mail/cyrus-imapd/DEINSTALL
+++ b/mail/cyrus-imapd/DEINSTALL
@@ -1,21 +1,38 @@
-# $NetBSD: DEINSTALL,v 1.3 2003/08/30 20:22:55 jlam Exp $
+# $NetBSD: DEINSTALL,v 1.4 2005/03/02 21:42:48 wiz Exp $
 
 IMAPDCONF=@IMAPDCONF@
 
 case ${STAGE} in
 DEINSTALL)
 	if [ -f ${IMAPDCONF} ]; then
-		imap_dirs=`						\
+		IMAPDIRS=`
 			${AWK} '/configdirectory:/      { print $2 };	\
 				/partition-.*:/         { print $2 };	\
 				/sievedir:/             { print $2 }'	\
-				${IMAPDCONF}				\
-		`
-		for dir in ${imap_dirs}; do
+				${IMAPDCONF} | ${SORT} -ur`
+		_IMAPDIRS=
+		for dir in ${IMAPDIRS}; do
+			${RMDIR} -p ${dir} 2>/dev/null || ${TRUE}
 			if [ -d ${dir} ]; then
-				ALL_DIRS="${ALL_DIRS} ${dir}"
+				_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-imapd/MESSAGE b/mail/cyrus-imapd/MESSAGE
index 160e55d4305..4536075fb96 100644
--- a/mail/cyrus-imapd/MESSAGE
+++ b/mail/cyrus-imapd/MESSAGE
@@ -1,12 +1,17 @@
 ===========================================================================
-$NetBSD: MESSAGE,v 1.2 2004/02/14 18:27:25 snj Exp $
+$NetBSD: MESSAGE,v 1.3 2005/03/02 21:42:48 wiz Exp $
 
-Please also refer to:
+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 will
-probably need to be added to /etc/services.
+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-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 3b539446ee3..ea31379bbdc 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,33 +1,25 @@
-# $NetBSD: Makefile,v 1.50 2004/12/29 15:42:37 minskim Exp $
+# $NetBSD: Makefile,v 1.51 2005/03/02 21:42:48 wiz Exp $
 
-DISTNAME=		cyrus-imapd-2.0.17
-PKGREVISION=		5
-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/
+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=		tech-pkg@NetBSD.org
-HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
-COMMENT=		Cyrus IMAP server
+MAINTAINER=	recht@NetBSD.org
+HOMEPAGE=	http://asg.web.cmu.edu/cyrus/imapd/
+COMMENT=	Cyrus IMAP server
 
-USE_BUILDLINK3=		YES
-GNU_CONFIGURE=		YES
-PERL5_CONFIGURE=	NO
-AUTOCONF_REQD=		2.13
+USE_BUILDLINK3=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
+PERL5_CONFIGURE=	no
+BDB_ACCEPTED=		db4 db3
 
-BUILD_DEFS+=		USE_INET6
-
-USE_PKGINSTALL=		YES
+USE_PKGINSTALL=		yes
 DEINSTALL_EXTRA_TMPL+=	${.CURDIR}/DEINSTALL
 
 .include "../../mk/bsd.prefs.mk"
 
-.if defined(CYRUS_USE_INET6) && ${CYRUS_USE_INET6} == "YES"
-PATCH_SITES=		http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=		${DISTNAME}-ipv6-20021205.diff.gz
-.endif
-
 # CYRUS_USER		username of the Cyrus administrator
 # CYRUS_GROUP		group of the Cyrus administrator
 #
@@ -38,36 +30,84 @@ 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-dbdir=${BUILDLINK_PREFIX.db3}
-CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
+CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=	--with-sasl=${BUILDLINK_PREFIX.cyrus-sasl}
-CONFIGURE_ARGS+=	--without-ucdsnmp
-CONFIGURE_ARGS+=	--without-notify
-CONFIGURE_ARGS+=	--without-zephyr
-CONFIGURE_ARGS+=	--enable-netscapehack
-
+CONFIGURE_ARGS+=	--with-perl=${PERL5}
 CONFIGURE_ARGS+=	--with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}
 CONFIGURE_ENV+=		ac_cv_lib_wrap_request_init=yes
 
-.if exists(/usr/include/krb5/com_err.h)
-CPPFLAGS+=		-I/usr/include/krb5
-CONFIGURE_ARGS+=	--with-com_err=
-.else
-CONFIGURE_ARGS+=	--with-com_err=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 defined(KERBEROS) && ${KERBEROS} == 4
-PKG_USE_KERBEROS=	# defined
+.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
@@ -77,52 +117,63 @@ FILES_SUBST+=		IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
 
 PERL5_PACKLIST= \
 	${PERL5_SITEARCH}/auto/Cyrus/IMAP/.packlist			\
-	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/acap/.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;						\
-	for file in deliver.8 imapd.8 master.8 pop3d.8; do		\
-		${MV} $${file} cyrus-$${file};				\
-		${SED}	-e "s|\(\$$(srcdir)/\)\($${file}\)|\1cyrus-\2|g" \
-			Makefile.in > Makefile.in.fixed;		\
-		${MV} -f Makefile.in.fixed Makefile.in;			\
+	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
-	files=`${FIND} ${WRKSRC} -type f -exec ${GREP} -l \
-		-e /etc/imapd\.conf -e /etc/cyrus\.conf {} \;`; \
-	for file in $${files}; do					\
-		${SED}	-e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
-			-e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g"	\
-			-e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
+	${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};			\
+			$$file > $$file.fixed;				\
+		${MV} -f $$file.fixed $$file;				\
 	done
 
-pre-configure:
-	cd ${WRKSRC};							\
-	${AUTOHEADER};							\
-	${AUTOCONF}
-
 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; ${INSTALL_DATA} *.conf ${EGDIR}
+	cd ${WRKSRC}/master/conf; for file in *.conf; do		\
+		${INSTALL_DATA} $$file ${EGDIR};			\
+	done
 	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html cyrusv2.mc ${HTMLDIR}
-	${INSTALL_DATA_DIR} ${HTMLDIR}/man
-	cd ${WRKSRC}/doc/man; ${INSTALL_DATA} *.html ${HTMLDIR}/man
-
-.include "../../databases/db3/buildlink3.mk"
-.include "../../lang/perl5/module.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
+	cd ${WRKSRC}/doc; for file in *.html cyrusv2.mc; do		\
+		${INSTALL_DATA} $$file ${HTMLDIR};			\
+	done
 
-.include "../../mk/autoconf.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/PLIST b/mail/cyrus-imapd/PLIST
index 2f68778ad88..f965f7fba8e 100644
--- a/mail/cyrus-imapd/PLIST
+++ b/mail/cyrus-imapd/PLIST
@@ -1,24 +1,50 @@
-@comment $NetBSD: PLIST,v 1.6 2004/04/23 22:07:54 reed Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/03/02 21:42:48 wiz 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/feedcyrus
+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
-include/cyrus/acap.h
+cyrus/bin/tls_prune
+cyrus/bin/translatesieve
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -28,52 +54,76 @@ 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/libacap.a
 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/collectnews.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/idled.8
 man/man8/ipurge.8
-man/man8/lmtpd.8
+man/man8/mbexamine.8
 man/man8/mbpath.8
-man/man8/quota.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/cyradm.1.html
 share/doc/html/cyrus-imapd/cyrusv2.mc
 share/doc/html/cyrus-imapd/faq.html
 share/doc/html/cyrus-imapd/feedback.html
@@ -83,12 +133,14 @@ 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
@@ -100,37 +152,13 @@ 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.conf
+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/doc/html/cyrus-imapd/man/arbitron.8.html
-share/doc/html/cyrus-imapd/man/collectnews.8.html
-share/doc/html/cyrus-imapd/man/ctl_deliver.8.html
-share/doc/html/cyrus-imapd/man/ctl_mboxlist.8.html
-share/doc/html/cyrus-imapd/man/cyrus.conf.5.html
-share/doc/html/cyrus-imapd/man/deliver.8.html
-share/doc/html/cyrus-imapd/man/fud.8.html
-share/doc/html/cyrus-imapd/man/idled.8.html
-share/doc/html/cyrus-imapd/man/imapd.8.html
-share/doc/html/cyrus-imapd/man/imapd.conf.5.html
-share/doc/html/cyrus-imapd/man/imclient.3.html
-share/doc/html/cyrus-imapd/man/imtest.1.html
-share/doc/html/cyrus-imapd/man/installsieve.1.html
-share/doc/html/cyrus-imapd/man/ipurge.8.html
-share/doc/html/cyrus-imapd/man/krb.equiv.5.html
-share/doc/html/cyrus-imapd/man/lmtpd.8.html
-share/doc/html/cyrus-imapd/man/master.8.html
-share/doc/html/cyrus-imapd/man/mbpath.8.html
-share/doc/html/cyrus-imapd/man/pop3d.8.html
-share/doc/html/cyrus-imapd/man/quota.8.html
-share/doc/html/cyrus-imapd/man/reconstruct.8.html
-share/doc/html/cyrus-imapd/man/rmnews.8.html
-share/doc/html/cyrus-imapd/man/syncnews.8.html
-share/doc/html/cyrus-imapd/man/timsieved.8.html
 @dirrm share/examples/cyrus-imapd
-@dirrm share/doc/html/cyrus-imapd/man
 @dirrm share/doc/html/cyrus-imapd
 @dirrm include/cyrus
 @dirrm cyrus/bin
diff --git a/mail/cyrus-imapd/buildlink3.mk b/mail/cyrus-imapd/buildlink3.mk
deleted file mode 100644
index 13d23488db8..00000000000
--- a/mail/cyrus-imapd/buildlink3.mk
+++ /dev/null
@@ -1,23 +0,0 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/04/25 01:13:25 wiz Exp $
-
-BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
-CYRUS_IMAPD_BUILDLINK3_MK:=	${CYRUS_IMAPD_BUILDLINK3_MK}+
-
-.if !empty(BUILDLINK_DEPTH:M+)
-BUILDLINK_DEPENDS+=	cyrus-imapd
-.endif
-
-BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Ncyrus-imapd}
-BUILDLINK_PACKAGES+=	cyrus-imapd
-
-.if !empty(CYRUS_IMAPD_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.cyrus-imapd+=	cyrus-imapd>=2.0.17nb3
-BUILDLINK_PKGSRCDIR.cyrus-imapd?=	../../mail/cyrus-imapd
-.endif	# CYRUS_IMAPD_BUILDLINK3_MK
-
-.include "../../databases/db3/buildlink3.mk"
-.include "../../security/cyrus-sasl/buildlink3.mk"
-.include "../../security/openssl/buildlink3.mk"
-.include "../../security/tcp_wrappers/buildlink3.mk"
-
-BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 83b4f0ca117..71130331b8d 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,20 +1,12 @@
-$NetBSD: distinfo,v 1.15 2002/12/17 15:05:01 tron Exp $
+$NetBSD: distinfo,v 1.16 2005/03/02 21:42:48 wiz Exp $
 
-SHA1 (cyrus-imapd-2.0.17.tar.gz) = e9db4c7d70784c8bc884cd16bd8c95e981c926b6
-Size (cyrus-imapd-2.0.17.tar.gz) = 1387695 bytes
-SHA1 (cyrus-imapd-2.0.17-ipv6-20021205.diff.gz) = 756238906698ccf12333ef6bc16fd3a003b4dde4
-Size (cyrus-imapd-2.0.17-ipv6-20021205.diff.gz) = 21602 bytes
-SHA1 (patch-aa) = 51b4fee0e8eb46cd4fd05fdffd4b52c9abe89b11
-SHA1 (patch-ab) = 76000108d4345a19d56c99cc2ccd64cd0d8c897e
-SHA1 (patch-ac) = 95eea5da0d7d54bd31e99decc281c6e55d11aa81
-SHA1 (patch-ad) = 2ded3c0228d6967af5599df0226cf43fc1e94b29
-SHA1 (patch-ae) = df4054aa5aa19129ce2ab28c5d74f0f92230a1c6
-SHA1 (patch-ag) = 08068d3d44a055237b208838def5e1ac4c4715b5
-SHA1 (patch-ah) = d6602de6b2105c97cef1005fb7883e6023184ef7
-SHA1 (patch-ai) = eb32cf0cf4c4007efc57530fa028b5336c22e26a
-SHA1 (patch-aj) = ca70e0a1e9d21cc5e4a2a01efcf6832e286df8a4
-SHA1 (patch-ak) = 18f2ab0ae3dbd8fbe954b460663ae822377dabde
-SHA1 (patch-al) = b56086c4b12502bf85304ee1a47dcdb9fd3cf027
-SHA1 (patch-am) = 1f424c625a8e130df90eae43216536cbb5605458
-SHA1 (patch-an) = a2a1fdc901022ab17b9ec8a73257bb1e9fbb365c
-SHA1 (patch-ao) = 81f35495ece1c5042fcdb5c57802f26e9daea837
+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-imapd/files/cyrus.sh b/mail/cyrus-imapd/files/cyrus.sh
index 9f0ec360804..775a8bb648a 100644
--- a/mail/cyrus-imapd/files/cyrus.sh
+++ b/mail/cyrus-imapd/files/cyrus.sh
@@ -1,9 +1,10 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: cyrus.sh,v 1.2 2002/09/20 02:01:57 grant Exp $
+# $NetBSD: cyrus.sh,v 1.3 2005/03/02 21:42:48 wiz 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.
@@ -17,7 +18,8 @@ rcd_dir=`@DIRNAME@ $0`
 name="cyrus"
 rcvar=$name
 command="@PREFIX@/cyrus/bin/master"
-command_args="& sleep 2"
+command_args="-d"
+pidfile="/var/run/cyrus-master.pid"
 required_files="@PKG_SYSCONFDIR@/cyrus.conf @IMAPDCONF@"
 extra_commands="mkimap reload"
 
@@ -49,18 +51,16 @@ cyrus_mkimap()
 {
 	# Generate the prerequisite directory structure for Cyrus IMAP.
 	if [ -f @IMAPDCONF@ ]; then
-		imap_dirs=`
-			@AWK@ '/^configdirectory:/	{ print $2 };	\
-			       /^partition-.*:/		{ print $2 };	\
-			       /^sievedir:/		{ print $2 }'	\
-			      @IMAPDCONF@				\
-		`
-		for dir in ${imap_dirs}; do
-			if [ ! -d ${dir} ]; then
-				@MKDIR@ ${dir}
-				@CHMOD@ 750 ${dir}
-				@CHOWN@ @CYRUS_USER@ ${dir}
-				@CHGRP@ @CYRUS_GROUP@ ${dir}
+		@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"
diff --git a/mail/cyrus-imapd/files/imapd.conf b/mail/cyrus-imapd/files/imapd.conf
index 9498566609a..66ca8cb4e0c 100644
--- a/mail/cyrus-imapd/files/imapd.conf
+++ b/mail/cyrus-imapd/files/imapd.conf
@@ -1,4 +1,4 @@
-# $NetBSD: imapd.conf,v 1.4 2003/09/15 09:01:18 jlam Exp $
+# $NetBSD: imapd.conf,v 1.5 2005/03/02 21:42:48 wiz Exp $
 #
 # Cyrus IMAP server configuration file.  Refer to imapd.conf(5) for
 # more options.
@@ -19,5 +19,5 @@ sasl_pwcheck_method: saslauthd
 # 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 
+#tls_cert_file: /var/imap/server.pem
+#tls_key_file: /var/imap/server.pem
diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa
deleted file mode 100644
index 0a08763533c..00000000000
--- a/mail/cyrus-imapd/patches/patch-aa
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2001/09/18 21:56:30 skrll Exp $
-
---- doc/install-configure.html.orig	Thu Jul  5 16:47:39 2001
-+++ doc/install-configure.html
-@@ -142,12 +142,12 @@
- </kbd></pre>
- 
- <li>Change to the Cyrus user and use the tool
--"<tt>tools/mkimap</tt>" to create the rest of the directories
-+"<tt>mkimap</tt>" to create the rest of the directories
- (subdirectories of the directories you just created).
- 
- <pre>
- <kbd>   su cyrus
--   tools/mkimap
-+   mkimap
-    exit
- </kbd>
- </pre>
diff --git a/mail/cyrus-imapd/patches/patch-ab b/mail/cyrus-imapd/patches/patch-ab
deleted file mode 100644
index b3c60127597..00000000000
--- a/mail/cyrus-imapd/patches/patch-ab
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ab,v 1.2 2001/09/18 21:56:30 skrll Exp $
-
---- imap/Makefile.in.orig	Sat Jun 23 04:14:01 2001
-+++ imap/Makefile.in
-@@ -65,7 +65,7 @@
- CYRUS_GROUP=@cyrus_group@
- 
- DEFS = @DEFS@ @LOCALDEFS@
--CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
-+CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
- IMAP_LIBS = @IMAP_LIBS@
- SIEVE_LIBS = @SIEVE_LIBS@
- IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
diff --git a/mail/cyrus-imapd/patches/patch-ac b/mail/cyrus-imapd/patches/patch-ac
deleted file mode 100644
index cc73b4928dd..00000000000
--- a/mail/cyrus-imapd/patches/patch-ac
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ac,v 1.2 2001/09/18 21:56:30 skrll Exp $
-
---- imap/lmtpd.c.orig	Mon May 21 19:21:47 2001
-+++ imap/lmtpd.c
-@@ -411,7 +411,12 @@
-     }
- }
- 
-+#ifdef __NetBSD__
-+#include <paths.h>
-+#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-imapd/patches/patch-ad b/mail/cyrus-imapd/patches/patch-ad
deleted file mode 100644
index 6b39b5b0b3b..00000000000
--- a/mail/cyrus-imapd/patches/patch-ad
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2001/09/18 21:56:30 skrll Exp $
-
---- tools/mkimap.orig	Wed Jan 24 21:26:51 2001
-+++ tools/mkimap
-@@ -74,7 +74,7 @@
- 	$conf = $1;
- 	print "i will configure directory $conf.\n";
-     }
--    if (/^sieveuserhomedir:\s+(1|t|yes|on)/) {
-+    if (/^sieveusehomedir:\s+(1|t|yes|on)/) {
- 	$nosievedir = 1;
- 	print "you are storing sieve scripts in user's home directories.\n";
-     }
diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae
deleted file mode 100644
index b8d205885f4..00000000000
--- a/mail/cyrus-imapd/patches/patch-ae
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-ae,v 1.4 2002/10/21 06:12:54 jlam Exp $
-
---- cmulocal/sasl.m4.orig	Fri Jul  7 13:46:12 2000
-+++ cmulocal/sasl.m4
-@@ -54,6 +54,9 @@ AC_ARG_WITH(sasl,
- 
- 	SASLFLAGS=""
- 	LIB_SASL=""
-+	AC_PATH_PROG(SASL_CONFIG, sasl-config, no)
-+
-+	if test "$SASL_CONFIG" = no; then
- 
- 	cmu_saved_CPPFLAGS=$CPPFLAGS
- 	cmu_saved_LDFLAGS=$LDFLAGS
-@@ -82,6 +85,15 @@ AC_ARG_WITH(sasl,
- 	  LIB_SASL=""
- 	  SASLFLAGS=""
- 	fi
-+
-+	else	# SASL_CONFIG
-+
-+	ac_cv_found_sasl=yes
-+	SASLFLAGS=`$SASL_CONFIG --cflags`
-+	LIB_SASL=`$SASL_CONFIG --libs`
-+
-+	fi
-+
- 	AC_SUBST(LIB_SASL)
- 	AC_SUBST(SASLFLAGS)
- 	])
diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
new file mode 100644
index 00000000000..e95b89b4355
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -0,0 +1,12 @@
+$NetBSD: patch-af,v 1.7 2005/03/02 21:42:48 wiz 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-imapd/patches/patch-ag b/mail/cyrus-imapd/patches/patch-ag
deleted file mode 100644
index 661f1f6cb40..00000000000
--- a/mail/cyrus-imapd/patches/patch-ag
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ag,v 1.2 2001/09/18 21:56:31 skrll Exp $
-
---- master/master.c.orig	Mon Jul 16 19:23:11 2001
-+++ master/master.c
-@@ -84,6 +84,7 @@
- #include <ucd-snmp/ucd-snmp-agent-includes.h>
- 
- #include "cyrusMasterMIB.h"
-+int smux_listen_sd;
- #endif
- 
- #include "masterconf.h"
diff --git a/mail/cyrus-imapd/patches/patch-ah b/mail/cyrus-imapd/patches/patch-ah
deleted file mode 100644
index 3b3ecb513cf..00000000000
--- a/mail/cyrus-imapd/patches/patch-ah
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ah,v 1.2 2001/09/18 21:56:31 skrll Exp $
-
---- perl/sieve/Makefile.in.orig	Tue Dec 26 23:07:25 2000
-+++ perl/sieve/Makefile.in
-@@ -63,6 +63,7 @@
- 
- SASL_LIB=@LIB_SASL@
- SASL_INC=@SASLFLAGS@
-+EXTRA_INC=@CPPFLAGS@ @COM_ERR_CPPFLAGS@
- CC=@CC@
- PERL=@PERL@
- 
-@@ -72,6 +73,7 @@
- 		(cd $$d; echo "### Making" all "in" `pwd`;	\
- 			if [ -f Makefile.PL ]; then \
- 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
-+			     EXTRA_INC="$(EXTRA_INC)" \
- 			     $(PERL) Makefile.PL PREFIX=$(prefix); \
- 			fi; \
- 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
diff --git a/mail/cyrus-imapd/patches/patch-ai b/mail/cyrus-imapd/patches/patch-ai
deleted file mode 100644
index 9b85ad5847e..00000000000
--- a/mail/cyrus-imapd/patches/patch-ai
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2001/09/18 21:57:17 skrll Exp $
-
---- perl/sieve/acap/Makefile.PL.orig	Tue Jun 13 21:32:21 2000
-+++ perl/sieve/acap/Makefile.PL
-@@ -42,6 +42,8 @@
- my $SASL_INC = $ENV{SASL_INC};
- my $SASL_LIB = $ENV{SASL_LIB} || "-lsasl";
- 
-+my $EXTRA_INC = $ENV{EXTRA_INC};
-+
- # See lib/ExtUtils/MakeMaker.pm for details of how to influence
- # the contents of the Makefile that is written.
- WriteMakefile(
-@@ -49,5 +51,5 @@
-     'VERSION_FROM' => 'acap.pm', # finds $VERSION
-     'LIBS'	=> ["-L../../../acap/ -lacap $SASL_LIB -L../../../lib/ -lcyrus -lssl -lcrypto"],   # e.g., '-lm' 
-     'DEFINE'	=> '-DPERL_POLLUTE',     # e.g., '-DHAVE_SOMETHING' 
--    'INC'	=> "-I../../../acap/ $SASL_INC",     # e.g., '-I/usr/include/other' 
-+    'INC'	=> "-I../../../acap/ $SASL_INC $EXTRA_INC",     # e.g., '-I/usr/include/other' 
- );
diff --git a/mail/cyrus-imapd/patches/patch-aj b/mail/cyrus-imapd/patches/patch-aj
deleted file mode 100644
index f1ba6076d1d..00000000000
--- a/mail/cyrus-imapd/patches/patch-aj
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2001/09/18 21:57:17 skrll Exp $
-
---- perl/sieve/acap/Makefile.in.orig	Tue May 23 21:56:40 2000
-+++ perl/sieve/acap/Makefile.in
-@@ -49,7 +49,7 @@
- RANLIB = @RANLIB@
- 
- DEFS = @DEFS@ -Dbool=char -DHAS_BOOL
--CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ -I/usr/local/lib/perl5/5.004/CORE -I$(srcdir)/../../../acap
-+CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ -I/usr/local/lib/perl5/5.004/CORE -I$(srcdir)/../../../acap @COM_ERR_CPPFLAGS@
- LIBS = @LIBS@ ../../../acap/libacapsieve.a ../../../acap/libacap.a
- IMAP_LIBS = @IMAP_LIBS@
- DEPLIBS = ../../../acap/libacapsieve.a ../../../acap/libacap.a @DEPLIBS@
-@@ -92,4 +92,4 @@
- depend: 
- 	${MAKEDEPEND} $(CPPFLAGS) $(DEFS) $(CFLAGS) *.c $(srcdir)/*.c 1> makedepend.log 2>&1
- 
--# DO NOT DELETE THIS LINE -- make depend depends on it.
-+# DO NOT DELETE THIS LINE -- make depend depends on it.
diff --git a/mail/cyrus-imapd/patches/patch-ak b/mail/cyrus-imapd/patches/patch-ak
deleted file mode 100644
index 603669fa14f..00000000000
--- a/mail/cyrus-imapd/patches/patch-ak
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ak,v 1.3 2002/11/01 00:26:30 jlam Exp $
-
---- configure.in.orig	Fri Jun 22 21:01:47 2001
-+++ configure.in
-@@ -180,6 +180,10 @@ dnl compile perl stuff
-     EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
- dnl and compile perl/cyradm
-     PERL_SUBDIRS="imap"
-+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-imapd/patches/patch-al b/mail/cyrus-imapd/patches/patch-al
index 8d892d5957e..5d34a762482 100644
--- a/mail/cyrus-imapd/patches/patch-al
+++ b/mail/cyrus-imapd/patches/patch-al
@@ -1,13 +1,25 @@
-$NetBSD: patch-al,v 1.1 2002/11/01 00:26:30 jlam Exp $
+$NetBSD: patch-al,v 1.2 2005/03/02 21:42:48 wiz Exp $
 
---- acap/Makefile.in.orig	Thu Oct 31 19:16:25 2002
-+++ acap/Makefile.in
-@@ -53,7 +53,7 @@ DEFS = @DEFS@
- CPPFLAGS = @CPPFLAGS@ @SASLFLAGS@ -I. -I..
- LIBS = @LIBS@
+--- 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>
  
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
+@@ -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
  
- SHELL = /bin/sh
+ #include <sasl/sasl.h>
+ #include <sasl/saslutil.h>
diff --git a/mail/cyrus-imapd/patches/patch-am b/mail/cyrus-imapd/patches/patch-am
index 26d9e6dd73c..555047a2f62 100644
--- a/mail/cyrus-imapd/patches/patch-am
+++ b/mail/cyrus-imapd/patches/patch-am
@@ -1,13 +1,13 @@
-$NetBSD: patch-am,v 1.1 2002/11/01 00:26:30 jlam Exp $
+$NetBSD: patch-am,v 1.2 2005/03/02 21:42:48 wiz Exp $
 
---- lib/Makefile.in.orig	Tue Aug 22 22:47:57 2000
-+++ lib/Makefile.in
-@@ -58,7 +58,7 @@ DEFS = @DEFS@
- CPPFLAGS = -I.. @CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ @PERL_CCCDLFLAGS@
- LDFLAGS = @LDFLAGS@
- 
- SHELL = /bin/sh
+--- 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-imapd/patches/patch-an b/mail/cyrus-imapd/patches/patch-an
deleted file mode 100644
index 0b105b6f7f9..00000000000
--- a/mail/cyrus-imapd/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.1 2002/11/01 00:26:30 jlam Exp $
-
---- sieve/Makefile.in.orig	Thu Mar  8 20:35:41 2001
-+++ 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-imapd/patches/patch-ao b/mail/cyrus-imapd/patches/patch-ao
deleted file mode 100644
index be0b0f7f859..00000000000
--- a/mail/cyrus-imapd/patches/patch-ao
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ao,v 1.2 2002/12/17 09:27:13 tron Exp $
-
---- perl/sieve/lib/Makefile.in.orig	Mon Dec 18 05:53:42 2000
-+++ perl/sieve/lib/Makefile.in
-@@ -54,8 +54,8 @@ LIBS = ../../../lib/libcyrus.a @LIB_SASL
- 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-imapd/patches/patch-ap b/mail/cyrus-imapd/patches/patch-ap
new file mode 100644
index 00000000000..688c004d7df
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ap
@@ -0,0 +1,35 @@
+$NetBSD: patch-ap,v 1.1 2005/03/02 21:42:48 wiz 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-imapd/patches/patch-ba b/mail/cyrus-imapd/patches/patch-ba
new file mode 100644
index 00000000000..c186b7f9453
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ba
@@ -0,0 +1,14 @@
+$NetBSD: patch-ba,v 1.1 2005/03/02 21:42:48 wiz 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-imapd/patches/patch-bb b/mail/cyrus-imapd/patches/patch-bb
new file mode 100644
index 00000000000..f584833af94
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-bb
@@ -0,0 +1,14 @@
+$NetBSD: patch-bb,v 1.1 2005/03/02 21:42:48 wiz 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-imapd/patches/patch-bc b/mail/cyrus-imapd/patches/patch-bc
new file mode 100644
index 00000000000..b940c725d53
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-bc
@@ -0,0 +1,14 @@
+$NetBSD: patch-bc,v 1.1 2005/03/02 21:42:48 wiz 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>