12 files changed, 148 insertions, 88 deletions

diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 53e57bed0495..e0484030fb72 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.3.12p2
-PORTREVISION=	1
+PORTVERSION=	2.3.13
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -45,9 +45,12 @@ OPTIONS=	BDB		"Use Berkeley DB"			on \
 		LDAP_PTLOADER	"Enable LDAP ptloader"			off \
 		LISTEXT		"Enable IMAP List extensions"		off \
 		MURDER		"Enable IMAP Murder support"		off \
+		MYSQL		"Use MySQL (experimental)"		off \
 		NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off \
 		NNTP		"Enable NNTP support"			off \
+		PGSQL		"Use PostgreSQL (experimental)"		off \
 		REPLICATION	"Enable replication"			off \
+		SQLITE		"Use SQLite (experimental)"		off \
 		SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 
@@ -85,6 +88,21 @@ PLIST_SUB+=	IDLED=""
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
+.endif
+
+.if defined(WITH_SQLITE)
+USE_SQLITE=	yes
+CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE}
+.endif
+
 .if defined(WITH_REPLICATION)
 CONFIGURE_ARGS+=--enable-replication
 PLIST_SUB+=	REPLICATION=""
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index 7e1d5feb6e49..bf4eadd49ab7 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.12p2.tar.gz) = ee2c300687994e4982c6af6aa154c742
-SHA256 (cyrus-imapd-2.3.12p2.tar.gz) = c4ea8af68d2b14d93f662fc97f805450ef0cb98ddb986b2b7330cb4aba93c4c4
-SIZE (cyrus-imapd-2.3.12p2.tar.gz) = 2305996
+MD5 (cyrus-imapd-2.3.13.tar.gz) = 7dc48324c3a99e210bf777ea74aae694
+SHA256 (cyrus-imapd-2.3.13.tar.gz) = f651c3f5112d3aefa5ab5250f9cb9bb012046a0c3bd72eabb82da9dde1150fba
+SIZE (cyrus-imapd-2.3.13.tar.gz) = 2328467
diff --git a/mail/cyrus-imapd23/files/patch-configure b/mail/cyrus-imapd23/files/patch-configure
index 73908ab528cf..75404c4d58d5 100644
--- a/mail/cyrus-imapd23/files/patch-configure
+++ b/mail/cyrus-imapd23/files/patch-configure
@@ -1,16 +1,16 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Tue May 23 22:57:47 2006
-+++ configure	Wed May 24 00:01:31 2006
-@@ -310,6 +310,7 @@
- #endif"
- 
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP"
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -16716,6 +16718,7 @@
+--- configure.orig	2008-10-09 23:46:22.000000000 +0900
++++ configure	2008-10-12 23:56:41.000000000 +0900
+@@ -733,6 +733,7 @@
+ LIB_WRAP
+ SNMP_CONFIG
+ LIB_UCDSNMP
++LDFLAGS_UCDSNMP
+ LIB_RT
+ IMAP_COM_ERR_LIBS
+ IMAP_LIBS
+@@ -18347,6 +18348,7 @@
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
@@ -18,7 +18,7 @@ diff -u configure.orig configure
      PERL_CCCDLFLAGS="$cccdlflags"
  
  fi
-@@ -17736,7 +17739,9 @@
+@@ -19329,7 +19331,9 @@
  
      if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
        CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
@@ -29,20 +29,29 @@ diff -u configure.orig configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NETSNMP 1
-@@ -17985,7 +17990,7 @@
+@@ -19563,7 +19567,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
 -      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
 +      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
+       { echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
+ echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6; }
  if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-@@ -18810,6 +18815,7 @@
- s,@LIB_WRAP@,$LIB_WRAP,;t t
- s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
- s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
-+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t
- s,@LIB_RT@,$LIB_RT,;t t
- s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
- s,@IMAP_LIBS@,$IMAP_LIBS,;t t
+@@ -20470,6 +20474,7 @@
+ LIB_WRAP!$LIB_WRAP$ac_delim
+ SNMP_CONFIG!$SNMP_CONFIG$ac_delim
+ LIB_UCDSNMP!$LIB_UCDSNMP$ac_delim
++LDFLAGS_UCDSNMP!$LDFLAGS_UCDSNMP$ac_delim
+ LIB_RT!$LIB_RT$ac_delim
+ IMAP_COM_ERR_LIBS!$IMAP_COM_ERR_LIBS$ac_delim
+ IMAP_LIBS!$IMAP_LIBS$ac_delim
+@@ -20478,7 +20483,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/mail/cyrus-imapd23/files/patch-lib::imapoptions b/mail/cyrus-imapd23/files/patch-lib::imapoptions
index c46c80a342a0..8c79e3b2e8f4 100644
--- a/mail/cyrus-imapd23/files/patch-lib::imapoptions
+++ b/mail/cyrus-imapd23/files/patch-lib::imapoptions
@@ -1,20 +1,20 @@
 Index: lib/imapoptions
 diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords. 
-    Possible values include "auxprop", "saslauthd", and "pwcheck". */
+--- lib/imapoptions.orig	2008-10-12 21:22:03.000000000 +0900
++++ lib/imapoptions	2008-10-12 21:23:33.000000000 +0900
+@@ -893,7 +893,7 @@
+ { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
+ /* The cyrusdb backend to use for the seen state. */
  
 -{ "sendmail", "/usr/lib/sendmail", STRING }
 +{ "sendmail", "/usr/sbin/sendmail", STRING }
  /* The pathname of the sendmail executable.  Sieve invokes sendmail
     for sending rejections, redirects and vacation responses. */
  
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
-    submission by timsieved(8). */
-    
+@@ -956,7 +956,7 @@
+ /* If enabled, timsieved will expect a capability response after a successful
+    SASL authentication, per draft-martin-mangesieve-12.txt . */
+ 
 -{ "sievedir", "/usr/sieve", STRING }
 +{ "sievedir", "/var/imap/sieve", STRING }
  /* If sieveusehomedir is false, this directory is searched for Sieve
diff --git a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
index 99d494cf81d4..ef0d76b256be 100644
--- a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
@@ -1,8 +1,8 @@
 Index: sieve/Makefile.in
 diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Sat May 29 03:03:09 2004
-+++ sieve/Makefile.in	Sat May 29 04:53:11 2004
-@@ -34,6 +34,7 @@
+--- sieve/Makefile.in.orig	2008-07-11 01:37:20.000000000 +0900
++++ sieve/Makefile.in	2008-10-12 21:26:13.000000000 +0900
+@@ -54,6 +54,7 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,14 +10,16 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
-@@ -60,8 +61,8 @@
+@@ -80,9 +81,9 @@
  dist: $(BUILT_SOURCES)
  
- install: sievec
+ install: sievec sieved
 -	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
 -	$(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
+-	$(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
 +	$(INSTALL) -d ${DESTDIR}$(service_path)
 +	$(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit
++	$(INSTALL) -s -c -m 755 sieved $(DESTDIR)$(service_path) || exit
  
- test: $(DEPLIBS) libsieve.a test.o
- 	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
+ test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
+ 	$(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 7e35fe26d09f..d9434d929b8b 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -46,6 +46,7 @@ cyrus/bin/proxyd
 cyrus/bin/quota
 cyrus/bin/reconstruct
 cyrus/bin/sievec
+cyrus/bin/sieved
 cyrus/bin/smmapd
 cyrus/bin/squatter
 %%REPLICATION%%cyrus/bin/sync_client
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 53e57bed0495..e0484030fb72 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION=	2.3.12p2
-PORTREVISION=	1
+PORTVERSION=	2.3.13
+#PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus/ \
 		http://ftp.andrew.cmu.edu/pub/cyrus/ \
@@ -45,9 +45,12 @@ OPTIONS=	BDB		"Use Berkeley DB"			on \
 		LDAP_PTLOADER	"Enable LDAP ptloader"			off \
 		LISTEXT		"Enable IMAP List extensions"		off \
 		MURDER		"Enable IMAP Murder support"		off \
+		MYSQL		"Use MySQL (experimental)"		off \
 		NETSCAPEHACK	"Enable X-NETSCAPE extensions"		off \
 		NNTP		"Enable NNTP support"			off \
+		PGSQL		"Use PostgreSQL (experimental)"		off \
 		REPLICATION	"Enable replication"			off \
+		SQLITE		"Use SQLite (experimental)"		off \
 		SNMP_4		"Enable SNMP support using net-snmp v4"	off \
 		SNMP_5		"Enable SNMP support using net-snmp v5"	off
 
@@ -85,6 +88,21 @@ PLIST_SUB+=	IDLED=""
 PLIST_SUB+=	IDLED="@comment "
 .endif
 
+.if defined(WITH_MYSQL)
+USE_MYSQL=	yes
+CONFIGURE_ARGS+=--with-mysql=${LOCALBASE}
+.endif
+
+.if defined(WITH_PGSQL)
+USE_PGSQL=	yes
+CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
+.endif
+
+.if defined(WITH_SQLITE)
+USE_SQLITE=	yes
+CONFIGURE_ARGS+=--with-sqlite=${LOCALBASE}
+.endif
+
 .if defined(WITH_REPLICATION)
 CONFIGURE_ARGS+=--enable-replication
 PLIST_SUB+=	REPLICATION=""
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index 7e1d5feb6e49..bf4eadd49ab7 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,3 +1,3 @@
-MD5 (cyrus-imapd-2.3.12p2.tar.gz) = ee2c300687994e4982c6af6aa154c742
-SHA256 (cyrus-imapd-2.3.12p2.tar.gz) = c4ea8af68d2b14d93f662fc97f805450ef0cb98ddb986b2b7330cb4aba93c4c4
-SIZE (cyrus-imapd-2.3.12p2.tar.gz) = 2305996
+MD5 (cyrus-imapd-2.3.13.tar.gz) = 7dc48324c3a99e210bf777ea74aae694
+SHA256 (cyrus-imapd-2.3.13.tar.gz) = f651c3f5112d3aefa5ab5250f9cb9bb012046a0c3bd72eabb82da9dde1150fba
+SIZE (cyrus-imapd-2.3.13.tar.gz) = 2328467
diff --git a/mail/cyrus-imapd24/files/patch-configure b/mail/cyrus-imapd24/files/patch-configure
index 73908ab528cf..75404c4d58d5 100644
--- a/mail/cyrus-imapd24/files/patch-configure
+++ b/mail/cyrus-imapd24/files/patch-configure
@@ -1,16 +1,16 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Tue May 23 22:57:47 2006
-+++ configure	Wed May 24 00:01:31 2006
-@@ -310,6 +310,7 @@
- #endif"
- 
- ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os MAKEDEPEND cyrus_prefix service_path cyrus_user cyrus_group CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT RANLIB ac_ct_RANLIB SET_MAKE INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CPP EGREP AWK LIBOBJS LIB_SOCKET IPV6_OBJS PRE_SUBDIRS EXTRA_SUBDIRS DEPLIBS LOCALDEFS BDB_INC BDB_LIB CYRUSDB_OBJS SIEVE_OBJS SIEVE_LIBS SIEVE_CPPFLAGS YACC LEX LEXLIB LEX_OUTPUT_ROOT SIEVE_SUBDIRS WITH_NONBLOCK WITH_GMTOFF WITH_MAP WITH_LOCK cyrus_sigveclib AFS_LIBS AFS_LDFLAGS LDAP_CPPFLAGS LDAP_LDFLAGS LDAP_LIBS SERVER_SUBDIRS OPENSSL_INC OPENSSL_LIB ZEPHYR_LIBS ZEPHYR_CPPFLAGS IMAP_PROGS COMPILE_ET COM_ERR_LIBS COM_ERR_LDFLAGS COM_ERR_CPPFLAGS LIB_CRYPT GSSAPI_LIBS GSSAPIBASE_LIBS LIB_DYN_SASL DYNSASLFLAGS LIB_SASL SASLFLAGS PERL PERL_CCCDLFLAGS MD5OBJ SNMP_SUBDIRS CMU_LIB_SUBDIR LIB_WRAP SNMP_CONFIG LIB_UCDSNMP LIB_RT IMAP_COM_ERR_LIBS IMAP_LIBS PERL_SUBDIRS PERL_DEPSUBDIRS LTLIBOBJS'
-+ac_subst_vars="${ac_subst_vars} LDFLAGS_UCDSNMP"
- ac_subst_files=''
- 
- # Initialize some variables set by options.
-@@ -16716,6 +16718,7 @@
+--- configure.orig	2008-10-09 23:46:22.000000000 +0900
++++ configure	2008-10-12 23:56:41.000000000 +0900
+@@ -733,6 +733,7 @@
+ LIB_WRAP
+ SNMP_CONFIG
+ LIB_UCDSNMP
++LDFLAGS_UCDSNMP
+ LIB_RT
+ IMAP_COM_ERR_LIBS
+ IMAP_LIBS
+@@ -18347,6 +18348,7 @@
      EXTRA_SUBDIRS="${EXTRA_SUBDIRS} perl"
      PERL_SUBDIRS="imap"
      PERL="${with_perl}"
@@ -18,7 +18,7 @@ diff -u configure.orig configure
      PERL_CCCDLFLAGS="$cccdlflags"
  
  fi
-@@ -17736,7 +17739,9 @@
+@@ -19329,7 +19331,9 @@
  
      if test -n "$SNMP_LIBS" && test -n "$SNMP_PREFIX"; then
        CPPFLAGS="$CPPFLAGS -I${SNMP_PREFIX}/include"
@@ -29,20 +29,29 @@ diff -u configure.orig configure
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_NETSNMP 1
-@@ -17985,7 +17990,7 @@
+@@ -19563,7 +19567,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
 -      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp"
 +      LIB_UCDSNMP="-lucdagent -lucdmibs -lsnmp -lkvm -ldevstat -lwrap"
-       echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
- echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6
+       { echo "$as_me:$LINENO: checking for rpmdbOpen in -lrpm" >&5
+ echo $ECHO_N "checking for rpmdbOpen in -lrpm... $ECHO_C" >&6; }
  if test "${ac_cv_lib_rpm_rpmdbOpen+set}" = set; then
-@@ -18810,6 +18815,7 @@
- s,@LIB_WRAP@,$LIB_WRAP,;t t
- s,@SNMP_CONFIG@,$SNMP_CONFIG,;t t
- s,@LIB_UCDSNMP@,$LIB_UCDSNMP,;t t
-+s,@LDFLAGS_UCDSNMP@,$LDFLAGS_UCDSNMP,;t t
- s,@LIB_RT@,$LIB_RT,;t t
- s,@IMAP_COM_ERR_LIBS@,$IMAP_COM_ERR_LIBS,;t t
- s,@IMAP_LIBS@,$IMAP_LIBS,;t t
+@@ -20470,6 +20474,7 @@
+ LIB_WRAP!$LIB_WRAP$ac_delim
+ SNMP_CONFIG!$SNMP_CONFIG$ac_delim
+ LIB_UCDSNMP!$LIB_UCDSNMP$ac_delim
++LDFLAGS_UCDSNMP!$LDFLAGS_UCDSNMP$ac_delim
+ LIB_RT!$LIB_RT$ac_delim
+ IMAP_COM_ERR_LIBS!$IMAP_COM_ERR_LIBS$ac_delim
+ IMAP_LIBS!$IMAP_LIBS$ac_delim
+@@ -20478,7 +20483,7 @@
+ LTLIBOBJS!$LTLIBOBJS$ac_delim
+ _ACEOF
+ 
+-  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 29; then
++  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 30; then
+     break
+   elif $ac_last_try; then
+     { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
diff --git a/mail/cyrus-imapd24/files/patch-lib::imapoptions b/mail/cyrus-imapd24/files/patch-lib::imapoptions
index c46c80a342a0..8c79e3b2e8f4 100644
--- a/mail/cyrus-imapd24/files/patch-lib::imapoptions
+++ b/mail/cyrus-imapd24/files/patch-lib::imapoptions
@@ -1,20 +1,20 @@
 Index: lib/imapoptions
 diff -u lib/imapoptions.orig lib/imapoptions
---- lib/imapoptions.orig	Thu Mar 20 04:00:39 2003
-+++ lib/imapoptions	Fri Mar 21 15:27:44 2003
-@@ -454,7 +454,7 @@
- /* The mechanism used by the server to verify plaintext passwords. 
-    Possible values include "auxprop", "saslauthd", and "pwcheck". */
+--- lib/imapoptions.orig	2008-10-12 21:22:03.000000000 +0900
++++ lib/imapoptions	2008-10-12 21:23:33.000000000 +0900
+@@ -893,7 +893,7 @@
+ { "seenstate_db", "skiplist", STRINGLIST("flat", "berkeley", "berkeley-hash", "skiplist")}
+ /* The cyrusdb backend to use for the seen state. */
  
 -{ "sendmail", "/usr/lib/sendmail", STRING }
 +{ "sendmail", "/usr/sbin/sendmail", STRING }
  /* The pathname of the sendmail executable.  Sieve invokes sendmail
     for sending rejections, redirects and vacation responses. */
  
-@@ -475,7 +475,7 @@
- /* Maximum number of sieve scripts any user may have, enforced at
-    submission by timsieved(8). */
-    
+@@ -956,7 +956,7 @@
+ /* If enabled, timsieved will expect a capability response after a successful
+    SASL authentication, per draft-martin-mangesieve-12.txt . */
+ 
 -{ "sievedir", "/usr/sieve", STRING }
 +{ "sievedir", "/var/imap/sieve", STRING }
  /* If sieveusehomedir is false, this directory is searched for Sieve
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
index 99d494cf81d4..ef0d76b256be 100644
--- a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
@@ -1,8 +1,8 @@
 Index: sieve/Makefile.in
 diff -u sieve/Makefile.in.orig sieve/Makefile.in
---- sieve/Makefile.in.orig	Sat May 29 03:03:09 2004
-+++ sieve/Makefile.in	Sat May 29 04:53:11 2004
-@@ -34,6 +34,7 @@
+--- sieve/Makefile.in.orig	2008-07-11 01:37:20.000000000 +0900
++++ sieve/Makefile.in	2008-10-12 21:26:13.000000000 +0900
+@@ -54,6 +54,7 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,14 +10,16 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
-@@ -60,8 +61,8 @@
+@@ -80,9 +81,9 @@
  dist: $(BUILT_SOURCES)
  
- install: sievec
+ install: sievec sieved
 -	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
 -	$(srcdir)/../install-sh -c -m 755 sievec $(DESTDIR)$(service_path) || exit
+-	$(srcdir)/../install-sh -c -m 755 sieved $(DESTDIR)$(service_path) || exit
 +	$(INSTALL) -d ${DESTDIR}$(service_path)
 +	$(INSTALL) -s -c -m 755 sievec $(DESTDIR)$(service_path) || exit
++	$(INSTALL) -s -c -m 755 sieved $(DESTDIR)$(service_path) || exit
  
- test: $(DEPLIBS) libsieve.a test.o
- 	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
+ test: $(DEPLIBS) libsieve.a test.o ../imap/message.o
+ 	$(CC) $(LDFLAGS) -o test test.o ../imap/message.o \
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 7e35fe26d09f..d9434d929b8b 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -46,6 +46,7 @@ cyrus/bin/proxyd
 cyrus/bin/quota
 cyrus/bin/reconstruct
 cyrus/bin/sievec
+cyrus/bin/sieved
 cyrus/bin/smmapd
 cyrus/bin/squatter
 %%REPLICATION%%cyrus/bin/sync_client