Update to 2.2.3.

33 files changed, 75 insertions, 324 deletions

diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 984e0c70b231..a9404a1dda4c 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.2.b
-PORTREVISION=	2
+PORTVERSION= 	2.2.3
+#PORTREVISION=	0
 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/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME=	${PORTNAME}-2.2.2-BETA
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -28,7 +27,8 @@ USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
+		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
@@ -103,10 +103,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-#EXTRA_PATCHES+=	${FILESDIR}/extra-patch-acconfig.h
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.in
-#USE_AUTOHEADER=	YES
+USE_AUTOHEADER=	YES
 USE_AUTOCONF=	YES
 WANT_AUTOCONF_VER=257
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
@@ -132,8 +130,8 @@ MAN8=		arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
 		deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
 		lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
-		reconstruct.8 rmnews.8 squatter.8 syncnews.8 timsieved.8 \
-		tls_prune.8
+		reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
+		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
@@ -172,12 +170,6 @@ pre-everything::
 	fi
 .endif
 
-.if defined(WITH_DRAC)
-pre-patch:
-		@${REINPLACE_CMD} -e '/^Index: acconfig\.h/,/^Index: /d' \
-			${WRKSRC}/contrib/drac_auth.patch
-.endif
-
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
@@ -214,7 +206,7 @@ post-install:
 			>>${TMPPLIST}; \
 		fi
 .endfor
-.for file in cyrusv2.mc murder.png netnews.png
+.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
 .endfor
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index f2179e3ff99a..4ed0375278bd 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c
+MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5
diff --git a/mail/cyrus-imapd22/files/extra-patch-acconfig.h b/mail/cyrus-imapd22/files/extra-patch-acconfig.h
deleted file mode 100644
index 05e561b78963..000000000000
--- a/mail/cyrus-imapd22/files/extra-patch-acconfig.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 21:03:25 2003
-@@ -263,8 +263,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
index 69be3bdc61b9..f8b4d889dc4a 100644
--- a/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd22/files/extra-patch-aclocal.m4
@@ -6,8 +6,8 @@ diff -u aclocal.m4.orig aclocal.m4
  	    BDB_LIBADD=""
  	fi
  
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
                dblib="berkeley"; break, dblib="no")
diff --git a/mail/cyrus-imapd22/files/patch-ac b/mail/cyrus-imapd22/files/patch-ac
index bf700856699a..2088891edc95 100644
--- a/mail/cyrus-imapd22/files/patch-ac
+++ b/mail/cyrus-imapd22/files/patch-ac
@@ -1,17 +1,17 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Wed Oct 29 02:24:50 2003
-+++ configure	Wed Oct 29 03:52:02 2003
-@@ -6811,7 +6811,7 @@
+--- configure.orig	Thu Jan 15 23:36:50 2004
++++ configure	Fri Jan 16 04:03:09 2004
+@@ -6565,7 +6565,7 @@
  	    BDB_LIBADD=""
  	fi
  
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
-@@ -13851,7 +13851,7 @@
+@@ -13854,7 +13854,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
diff --git a/mail/cyrus-imapd22/files/patch-config.h.in b/mail/cyrus-imapd22/files/patch-config.h.in
deleted file mode 100644
index f49e1e525f4b..000000000000
--- a/mail/cyrus-imapd22/files/patch-config.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Thu Mar 20 04:04:36 2003
-+++ config.h.in	Fri Mar 21 14:33:39 2003
-@@ -360,8 +360,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd22/files/patch-dc b/mail/cyrus-imapd22/files/patch-dc
deleted file mode 100644
index f2f5f074e332..000000000000
--- a/mail/cyrus-imapd22/files/patch-dc
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Feb  7 07:41:03 2003
-+++ master/Makefile.in	Fri Mar 21 18:02:28 2003
-@@ -52,7 +52,8 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \
-+	-DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd22/files/patch-imap::idled.c b/mail/cyrus-imapd22/files/patch-imap::idled.c
deleted file mode 100644
index f08a8a677048..000000000000
--- a/mail/cyrus-imapd22/files/patch-imap::idled.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imap/idled.c
-diff -u imap/idled.c.orig imap/idled.c
---- imap/idled.c.orig	Thu Oct 23 03:50:07 2003
-+++ imap/idled.c	Tue Jan 13 23:17:21 2004
-@@ -409,3 +409,10 @@
-     /* never gets here */      
-     exit(1);
- }
-+
-+void printstring(const char *s __attribute__((unused)))
-+{
-+    /* needed to link against annotate.o */
-+    fatal("printstring() executed, but its not used for IDLED!",
-+	  EC_SOFTWARE);
-+}
diff --git a/mail/cyrus-imapd22/files/patch-lib::Makefile.in b/mail/cyrus-imapd22/files/patch-lib::Makefile.in
deleted file mode 100644
index b85111fb7723..000000000000
--- a/mail/cyrus-imapd22/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Feb 13 04:12:42 2003
-+++ lib/Makefile.in	Fri Mar 21 15:11:50 2003
-@@ -56,7 +56,7 @@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
diff --git a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in b/mail/cyrus-imapd22/files/patch-sieve::Makefile.in
index cbc212929f04..d54f608b1f92 100644
--- a/mail/cyrus-imapd22/files/patch-sieve::Makefile.in
+++ b/mail/cyrus-imapd22/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	Fri Feb 28 03:13:50 2003
-+++ sieve/Makefile.in	Mon Mar 24 02:26:24 2003
-@@ -32,6 +32,7 @@
+--- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
++++ sieve/Makefile.in	Fri Jan 16 03:47:03 2004
+@@ -33,6 +33,7 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,12 +10,12 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
-@@ -58,7 +59,7 @@
+@@ -59,7 +60,7 @@
  
  install: sievec
- 	$(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin
--	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
-+	$(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
+ 	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+-	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit
++	$(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit
  
  test: $(DEPLIBS) libsieve.a test.o
  	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index 4f1750c38a39..2ca5c049726e 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -38,6 +38,7 @@ cyrus/bin/pop3proxyd
 %%MURDER%%cyrus/bin/proxyd
 cyrus/bin/reconstruct
 cyrus/bin/sievec
+cyrus/bin/smmapd
 cyrus/bin/squatter
 cyrus/bin/timsieved
 cyrus/bin/tls_prune
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 984e0c70b231..a9404a1dda4c 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.2.b
-PORTREVISION=	2
+PORTVERSION= 	2.2.3
+#PORTREVISION=	0
 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/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME=	${PORTNAME}-2.2.2-BETA
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -28,7 +27,8 @@ USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
+		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
@@ -103,10 +103,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-#EXTRA_PATCHES+=	${FILESDIR}/extra-patch-acconfig.h
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.in
-#USE_AUTOHEADER=	YES
+USE_AUTOHEADER=	YES
 USE_AUTOCONF=	YES
 WANT_AUTOCONF_VER=257
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
@@ -132,8 +130,8 @@ MAN8=		arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
 		deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
 		lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
-		reconstruct.8 rmnews.8 squatter.8 syncnews.8 timsieved.8 \
-		tls_prune.8
+		reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
+		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
@@ -172,12 +170,6 @@ pre-everything::
 	fi
 .endif
 
-.if defined(WITH_DRAC)
-pre-patch:
-		@${REINPLACE_CMD} -e '/^Index: acconfig\.h/,/^Index: /d' \
-			${WRKSRC}/contrib/drac_auth.patch
-.endif
-
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
@@ -214,7 +206,7 @@ post-install:
 			>>${TMPPLIST}; \
 		fi
 .endfor
-.for file in cyrusv2.mc murder.png netnews.png
+.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
 .endfor
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index f2179e3ff99a..4ed0375278bd 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c
+MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5
diff --git a/mail/cyrus-imapd23/files/extra-patch-acconfig.h b/mail/cyrus-imapd23/files/extra-patch-acconfig.h
deleted file mode 100644
index 05e561b78963..000000000000
--- a/mail/cyrus-imapd23/files/extra-patch-acconfig.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 21:03:25 2003
-@@ -263,8 +263,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
index 69be3bdc61b9..f8b4d889dc4a 100644
--- a/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd23/files/extra-patch-aclocal.m4
@@ -6,8 +6,8 @@ diff -u aclocal.m4.orig aclocal.m4
  	    BDB_LIBADD=""
  	fi
  
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
                dblib="berkeley"; break, dblib="no")
diff --git a/mail/cyrus-imapd23/files/patch-ac b/mail/cyrus-imapd23/files/patch-ac
index bf700856699a..2088891edc95 100644
--- a/mail/cyrus-imapd23/files/patch-ac
+++ b/mail/cyrus-imapd23/files/patch-ac
@@ -1,17 +1,17 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Wed Oct 29 02:24:50 2003
-+++ configure	Wed Oct 29 03:52:02 2003
-@@ -6811,7 +6811,7 @@
+--- configure.orig	Thu Jan 15 23:36:50 2004
++++ configure	Fri Jan 16 04:03:09 2004
+@@ -6565,7 +6565,7 @@
  	    BDB_LIBADD=""
  	fi
  
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
-@@ -13851,7 +13851,7 @@
+@@ -13854,7 +13854,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
diff --git a/mail/cyrus-imapd23/files/patch-config.h.in b/mail/cyrus-imapd23/files/patch-config.h.in
deleted file mode 100644
index f49e1e525f4b..000000000000
--- a/mail/cyrus-imapd23/files/patch-config.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Thu Mar 20 04:04:36 2003
-+++ config.h.in	Fri Mar 21 14:33:39 2003
-@@ -360,8 +360,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd23/files/patch-dc b/mail/cyrus-imapd23/files/patch-dc
deleted file mode 100644
index f2f5f074e332..000000000000
--- a/mail/cyrus-imapd23/files/patch-dc
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Feb  7 07:41:03 2003
-+++ master/Makefile.in	Fri Mar 21 18:02:28 2003
-@@ -52,7 +52,8 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \
-+	-DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd23/files/patch-imap::idled.c b/mail/cyrus-imapd23/files/patch-imap::idled.c
deleted file mode 100644
index f08a8a677048..000000000000
--- a/mail/cyrus-imapd23/files/patch-imap::idled.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imap/idled.c
-diff -u imap/idled.c.orig imap/idled.c
---- imap/idled.c.orig	Thu Oct 23 03:50:07 2003
-+++ imap/idled.c	Tue Jan 13 23:17:21 2004
-@@ -409,3 +409,10 @@
-     /* never gets here */      
-     exit(1);
- }
-+
-+void printstring(const char *s __attribute__((unused)))
-+{
-+    /* needed to link against annotate.o */
-+    fatal("printstring() executed, but its not used for IDLED!",
-+	  EC_SOFTWARE);
-+}
diff --git a/mail/cyrus-imapd23/files/patch-lib::Makefile.in b/mail/cyrus-imapd23/files/patch-lib::Makefile.in
deleted file mode 100644
index b85111fb7723..000000000000
--- a/mail/cyrus-imapd23/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Feb 13 04:12:42 2003
-+++ lib/Makefile.in	Fri Mar 21 15:11:50 2003
-@@ -56,7 +56,7 @@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
diff --git a/mail/cyrus-imapd23/files/patch-sieve::Makefile.in b/mail/cyrus-imapd23/files/patch-sieve::Makefile.in
index cbc212929f04..d54f608b1f92 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	Fri Feb 28 03:13:50 2003
-+++ sieve/Makefile.in	Mon Mar 24 02:26:24 2003
-@@ -32,6 +32,7 @@
+--- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
++++ sieve/Makefile.in	Fri Jan 16 03:47:03 2004
+@@ -33,6 +33,7 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,12 +10,12 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
-@@ -58,7 +59,7 @@
+@@ -59,7 +60,7 @@
  
  install: sievec
- 	$(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin
--	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
-+	$(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
+ 	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+-	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit
++	$(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit
  
  test: $(DEPLIBS) libsieve.a test.o
  	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 4f1750c38a39..2ca5c049726e 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -38,6 +38,7 @@ cyrus/bin/pop3proxyd
 %%MURDER%%cyrus/bin/proxyd
 cyrus/bin/reconstruct
 cyrus/bin/sievec
+cyrus/bin/smmapd
 cyrus/bin/squatter
 cyrus/bin/timsieved
 cyrus/bin/tls_prune
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 984e0c70b231..a9404a1dda4c 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,13 +6,12 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.2.2.b
-PORTREVISION=	2
+PORTVERSION= 	2.2.3
+#PORTREVISION=	0
 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/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
-DISTNAME=	${PORTNAME}-2.2.2-BETA
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
@@ -28,7 +27,8 @@ USE_OPENSSL=	yes
 USE_PERL5=	yes
 USE_REINPLACE=	YES
 GNU_CONFIGURE=	YES
-CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
+CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
+		--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-user=${CYRUS_USER} \
 		--with-cyrus-group=${CYRUS_GROUP} \
 		--with-sasl=${LOCALBASE} \
@@ -103,10 +103,8 @@ CONFIGURE_ARGS+=--enable-netscapehack
 
 .if defined(WITH_DRAC)
 EXTRA_PATCHES+=	${WRKSRC}/contrib/drac_auth.patch
-#EXTRA_PATCHES+=	${FILESDIR}/extra-patch-acconfig.h
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-aclocal.m4
-EXTRA_PATCHES+=	${FILESDIR}/extra-patch-config.h.in
-#USE_AUTOHEADER=	YES
+USE_AUTOHEADER=	YES
 USE_AUTOCONF=	YES
 WANT_AUTOCONF_VER=257
 CONFIGURE_ARGS+=--with-drac=${LOCALBASE}
@@ -132,8 +130,8 @@ MAN8=		arbitron.8 chk_cyrus.8 nntpd.8 ctl_cyrusdb.8 ctl_deliver.8 \
 		cyr_expire.8 ctl_mboxlist.8 cvt_cyrusdb.8 cyrquota.8 \
 		deliver.8 fetchnews.8 fud.8 idled.8 imapd.8 ipurge.8 \
 		lmtpd.8 master.8 mbexamine.8 mbpath.8 notifyd.8 pop3d.8 \
-		reconstruct.8 rmnews.8 squatter.8 syncnews.8 timsieved.8 \
-		tls_prune.8
+		reconstruct.8 rmnews.8 smmapd.8 squatter.8 syncnews.8 \
+		timsieved.8 tls_prune.8
 
 DOCS=		altnamespace anoncvs bugs changes faq feedback index \
 		install install-admin-mb install-auth install-compile \
@@ -172,12 +170,6 @@ pre-everything::
 	fi
 .endif
 
-.if defined(WITH_DRAC)
-pre-patch:
-		@${REINPLACE_CMD} -e '/^Index: acconfig\.h/,/^Index: /d' \
-			${WRKSRC}/contrib/drac_auth.patch
-.endif
-
 post-patch:
 		@${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \
 			${.CURDIR}/pkg-install > ${PKGINSTALL}
@@ -214,7 +206,7 @@ post-install:
 			>>${TMPPLIST}; \
 		fi
 .endfor
-.for file in cyrusv2.mc murder.png netnews.png
+.for file in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png
 		${INSTALL_DATA} ${WRKSRC}/doc/${file} ${DOCSDIR}
 		@${ECHO_CMD} share/doc/cyrus-imapd22/${file} >>${TMPPLIST}
 .endfor
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index f2179e3ff99a..4ed0375278bd 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1 +1 @@
-MD5 (cyrus-imapd-2.2.2-BETA.tar.gz) = 774b55e758a2bf83d6ffd6b90a3fff4c
+MD5 (cyrus-imapd-2.2.3.tar.gz) = 32888c5120edeb2867d6283fedbdb7d5
diff --git a/mail/cyrus-imapd24/files/extra-patch-acconfig.h b/mail/cyrus-imapd24/files/extra-patch-acconfig.h
deleted file mode 100644
index 05e561b78963..000000000000
--- a/mail/cyrus-imapd24/files/extra-patch-acconfig.h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: acconfig.h
-diff -u acconfig.h.orig acconfig.h
---- acconfig.h.orig	Fri Feb 14 05:32:50 2003
-+++ acconfig.h	Fri Mar 21 21:03:25 2003
-@@ -263,8 +263,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4 b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
index 69be3bdc61b9..f8b4d889dc4a 100644
--- a/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
+++ b/mail/cyrus-imapd24/files/extra-patch-aclocal.m4
@@ -6,8 +6,8 @@ diff -u aclocal.m4.orig aclocal.m4
  	    BDB_LIBADD=""
  	fi
  
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              AC_CHECK_LIB($dbname, db_create, BDB_LIBADD="$BDB_LIBADD -l$dbname";
                dblib="berkeley"; break, dblib="no")
diff --git a/mail/cyrus-imapd24/files/patch-ac b/mail/cyrus-imapd24/files/patch-ac
index bf700856699a..2088891edc95 100644
--- a/mail/cyrus-imapd24/files/patch-ac
+++ b/mail/cyrus-imapd24/files/patch-ac
@@ -1,17 +1,17 @@
 Index: configure
 diff -u configure.orig configure
---- configure.orig	Wed Oct 29 02:24:50 2003
-+++ configure	Wed Oct 29 03:52:02 2003
-@@ -6811,7 +6811,7 @@
+--- configure.orig	Thu Jan 15 23:36:50 2004
++++ configure	Fri Jan 16 04:03:09 2004
+@@ -6565,7 +6565,7 @@
  	    BDB_LIBADD=""
  	fi
  
--        for dbname in db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
-+        for dbname in ${with_bdb} db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
+-        for dbname in db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
++        for dbname in ${with_bdb} db-4.2 db4.2 db42 db-4.1 db4.1 db41 db-4.0 db4.0 db-4 db40 db4 db-3.3 db3.3 db33 db-3.2 db3.2 db32 db-3.1 db3.1 db31 db-3 db30 db3 db
            do
              as_ac_Lib=`echo "ac_cv_lib_$dbname''_db_create" | $as_tr_sh`
  echo "$as_me:$LINENO: checking for db_create in -l$dbname" >&5
-@@ -13851,7 +13851,7 @@
+@@ -13854,7 +13854,7 @@
  #define HAVE_UCDSNMP 1
  _ACEOF
  
diff --git a/mail/cyrus-imapd24/files/patch-config.h.in b/mail/cyrus-imapd24/files/patch-config.h.in
deleted file mode 100644
index f49e1e525f4b..000000000000
--- a/mail/cyrus-imapd24/files/patch-config.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: config.h.in
-diff -u config.h.in.orig config.h.in
---- config.h.in.orig	Thu Mar 20 04:04:36 2003
-+++ config.h.in	Fri Mar 21 14:33:39 2003
-@@ -360,8 +360,12 @@
- #define FNAME_DOMAINDIR "/domain/"
- #define FNAME_LOGDIR "/log/"
- #define FNAME_PTSDB "/ptclient/ptscache.db"
-+#if !defined(CONFIG_FILENAME)
- #define CONFIG_FILENAME "/etc/imapd.conf"
-+#endif
-+#if !defined(DEFAULT_MASTER_CONFIG_FILENAME)
- #define DEFAULT_MASTER_CONFIG_FILENAME "/etc/cyrus.conf"
-+#endif
- 
- #ifndef HAVE_SHUTDOWN
- #define shutdown(fd, mode) 0
diff --git a/mail/cyrus-imapd24/files/patch-dc b/mail/cyrus-imapd24/files/patch-dc
deleted file mode 100644
index f2f5f074e332..000000000000
--- a/mail/cyrus-imapd24/files/patch-dc
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: master/Makefile.in
-diff -u master/Makefile.in.orig master/Makefile.in
---- master/Makefile.in.orig	Fri Feb  7 07:41:03 2003
-+++ master/Makefile.in	Fri Mar 21 18:02:28 2003
-@@ -52,7 +52,8 @@
- CYRUS_USER=@cyrus_user@
- CYRUS_GROUP=@cyrus_group@
- 
--DEFS = @DEFS@ @LOCALDEFS@
-+DEFS = @DEFS@ @LOCALDEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\" \
-+	-DDEFAULT_MASTER_CONFIG_FILENAME=\"$(prefix)/etc/cyrus.conf\"
- CPPFLAGS = -I. -I.. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @COM_ERR_CPPFLAGS@
- DEPLIBS = ../lib/libcyrus_min.a @DEPLIBS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-imap::idled.c b/mail/cyrus-imapd24/files/patch-imap::idled.c
deleted file mode 100644
index f08a8a677048..000000000000
--- a/mail/cyrus-imapd24/files/patch-imap::idled.c
+++ /dev/null
@@ -1,15 +0,0 @@
-Index: imap/idled.c
-diff -u imap/idled.c.orig imap/idled.c
---- imap/idled.c.orig	Thu Oct 23 03:50:07 2003
-+++ imap/idled.c	Tue Jan 13 23:17:21 2004
-@@ -409,3 +409,10 @@
-     /* never gets here */      
-     exit(1);
- }
-+
-+void printstring(const char *s __attribute__((unused)))
-+{
-+    /* needed to link against annotate.o */
-+    fatal("printstring() executed, but its not used for IDLED!",
-+	  EC_SOFTWARE);
-+}
diff --git a/mail/cyrus-imapd24/files/patch-lib::Makefile.in b/mail/cyrus-imapd24/files/patch-lib::Makefile.in
deleted file mode 100644
index b85111fb7723..000000000000
--- a/mail/cyrus-imapd24/files/patch-lib::Makefile.in
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lib/Makefile.in
-diff -u lib/Makefile.in.orig lib/Makefile.in
---- lib/Makefile.in.orig	Thu Feb 13 04:12:42 2003
-+++ lib/Makefile.in	Fri Mar 21 15:11:50 2003
-@@ -56,7 +56,7 @@
- INSTALL = @INSTALL@
- RANLIB = @RANLIB@
- 
--DEFS = @DEFS@
-+DEFS = @DEFS@ -DCONFIG_FILENAME=\"$(prefix)/etc/imapd.conf\"
- CPPFLAGS = -I.. @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SASLFLAGS@
- LIBS = @LIBS@
- 
diff --git a/mail/cyrus-imapd24/files/patch-sieve::Makefile.in b/mail/cyrus-imapd24/files/patch-sieve::Makefile.in
index cbc212929f04..d54f608b1f92 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	Fri Feb 28 03:13:50 2003
-+++ sieve/Makefile.in	Mon Mar 24 02:26:24 2003
-@@ -32,6 +32,7 @@
+--- sieve/Makefile.in.orig	Wed Nov 12 13:02:12 2003
++++ sieve/Makefile.in	Fri Jan 16 03:47:03 2004
+@@ -33,6 +33,7 @@
  YACC = @YACC@
  YFLAGS = -d
  LEX = @LEX@
@@ -10,12 +10,12 @@ diff -u sieve/Makefile.in.orig sieve/Makefile.in
  RANLIB = @RANLIB@
  COMPILE_ET = @COMPILE_ET@
  
-@@ -58,7 +59,7 @@
+@@ -59,7 +60,7 @@
  
  install: sievec
- 	$(srcdir)/../install-sh -d ${DESTDIR}$(cyrus_prefix)/bin
--	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
-+	$(INSTALL) -m 755 sievec $(DESTDIR)$(cyrus_prefix)/bin || exit
+ 	$(srcdir)/../install-sh -d ${DESTDIR}$(service_path)
+-	$(srcdir)/../install-sh -m 755 sievec $(DESTDIR)$(service_path) || exit
++	$(INSTALL) -m 755 sievec $(DESTDIR)$(service_path) || exit
  
  test: $(DEPLIBS) libsieve.a test.o
  	$(CC) $(LDFLAGS) -o test test.o libsieve.a $(DEPLIBS) $(LIBS)
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 4f1750c38a39..2ca5c049726e 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -38,6 +38,7 @@ cyrus/bin/pop3proxyd
 %%MURDER%%cyrus/bin/proxyd
 cyrus/bin/reconstruct
 cyrus/bin/sievec
+cyrus/bin/smmapd
 cyrus/bin/squatter
 cyrus/bin/timsieved
 cyrus/bin/tls_prune