Update to 2.0.14.

20 files changed, 80 insertions, 450 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 6c3771741af9..c844d99cb499 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.13
-PORTREVISION=	2
+PORTVERSION= 	2.0.14
 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-20010506.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20010531.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index b21c153cccba..b53ee504f509 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.13.tar.gz) = 7d5fadb3eaffdeacb3639d2f6bd7b5a5
-MD5 (cyrus-imapd-2.0.13-ipv6-20010506.diff.gz) = 77bb0f9aa148146207213b79746f5695
+MD5 (cyrus-imapd-2.0.14.tar.gz) = 267184ae5fcc4ef5d355caf2550b821a
+MD5 (cyrus-imapd-2.0.14-ipv6-20010531.diff.gz) = 3a43c2605dbd521286a5a37ff6d72981
diff --git a/mail/cyrus-imapd/files/patch-dh b/mail/cyrus-imapd/files/patch-dh
deleted file mode 100644
index 23a4e67bcc2e..000000000000
--- a/mail/cyrus-imapd/files/patch-dh
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: imap/imapd.c
-diff -u imap/imapd.c.orig imap/imapd.c
---- imap/imapd.c.orig	Mon May  7 02:45:36 2001
-+++ imap/imapd.c	Mon May  7 03:31:46 2001
-@@ -394,6 +394,9 @@
-     imapd_exists = -1;
- }
- 
-+static int imaps = 0;
-+static sasl_ssf_t extprops_ssf = 0;
-+
- /*
-  * run once when process is forked;
-  * MUST NOT exit directly; must return with non-zero error code
-@@ -401,6 +404,7 @@
- int service_init(int argc, char **argv, char **envp)
- {
-     int r;
-+    int opt;
- 
-     config_changeident("imapd");
-     
-@@ -447,6 +451,26 @@
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
- 
-+    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
-+	switch (opt) {
-+	case 'C': /* alt config file - handled by service::main() */
-+	    break;
-+	case 's': /* imaps (do starttls right away) */
-+	    imaps = 1;
-+	    if (!starttls_enabled()) {
-+		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
-+		fatal("imaps: required OpenSSL options not present",
-+		      EC_CONFIG);
-+	    }
-+	    break;
-+	case 'p': /* external protection */
-+	    extprops_ssf = atoi(optarg);
-+	    break;
-+	default:
-+	    break;
-+	}
-+    }
-+
-     return 0;
- }
- 
-@@ -455,8 +479,6 @@
-  */
- int service_main(int argc, char **argv, char **envp)
- {
--    int imaps = 0;
--    int opt;
-     socklen_t salen;
-     struct hostent *hp;
-     int timeout;
-@@ -478,25 +500,7 @@
- #endif
- 
-     memset(&extprops, 0, sizeof(sasl_external_properties_t));
--    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
--	switch (opt) {
--	case 'C': /* alt config file - handled by service::main() */
--	    break;
--	case 's': /* imaps (do starttls right away) */
--	    imaps = 1;
--	    if (!starttls_enabled()) {
--		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
--		fatal("imaps: required OpenSSL options not present",
--		      EC_CONFIG);
--	    }
--	    break;
--	case 'p': /* external protection */
--	    extprops.ssf = atoi(optarg);
--	    break;
--	default:
--	    break;
--	}
--    }
-+    extprops.ssf = extprops_ssf;
- 
-     imapd_in = prot_new(0, 0);
-     imapd_out = prot_new(1, 1);
diff --git a/mail/cyrus-imapd/files/patch-di b/mail/cyrus-imapd/files/patch-di
new file mode 100644
index 000000000000..158e70cd5f2e
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-di
@@ -0,0 +1,12 @@
+Index: imap/pop3d.c
+diff -u imap/pop3d.c.orig imap/pop3d.c
+--- imap/pop3d.c.orig	Thu May 31 06:24:20 2001
++++ imap/pop3d.c	Thu May 31 06:35:46 2001
+@@ -53,6 +53,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <assert.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <syslog.h>
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 6c3771741af9..c844d99cb499 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.13
-PORTREVISION=	2
+PORTVERSION= 	2.0.14
 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-20010506.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20010531.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
diff --git a/mail/cyrus-imapd2/distinfo b/mail/cyrus-imapd2/distinfo
index b21c153cccba..b53ee504f509 100644
--- a/mail/cyrus-imapd2/distinfo
+++ b/mail/cyrus-imapd2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.13.tar.gz) = 7d5fadb3eaffdeacb3639d2f6bd7b5a5
-MD5 (cyrus-imapd-2.0.13-ipv6-20010506.diff.gz) = 77bb0f9aa148146207213b79746f5695
+MD5 (cyrus-imapd-2.0.14.tar.gz) = 267184ae5fcc4ef5d355caf2550b821a
+MD5 (cyrus-imapd-2.0.14-ipv6-20010531.diff.gz) = 3a43c2605dbd521286a5a37ff6d72981
diff --git a/mail/cyrus-imapd2/files/patch-dh b/mail/cyrus-imapd2/files/patch-dh
deleted file mode 100644
index 23a4e67bcc2e..000000000000
--- a/mail/cyrus-imapd2/files/patch-dh
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: imap/imapd.c
-diff -u imap/imapd.c.orig imap/imapd.c
---- imap/imapd.c.orig	Mon May  7 02:45:36 2001
-+++ imap/imapd.c	Mon May  7 03:31:46 2001
-@@ -394,6 +394,9 @@
-     imapd_exists = -1;
- }
- 
-+static int imaps = 0;
-+static sasl_ssf_t extprops_ssf = 0;
-+
- /*
-  * run once when process is forked;
-  * MUST NOT exit directly; must return with non-zero error code
-@@ -401,6 +404,7 @@
- int service_init(int argc, char **argv, char **envp)
- {
-     int r;
-+    int opt;
- 
-     config_changeident("imapd");
-     
-@@ -447,6 +451,26 @@
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
- 
-+    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
-+	switch (opt) {
-+	case 'C': /* alt config file - handled by service::main() */
-+	    break;
-+	case 's': /* imaps (do starttls right away) */
-+	    imaps = 1;
-+	    if (!starttls_enabled()) {
-+		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
-+		fatal("imaps: required OpenSSL options not present",
-+		      EC_CONFIG);
-+	    }
-+	    break;
-+	case 'p': /* external protection */
-+	    extprops_ssf = atoi(optarg);
-+	    break;
-+	default:
-+	    break;
-+	}
-+    }
-+
-     return 0;
- }
- 
-@@ -455,8 +479,6 @@
-  */
- int service_main(int argc, char **argv, char **envp)
- {
--    int imaps = 0;
--    int opt;
-     socklen_t salen;
-     struct hostent *hp;
-     int timeout;
-@@ -478,25 +500,7 @@
- #endif
- 
-     memset(&extprops, 0, sizeof(sasl_external_properties_t));
--    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
--	switch (opt) {
--	case 'C': /* alt config file - handled by service::main() */
--	    break;
--	case 's': /* imaps (do starttls right away) */
--	    imaps = 1;
--	    if (!starttls_enabled()) {
--		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
--		fatal("imaps: required OpenSSL options not present",
--		      EC_CONFIG);
--	    }
--	    break;
--	case 'p': /* external protection */
--	    extprops.ssf = atoi(optarg);
--	    break;
--	default:
--	    break;
--	}
--    }
-+    extprops.ssf = extprops_ssf;
- 
-     imapd_in = prot_new(0, 0);
-     imapd_out = prot_new(1, 1);
diff --git a/mail/cyrus-imapd2/files/patch-di b/mail/cyrus-imapd2/files/patch-di
new file mode 100644
index 000000000000..158e70cd5f2e
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-di
@@ -0,0 +1,12 @@
+Index: imap/pop3d.c
+diff -u imap/pop3d.c.orig imap/pop3d.c
+--- imap/pop3d.c.orig	Thu May 31 06:24:20 2001
++++ imap/pop3d.c	Thu May 31 06:35:46 2001
+@@ -53,6 +53,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <assert.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <syslog.h>
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 6c3771741af9..c844d99cb499 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.13
-PORTREVISION=	2
+PORTVERSION= 	2.0.14
 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-20010506.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20010531.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
diff --git a/mail/cyrus-imapd22/distinfo b/mail/cyrus-imapd22/distinfo
index b21c153cccba..b53ee504f509 100644
--- a/mail/cyrus-imapd22/distinfo
+++ b/mail/cyrus-imapd22/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.13.tar.gz) = 7d5fadb3eaffdeacb3639d2f6bd7b5a5
-MD5 (cyrus-imapd-2.0.13-ipv6-20010506.diff.gz) = 77bb0f9aa148146207213b79746f5695
+MD5 (cyrus-imapd-2.0.14.tar.gz) = 267184ae5fcc4ef5d355caf2550b821a
+MD5 (cyrus-imapd-2.0.14-ipv6-20010531.diff.gz) = 3a43c2605dbd521286a5a37ff6d72981
diff --git a/mail/cyrus-imapd22/files/patch-dh b/mail/cyrus-imapd22/files/patch-dh
deleted file mode 100644
index 23a4e67bcc2e..000000000000
--- a/mail/cyrus-imapd22/files/patch-dh
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: imap/imapd.c
-diff -u imap/imapd.c.orig imap/imapd.c
---- imap/imapd.c.orig	Mon May  7 02:45:36 2001
-+++ imap/imapd.c	Mon May  7 03:31:46 2001
-@@ -394,6 +394,9 @@
-     imapd_exists = -1;
- }
- 
-+static int imaps = 0;
-+static sasl_ssf_t extprops_ssf = 0;
-+
- /*
-  * run once when process is forked;
-  * MUST NOT exit directly; must return with non-zero error code
-@@ -401,6 +404,7 @@
- int service_init(int argc, char **argv, char **envp)
- {
-     int r;
-+    int opt;
- 
-     config_changeident("imapd");
-     
-@@ -447,6 +451,26 @@
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
- 
-+    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
-+	switch (opt) {
-+	case 'C': /* alt config file - handled by service::main() */
-+	    break;
-+	case 's': /* imaps (do starttls right away) */
-+	    imaps = 1;
-+	    if (!starttls_enabled()) {
-+		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
-+		fatal("imaps: required OpenSSL options not present",
-+		      EC_CONFIG);
-+	    }
-+	    break;
-+	case 'p': /* external protection */
-+	    extprops_ssf = atoi(optarg);
-+	    break;
-+	default:
-+	    break;
-+	}
-+    }
-+
-     return 0;
- }
- 
-@@ -455,8 +479,6 @@
-  */
- int service_main(int argc, char **argv, char **envp)
- {
--    int imaps = 0;
--    int opt;
-     socklen_t salen;
-     struct hostent *hp;
-     int timeout;
-@@ -478,25 +500,7 @@
- #endif
- 
-     memset(&extprops, 0, sizeof(sasl_external_properties_t));
--    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
--	switch (opt) {
--	case 'C': /* alt config file - handled by service::main() */
--	    break;
--	case 's': /* imaps (do starttls right away) */
--	    imaps = 1;
--	    if (!starttls_enabled()) {
--		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
--		fatal("imaps: required OpenSSL options not present",
--		      EC_CONFIG);
--	    }
--	    break;
--	case 'p': /* external protection */
--	    extprops.ssf = atoi(optarg);
--	    break;
--	default:
--	    break;
--	}
--    }
-+    extprops.ssf = extprops_ssf;
- 
-     imapd_in = prot_new(0, 0);
-     imapd_out = prot_new(1, 1);
diff --git a/mail/cyrus-imapd22/files/patch-di b/mail/cyrus-imapd22/files/patch-di
new file mode 100644
index 000000000000..158e70cd5f2e
--- /dev/null
+++ b/mail/cyrus-imapd22/files/patch-di
@@ -0,0 +1,12 @@
+Index: imap/pop3d.c
+diff -u imap/pop3d.c.orig imap/pop3d.c
+--- imap/pop3d.c.orig	Thu May 31 06:24:20 2001
++++ imap/pop3d.c	Thu May 31 06:35:46 2001
+@@ -53,6 +53,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <assert.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <syslog.h>
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 6c3771741af9..c844d99cb499 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.13
-PORTREVISION=	2
+PORTVERSION= 	2.0.14
 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-20010506.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20010531.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
diff --git a/mail/cyrus-imapd23/distinfo b/mail/cyrus-imapd23/distinfo
index b21c153cccba..b53ee504f509 100644
--- a/mail/cyrus-imapd23/distinfo
+++ b/mail/cyrus-imapd23/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.13.tar.gz) = 7d5fadb3eaffdeacb3639d2f6bd7b5a5
-MD5 (cyrus-imapd-2.0.13-ipv6-20010506.diff.gz) = 77bb0f9aa148146207213b79746f5695
+MD5 (cyrus-imapd-2.0.14.tar.gz) = 267184ae5fcc4ef5d355caf2550b821a
+MD5 (cyrus-imapd-2.0.14-ipv6-20010531.diff.gz) = 3a43c2605dbd521286a5a37ff6d72981
diff --git a/mail/cyrus-imapd23/files/patch-dh b/mail/cyrus-imapd23/files/patch-dh
deleted file mode 100644
index 23a4e67bcc2e..000000000000
--- a/mail/cyrus-imapd23/files/patch-dh
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: imap/imapd.c
-diff -u imap/imapd.c.orig imap/imapd.c
---- imap/imapd.c.orig	Mon May  7 02:45:36 2001
-+++ imap/imapd.c	Mon May  7 03:31:46 2001
-@@ -394,6 +394,9 @@
-     imapd_exists = -1;
- }
- 
-+static int imaps = 0;
-+static sasl_ssf_t extprops_ssf = 0;
-+
- /*
-  * run once when process is forked;
-  * MUST NOT exit directly; must return with non-zero error code
-@@ -401,6 +404,7 @@
- int service_init(int argc, char **argv, char **envp)
- {
-     int r;
-+    int opt;
- 
-     config_changeident("imapd");
-     
-@@ -447,6 +451,26 @@
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
- 
-+    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
-+	switch (opt) {
-+	case 'C': /* alt config file - handled by service::main() */
-+	    break;
-+	case 's': /* imaps (do starttls right away) */
-+	    imaps = 1;
-+	    if (!starttls_enabled()) {
-+		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
-+		fatal("imaps: required OpenSSL options not present",
-+		      EC_CONFIG);
-+	    }
-+	    break;
-+	case 'p': /* external protection */
-+	    extprops_ssf = atoi(optarg);
-+	    break;
-+	default:
-+	    break;
-+	}
-+    }
-+
-     return 0;
- }
- 
-@@ -455,8 +479,6 @@
-  */
- int service_main(int argc, char **argv, char **envp)
- {
--    int imaps = 0;
--    int opt;
-     socklen_t salen;
-     struct hostent *hp;
-     int timeout;
-@@ -478,25 +500,7 @@
- #endif
- 
-     memset(&extprops, 0, sizeof(sasl_external_properties_t));
--    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
--	switch (opt) {
--	case 'C': /* alt config file - handled by service::main() */
--	    break;
--	case 's': /* imaps (do starttls right away) */
--	    imaps = 1;
--	    if (!starttls_enabled()) {
--		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
--		fatal("imaps: required OpenSSL options not present",
--		      EC_CONFIG);
--	    }
--	    break;
--	case 'p': /* external protection */
--	    extprops.ssf = atoi(optarg);
--	    break;
--	default:
--	    break;
--	}
--    }
-+    extprops.ssf = extprops_ssf;
- 
-     imapd_in = prot_new(0, 0);
-     imapd_out = prot_new(1, 1);
diff --git a/mail/cyrus-imapd23/files/patch-di b/mail/cyrus-imapd23/files/patch-di
new file mode 100644
index 000000000000..158e70cd5f2e
--- /dev/null
+++ b/mail/cyrus-imapd23/files/patch-di
@@ -0,0 +1,12 @@
+Index: imap/pop3d.c
+diff -u imap/pop3d.c.orig imap/pop3d.c
+--- imap/pop3d.c.orig	Thu May 31 06:24:20 2001
++++ imap/pop3d.c	Thu May 31 06:35:46 2001
+@@ -53,6 +53,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <assert.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <syslog.h>
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 6c3771741af9..c844d99cb499 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -6,14 +6,13 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.0.13
-PORTREVISION=	2
+PORTVERSION= 	2.0.14
 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-20010506.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20010531.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 
diff --git a/mail/cyrus-imapd24/distinfo b/mail/cyrus-imapd24/distinfo
index b21c153cccba..b53ee504f509 100644
--- a/mail/cyrus-imapd24/distinfo
+++ b/mail/cyrus-imapd24/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.0.13.tar.gz) = 7d5fadb3eaffdeacb3639d2f6bd7b5a5
-MD5 (cyrus-imapd-2.0.13-ipv6-20010506.diff.gz) = 77bb0f9aa148146207213b79746f5695
+MD5 (cyrus-imapd-2.0.14.tar.gz) = 267184ae5fcc4ef5d355caf2550b821a
+MD5 (cyrus-imapd-2.0.14-ipv6-20010531.diff.gz) = 3a43c2605dbd521286a5a37ff6d72981
diff --git a/mail/cyrus-imapd24/files/patch-dh b/mail/cyrus-imapd24/files/patch-dh
deleted file mode 100644
index 23a4e67bcc2e..000000000000
--- a/mail/cyrus-imapd24/files/patch-dh
+++ /dev/null
@@ -1,85 +0,0 @@
-Index: imap/imapd.c
-diff -u imap/imapd.c.orig imap/imapd.c
---- imap/imapd.c.orig	Mon May  7 02:45:36 2001
-+++ imap/imapd.c	Mon May  7 03:31:46 2001
-@@ -394,6 +394,9 @@
-     imapd_exists = -1;
- }
- 
-+static int imaps = 0;
-+static sasl_ssf_t extprops_ssf = 0;
-+
- /*
-  * run once when process is forked;
-  * MUST NOT exit directly; must return with non-zero error code
-@@ -401,6 +404,7 @@
- int service_init(int argc, char **argv, char **envp)
- {
-     int r;
-+    int opt;
- 
-     config_changeident("imapd");
-     
-@@ -447,6 +451,26 @@
-     snmp_connect(); /* ignore return code */
-     snmp_set_str(SERVER_NAME_VERSION,CYRUS_VERSION);
- 
-+    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
-+	switch (opt) {
-+	case 'C': /* alt config file - handled by service::main() */
-+	    break;
-+	case 's': /* imaps (do starttls right away) */
-+	    imaps = 1;
-+	    if (!starttls_enabled()) {
-+		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
-+		fatal("imaps: required OpenSSL options not present",
-+		      EC_CONFIG);
-+	    }
-+	    break;
-+	case 'p': /* external protection */
-+	    extprops_ssf = atoi(optarg);
-+	    break;
-+	default:
-+	    break;
-+	}
-+    }
-+
-     return 0;
- }
- 
-@@ -455,8 +479,6 @@
-  */
- int service_main(int argc, char **argv, char **envp)
- {
--    int imaps = 0;
--    int opt;
-     socklen_t salen;
-     struct hostent *hp;
-     int timeout;
-@@ -478,25 +500,7 @@
- #endif
- 
-     memset(&extprops, 0, sizeof(sasl_external_properties_t));
--    while ((opt = getopt(argc, argv, "C:sp:")) != EOF) {
--	switch (opt) {
--	case 'C': /* alt config file - handled by service::main() */
--	    break;
--	case 's': /* imaps (do starttls right away) */
--	    imaps = 1;
--	    if (!starttls_enabled()) {
--		syslog(LOG_ERR, "imaps: required OpenSSL options not present");
--		fatal("imaps: required OpenSSL options not present",
--		      EC_CONFIG);
--	    }
--	    break;
--	case 'p': /* external protection */
--	    extprops.ssf = atoi(optarg);
--	    break;
--	default:
--	    break;
--	}
--    }
-+    extprops.ssf = extprops_ssf;
- 
-     imapd_in = prot_new(0, 0);
-     imapd_out = prot_new(1, 1);
diff --git a/mail/cyrus-imapd24/files/patch-di b/mail/cyrus-imapd24/files/patch-di
new file mode 100644
index 000000000000..158e70cd5f2e
--- /dev/null
+++ b/mail/cyrus-imapd24/files/patch-di
@@ -0,0 +1,12 @@
+Index: imap/pop3d.c
+diff -u imap/pop3d.c.orig imap/pop3d.c
+--- imap/pop3d.c.orig	Thu May 31 06:24:20 2001
++++ imap/pop3d.c	Thu May 31 06:35:46 2001
+@@ -53,6 +53,7 @@
+ #include <fcntl.h>
+ #include <time.h>
+ #include <signal.h>
++#include <assert.h>
+ #include <sys/types.h>
+ #include <sys/param.h>
+ #include <syslog.h>