Add cyrus-imapd-2.1.5 after repo. copy.

56 files changed, 1516 insertions, 488 deletions

diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 7b263544d420..18fe5e214488 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.16
-PORTREVISION=	2
+PORTVERSION= 	2.1.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20020118.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20020630.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl \
+LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
 		db3.2:${PORTSDIR}/databases/db3
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
+		${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	YES
@@ -33,68 +33,78 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 
 .if defined(WITH_SNMP)
 # It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+#CONFIGURE_ENV=	LIBS=-lkvm
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
 
-MAN1=		cyradm.1 imtest.1 installsieve.1
+MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 pop3test.1 \
+		sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
-		cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
-		syncnews.8 timsieved.8
+MAN8=		arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
+		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
+		deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
+		mbpath.8 notifyd.8 pop3d.8 reconstruct.8 rmnews.8 \
+		squatter.8 syncnews.8 timsieved.8 tls_prune.8
 
-DOCS=		HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
-		changes copyrights feedback index install install-admin-mb \
-		install-compile install-configure install-murder install-perf \
+DOCS=		altnamespace anoncvs bugs changes faq feedback index \
+		install install-admin-mb install-auth install-compile \
+		install-configure install-murder install-perf \
 		install-prereq install-sieve install-snmpmon install-testing \
-		install-upgrade mailing-list notes os overview questions \
-		quota-extension readme server-design sieve sieve-protocol
-HTDOCS=		anoncvs bugs changes faq feedback index install-admin-mb \
-		install-auth install-compile install-configure install-murder \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install mailing-list man \
-		notes os overview questions readme sieve-protocol sieve specs
+		install-upgrade mailing-list man notes os overview questions \
+		readme sieve sieve-protocol specs
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
 
 post-patch:
 		@${SED} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/tools/mkimap \
 			> ${WRKSRC}/tools/mkimap.new
 		@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+		@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+.if ${OSVERSION} < 500000
+		@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
+			> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new
+		@${MV} ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
+.endif
 
 post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+		@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/man
-		${MKDIR} ${PREFIX}/share/doc/cyrus/text
-.for file in ${HTDOCS}
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/man
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/text
+.for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/${file}.html >>${TMPPLIST}
 .endfor
 .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
 		ofile=`echo ${file} | sed s/cyrquota/quota/`; \
 		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
-		${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
+			${PREFIX}/share/doc/cyrus-imapd2/man/$${ofile}.html; \
+		${ECHO} share/doc/cyrus-imapd2/man/$${ofile}.html \
+			>>${TMPPLIST}; \
 		fi
 .endfor
 		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/cyrusv2.mc >>${TMPPLIST}
 .for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
-			${PREFIX}/share/doc/cyrus/text
-		@${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2/text
+		@${ECHO} share/doc/cyrus-imapd2/text/${file} >>${TMPPLIST}
 .endfor
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/text" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2" >>${TMPPLIST}
 .endif
 		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
 			${PREFIX}/etc/rc.d/imapd.sh.sample
@@ -107,4 +117,4 @@ post-install:
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd2/distinfo b/mail/cyrus-imapd2/distinfo
index 75d8b622c99b..7cdf528e94e2 100644
--- a/mail/cyrus-imapd2/distinfo
+++ b/mail/cyrus-imapd2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.16.tar.gz) = ce20ec83762e89bcb98567f396668b8d
-MD5 (cyrus-imapd-2.0.16-ipv6-20020118.diff.gz) = 9752c325aeeeb39b82c7a427fee076b2
+MD5 (cyrus-imapd-2.1.5.tar.gz) = 86eb126e818f998cf7ff2e1fe1a09cb3
+MD5 (cyrus-imapd-2.1.5-ipv6-20020630.diff.gz) = 699d0281d13aa50044143e013045fd09
diff --git a/mail/cyrus-imapd2/files/imapd.conf b/mail/cyrus-imapd2/files/imapd.conf
index c9de5a5a31b4..8384d7892b02 100644
--- a/mail/cyrus-imapd2/files/imapd.conf
+++ b/mail/cyrus-imapd2/files/imapd.conf
@@ -17,14 +17,45 @@ configdirectory: /var/imap
 #
 partition-default: /var/spool/imap
 
+# Use the UNIX separator character '/' for delimiting levels of
+# mailbox hierarchy.  The default is to use the netnews separator
+# character '.'.
+#unixhierarchysep: no
+
+# Use the alternate IMAP namespace, where personal folders reside at
+# the same level in the hierarchy as INBOX.
+#
+#altnamespace: no
+
+# If using the alternate IMAP namespace, the prefix for the other
+# users namespace.  The hierarchy delimiter will be automatically
+# appended.
+#
+#userprefix: Other Users
+
+# If using the alternate IMAP namespace, the prefix for the shared
+# namespace.  The hierarchy delimiter will be automatically appended.
+#
+#sharedprefix: Shared Folders
+
 # The umask value used by various Cyrus IMAP programs
 #
 #umask: 077
 
+# This is the hostname visible in the greeting messages of the POP,
+# IMAP and LMTP daemons. If it is unset, then the result returned from
+# gethostname(2) is used.
+#
+#servername: <result returned by gethostname(2)>
+
 # Whether to allow anonymous logins
 #
 #allowanonymouslogin: no
 
+# Allow the use of the SASL PLAIN mechanism.
+#
+#allowplaintext: yes
+
 # The percent  of  quota  utilization  over  which  the server generates
 # warnings.
 #
@@ -35,6 +66,20 @@ partition-default: /var/spool/imap
 #
 #timeout: 30
 
+# The interval (in seconds) for polling the mailbox for changes while
+# running the IDLE command.  This option is used when idled can not be
+# contacted or when polling is used exclusively.  The minimum value is
+# 1.  A value of 0 will disable polling (and disable IDLE if polling
+# is the only method available).
+#
+#imapidlepoll: 60
+
+# If enabled, the server responds to an ID command with a parameter
+# list containing: version, vendor, support-url, os, os-version,
+# command, arguments, environment.  Otherwise the server returns NIL.
+#
+#imapidresponse: yes
+
 # Set the length of the POP server's inactivity autologout timer, in
 # minutes.  The minimum value is 10, the default.
 #
@@ -45,6 +90,16 @@ partition-default: /var/spool/imap
 #
 #popminpoll: 0
 
+# The number of days advertised as being the minimum a message may be
+# left on the POP server before it is deleted (via the CAPA command,
+# defined in the POP3 Extension Mechanism, which some clients may
+# support).  "NEVER", the default, may be specified with a negative
+# number.  The Cyrus POP3 server never deletes mail, no matter what
+# the value of this parameter is.  However, if a site implements a
+# less liberal policy, it needs to change this parameter accordingly.
+#
+#popexpiretime: 0
+
 # The list of userids with administrative rights.  Separate each userid
 # with a space.  We recommend that administrator userids be separate from 
 # standard userids.  Sites using Kerberos authentication may use separate
@@ -52,11 +107,11 @@ partition-default: /var/spool/imap
 #
 #admins: <none>
 
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
+# A list of users and groups that are allowed to proxy for other
+# users, seperated by spaces.  Any user listed in this will be allowed
+# to login for any other user: use with caution.
 #
-#imspservers: <none>
+#proxyservers: <none>
 
 # The Access Control List (ACL) placed on a newly-created (non-user)
 # mailbox that does not have a parent mailbox.
@@ -90,9 +145,9 @@ partition-default: /var/spool/imap
 #
 #plaintextloginpause: 0
 
-# The pathname of srvtab file containing the server's private  key.  This 
-# option is only used when the server is compiled with Kerberos
-# authentication.
+# The pathname of srvtab file containing the server's private key.
+# This option is passed to the SASL library and overrides its default
+# setting.
 #
 #srvtab: /etc/srvtab
 
@@ -108,8 +163,64 @@ partition-default: /var/spool/imap
 #
 #loginuseacl: no
 
-# If enabled, deliver wil look for Sieve scripts in user's home directories:
-# ~user/.sieve.
+# If enabled, lmtpd attempts to only write one copy of a message per
+# partition and create hard links, resulting in a potentially large
+# disk savings.
+#
+#singleinstancestore: yes
+
+# If enabled, lmtpd will suppress delivery of a message to a mailbox
+# if a message with the same message-id (or resent-message-id) is
+# recorded as having already been delivered to the mailbox.  Records
+# the mailbox and message-id/resent-message-id of all successful
+# deliveries.
+# Note that duplicate delivery suppression is required for Sieve.
+# Disabling duplicate delivery suppression will also disable Sieve,
+# and as such should only be disabled for performance reasons.
+#
+#duplicatesuppression: yes
+
+# If enabled, lmtpd rejects messages with 8-bit characters in the
+# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
+# soultion to non-ASCII characters in headers is offered by RFC 2047
+# and its predecessors.)
+#
+#reject8bit: no
+
+# Maximum incoming LMTP message size.  If set, lmtpd will reject
+# messages larger than maxmessagesize bytes.  The default is to allow
+# messages of any size.
+#
+#maxmessagesize: <unlimited>
+
+# Userid used to deliver messages to shared folders.  For example, if
+# set to "bb", email sent to "bb+shared.blah" would be delivered to
+# the "shared.blah" folder.  By default, an email address of
+# "+shared.blah" would be used.
+#postuser: <none>
+
+# If enabled at compile time, this specifies a URL to reply when
+# Netscape asks the server where the mail administration HTTP server
+# is.  The default is a site at CMU with a hopefully informative
+# message; administrators should set this to a local resource with
+# some information of greater use.
+#
+#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
+
+# Notifyd(8) method to use for "MAIL" notifications.  If not set,
+# "MAIL" notifications are disabled.
+#
+#mailnotifier: <no default>
+
+# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
+# "SIEVE" notifications are disabled.
+#
+# This method is only used when no method is specified in the script.
+#
+#sievenotifier: <no default>
+
+# If enabled, lmtpd will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
 #
 sieveusehomedir: false
 
@@ -119,26 +230,144 @@ sieveusehomedir: false
 #
 sievedir: /var/imap/sieve
 
+# The pathname of the sendmail executable.  Sieve uses sendmail for
+# sending rejections, redirects and vaca- tion responses.
+#
+#sendmail: /usr/sbin/sendmail
+
+# Username that is used as the 'From' address in rejection MDNs
+# produced by sieve.
+#
+#postmaster: postmaster
+
 # If enabled, the partitions will also be hashed, in addition to the hashing
 # done on configuration directories.  This is recommended if one partition has
 # a very bushy mailbox tree.
 #
 #hashimapspool: false
 
+# Maximum size (in kilobytes) any sieve script can be, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscriptsize: 32
+
+# Maximum number of sieve scripts any user may have, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscripts: 5
+
+# Maximum SSF (security strength factor) that the server will allow a
+# client to negotiate.
+#
+#sasl_maximum_layer: 256
+
+# The minimum SSF that the server will allow a client to negotiate.  A
+# value of 1 requires integrity protection; any higher value requires
+# some amount of encryption.
+#
+#sasl_minimum_layer: 0
+
 # The mechanism used by the server to verify plaintext passwords.  Possible
-# values also include "PAM", "sasldb", "kerberos_v4", "passwd", and "shadow"
+# values include "auxprop", "saslauthd", and "pwcheck"
 #
-sasl_pwcheck_method: pwcheck
+sasl_pwcheck_method: saslauthd
 
-# If  enabled,  the  SASL library will automatically create authentication
+# If enabled,  the SASL library will automatically create authentication
 # secrets when given a plaintext password.  See the SASL documentation.
 #
 #sasl_auto_transition: no
 
-# If you wish to enable TLS/SSL, put CERT into following place, then
-# uncomment this.
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
+# Location of the opiekeys file
+#
+#sasl_opiekeys: /etc/opiekeys
+
+# File containing the global certificate used for ALL services (imap,
+# pop3, lmtp).
+#
+#tls_cert_file: <none>
+
+# File containing the private key belonging to the global server
+# certificate.
+#
+#tls_key_file: <none>
+
+# File containing the certificate used for imap ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for imap.
+#
+#tls_imap_cert_file: <none>
+
+# File containing the private key belonging to the imap-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for imap.
+#
+#tls_imap_key_file: <none>
+
+# File containing the certificate used for pop3 ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for pop3.
+#
+#tls_pop3_cert_file: <none>
+
+# File containing the private key belonging to the pop3-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for pop3.
+#
+#tls_pop3_key_file: <none>
+
+# File containing the certificate used for lmtp ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for lmtp.
+#
+#tls_lmtp_cert_file: <none>
+
+# File containing the private key belonging to the lmtp-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for lmtp.
+#
+#tls_lmtp_key_file: <none>
+
+# File containing the certificate used for sieve ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for sieve.
+#
+#tls_sieve_cert_file: <none>
+
+# File containing the private key belonging to the sieve-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for sieve.
+#
+#tls_sieve_key_file: <none>
+
+# File containing one or more Certificate Authority (CA) certificates.
+#
+#tls_ca_file: <none>
+
+# Path to directory with certificates of CAs.
+#
+#tls_ca_path: <none>
+
+# The length of time (in minutes) that a TLS session will be cached
+# for later reuse.  The maximum value is 1440 (24 hours), the default.
+# A value of 0 will disable session caching.
+#
+#tls_session_timeout: 1440
+
+# The right that a user needs to delete a mailbox.
+#
+#deleteright: c
+
+# Unix domain socket that lmtpd listens on, used by deliver(8).
+#
+#lmtpsocket: /var/imap/socket/lmtp
+
+# Unix domain socket that idled listens on.
+#
+#idlesocket: /var/imap/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+#
+#notifysocket: /var/imap/socket/notify
 
 #
 # EOF
diff --git a/mail/cyrus-imapd2/files/patch-ac b/mail/cyrus-imapd2/files/patch-ac
index 630aaec33cc9..6332c2f16e76 100644
--- a/mail/cyrus-imapd2/files/patch-ac
+++ b/mail/cyrus-imapd2/files/patch-ac
@@ -1,13 +1,13 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Thu Dec 21 06:39:31 2000
-+++ configure	Thu Jan  4 23:22:47 2001
-@@ -4178,7 +4178,7 @@
- 	cmu_saved_LIBS=$LIBS
- 	if test -d ${with_sasl}; then
-           ac_cv_sasl_where_lib=${with_sasl}/lib
--          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
+--- configure.orig	Wed Dec 12 15:50:29 2001
++++ configure	Wed Dec 12 15:51:15 2001
+@@ -5542,7 +5542,7 @@
+ #define HAVE_UCDSNMP 1
+ EOF
  
- 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
- 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
+-    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
++    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
+     echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
+ echo "configure:5548: checking for rpmdbOpen in -lrpm" >&5
+ ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd2/files/patch-af b/mail/cyrus-imapd2/files/patch-af
deleted file mode 100644
index 0a8d78f88d0c..000000000000
--- a/mail/cyrus-imapd2/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpd.c
-diff -u imap/lmtpd.c.orig imap/lmtpd.c
---- imap/lmtpd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpd.c	Thu Jan  4 23:26:22 2001
-@@ -407,7 +407,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd2/files/patch-ag b/mail/cyrus-imapd2/files/patch-ag
deleted file mode 100644
index d22ee0d59350..000000000000
--- a/mail/cyrus-imapd2/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpproxyd.c
-diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c
---- imap/lmtpproxyd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpproxyd.c	Thu Jan  4 23:26:48 2001
-@@ -398,7 +398,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd2/files/patch-ah b/mail/cyrus-imapd2/files/patch-ah
new file mode 100644
index 000000000000..52c44e1c25db
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-ah
@@ -0,0 +1,13 @@
+Index: imap/lmtpengine.h
+diff -u imap/lmtpengine.h.orig imap/lmtpengine.h
+--- imap/lmtpengine.h.orig	Sun Feb 10 10:53:58 2002
++++ imap/lmtpengine.h	Thu Feb 21 14:16:52 2002
+@@ -44,7 +44,7 @@
+ #define LMTPENGINE_H
+ 
+ /* configuration parameters */
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd2/files/patch-bc b/mail/cyrus-imapd2/files/patch-bc
index f31ed31d722f..ce5594805a0b 100644
--- a/mail/cyrus-imapd2/files/patch-bc
+++ b/mail/cyrus-imapd2/files/patch-bc
@@ -1,13 +1,13 @@
 Index: imap/Makefile.in
 diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Dec 19 05:27:14 2000
-+++ imap/Makefile.in	Thu Jan  4 23:30:15 2001
-@@ -64,7 +64,7 @@
+--- imap/Makefile.in.orig	Fri Apr 19 02:35:26 2002
++++ imap/Makefile.in	Thu May  2 04:02:37 2002
+@@ -61,7 +61,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- 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 @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
  IMAP_LIBS = @IMAP_LIBS@
  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd2/files/patch-dc b/mail/cyrus-imapd2/files/patch-dc
index c913dc4f35ee..4c2865a19c62 100644
--- a/mail/cyrus-imapd2/files/patch-dc
+++ b/mail/cyrus-imapd2/files/patch-dc
@@ -1,13 +1,13 @@
 Index: master/Makefile.in
 diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Dec 15 04:26:50 2000
-+++ master/Makefile.in	Sat Jan  6 06:08:21 2001
+--- master/Makefile.in.orig	Wed Dec 12 02:03:08 2001
++++ master/Makefile.in	Wed Dec 12 02:05:57 2001
 @@ -52,7 +52,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = @DEPLIBS@
+ CPPFLAGS = -I. -I.. -I../lib -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
  
diff --git a/mail/cyrus-imapd2/files/patch-df b/mail/cyrus-imapd2/files/patch-df
index 93540e209402..1b092230a8f3 100644
--- a/mail/cyrus-imapd2/files/patch-df
+++ b/mail/cyrus-imapd2/files/patch-df
@@ -1,20 +1,15 @@
 Index: master/service.c
-===================================================================
-RCS file: /usr/home/ume/ncvs/src/cyrus-imapd/master/service.c,v
-retrieving revision 1.2
-diff -u -r1.2 service.c
---- master/service.c	2001/02/01 14:11:43	1.2
-+++ master/service.c	2001/02/01 22:10:35
-@@ -99,7 +99,13 @@
+diff -u master/service.c.orig master/service.c
+--- master/service.c.orig	Mon Dec 17 18:08:07 2001
++++ master/service.c	Mon Dec 17 18:08:38 2001
+@@ -101,7 +101,11 @@
      
      /* is this a connection from the local host? */
      if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
 -	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
 +	switch (((struct sockaddr *)&sin)->sa_family) {
 +	case AF_INET:
-+#ifdef INET6
 +	case AF_INET6:
-+#endif
 +	    break;
 +	default:
  	    return 1;
diff --git a/mail/cyrus-imapd2/files/patch-dh b/mail/cyrus-imapd2/files/patch-dh
new file mode 100644
index 000000000000..fc6d23de6227
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-dh
@@ -0,0 +1,15 @@
+Index: lib/cyrusdb_skiplist.c
+diff -u lib/cyrusdb_skiplist.c.orig lib/cyrusdb_skiplist.c
+--- lib/cyrusdb_skiplist.c.orig	Wed Apr 24 03:25:48 2002
++++ lib/cyrusdb_skiplist.c	Thu May  2 04:18:15 2002
+@@ -67,6 +67,10 @@
+ #include "lock.h"
+ #include "retry.h"
+ 
++#ifndef O_DSYNC
++#define O_DSYNC	O_FSYNC
++#endif
++
+ #define PROB (0.5)
+ 
+ /* 
diff --git a/mail/cyrus-imapd2/files/patch-di b/mail/cyrus-imapd2/files/patch-di
new file mode 100644
index 000000000000..ba35e969ab60
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-di
@@ -0,0 +1,13 @@
+Index: notifyd/notify_mailto.c
+diff -u notifyd/notify_mailto.c.orig notifyd/notify_mailto.c
+--- notifyd/notify_mailto.c.orig	Tue Mar 19 00:14:17 2002
++++ notifyd/notify_mailto.c	Thu May  2 03:51:15 2002
+@@ -56,7 +56,7 @@
+ #include "rfc822date.h"
+ #include <sieve_interface.h>
+ 
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd2/pkg-install b/mail/cyrus-imapd2/pkg-install
index 154d83b03038..20f1fbb0ff7c 100644
--- a/mail/cyrus-imapd2/pkg-install
+++ b/mail/cyrus-imapd2/pkg-install
@@ -43,8 +43,8 @@ checkfile() {
 # Install timseived's Cyrus.conf file
 
 cyrus_conf() {
-        if [ ! -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf ]; then
-                echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Cyrus.conf
+        if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
+                echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
         fi
 }
 
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
index ab8b7c30120d..33253d4af4a9 100644
--- a/mail/cyrus-imapd2/pkg-plist
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -1,9 +1,17 @@
 bin/cyradm
 bin/imtest
 bin/installsieve
+bin/lmtptest
+bin/mupdatetest
+bin/pop3test
 bin/sieveshell
+bin/sivtest
+bin/smtptest
+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/cyrquota
 cyrus/bin/deliver
@@ -15,9 +23,12 @@ cyrus/bin/lmtpd
 cyrus/bin/master
 cyrus/bin/mbpath
 cyrus/bin/mkimap
+cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/reconstruct
+cyrus/bin/squatter
 cyrus/bin/timsieved
+cyrus/bin/tls_prune
 @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
 etc/cyrus.conf.dist
 @exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
@@ -38,38 +49,36 @@ 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
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@@ -80,7 +89,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/mana
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 7b263544d420..18fe5e214488 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.16
-PORTREVISION=	2
+PORTVERSION= 	2.1.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20020118.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20020630.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl \
+LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
 		db3.2:${PORTSDIR}/databases/db3
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
+		${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	YES
@@ -33,68 +33,78 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 
 .if defined(WITH_SNMP)
 # It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+#CONFIGURE_ENV=	LIBS=-lkvm
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
 
-MAN1=		cyradm.1 imtest.1 installsieve.1
+MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 pop3test.1 \
+		sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
-		cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
-		syncnews.8 timsieved.8
+MAN8=		arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
+		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
+		deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
+		mbpath.8 notifyd.8 pop3d.8 reconstruct.8 rmnews.8 \
+		squatter.8 syncnews.8 timsieved.8 tls_prune.8
 
-DOCS=		HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
-		changes copyrights feedback index install install-admin-mb \
-		install-compile install-configure install-murder install-perf \
+DOCS=		altnamespace anoncvs bugs changes faq feedback index \
+		install install-admin-mb install-auth install-compile \
+		install-configure install-murder install-perf \
 		install-prereq install-sieve install-snmpmon install-testing \
-		install-upgrade mailing-list notes os overview questions \
-		quota-extension readme server-design sieve sieve-protocol
-HTDOCS=		anoncvs bugs changes faq feedback index install-admin-mb \
-		install-auth install-compile install-configure install-murder \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install mailing-list man \
-		notes os overview questions readme sieve-protocol sieve specs
+		install-upgrade mailing-list man notes os overview questions \
+		readme sieve sieve-protocol specs
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
 
 post-patch:
 		@${SED} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/tools/mkimap \
 			> ${WRKSRC}/tools/mkimap.new
 		@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+		@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+.if ${OSVERSION} < 500000
+		@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
+			> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new
+		@${MV} ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
+.endif
 
 post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+		@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/man
-		${MKDIR} ${PREFIX}/share/doc/cyrus/text
-.for file in ${HTDOCS}
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/man
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/text
+.for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/${file}.html >>${TMPPLIST}
 .endfor
 .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
 		ofile=`echo ${file} | sed s/cyrquota/quota/`; \
 		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
-		${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
+			${PREFIX}/share/doc/cyrus-imapd2/man/$${ofile}.html; \
+		${ECHO} share/doc/cyrus-imapd2/man/$${ofile}.html \
+			>>${TMPPLIST}; \
 		fi
 .endfor
 		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/cyrusv2.mc >>${TMPPLIST}
 .for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
-			${PREFIX}/share/doc/cyrus/text
-		@${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2/text
+		@${ECHO} share/doc/cyrus-imapd2/text/${file} >>${TMPPLIST}
 .endfor
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/text" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2" >>${TMPPLIST}
 .endif
 		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
 			${PREFIX}/etc/rc.d/imapd.sh.sample
@@ -107,4 +117,4 @@ post-install:
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index 75d8b622c99b..7cdf528e94e2 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.16.tar.gz) = ce20ec83762e89bcb98567f396668b8d
-MD5 (cyrus-imapd-2.0.16-ipv6-20020118.diff.gz) = 9752c325aeeeb39b82c7a427fee076b2
+MD5 (cyrus-imapd-2.1.5.tar.gz) = 86eb126e818f998cf7ff2e1fe1a09cb3
+MD5 (cyrus-imapd-2.1.5-ipv6-20020630.diff.gz) = 699d0281d13aa50044143e013045fd09
diff --git a/mail/cyrus-imapd22/files/imapd.conf b/mail/cyrus-imapd22/files/imapd.conf
index c9de5a5a31b4..8384d7892b02 100644
--- a/mail/cyrus-imapd22/files/imapd.conf
+++ b/mail/cyrus-imapd22/files/imapd.conf
@@ -17,14 +17,45 @@ configdirectory: /var/imap
 #
 partition-default: /var/spool/imap
 
+# Use the UNIX separator character '/' for delimiting levels of
+# mailbox hierarchy.  The default is to use the netnews separator
+# character '.'.
+#unixhierarchysep: no
+
+# Use the alternate IMAP namespace, where personal folders reside at
+# the same level in the hierarchy as INBOX.
+#
+#altnamespace: no
+
+# If using the alternate IMAP namespace, the prefix for the other
+# users namespace.  The hierarchy delimiter will be automatically
+# appended.
+#
+#userprefix: Other Users
+
+# If using the alternate IMAP namespace, the prefix for the shared
+# namespace.  The hierarchy delimiter will be automatically appended.
+#
+#sharedprefix: Shared Folders
+
 # The umask value used by various Cyrus IMAP programs
 #
 #umask: 077
 
+# This is the hostname visible in the greeting messages of the POP,
+# IMAP and LMTP daemons. If it is unset, then the result returned from
+# gethostname(2) is used.
+#
+#servername: <result returned by gethostname(2)>
+
 # Whether to allow anonymous logins
 #
 #allowanonymouslogin: no
 
+# Allow the use of the SASL PLAIN mechanism.
+#
+#allowplaintext: yes
+
 # The percent  of  quota  utilization  over  which  the server generates
 # warnings.
 #
@@ -35,6 +66,20 @@ partition-default: /var/spool/imap
 #
 #timeout: 30
 
+# The interval (in seconds) for polling the mailbox for changes while
+# running the IDLE command.  This option is used when idled can not be
+# contacted or when polling is used exclusively.  The minimum value is
+# 1.  A value of 0 will disable polling (and disable IDLE if polling
+# is the only method available).
+#
+#imapidlepoll: 60
+
+# If enabled, the server responds to an ID command with a parameter
+# list containing: version, vendor, support-url, os, os-version,
+# command, arguments, environment.  Otherwise the server returns NIL.
+#
+#imapidresponse: yes
+
 # Set the length of the POP server's inactivity autologout timer, in
 # minutes.  The minimum value is 10, the default.
 #
@@ -45,6 +90,16 @@ partition-default: /var/spool/imap
 #
 #popminpoll: 0
 
+# The number of days advertised as being the minimum a message may be
+# left on the POP server before it is deleted (via the CAPA command,
+# defined in the POP3 Extension Mechanism, which some clients may
+# support).  "NEVER", the default, may be specified with a negative
+# number.  The Cyrus POP3 server never deletes mail, no matter what
+# the value of this parameter is.  However, if a site implements a
+# less liberal policy, it needs to change this parameter accordingly.
+#
+#popexpiretime: 0
+
 # The list of userids with administrative rights.  Separate each userid
 # with a space.  We recommend that administrator userids be separate from 
 # standard userids.  Sites using Kerberos authentication may use separate
@@ -52,11 +107,11 @@ partition-default: /var/spool/imap
 #
 #admins: <none>
 
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
+# A list of users and groups that are allowed to proxy for other
+# users, seperated by spaces.  Any user listed in this will be allowed
+# to login for any other user: use with caution.
 #
-#imspservers: <none>
+#proxyservers: <none>
 
 # The Access Control List (ACL) placed on a newly-created (non-user)
 # mailbox that does not have a parent mailbox.
@@ -90,9 +145,9 @@ partition-default: /var/spool/imap
 #
 #plaintextloginpause: 0
 
-# The pathname of srvtab file containing the server's private  key.  This 
-# option is only used when the server is compiled with Kerberos
-# authentication.
+# The pathname of srvtab file containing the server's private key.
+# This option is passed to the SASL library and overrides its default
+# setting.
 #
 #srvtab: /etc/srvtab
 
@@ -108,8 +163,64 @@ partition-default: /var/spool/imap
 #
 #loginuseacl: no
 
-# If enabled, deliver wil look for Sieve scripts in user's home directories:
-# ~user/.sieve.
+# If enabled, lmtpd attempts to only write one copy of a message per
+# partition and create hard links, resulting in a potentially large
+# disk savings.
+#
+#singleinstancestore: yes
+
+# If enabled, lmtpd will suppress delivery of a message to a mailbox
+# if a message with the same message-id (or resent-message-id) is
+# recorded as having already been delivered to the mailbox.  Records
+# the mailbox and message-id/resent-message-id of all successful
+# deliveries.
+# Note that duplicate delivery suppression is required for Sieve.
+# Disabling duplicate delivery suppression will also disable Sieve,
+# and as such should only be disabled for performance reasons.
+#
+#duplicatesuppression: yes
+
+# If enabled, lmtpd rejects messages with 8-bit characters in the
+# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
+# soultion to non-ASCII characters in headers is offered by RFC 2047
+# and its predecessors.)
+#
+#reject8bit: no
+
+# Maximum incoming LMTP message size.  If set, lmtpd will reject
+# messages larger than maxmessagesize bytes.  The default is to allow
+# messages of any size.
+#
+#maxmessagesize: <unlimited>
+
+# Userid used to deliver messages to shared folders.  For example, if
+# set to "bb", email sent to "bb+shared.blah" would be delivered to
+# the "shared.blah" folder.  By default, an email address of
+# "+shared.blah" would be used.
+#postuser: <none>
+
+# If enabled at compile time, this specifies a URL to reply when
+# Netscape asks the server where the mail administration HTTP server
+# is.  The default is a site at CMU with a hopefully informative
+# message; administrators should set this to a local resource with
+# some information of greater use.
+#
+#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
+
+# Notifyd(8) method to use for "MAIL" notifications.  If not set,
+# "MAIL" notifications are disabled.
+#
+#mailnotifier: <no default>
+
+# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
+# "SIEVE" notifications are disabled.
+#
+# This method is only used when no method is specified in the script.
+#
+#sievenotifier: <no default>
+
+# If enabled, lmtpd will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
 #
 sieveusehomedir: false
 
@@ -119,26 +230,144 @@ sieveusehomedir: false
 #
 sievedir: /var/imap/sieve
 
+# The pathname of the sendmail executable.  Sieve uses sendmail for
+# sending rejections, redirects and vaca- tion responses.
+#
+#sendmail: /usr/sbin/sendmail
+
+# Username that is used as the 'From' address in rejection MDNs
+# produced by sieve.
+#
+#postmaster: postmaster
+
 # If enabled, the partitions will also be hashed, in addition to the hashing
 # done on configuration directories.  This is recommended if one partition has
 # a very bushy mailbox tree.
 #
 #hashimapspool: false
 
+# Maximum size (in kilobytes) any sieve script can be, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscriptsize: 32
+
+# Maximum number of sieve scripts any user may have, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscripts: 5
+
+# Maximum SSF (security strength factor) that the server will allow a
+# client to negotiate.
+#
+#sasl_maximum_layer: 256
+
+# The minimum SSF that the server will allow a client to negotiate.  A
+# value of 1 requires integrity protection; any higher value requires
+# some amount of encryption.
+#
+#sasl_minimum_layer: 0
+
 # The mechanism used by the server to verify plaintext passwords.  Possible
-# values also include "PAM", "sasldb", "kerberos_v4", "passwd", and "shadow"
+# values include "auxprop", "saslauthd", and "pwcheck"
 #
-sasl_pwcheck_method: pwcheck
+sasl_pwcheck_method: saslauthd
 
-# If  enabled,  the  SASL library will automatically create authentication
+# If enabled,  the SASL library will automatically create authentication
 # secrets when given a plaintext password.  See the SASL documentation.
 #
 #sasl_auto_transition: no
 
-# If you wish to enable TLS/SSL, put CERT into following place, then
-# uncomment this.
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
+# Location of the opiekeys file
+#
+#sasl_opiekeys: /etc/opiekeys
+
+# File containing the global certificate used for ALL services (imap,
+# pop3, lmtp).
+#
+#tls_cert_file: <none>
+
+# File containing the private key belonging to the global server
+# certificate.
+#
+#tls_key_file: <none>
+
+# File containing the certificate used for imap ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for imap.
+#
+#tls_imap_cert_file: <none>
+
+# File containing the private key belonging to the imap-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for imap.
+#
+#tls_imap_key_file: <none>
+
+# File containing the certificate used for pop3 ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for pop3.
+#
+#tls_pop3_cert_file: <none>
+
+# File containing the private key belonging to the pop3-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for pop3.
+#
+#tls_pop3_key_file: <none>
+
+# File containing the certificate used for lmtp ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for lmtp.
+#
+#tls_lmtp_cert_file: <none>
+
+# File containing the private key belonging to the lmtp-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for lmtp.
+#
+#tls_lmtp_key_file: <none>
+
+# File containing the certificate used for sieve ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for sieve.
+#
+#tls_sieve_cert_file: <none>
+
+# File containing the private key belonging to the sieve-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for sieve.
+#
+#tls_sieve_key_file: <none>
+
+# File containing one or more Certificate Authority (CA) certificates.
+#
+#tls_ca_file: <none>
+
+# Path to directory with certificates of CAs.
+#
+#tls_ca_path: <none>
+
+# The length of time (in minutes) that a TLS session will be cached
+# for later reuse.  The maximum value is 1440 (24 hours), the default.
+# A value of 0 will disable session caching.
+#
+#tls_session_timeout: 1440
+
+# The right that a user needs to delete a mailbox.
+#
+#deleteright: c
+
+# Unix domain socket that lmtpd listens on, used by deliver(8).
+#
+#lmtpsocket: /var/imap/socket/lmtp
+
+# Unix domain socket that idled listens on.
+#
+#idlesocket: /var/imap/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+#
+#notifysocket: /var/imap/socket/notify
 
 #
 # EOF
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
index 630aaec33cc9..6332c2f16e76 100644
--- a/mail/cyrus-imapd22/files/patch-ac
+++ b/mail/cyrus-imapd22/files/patch-ac
@@ -1,13 +1,13 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Thu Dec 21 06:39:31 2000
-+++ configure	Thu Jan  4 23:22:47 2001
-@@ -4178,7 +4178,7 @@
- 	cmu_saved_LIBS=$LIBS
- 	if test -d ${with_sasl}; then
-           ac_cv_sasl_where_lib=${with_sasl}/lib
--          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
+--- configure.orig	Wed Dec 12 15:50:29 2001
++++ configure	Wed Dec 12 15:51:15 2001
+@@ -5542,7 +5542,7 @@
+ #define HAVE_UCDSNMP 1
+ EOF
  
- 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
- 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
+-    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
++    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
+     echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
+ echo "configure:5548: checking for rpmdbOpen in -lrpm" >&5
+ ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd22/files/patch-af b/mail/cyrus-imapd22/files/patch-af
deleted file mode 100644
index 0a8d78f88d0c..000000000000
--- a/mail/cyrus-imapd22/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpd.c
-diff -u imap/lmtpd.c.orig imap/lmtpd.c
---- imap/lmtpd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpd.c	Thu Jan  4 23:26:22 2001
-@@ -407,7 +407,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd22/files/patch-ag b/mail/cyrus-imapd22/files/patch-ag
deleted file mode 100644
index d22ee0d59350..000000000000
--- a/mail/cyrus-imapd22/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpproxyd.c
-diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c
---- imap/lmtpproxyd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpproxyd.c	Thu Jan  4 23:26:48 2001
-@@ -398,7 +398,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd22/files/patch-ah b/mail/cyrus-imapd22/files/patch-ah
new file mode 100644
index 000000000000..52c44e1c25db
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-ah
@@ -0,0 +1,13 @@
+Index: imap/lmtpengine.h
+diff -u imap/lmtpengine.h.orig imap/lmtpengine.h
+--- imap/lmtpengine.h.orig	Sun Feb 10 10:53:58 2002
++++ imap/lmtpengine.h	Thu Feb 21 14:16:52 2002
+@@ -44,7 +44,7 @@
+ #define LMTPENGINE_H
+ 
+ /* configuration parameters */
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd22/files/patch-bc b/mail/cyrus-imapd22/files/patch-bc
index f31ed31d722f..ce5594805a0b 100644
--- a/mail/cyrus-imapd22/files/patch-bc
+++ b/mail/cyrus-imapd22/files/patch-bc
@@ -1,13 +1,13 @@
 Index: imap/Makefile.in
 diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Dec 19 05:27:14 2000
-+++ imap/Makefile.in	Thu Jan  4 23:30:15 2001
-@@ -64,7 +64,7 @@
+--- imap/Makefile.in.orig	Fri Apr 19 02:35:26 2002
++++ imap/Makefile.in	Thu May  2 04:02:37 2002
+@@ -61,7 +61,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- 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 @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
  IMAP_LIBS = @IMAP_LIBS@
  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd22/files/patch-dc b/mail/cyrus-imapd22/files/patch-dc
index c913dc4f35ee..4c2865a19c62 100644
--- a/mail/cyrus-imapd22/files/patch-dc
+++ b/mail/cyrus-imapd22/files/patch-dc
@@ -1,13 +1,13 @@
 Index: master/Makefile.in
 diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Dec 15 04:26:50 2000
-+++ master/Makefile.in	Sat Jan  6 06:08:21 2001
+--- master/Makefile.in.orig	Wed Dec 12 02:03:08 2001
++++ master/Makefile.in	Wed Dec 12 02:05:57 2001
 @@ -52,7 +52,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = @DEPLIBS@
+ CPPFLAGS = -I. -I.. -I../lib -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
  
diff --git a/mail/cyrus-imapd22/files/patch-df b/mail/cyrus-imapd22/files/patch-df
index 93540e209402..1b092230a8f3 100644
--- a/mail/cyrus-imapd22/files/patch-df
+++ b/mail/cyrus-imapd22/files/patch-df
@@ -1,20 +1,15 @@
 Index: master/service.c
-===================================================================
-RCS file: /usr/home/ume/ncvs/src/cyrus-imapd/master/service.c,v
-retrieving revision 1.2
-diff -u -r1.2 service.c
---- master/service.c	2001/02/01 14:11:43	1.2
-+++ master/service.c	2001/02/01 22:10:35
-@@ -99,7 +99,13 @@
+diff -u master/service.c.orig master/service.c
+--- master/service.c.orig	Mon Dec 17 18:08:07 2001
++++ master/service.c	Mon Dec 17 18:08:38 2001
+@@ -101,7 +101,11 @@
      
      /* is this a connection from the local host? */
      if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
 -	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
 +	switch (((struct sockaddr *)&sin)->sa_family) {
 +	case AF_INET:
-+#ifdef INET6
 +	case AF_INET6:
-+#endif
 +	    break;
 +	default:
  	    return 1;
diff --git a/mail/cyrus-imapd22/files/patch-dh b/mail/cyrus-imapd22/files/patch-dh
new file mode 100644
index 000000000000..fc6d23de6227
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-dh
@@ -0,0 +1,15 @@
+Index: lib/cyrusdb_skiplist.c
+diff -u lib/cyrusdb_skiplist.c.orig lib/cyrusdb_skiplist.c
+--- lib/cyrusdb_skiplist.c.orig	Wed Apr 24 03:25:48 2002
++++ lib/cyrusdb_skiplist.c	Thu May  2 04:18:15 2002
+@@ -67,6 +67,10 @@
+ #include "lock.h"
+ #include "retry.h"
+ 
++#ifndef O_DSYNC
++#define O_DSYNC	O_FSYNC
++#endif
++
+ #define PROB (0.5)
+ 
+ /* 
diff --git a/mail/cyrus-imapd22/files/patch-di b/mail/cyrus-imapd22/files/patch-di
new file mode 100644
index 000000000000..ba35e969ab60
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-di
@@ -0,0 +1,13 @@
+Index: notifyd/notify_mailto.c
+diff -u notifyd/notify_mailto.c.orig notifyd/notify_mailto.c
+--- notifyd/notify_mailto.c.orig	Tue Mar 19 00:14:17 2002
++++ notifyd/notify_mailto.c	Thu May  2 03:51:15 2002
+@@ -56,7 +56,7 @@
+ #include "rfc822date.h"
+ #include <sieve_interface.h>
+ 
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd22/pkg-install b/mail/cyrus-imapd22/pkg-install
index 154d83b03038..20f1fbb0ff7c 100644
--- a/mail/cyrus-imapd22/pkg-install
+++ b/mail/cyrus-imapd22/pkg-install
@@ -43,8 +43,8 @@ checkfile() {
 # Install timseived's Cyrus.conf file
 
 cyrus_conf() {
-        if [ ! -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf ]; then
-                echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Cyrus.conf
+        if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
+                echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
         fi
 }
 
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index ab8b7c30120d..33253d4af4a9 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -1,9 +1,17 @@
 bin/cyradm
 bin/imtest
 bin/installsieve
+bin/lmtptest
+bin/mupdatetest
+bin/pop3test
 bin/sieveshell
+bin/sivtest
+bin/smtptest
+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/cyrquota
 cyrus/bin/deliver
@@ -15,9 +23,12 @@ cyrus/bin/lmtpd
 cyrus/bin/master
 cyrus/bin/mbpath
 cyrus/bin/mkimap
+cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/reconstruct
+cyrus/bin/squatter
 cyrus/bin/timsieved
+cyrus/bin/tls_prune
 @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
 etc/cyrus.conf.dist
 @exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
@@ -38,38 +49,36 @@ 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
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@@ -80,7 +89,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/mana
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 7b263544d420..18fe5e214488 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.16
-PORTREVISION=	2
+PORTVERSION= 	2.1.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20020118.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20020630.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl \
+LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
 		db3.2:${PORTSDIR}/databases/db3
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
+		${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	YES
@@ -33,68 +33,78 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 
 .if defined(WITH_SNMP)
 # It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+#CONFIGURE_ENV=	LIBS=-lkvm
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
 
-MAN1=		cyradm.1 imtest.1 installsieve.1
+MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 pop3test.1 \
+		sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
-		cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
-		syncnews.8 timsieved.8
+MAN8=		arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
+		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
+		deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
+		mbpath.8 notifyd.8 pop3d.8 reconstruct.8 rmnews.8 \
+		squatter.8 syncnews.8 timsieved.8 tls_prune.8
 
-DOCS=		HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
-		changes copyrights feedback index install install-admin-mb \
-		install-compile install-configure install-murder install-perf \
+DOCS=		altnamespace anoncvs bugs changes faq feedback index \
+		install install-admin-mb install-auth install-compile \
+		install-configure install-murder install-perf \
 		install-prereq install-sieve install-snmpmon install-testing \
-		install-upgrade mailing-list notes os overview questions \
-		quota-extension readme server-design sieve sieve-protocol
-HTDOCS=		anoncvs bugs changes faq feedback index install-admin-mb \
-		install-auth install-compile install-configure install-murder \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install mailing-list man \
-		notes os overview questions readme sieve-protocol sieve specs
+		install-upgrade mailing-list man notes os overview questions \
+		readme sieve sieve-protocol specs
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
 
 post-patch:
 		@${SED} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/tools/mkimap \
 			> ${WRKSRC}/tools/mkimap.new
 		@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+		@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+.if ${OSVERSION} < 500000
+		@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
+			> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new
+		@${MV} ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
+.endif
 
 post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+		@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/man
-		${MKDIR} ${PREFIX}/share/doc/cyrus/text
-.for file in ${HTDOCS}
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/man
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/text
+.for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/${file}.html >>${TMPPLIST}
 .endfor
 .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
 		ofile=`echo ${file} | sed s/cyrquota/quota/`; \
 		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
-		${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
+			${PREFIX}/share/doc/cyrus-imapd2/man/$${ofile}.html; \
+		${ECHO} share/doc/cyrus-imapd2/man/$${ofile}.html \
+			>>${TMPPLIST}; \
 		fi
 .endfor
 		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/cyrusv2.mc >>${TMPPLIST}
 .for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
-			${PREFIX}/share/doc/cyrus/text
-		@${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2/text
+		@${ECHO} share/doc/cyrus-imapd2/text/${file} >>${TMPPLIST}
 .endfor
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/text" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2" >>${TMPPLIST}
 .endif
 		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
 			${PREFIX}/etc/rc.d/imapd.sh.sample
@@ -107,4 +117,4 @@ post-install:
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index 75d8b622c99b..7cdf528e94e2 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.16.tar.gz) = ce20ec83762e89bcb98567f396668b8d
-MD5 (cyrus-imapd-2.0.16-ipv6-20020118.diff.gz) = 9752c325aeeeb39b82c7a427fee076b2
+MD5 (cyrus-imapd-2.1.5.tar.gz) = 86eb126e818f998cf7ff2e1fe1a09cb3
+MD5 (cyrus-imapd-2.1.5-ipv6-20020630.diff.gz) = 699d0281d13aa50044143e013045fd09
diff --git a/mail/cyrus-imapd23/files/imapd.conf b/mail/cyrus-imapd23/files/imapd.conf
index c9de5a5a31b4..8384d7892b02 100644
--- a/mail/cyrus-imapd23/files/imapd.conf
+++ b/mail/cyrus-imapd23/files/imapd.conf
@@ -17,14 +17,45 @@ configdirectory: /var/imap
 #
 partition-default: /var/spool/imap
 
+# Use the UNIX separator character '/' for delimiting levels of
+# mailbox hierarchy.  The default is to use the netnews separator
+# character '.'.
+#unixhierarchysep: no
+
+# Use the alternate IMAP namespace, where personal folders reside at
+# the same level in the hierarchy as INBOX.
+#
+#altnamespace: no
+
+# If using the alternate IMAP namespace, the prefix for the other
+# users namespace.  The hierarchy delimiter will be automatically
+# appended.
+#
+#userprefix: Other Users
+
+# If using the alternate IMAP namespace, the prefix for the shared
+# namespace.  The hierarchy delimiter will be automatically appended.
+#
+#sharedprefix: Shared Folders
+
 # The umask value used by various Cyrus IMAP programs
 #
 #umask: 077
 
+# This is the hostname visible in the greeting messages of the POP,
+# IMAP and LMTP daemons. If it is unset, then the result returned from
+# gethostname(2) is used.
+#
+#servername: <result returned by gethostname(2)>
+
 # Whether to allow anonymous logins
 #
 #allowanonymouslogin: no
 
+# Allow the use of the SASL PLAIN mechanism.
+#
+#allowplaintext: yes
+
 # The percent  of  quota  utilization  over  which  the server generates
 # warnings.
 #
@@ -35,6 +66,20 @@ partition-default: /var/spool/imap
 #
 #timeout: 30
 
+# The interval (in seconds) for polling the mailbox for changes while
+# running the IDLE command.  This option is used when idled can not be
+# contacted or when polling is used exclusively.  The minimum value is
+# 1.  A value of 0 will disable polling (and disable IDLE if polling
+# is the only method available).
+#
+#imapidlepoll: 60
+
+# If enabled, the server responds to an ID command with a parameter
+# list containing: version, vendor, support-url, os, os-version,
+# command, arguments, environment.  Otherwise the server returns NIL.
+#
+#imapidresponse: yes
+
 # Set the length of the POP server's inactivity autologout timer, in
 # minutes.  The minimum value is 10, the default.
 #
@@ -45,6 +90,16 @@ partition-default: /var/spool/imap
 #
 #popminpoll: 0
 
+# The number of days advertised as being the minimum a message may be
+# left on the POP server before it is deleted (via the CAPA command,
+# defined in the POP3 Extension Mechanism, which some clients may
+# support).  "NEVER", the default, may be specified with a negative
+# number.  The Cyrus POP3 server never deletes mail, no matter what
+# the value of this parameter is.  However, if a site implements a
+# less liberal policy, it needs to change this parameter accordingly.
+#
+#popexpiretime: 0
+
 # The list of userids with administrative rights.  Separate each userid
 # with a space.  We recommend that administrator userids be separate from 
 # standard userids.  Sites using Kerberos authentication may use separate
@@ -52,11 +107,11 @@ partition-default: /var/spool/imap
 #
 #admins: <none>
 
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
+# A list of users and groups that are allowed to proxy for other
+# users, seperated by spaces.  Any user listed in this will be allowed
+# to login for any other user: use with caution.
 #
-#imspservers: <none>
+#proxyservers: <none>
 
 # The Access Control List (ACL) placed on a newly-created (non-user)
 # mailbox that does not have a parent mailbox.
@@ -90,9 +145,9 @@ partition-default: /var/spool/imap
 #
 #plaintextloginpause: 0
 
-# The pathname of srvtab file containing the server's private  key.  This 
-# option is only used when the server is compiled with Kerberos
-# authentication.
+# The pathname of srvtab file containing the server's private key.
+# This option is passed to the SASL library and overrides its default
+# setting.
 #
 #srvtab: /etc/srvtab
 
@@ -108,8 +163,64 @@ partition-default: /var/spool/imap
 #
 #loginuseacl: no
 
-# If enabled, deliver wil look for Sieve scripts in user's home directories:
-# ~user/.sieve.
+# If enabled, lmtpd attempts to only write one copy of a message per
+# partition and create hard links, resulting in a potentially large
+# disk savings.
+#
+#singleinstancestore: yes
+
+# If enabled, lmtpd will suppress delivery of a message to a mailbox
+# if a message with the same message-id (or resent-message-id) is
+# recorded as having already been delivered to the mailbox.  Records
+# the mailbox and message-id/resent-message-id of all successful
+# deliveries.
+# Note that duplicate delivery suppression is required for Sieve.
+# Disabling duplicate delivery suppression will also disable Sieve,
+# and as such should only be disabled for performance reasons.
+#
+#duplicatesuppression: yes
+
+# If enabled, lmtpd rejects messages with 8-bit characters in the
+# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
+# soultion to non-ASCII characters in headers is offered by RFC 2047
+# and its predecessors.)
+#
+#reject8bit: no
+
+# Maximum incoming LMTP message size.  If set, lmtpd will reject
+# messages larger than maxmessagesize bytes.  The default is to allow
+# messages of any size.
+#
+#maxmessagesize: <unlimited>
+
+# Userid used to deliver messages to shared folders.  For example, if
+# set to "bb", email sent to "bb+shared.blah" would be delivered to
+# the "shared.blah" folder.  By default, an email address of
+# "+shared.blah" would be used.
+#postuser: <none>
+
+# If enabled at compile time, this specifies a URL to reply when
+# Netscape asks the server where the mail administration HTTP server
+# is.  The default is a site at CMU with a hopefully informative
+# message; administrators should set this to a local resource with
+# some information of greater use.
+#
+#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
+
+# Notifyd(8) method to use for "MAIL" notifications.  If not set,
+# "MAIL" notifications are disabled.
+#
+#mailnotifier: <no default>
+
+# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
+# "SIEVE" notifications are disabled.
+#
+# This method is only used when no method is specified in the script.
+#
+#sievenotifier: <no default>
+
+# If enabled, lmtpd will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
 #
 sieveusehomedir: false
 
@@ -119,26 +230,144 @@ sieveusehomedir: false
 #
 sievedir: /var/imap/sieve
 
+# The pathname of the sendmail executable.  Sieve uses sendmail for
+# sending rejections, redirects and vaca- tion responses.
+#
+#sendmail: /usr/sbin/sendmail
+
+# Username that is used as the 'From' address in rejection MDNs
+# produced by sieve.
+#
+#postmaster: postmaster
+
 # If enabled, the partitions will also be hashed, in addition to the hashing
 # done on configuration directories.  This is recommended if one partition has
 # a very bushy mailbox tree.
 #
 #hashimapspool: false
 
+# Maximum size (in kilobytes) any sieve script can be, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscriptsize: 32
+
+# Maximum number of sieve scripts any user may have, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscripts: 5
+
+# Maximum SSF (security strength factor) that the server will allow a
+# client to negotiate.
+#
+#sasl_maximum_layer: 256
+
+# The minimum SSF that the server will allow a client to negotiate.  A
+# value of 1 requires integrity protection; any higher value requires
+# some amount of encryption.
+#
+#sasl_minimum_layer: 0
+
 # The mechanism used by the server to verify plaintext passwords.  Possible
-# values also include "PAM", "sasldb", "kerberos_v4", "passwd", and "shadow"
+# values include "auxprop", "saslauthd", and "pwcheck"
 #
-sasl_pwcheck_method: pwcheck
+sasl_pwcheck_method: saslauthd
 
-# If  enabled,  the  SASL library will automatically create authentication
+# If enabled,  the SASL library will automatically create authentication
 # secrets when given a plaintext password.  See the SASL documentation.
 #
 #sasl_auto_transition: no
 
-# If you wish to enable TLS/SSL, put CERT into following place, then
-# uncomment this.
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
+# Location of the opiekeys file
+#
+#sasl_opiekeys: /etc/opiekeys
+
+# File containing the global certificate used for ALL services (imap,
+# pop3, lmtp).
+#
+#tls_cert_file: <none>
+
+# File containing the private key belonging to the global server
+# certificate.
+#
+#tls_key_file: <none>
+
+# File containing the certificate used for imap ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for imap.
+#
+#tls_imap_cert_file: <none>
+
+# File containing the private key belonging to the imap-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for imap.
+#
+#tls_imap_key_file: <none>
+
+# File containing the certificate used for pop3 ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for pop3.
+#
+#tls_pop3_cert_file: <none>
+
+# File containing the private key belonging to the pop3-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for pop3.
+#
+#tls_pop3_key_file: <none>
+
+# File containing the certificate used for lmtp ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for lmtp.
+#
+#tls_lmtp_cert_file: <none>
+
+# File containing the private key belonging to the lmtp-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for lmtp.
+#
+#tls_lmtp_key_file: <none>
+
+# File containing the certificate used for sieve ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for sieve.
+#
+#tls_sieve_cert_file: <none>
+
+# File containing the private key belonging to the sieve-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for sieve.
+#
+#tls_sieve_key_file: <none>
+
+# File containing one or more Certificate Authority (CA) certificates.
+#
+#tls_ca_file: <none>
+
+# Path to directory with certificates of CAs.
+#
+#tls_ca_path: <none>
+
+# The length of time (in minutes) that a TLS session will be cached
+# for later reuse.  The maximum value is 1440 (24 hours), the default.
+# A value of 0 will disable session caching.
+#
+#tls_session_timeout: 1440
+
+# The right that a user needs to delete a mailbox.
+#
+#deleteright: c
+
+# Unix domain socket that lmtpd listens on, used by deliver(8).
+#
+#lmtpsocket: /var/imap/socket/lmtp
+
+# Unix domain socket that idled listens on.
+#
+#idlesocket: /var/imap/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+#
+#notifysocket: /var/imap/socket/notify
 
 #
 # EOF
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
index 630aaec33cc9..6332c2f16e76 100644
--- a/mail/cyrus-imapd23/files/patch-ac
+++ b/mail/cyrus-imapd23/files/patch-ac
@@ -1,13 +1,13 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Thu Dec 21 06:39:31 2000
-+++ configure	Thu Jan  4 23:22:47 2001
-@@ -4178,7 +4178,7 @@
- 	cmu_saved_LIBS=$LIBS
- 	if test -d ${with_sasl}; then
-           ac_cv_sasl_where_lib=${with_sasl}/lib
--          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
+--- configure.orig	Wed Dec 12 15:50:29 2001
++++ configure	Wed Dec 12 15:51:15 2001
+@@ -5542,7 +5542,7 @@
+ #define HAVE_UCDSNMP 1
+ EOF
  
- 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
- 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
+-    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
++    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
+     echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
+ echo "configure:5548: checking for rpmdbOpen in -lrpm" >&5
+ ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd23/files/patch-af b/mail/cyrus-imapd23/files/patch-af
deleted file mode 100644
index 0a8d78f88d0c..000000000000
--- a/mail/cyrus-imapd23/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpd.c
-diff -u imap/lmtpd.c.orig imap/lmtpd.c
---- imap/lmtpd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpd.c	Thu Jan  4 23:26:22 2001
-@@ -407,7 +407,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd23/files/patch-ag b/mail/cyrus-imapd23/files/patch-ag
deleted file mode 100644
index d22ee0d59350..000000000000
--- a/mail/cyrus-imapd23/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpproxyd.c
-diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c
---- imap/lmtpproxyd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpproxyd.c	Thu Jan  4 23:26:48 2001
-@@ -398,7 +398,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd23/files/patch-ah b/mail/cyrus-imapd23/files/patch-ah
new file mode 100644
index 000000000000..52c44e1c25db
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-ah
@@ -0,0 +1,13 @@
+Index: imap/lmtpengine.h
+diff -u imap/lmtpengine.h.orig imap/lmtpengine.h
+--- imap/lmtpengine.h.orig	Sun Feb 10 10:53:58 2002
++++ imap/lmtpengine.h	Thu Feb 21 14:16:52 2002
+@@ -44,7 +44,7 @@
+ #define LMTPENGINE_H
+ 
+ /* configuration parameters */
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd23/files/patch-bc b/mail/cyrus-imapd23/files/patch-bc
index f31ed31d722f..ce5594805a0b 100644
--- a/mail/cyrus-imapd23/files/patch-bc
+++ b/mail/cyrus-imapd23/files/patch-bc
@@ -1,13 +1,13 @@
 Index: imap/Makefile.in
 diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Dec 19 05:27:14 2000
-+++ imap/Makefile.in	Thu Jan  4 23:30:15 2001
-@@ -64,7 +64,7 @@
+--- imap/Makefile.in.orig	Fri Apr 19 02:35:26 2002
++++ imap/Makefile.in	Thu May  2 04:02:37 2002
+@@ -61,7 +61,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- 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 @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
  IMAP_LIBS = @IMAP_LIBS@
  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd23/files/patch-dc b/mail/cyrus-imapd23/files/patch-dc
index c913dc4f35ee..4c2865a19c62 100644
--- a/mail/cyrus-imapd23/files/patch-dc
+++ b/mail/cyrus-imapd23/files/patch-dc
@@ -1,13 +1,13 @@
 Index: master/Makefile.in
 diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Dec 15 04:26:50 2000
-+++ master/Makefile.in	Sat Jan  6 06:08:21 2001
+--- master/Makefile.in.orig	Wed Dec 12 02:03:08 2001
++++ master/Makefile.in	Wed Dec 12 02:05:57 2001
 @@ -52,7 +52,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = @DEPLIBS@
+ CPPFLAGS = -I. -I.. -I../lib -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
  
diff --git a/mail/cyrus-imapd23/files/patch-df b/mail/cyrus-imapd23/files/patch-df
index 93540e209402..1b092230a8f3 100644
--- a/mail/cyrus-imapd23/files/patch-df
+++ b/mail/cyrus-imapd23/files/patch-df
@@ -1,20 +1,15 @@
 Index: master/service.c
-===================================================================
-RCS file: /usr/home/ume/ncvs/src/cyrus-imapd/master/service.c,v
-retrieving revision 1.2
-diff -u -r1.2 service.c
---- master/service.c	2001/02/01 14:11:43	1.2
-+++ master/service.c	2001/02/01 22:10:35
-@@ -99,7 +99,13 @@
+diff -u master/service.c.orig master/service.c
+--- master/service.c.orig	Mon Dec 17 18:08:07 2001
++++ master/service.c	Mon Dec 17 18:08:38 2001
+@@ -101,7 +101,11 @@
      
      /* is this a connection from the local host? */
      if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
 -	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
 +	switch (((struct sockaddr *)&sin)->sa_family) {
 +	case AF_INET:
-+#ifdef INET6
 +	case AF_INET6:
-+#endif
 +	    break;
 +	default:
  	    return 1;
diff --git a/mail/cyrus-imapd23/files/patch-dh b/mail/cyrus-imapd23/files/patch-dh
new file mode 100644
index 000000000000..fc6d23de6227
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-dh
@@ -0,0 +1,15 @@
+Index: lib/cyrusdb_skiplist.c
+diff -u lib/cyrusdb_skiplist.c.orig lib/cyrusdb_skiplist.c
+--- lib/cyrusdb_skiplist.c.orig	Wed Apr 24 03:25:48 2002
++++ lib/cyrusdb_skiplist.c	Thu May  2 04:18:15 2002
+@@ -67,6 +67,10 @@
+ #include "lock.h"
+ #include "retry.h"
+ 
++#ifndef O_DSYNC
++#define O_DSYNC	O_FSYNC
++#endif
++
+ #define PROB (0.5)
+ 
+ /* 
diff --git a/mail/cyrus-imapd23/files/patch-di b/mail/cyrus-imapd23/files/patch-di
new file mode 100644
index 000000000000..ba35e969ab60
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-di
@@ -0,0 +1,13 @@
+Index: notifyd/notify_mailto.c
+diff -u notifyd/notify_mailto.c.orig notifyd/notify_mailto.c
+--- notifyd/notify_mailto.c.orig	Tue Mar 19 00:14:17 2002
++++ notifyd/notify_mailto.c	Thu May  2 03:51:15 2002
+@@ -56,7 +56,7 @@
+ #include "rfc822date.h"
+ #include <sieve_interface.h>
+ 
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd23/pkg-install b/mail/cyrus-imapd23/pkg-install
index 154d83b03038..20f1fbb0ff7c 100644
--- a/mail/cyrus-imapd23/pkg-install
+++ b/mail/cyrus-imapd23/pkg-install
@@ -43,8 +43,8 @@ checkfile() {
 # Install timseived's Cyrus.conf file
 
 cyrus_conf() {
-        if [ ! -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf ]; then
-                echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Cyrus.conf
+        if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
+                echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
         fi
 }
 
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index ab8b7c30120d..33253d4af4a9 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -1,9 +1,17 @@
 bin/cyradm
 bin/imtest
 bin/installsieve
+bin/lmtptest
+bin/mupdatetest
+bin/pop3test
 bin/sieveshell
+bin/sivtest
+bin/smtptest
+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/cyrquota
 cyrus/bin/deliver
@@ -15,9 +23,12 @@ cyrus/bin/lmtpd
 cyrus/bin/master
 cyrus/bin/mbpath
 cyrus/bin/mkimap
+cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/reconstruct
+cyrus/bin/squatter
 cyrus/bin/timsieved
+cyrus/bin/tls_prune
 @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
 etc/cyrus.conf.dist
 @exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
@@ -38,38 +49,36 @@ 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
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@@ -80,7 +89,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/mana
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 7b263544d420..18fe5e214488 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,21 +6,21 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.16
-PORTREVISION=	2
+PORTVERSION= 	2.1.5
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20020118.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20020630.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
-LIB_DEPENDS=	sasl.8:${PORTSDIR}/security/cyrus-sasl \
+LIB_DEPENDS=	sasl2.2:${PORTSDIR}/security/cyrus-sasl2 \
 		db3.2:${PORTSDIR}/databases/db3
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
-		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl
+		${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2
+RUN_DEPENDS=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	YES
@@ -33,68 +33,78 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 
 .if defined(WITH_SNMP)
 # It seems not compilable due to lack of auto_nlist_value() in libucdagent.
-CONFIGURE_ENV=	LIBS=-lkvm
+LIB_DEPENDS+=	netsnmp.5:${PORTSDIR}/net/net-snmp
+#CONFIGURE_ENV=	LIBS=-lkvm
 .else
 CONFIGURE_ARGS+=--with-ucdsnmp=no
 .endif
 
-MAN1=		cyradm.1 imtest.1 installsieve.1
+MAN1=		cyradm.1 imtest.1 installsieve.1 lmtptest.1 pop3test.1 \
+		sieveshell.1 sivtest.1 smtptest.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
-		cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
-		syncnews.8 timsieved.8
+MAN8=		arbitron.8 chk_cyrus.8 collectnews.8 ctl_cyrusdb.8 \
+		ctl_deliver.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
+		deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 \
+		mbpath.8 notifyd.8 pop3d.8 reconstruct.8 rmnews.8 \
+		squatter.8 syncnews.8 timsieved.8 tls_prune.8
 
-DOCS=		HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
-		changes copyrights feedback index install install-admin-mb \
-		install-compile install-configure install-murder install-perf \
+DOCS=		altnamespace anoncvs bugs changes faq feedback index \
+		install install-admin-mb install-auth install-compile \
+		install-configure install-murder install-perf \
 		install-prereq install-sieve install-snmpmon install-testing \
-		install-upgrade mailing-list notes os overview questions \
-		quota-extension readme server-design sieve sieve-protocol
-HTDOCS=		anoncvs bugs changes faq feedback index install-admin-mb \
-		install-auth install-compile install-configure install-murder \
-		install-perf install-prereq install-sieve install-snmpmon \
-		install-testing install-upgrade install mailing-list man \
-		notes os overview questions readme sieve-protocol sieve specs
+		install-upgrade mailing-list man notes os overview questions \
+		readme sieve sieve-protocol specs
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+RUN_DEPENDS+=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/Pod/Parser.pm:${PORTSDIR}/textproc/p5-PodParser
+.endif
 
 post-patch:
 		@${SED} -e "s|/etc/|${PREFIX}/etc/|" ${WRKSRC}/tools/mkimap \
 			> ${WRKSRC}/tools/mkimap.new
 		@${MV} ${WRKSRC}/tools/mkimap.new ${WRKSRC}/tools/mkimap
-
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+		@${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
+.if ${OSVERSION} < 500000
+		@${SED} -e "s|exec perl -x|exec perl -I${LOCALBASE}/lib/perl5/site_perl/${PERL_VER} -x|" \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl \
+			> ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new
+		@${MV} ${WRKSRC}/perl/sieve/scripts/sieveshell.pl.new \
+			${WRKSRC}/perl/sieve/scripts/sieveshell.pl
+.endif
 
 post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+		@${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/man
-		${MKDIR} ${PREFIX}/share/doc/cyrus/text
-.for file in ${HTDOCS}
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/man
+		${MKDIR} ${PREFIX}/share/doc/cyrus-imapd2/text
+.for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/${file}.html >>${TMPPLIST}
 .endfor
 .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
 		ofile=`echo ${file} | sed s/cyrquota/quota/`; \
 		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
 		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
-		${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
+			${PREFIX}/share/doc/cyrus-imapd2/man/$${ofile}.html; \
+		${ECHO} share/doc/cyrus-imapd2/man/$${ofile}.html \
+			>>${TMPPLIST}; \
 		fi
 .endfor
 		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2
+		@${ECHO} share/doc/cyrus-imapd2/cyrusv2.mc >>${TMPPLIST}
 .for file in ${DOCS}
 		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
-			${PREFIX}/share/doc/cyrus/text
-		@${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST}
+			${PREFIX}/share/doc/cyrus-imapd2/text
+		@${ECHO} share/doc/cyrus-imapd2/text/${file} >>${TMPPLIST}
 .endfor
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/text" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2/man" >>${TMPPLIST}
+		@${ECHO} "@dirrm share/doc/cyrus-imapd2" >>${TMPPLIST}
 .endif
 		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
 			${PREFIX}/etc/rc.d/imapd.sh.sample
@@ -107,4 +117,4 @@ post-install:
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 75d8b622c99b..7cdf528e94e2 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.16.tar.gz) = ce20ec83762e89bcb98567f396668b8d
-MD5 (cyrus-imapd-2.0.16-ipv6-20020118.diff.gz) = 9752c325aeeeb39b82c7a427fee076b2
+MD5 (cyrus-imapd-2.1.5.tar.gz) = 86eb126e818f998cf7ff2e1fe1a09cb3
+MD5 (cyrus-imapd-2.1.5-ipv6-20020630.diff.gz) = 699d0281d13aa50044143e013045fd09
diff --git a/mail/cyrus-imapd24/files/imapd.conf b/mail/cyrus-imapd24/files/imapd.conf
index c9de5a5a31b4..8384d7892b02 100644
--- a/mail/cyrus-imapd24/files/imapd.conf
+++ b/mail/cyrus-imapd24/files/imapd.conf
@@ -17,14 +17,45 @@ configdirectory: /var/imap
 #
 partition-default: /var/spool/imap
 
+# Use the UNIX separator character '/' for delimiting levels of
+# mailbox hierarchy.  The default is to use the netnews separator
+# character '.'.
+#unixhierarchysep: no
+
+# Use the alternate IMAP namespace, where personal folders reside at
+# the same level in the hierarchy as INBOX.
+#
+#altnamespace: no
+
+# If using the alternate IMAP namespace, the prefix for the other
+# users namespace.  The hierarchy delimiter will be automatically
+# appended.
+#
+#userprefix: Other Users
+
+# If using the alternate IMAP namespace, the prefix for the shared
+# namespace.  The hierarchy delimiter will be automatically appended.
+#
+#sharedprefix: Shared Folders
+
 # The umask value used by various Cyrus IMAP programs
 #
 #umask: 077
 
+# This is the hostname visible in the greeting messages of the POP,
+# IMAP and LMTP daemons. If it is unset, then the result returned from
+# gethostname(2) is used.
+#
+#servername: <result returned by gethostname(2)>
+
 # Whether to allow anonymous logins
 #
 #allowanonymouslogin: no
 
+# Allow the use of the SASL PLAIN mechanism.
+#
+#allowplaintext: yes
+
 # The percent  of  quota  utilization  over  which  the server generates
 # warnings.
 #
@@ -35,6 +66,20 @@ partition-default: /var/spool/imap
 #
 #timeout: 30
 
+# The interval (in seconds) for polling the mailbox for changes while
+# running the IDLE command.  This option is used when idled can not be
+# contacted or when polling is used exclusively.  The minimum value is
+# 1.  A value of 0 will disable polling (and disable IDLE if polling
+# is the only method available).
+#
+#imapidlepoll: 60
+
+# If enabled, the server responds to an ID command with a parameter
+# list containing: version, vendor, support-url, os, os-version,
+# command, arguments, environment.  Otherwise the server returns NIL.
+#
+#imapidresponse: yes
+
 # Set the length of the POP server's inactivity autologout timer, in
 # minutes.  The minimum value is 10, the default.
 #
@@ -45,6 +90,16 @@ partition-default: /var/spool/imap
 #
 #popminpoll: 0
 
+# The number of days advertised as being the minimum a message may be
+# left on the POP server before it is deleted (via the CAPA command,
+# defined in the POP3 Extension Mechanism, which some clients may
+# support).  "NEVER", the default, may be specified with a negative
+# number.  The Cyrus POP3 server never deletes mail, no matter what
+# the value of this parameter is.  However, if a site implements a
+# less liberal policy, it needs to change this parameter accordingly.
+#
+#popexpiretime: 0
+
 # The list of userids with administrative rights.  Separate each userid
 # with a space.  We recommend that administrator userids be separate from 
 # standard userids.  Sites using Kerberos authentication may use separate
@@ -52,11 +107,11 @@ partition-default: /var/spool/imap
 #
 #admins: <none>
 
-# The list of the host names of the mail domain's IMSP servers.  Separate each
-# host name with a space.  The Kerberos identities of these servers may login
-# as any user in order to perform commands by proxy.
+# A list of users and groups that are allowed to proxy for other
+# users, seperated by spaces.  Any user listed in this will be allowed
+# to login for any other user: use with caution.
 #
-#imspservers: <none>
+#proxyservers: <none>
 
 # The Access Control List (ACL) placed on a newly-created (non-user)
 # mailbox that does not have a parent mailbox.
@@ -90,9 +145,9 @@ partition-default: /var/spool/imap
 #
 #plaintextloginpause: 0
 
-# The pathname of srvtab file containing the server's private  key.  This 
-# option is only used when the server is compiled with Kerberos
-# authentication.
+# The pathname of srvtab file containing the server's private key.
+# This option is passed to the SASL library and overrides its default
+# setting.
 #
 #srvtab: /etc/srvtab
 
@@ -108,8 +163,64 @@ partition-default: /var/spool/imap
 #
 #loginuseacl: no
 
-# If enabled, deliver wil look for Sieve scripts in user's home directories:
-# ~user/.sieve.
+# If enabled, lmtpd attempts to only write one copy of a message per
+# partition and create hard links, resulting in a potentially large
+# disk savings.
+#
+#singleinstancestore: yes
+
+# If enabled, lmtpd will suppress delivery of a message to a mailbox
+# if a message with the same message-id (or resent-message-id) is
+# recorded as having already been delivered to the mailbox.  Records
+# the mailbox and message-id/resent-message-id of all successful
+# deliveries.
+# Note that duplicate delivery suppression is required for Sieve.
+# Disabling duplicate delivery suppression will also disable Sieve,
+# and as such should only be disabled for performance reasons.
+#
+#duplicatesuppression: yes
+
+# If enabled, lmtpd rejects messages with 8-bit characters in the
+# headers.  Otherwise, 8-bit characters are changed to `X'.  (A proper
+# soultion to non-ASCII characters in headers is offered by RFC 2047
+# and its predecessors.)
+#
+#reject8bit: no
+
+# Maximum incoming LMTP message size.  If set, lmtpd will reject
+# messages larger than maxmessagesize bytes.  The default is to allow
+# messages of any size.
+#
+#maxmessagesize: <unlimited>
+
+# Userid used to deliver messages to shared folders.  For example, if
+# set to "bb", email sent to "bb+shared.blah" would be delivered to
+# the "shared.blah" folder.  By default, an email address of
+# "+shared.blah" would be used.
+#postuser: <none>
+
+# If enabled at compile time, this specifies a URL to reply when
+# Netscape asks the server where the mail administration HTTP server
+# is.  The default is a site at CMU with a hopefully informative
+# message; administrators should set this to a local resource with
+# some information of greater use.
+#
+#netscapeurl: http://andrew2.andrew.cmu.edu/cyrus/imapd/netscapeadmin.html
+
+# Notifyd(8) method to use for "MAIL" notifications.  If not set,
+# "MAIL" notifications are disabled.
+#
+#mailnotifier: <no default>
+
+# Notifyd(8) method to use for "SIEVE" notifications.  If not set,
+# "SIEVE" notifications are disabled.
+#
+# This method is only used when no method is specified in the script.
+#
+#sievenotifier: <no default>
+
+# If enabled, lmtpd will look for Sieve scripts in user's home
+# directories: ~user/.sieve.
 #
 sieveusehomedir: false
 
@@ -119,26 +230,144 @@ sieveusehomedir: false
 #
 sievedir: /var/imap/sieve
 
+# The pathname of the sendmail executable.  Sieve uses sendmail for
+# sending rejections, redirects and vaca- tion responses.
+#
+#sendmail: /usr/sbin/sendmail
+
+# Username that is used as the 'From' address in rejection MDNs
+# produced by sieve.
+#
+#postmaster: postmaster
+
 # If enabled, the partitions will also be hashed, in addition to the hashing
 # done on configuration directories.  This is recommended if one partition has
 # a very bushy mailbox tree.
 #
 #hashimapspool: false
 
+# Maximum size (in kilobytes) any sieve script can be, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscriptsize: 32
+
+# Maximum number of sieve scripts any user may have, enforced at
+# submission by timsieved(8).
+#
+#sieve_maxscripts: 5
+
+# Maximum SSF (security strength factor) that the server will allow a
+# client to negotiate.
+#
+#sasl_maximum_layer: 256
+
+# The minimum SSF that the server will allow a client to negotiate.  A
+# value of 1 requires integrity protection; any higher value requires
+# some amount of encryption.
+#
+#sasl_minimum_layer: 0
+
 # The mechanism used by the server to verify plaintext passwords.  Possible
-# values also include "PAM", "sasldb", "kerberos_v4", "passwd", and "shadow"
+# values include "auxprop", "saslauthd", and "pwcheck"
 #
-sasl_pwcheck_method: pwcheck
+sasl_pwcheck_method: saslauthd
 
-# If  enabled,  the  SASL library will automatically create authentication
+# If enabled,  the SASL library will automatically create authentication
 # secrets when given a plaintext password.  See the SASL documentation.
 #
 #sasl_auto_transition: no
 
-# If you wish to enable TLS/SSL, put CERT into following place, then
-# uncomment this.
-#tls_cert_file: /var/imap/server.pem
-#tls_key_file: /var/imap/server.pem
+# Location of the opiekeys file
+#
+#sasl_opiekeys: /etc/opiekeys
+
+# File containing the global certificate used for ALL services (imap,
+# pop3, lmtp).
+#
+#tls_cert_file: <none>
+
+# File containing the private key belonging to the global server
+# certificate.
+#
+#tls_key_file: <none>
+
+# File containing the certificate used for imap ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for imap.
+#
+#tls_imap_cert_file: <none>
+
+# File containing the private key belonging to the imap-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for imap.
+#
+#tls_imap_key_file: <none>
+
+# File containing the certificate used for pop3 ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable SSL/TLS for pop3.
+#
+#tls_pop3_cert_file: <none>
+
+# File containing the private key belonging to the pop3-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable SSL/TLS for pop3.
+#
+#tls_pop3_key_file: <none>
+
+# File containing the certificate used for lmtp ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for lmtp.
+#
+#tls_lmtp_cert_file: <none>
+
+# File containing the private key belonging to the lmtp-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for lmtp.
+#
+#tls_lmtp_key_file: <none>
+
+# File containing the certificate used for sieve ONLY.  If not
+# specified, the global certificate is used.  A value of "disabled"
+# will disable TLS for sieve.
+#
+#tls_sieve_cert_file: <none>
+
+# File containing the private key belonging to the sieve-specific
+# server certificate.  If not specified, the global private key is
+# used.  A value of "disabled" will disable TLS for sieve.
+#
+#tls_sieve_key_file: <none>
+
+# File containing one or more Certificate Authority (CA) certificates.
+#
+#tls_ca_file: <none>
+
+# Path to directory with certificates of CAs.
+#
+#tls_ca_path: <none>
+
+# The length of time (in minutes) that a TLS session will be cached
+# for later reuse.  The maximum value is 1440 (24 hours), the default.
+# A value of 0 will disable session caching.
+#
+#tls_session_timeout: 1440
+
+# The right that a user needs to delete a mailbox.
+#
+#deleteright: c
+
+# Unix domain socket that lmtpd listens on, used by deliver(8).
+#
+#lmtpsocket: /var/imap/socket/lmtp
+
+# Unix domain socket that idled listens on.
+#
+#idlesocket: /var/imap/socket/idle
+
+# Unix domain socket that the new mail notification daemon listens on.
+#
+#notifysocket: /var/imap/socket/notify
 
 #
 # EOF
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index 630aaec33cc9..6332c2f16e76 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -1,13 +1,13 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Thu Dec 21 06:39:31 2000
-+++ configure	Thu Jan  4 23:22:47 2001
-@@ -4178,7 +4178,7 @@
- 	cmu_saved_LIBS=$LIBS
- 	if test -d ${with_sasl}; then
-           ac_cv_sasl_where_lib=${with_sasl}/lib
--          ac_cv_sasl_where_inc=${with_sasl}/include
-+          ac_cv_sasl_where_inc=${with_sasl}/include/sasl1
+--- configure.orig	Wed Dec 12 15:50:29 2001
++++ configure	Wed Dec 12 15:51:15 2001
+@@ -5542,7 +5542,7 @@
+ #define HAVE_UCDSNMP 1
+ EOF
  
- 	  SASLFLAGS="-I$ac_cv_sasl_where_inc"
- 	  LIB_SASL="-L$ac_cv_sasl_where_lib"
+-    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
++    LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm"
+     echo $ac_n "checking for rpmdbOpen in -lrpm""... $ac_c" 1>&6
+ echo "configure:5548: checking for rpmdbOpen in -lrpm" >&5
+ ac_lib_var=`echo rpm'_'rpmdbOpen | sed 'y%./+-%__p_%'`
diff --git a/mail/cyrus-imapd24/files/patch-af b/mail/cyrus-imapd24/files/patch-af
deleted file mode 100644
index 0a8d78f88d0c..000000000000
--- a/mail/cyrus-imapd24/files/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpd.c
-diff -u imap/lmtpd.c.orig imap/lmtpd.c
---- imap/lmtpd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpd.c	Thu Jan  4 23:26:22 2001
-@@ -407,7 +407,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd24/files/patch-ag b/mail/cyrus-imapd24/files/patch-ag
deleted file mode 100644
index d22ee0d59350..000000000000
--- a/mail/cyrus-imapd24/files/patch-ag
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: imap/lmtpproxyd.c
-diff -u imap/lmtpproxyd.c.orig imap/lmtpproxyd.c
---- imap/lmtpproxyd.c.orig	Wed Dec 20 04:31:41 2000
-+++ imap/lmtpproxyd.c	Thu Jan  4 23:26:48 2001
-@@ -398,7 +398,7 @@
-     }
- }
- 
--#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
-+#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
- #define DEFAULT_POSTMASTER ("postmaster")
- 
- #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd24/files/patch-ah b/mail/cyrus-imapd24/files/patch-ah
new file mode 100644
index 000000000000..52c44e1c25db
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-ah
@@ -0,0 +1,13 @@
+Index: imap/lmtpengine.h
+diff -u imap/lmtpengine.h.orig imap/lmtpengine.h
+--- imap/lmtpengine.h.orig	Sun Feb 10 10:53:58 2002
++++ imap/lmtpengine.h	Thu Feb 21 14:16:52 2002
+@@ -44,7 +44,7 @@
+ #define LMTPENGINE_H
+ 
+ /* configuration parameters */
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd24/files/patch-bc b/mail/cyrus-imapd24/files/patch-bc
index f31ed31d722f..ce5594805a0b 100644
--- a/mail/cyrus-imapd24/files/patch-bc
+++ b/mail/cyrus-imapd24/files/patch-bc
@@ -1,13 +1,13 @@
 Index: imap/Makefile.in
 diff -u imap/Makefile.in.orig imap/Makefile.in
---- imap/Makefile.in.orig	Tue Dec 19 05:27:14 2000
-+++ imap/Makefile.in	Thu Jan  4 23:30:15 2001
-@@ -64,7 +64,7 @@
+--- imap/Makefile.in.orig	Fri Apr 19 02:35:26 2002
++++ imap/Makefile.in	Thu May  2 04:02:37 2002
+@@ -61,7 +61,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- 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 @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
  IMAP_LIBS = @IMAP_LIBS@
  SIEVE_LIBS = @SIEVE_LIBS@
diff --git a/mail/cyrus-imapd24/files/patch-dc b/mail/cyrus-imapd24/files/patch-dc
index c913dc4f35ee..4c2865a19c62 100644
--- a/mail/cyrus-imapd24/files/patch-dc
+++ b/mail/cyrus-imapd24/files/patch-dc
@@ -1,13 +1,13 @@
 Index: master/Makefile.in
 diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Dec 15 04:26:50 2000
-+++ master/Makefile.in	Sat Jan  6 06:08:21 2001
+--- master/Makefile.in.orig	Wed Dec 12 02:03:08 2001
++++ master/Makefile.in	Wed Dec 12 02:05:57 2001
 @@ -52,7 +52,7 @@
  CYRUS_USER=@cyrus_user@
  CYRUS_GROUP=@cyrus_group@
  
 -DEFS = @DEFS@ @LOCALDEFS@
 +DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = @DEPLIBS@
+ CPPFLAGS = -I. -I.. -I../lib -I$(srcdir) @CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ DEPLIBS = ../lib/libcyrus.a @DEPLIBS@
  
diff --git a/mail/cyrus-imapd24/files/patch-df b/mail/cyrus-imapd24/files/patch-df
index 93540e209402..1b092230a8f3 100644
--- a/mail/cyrus-imapd24/files/patch-df
+++ b/mail/cyrus-imapd24/files/patch-df
@@ -1,20 +1,15 @@
 Index: master/service.c
-===================================================================
-RCS file: /usr/home/ume/ncvs/src/cyrus-imapd/master/service.c,v
-retrieving revision 1.2
-diff -u -r1.2 service.c
---- master/service.c	2001/02/01 14:11:43	1.2
-+++ master/service.c	2001/02/01 22:10:35
-@@ -99,7 +99,13 @@
+diff -u master/service.c.orig master/service.c
+--- master/service.c.orig	Mon Dec 17 18:08:07 2001
++++ master/service.c	Mon Dec 17 18:08:38 2001
+@@ -101,7 +101,11 @@
      
      /* is this a connection from the local host? */
      if (getpeername(fd, (struct sockaddr *) &sin, &len) == 0) {
 -	if (((struct sockaddr *)&sin)->sa_family == AF_UNIX) {
 +	switch (((struct sockaddr *)&sin)->sa_family) {
 +	case AF_INET:
-+#ifdef INET6
 +	case AF_INET6:
-+#endif
 +	    break;
 +	default:
  	    return 1;
diff --git a/mail/cyrus-imapd24/files/patch-dh b/mail/cyrus-imapd24/files/patch-dh
new file mode 100644
index 000000000000..fc6d23de6227
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-dh
@@ -0,0 +1,15 @@
+Index: lib/cyrusdb_skiplist.c
+diff -u lib/cyrusdb_skiplist.c.orig lib/cyrusdb_skiplist.c
+--- lib/cyrusdb_skiplist.c.orig	Wed Apr 24 03:25:48 2002
++++ lib/cyrusdb_skiplist.c	Thu May  2 04:18:15 2002
+@@ -67,6 +67,10 @@
+ #include "lock.h"
+ #include "retry.h"
+ 
++#ifndef O_DSYNC
++#define O_DSYNC	O_FSYNC
++#endif
++
+ #define PROB (0.5)
+ 
+ /* 
diff --git a/mail/cyrus-imapd24/files/patch-di b/mail/cyrus-imapd24/files/patch-di
new file mode 100644
index 000000000000..ba35e969ab60
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-di
@@ -0,0 +1,13 @@
+Index: notifyd/notify_mailto.c
+diff -u notifyd/notify_mailto.c.orig notifyd/notify_mailto.c
+--- notifyd/notify_mailto.c.orig	Tue Mar 19 00:14:17 2002
++++ notifyd/notify_mailto.c	Thu May  2 03:51:15 2002
+@@ -56,7 +56,7 @@
+ #include "rfc822date.h"
+ #include <sieve_interface.h>
+ 
+-#define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#define DEFAULT_SENDMAIL ("/usr/sbin/sendmail")
+ #define DEFAULT_POSTMASTER ("postmaster")
+ 
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd24/pkg-install b/mail/cyrus-imapd24/pkg-install
index 154d83b03038..20f1fbb0ff7c 100644
--- a/mail/cyrus-imapd24/pkg-install
+++ b/mail/cyrus-imapd24/pkg-install
@@ -43,8 +43,8 @@ checkfile() {
 # Install timseived's Cyrus.conf file
 
 cyrus_conf() {
-        if [ ! -f ${PKG_PREFIX}/lib/sasl/Cyrus.conf ]; then
-                echo "pwcheck_method: pwcheck" > ${PKG_PREFIX}/lib/sasl/Cyrus.conf
+        if [ ! -f ${PKG_PREFIX}/lib/sasl2/Cyrus.conf ]; then
+                echo "pwcheck_method: saslauthd" > ${PKG_PREFIX}/lib/sasl2/Cyrus.conf
         fi
 }
 
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index ab8b7c30120d..33253d4af4a9 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -1,9 +1,17 @@
 bin/cyradm
 bin/imtest
 bin/installsieve
+bin/lmtptest
+bin/mupdatetest
+bin/pop3test
 bin/sieveshell
+bin/sivtest
+bin/smtptest
+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/cyrquota
 cyrus/bin/deliver
@@ -15,9 +23,12 @@ cyrus/bin/lmtpd
 cyrus/bin/master
 cyrus/bin/mbpath
 cyrus/bin/mkimap
+cyrus/bin/notifyd
 cyrus/bin/pop3d
 cyrus/bin/reconstruct
+cyrus/bin/squatter
 cyrus/bin/timsieved
+cyrus/bin/tls_prune
 @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
 etc/cyrus.conf.dist
 @exec [ -f %B/cyrus.conf ] || cp %B/%f %B/cyrus.conf
@@ -38,38 +49,36 @@ 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
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
+lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
 lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/IMAP.pm
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/acap.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE/managesieve.pm
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP/IMAP.so
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/.packlist
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.bs
-lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap/acap.so
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/.packlist
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
 lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
@@ -80,7 +89,6 @@ lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/mana
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/Cyrus
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/IMAP
-@dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/acap
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE
 @dirrm lib/perl5/site_perl/%%PERL_VER%%/%%PERL_ARCH%%/auto/Cyrus