Update cyrus-imapd to 1.6.24nb1:

* Update dependency on cyrus-sasl to >=1.5.24nb2.
* Move creation of cyrus user and mail group to cyrus-sasl.
* Install HTML documentation.
* Install minimal imapd.conf configuration file defaulting to 'pwcheck'
  authentication.
* Install mkimap perl script for creating cyrus imap directories.
* Improvements to DEINSTALL/INSTALL scripts.
* Make me the maintainer.

4 files changed, 58 insertions, 0 deletions

diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa
new file mode 100644
index 00000000000..96220688232
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-aa
@@ -0,0 +1,19 @@
+$NetBSD: patch-aa,v 1.1 2000/12/10 09:46:13 jlam Exp $
+
+--- doc/html/install.html.orig	Thu Dec 30 16:07:24 1999
++++ doc/html/install.html
+@@ -573,12 +573,12 @@
+ </kbd></pre>
+ 
+ <li>Change to the Cyrus user and use the tool
+-"<tt>tools/mkimap</tt>" to create the rest of the directories
++"<tt>mkimap</tt>" to create the rest of the directories
+ (subdirectories of the directories you just created).
+ 
+ <pre>
+ <kbd>   su cyrus
+-   tools/mkimap
++   /usr/cyrus/bin/mkimap
+ </kbd>
+ </pre>
+ 
diff --git a/mail/cyrus-imapd/patches/patch-ab b/mail/cyrus-imapd/patches/patch-ab
new file mode 100644
index 00000000000..266da8fd245
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1 2000/12/10 09:46:13 jlam Exp $
+
+--- installsieve/Makefile.in.orig	Thu Nov 11 13:30:16 1999
++++ installsieve/Makefile.in
+@@ -28,7 +28,7 @@
+ CC = @CC@
+ 
+ DEFS = @DEFS@
+-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@
++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../lib @CPPFLAGS@ @SASLFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
diff --git a/mail/cyrus-imapd/patches/patch-ac b/mail/cyrus-imapd/patches/patch-ac
new file mode 100644
index 00000000000..ed51016a313
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1 2000/12/10 09:46:13 jlam Exp $
+
+--- timsieved/Makefile.in.orig	Thu Nov 11 13:30:04 1999
++++ timsieved/Makefile.in
+@@ -34,7 +34,7 @@
+ CYRUS_GROUP=@cyrus_group@
+ 
+ DEFS = @DEFS@ @LOCALDEFS@
+-CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@
++CPPFLAGS = -I. -I$(srcdir) -I$(srcdir)/../sieve -I$(srcdir)/../lib @COM_ERR_CPPFLAGS@ @CPPFLAGS@ @SASLFLAGS@
+ CFLAGS = @CFLAGS@
+ LDFLAGS = @LDFLAGS@
+ 
diff --git a/mail/cyrus-imapd/patches/patch-ad b/mail/cyrus-imapd/patches/patch-ad
new file mode 100644
index 00000000000..b3b0f3b354d
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2000/12/10 09:46:13 jlam Exp $
+
+--- tools/mkimap.orig	Tue Jan  4 15:52:22 2000
++++ tools/mkimap
+@@ -35,7 +35,7 @@
+ 	$conf = $1;
+ 	print "i will configure directory $conf.\n";
+     }
+-    if (/^sieveuserhomedir:\s(1|t|yes|on)/) {
++    if (/^sieveusehomedir:\s(1|t|yes|on)/) {
+ 	$nosievedir = 1;
+ 	print "you are storing sieve scripts in user's home directories.\n";
+     }