6 files changed, 18 insertions, 30 deletions

diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index a387eb7dbae8..db8a12fc69de 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cyrus-imapd
-PORTVERSION= 	2.1.14
+PORTVERSION= 	2.1.15
 #PORTREVISION=	0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
@@ -14,7 +14,7 @@ MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,net/mail/cyrus-mail/&,}
 
 PATCH_SITES=	http://www.imasy.or.jp/~ume/ipv6/
-PATCHFILES=	${DISTNAME}-ipv6-20030703.diff.gz
+PATCHFILES=	${DISTNAME}-ipv6-20030819.diff.gz
 
 MAINTAINER=	ume@FreeBSD.org
 COMMENT=	The cyrus mail server, supporting POP3 and IMAP4 protocols
diff --git a/mail/cyrus-imapd2/distinfo b/mail/cyrus-imapd2/distinfo
index 15f566cb1986..9495deab30f2 100644
--- a/mail/cyrus-imapd2/distinfo
+++ b/mail/cyrus-imapd2/distinfo
@@ -1,2 +1,2 @@
-MD5 (cyrus-imapd-2.1.14.tar.gz) = e30da9749e926f847be5ab4e75eaf110
-MD5 (cyrus-imapd-2.1.14-ipv6-20030703.diff.gz) = 04ea9b030caf0cf2caf95b6ba1486c36
+MD5 (cyrus-imapd-2.1.15.tar.gz) = 17f1272218478bcc71665d9a756d5c07
+MD5 (cyrus-imapd-2.1.15-ipv6-20030819.diff.gz) = de6e1de7a65938d1561cea38c39d77db
diff --git a/mail/cyrus-imapd2/files/patch-ah b/mail/cyrus-imapd2/files/patch-ah
deleted file mode 100644
index 52c44e1c25db..000000000000
--- a/mail/cyrus-imapd2/files/patch-ah
+++ /dev/null
@@ -1,13 +0,0 @@
-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-config.h.in b/mail/cyrus-imapd2/files/patch-config.h.in
new file mode 100644
index 000000000000..21d0bcd1b1c6
--- /dev/null
+++ b/mail/cyrus-imapd2/files/patch-config.h.in
@@ -0,0 +1,13 @@
+Index: config.h.in
+diff -u config.h.in.orig config.h.in
+--- config.h.in.orig	Tue Aug 19 04:47:14 2003
++++ config.h.in	Tue Aug 19 04:50:46 2003
+@@ -364,7 +364,7 @@
+ #endif
+ 
+ /* sendmail 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-di b/mail/cyrus-imapd2/files/patch-di
deleted file mode 100644
index ba35e969ab60..000000000000
--- a/mail/cyrus-imapd2/files/patch-di
+++ /dev/null
@@ -1,13 +0,0 @@
-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-plist b/mail/cyrus-imapd2/pkg-plist
index 3fecd788183f..9cea1b0da89f 100644
--- a/mail/cyrus-imapd2/pkg-plist
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -7,6 +7,7 @@ bin/pop3test
 bin/sieveshell
 bin/sivtest
 bin/smtptest
+cyrus/bin/arbitron
 cyrus/bin/chk_cyrus
 cyrus/bin/ctl_cyrusdb
 cyrus/bin/ctl_deliver