Update to version 2.0.16

Changes to numerous to mention see the changes.html file.

13 files changed, 172 insertions, 124 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 6d14308a30a..8f8e6ea20ce 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2001/06/12 20:33:04 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2001/09/18 21:56:29 skrll Exp $
 
-DISTNAME=		cyrus-imapd-1.6.24
-PKGNAME=		${DISTNAME}nb1
+DISTNAME=		cyrus-imapd-2.0.16
 CATEGORIES=		mail
 MASTER_SITES=		ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 			ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
@@ -10,8 +9,8 @@ MAINTAINER=		jlam@netbsd.org
 HOMEPAGE=		http://asg.web.cmu.edu/cyrus/imapd/
 COMMENT=		IMAP server
 
-DEPENDS+=		tcl>=8.3.2:../../lang/tcl
 DEPENDS+=		cyrus-sasl>=1.5.24nb2:../../security/cyrus-sasl
+DEPENDS+=		db3>=2.9:../../databases/db3
 
 LICENSE=		cyrus-imapd-license
 
@@ -33,8 +32,10 @@ CONFIGURE_ARGS+=	--with-cyrus-user=${CYRUS_USER}
 CONFIGURE_ARGS+=	--with-cyrus-group=${CYRUS_GROUP}
 CONFIGURE_ARGS+=	--with-cyrus-prefix=${PREFIX}/cyrus
 CONFIGURE_ARGS+=	--with-statedir=/var/run
-CONFIGURE_ARGS+=	--with-sasldir=${LOCALBASE}
+CONFIGURE_ARGS+=	--with-sasl=${LOCALBASE}
 CONFIGURE_ARGS+=	--with-openssl=${SSLBASE}
+CONFIGURE_ARGS+=	--with-dbdir=${LOCALBASE}
+CONFIGURE_ARGS+=	--without-ucdsnmp
 CONFIGURE_ARGS+=	--without-notify
 CONFIGURE_ARGS+=	--without-zephyr
 CONFIGURE_ARGS+=	--enable-netscapehack
@@ -80,7 +81,8 @@ post-install:
 	${INSTALL_DATA_DIR} ${EGDIR}
 	${INSTALL_DATA} ${FILESDIR}/imapd.conf ${EGDIR}
 	${INSTALL_DATA_DIR} ${HTMLDIR}
-	cd ${WRKSRC}/doc/html; ${INSTALL_DATA} *.html ${HTMLDIR}
+	cd ${WRKSRC}/doc; ${INSTALL_DATA} *.html ${HTMLDIR}
+	cd ${WRKSRC}/master/conf; ${INSTALL_DATA} *.conf ${EGDIR}
 	PKG_PREFIX=${PREFIX} ${SH} ${INSTALL_FILE} ${PKGNAME} POST-INSTALL
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index 32b07f61fd0..ae22490cc89 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,12 +1,14 @@
-$NetBSD: distinfo,v 1.3 2001/07/22 01:54:53 wiz Exp $
+$NetBSD: distinfo,v 1.4 2001/09/18 21:56:29 skrll Exp $
 
-SHA1 (cyrus-imapd-1.6.24.tar.gz) = 4449de2d25f255ff798dadf3e28f5a9dc69b479e
-Size (cyrus-imapd-1.6.24.tar.gz) = 1046770 bytes
-SHA1 (patch-aa) = d92e953dd4396d329d5cef2348eeb6cfbdb1fdea
-SHA1 (patch-ab) = df07e6e2bd073fba3d330b4076b3309f2fc14894
-SHA1 (patch-ac) = c76d833f746eb4632fdf65aead950749d4ad5b0a
-SHA1 (patch-ad) = 569d73e7a5a25cb275301e4cdfd2da69845b6ca0
-SHA1 (patch-ae) = 30b502ac59c9c46e07690fa09a5e01ff743a95f3
-SHA1 (patch-af) = 15be84e70ee10fecc6fdf868e862e7d9de4aca6e
-SHA1 (patch-ag) = 16f3da75b0d575c5050527c6defd530de355ace5
-SHA1 (patch-ah) = 6edc4c840f2a43291e5393c87c09f06cd9d6e42a
+SHA1 (cyrus-imapd-2.0.16.tar.gz) = 7aa83f4b01d164f57cfd4cfe195f85551212b962
+Size (cyrus-imapd-2.0.16.tar.gz) = 1383996 bytes
+SHA1 (patch-aa) = 51b4fee0e8eb46cd4fd05fdffd4b52c9abe89b11
+SHA1 (patch-ab) = 76000108d4345a19d56c99cc2ccd64cd0d8c897e
+SHA1 (patch-ac) = 95eea5da0d7d54bd31e99decc281c6e55d11aa81
+SHA1 (patch-ad) = 2ded3c0228d6967af5599df0226cf43fc1e94b29
+SHA1 (patch-ae) = 2001dd2a9251811bb2096ae895cbcd4b32e1b08d
+SHA1 (patch-af) = 3c97d6c16f5c371bdfeadf69878223d07d2b6ff5
+SHA1 (patch-ag) = 08068d3d44a055237b208838def5e1ac4c4715b5
+SHA1 (patch-ah) = d6602de6b2105c97cef1005fb7883e6023184ef7
+SHA1 (patch-ai) = eb32cf0cf4c4007efc57530fa028b5336c22e26a
+SHA1 (patch-aj) = ca70e0a1e9d21cc5e4a2a01efcf6832e286df8a4
diff --git a/mail/cyrus-imapd/files/imapd.conf b/mail/cyrus-imapd/files/imapd.conf
index 23bb9a171bf..f1d165710be 100644
--- a/mail/cyrus-imapd/files/imapd.conf
+++ b/mail/cyrus-imapd/files/imapd.conf
@@ -1,4 +1,4 @@
-# $NetBSD: imapd.conf,v 1.1 2000/12/10 09:46:44 jlam Exp $
+# $NetBSD: imapd.conf,v 1.2 2001/09/18 21:56:30 skrll Exp $
 #
 # Cyrus IMAP server configuration file.  Refer to imapd.conf(5) for
 # more options.
diff --git a/mail/cyrus-imapd/patches/patch-aa b/mail/cyrus-imapd/patches/patch-aa
index 96220688232..0a08763533c 100644
--- a/mail/cyrus-imapd/patches/patch-aa
+++ b/mail/cyrus-imapd/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-aa,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- doc/html/install.html.orig	Thu Dec 30 16:07:24 1999
-+++ doc/html/install.html
-@@ -573,12 +573,12 @@
+--- doc/install-configure.html.orig	Thu Jul  5 16:47:39 2001
++++ doc/install-configure.html
+@@ -142,12 +142,12 @@
  </kbd></pre>
  
  <li>Change to the Cyrus user and use the tool
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.1 2000/12/10 09:46:13 jlam Exp $
  <pre>
  <kbd>   su cyrus
 -   tools/mkimap
-+   /usr/cyrus/bin/mkimap
++   mkimap
+    exit
  </kbd>
  </pre>
- 
diff --git a/mail/cyrus-imapd/patches/patch-ab b/mail/cyrus-imapd/patches/patch-ab
index 266da8fd245..b3c60127597 100644
--- a/mail/cyrus-imapd/patches/patch-ab
+++ b/mail/cyrus-imapd/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-ab,v 1.2 2001/09/18 21:56:30 skrll 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@
+--- imap/Makefile.in.orig	Sat Jun 23 04:14:01 2001
++++ imap/Makefile.in
+@@ -65,7 +65,7 @@
+ CYRUS_GROUP=@cyrus_group@
  
+ DEFS = @DEFS@ @LOCALDEFS@
+-CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
++CPPFLAGS = -I. -I.. -I../sieve -I$(srcdir) -I$(srcdir)/../lib -I$(srcdir)/../acap -I../acap @CPPFLAGS@ @COM_ERR_CPPFLAGS@ @SIEVE_CPPFLAGS@ @ZEPHYR_CPPFLAGS@ @SASLFLAGS@
+ IMAP_LIBS = @IMAP_LIBS@
+ SIEVE_LIBS = @SIEVE_LIBS@
+ IMAP_COM_ERR_LIBS = @IMAP_COM_ERR_LIBS@
diff --git a/mail/cyrus-imapd/patches/patch-ac b/mail/cyrus-imapd/patches/patch-ac
index ed51016a313..cc73b4928dd 100644
--- a/mail/cyrus-imapd/patches/patch-ac
+++ b/mail/cyrus-imapd/patches/patch-ac
@@ -1,13 +1,17 @@
-$NetBSD: patch-ac,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-ac,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- timsieved/Makefile.in.orig	Thu Nov 11 13:30:04 1999
-+++ timsieved/Makefile.in
-@@ -34,7 +34,7 @@
- CYRUS_GROUP=@cyrus_group@
+--- imap/lmtpd.c.orig	Mon May 21 19:21:47 2001
++++ imap/lmtpd.c
+@@ -411,7 +411,12 @@
+     }
+ }
  
- 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@
++#ifdef __NetBSD__
++#include <paths.h>
++#define DEFAULT_SENDMAIL (_PATH_SENDMAIL)
++#else
+ #define DEFAULT_SENDMAIL ("/usr/lib/sendmail")
++#endif
+ #define DEFAULT_POSTMASTER ("postmaster")
  
+ #define SENDMAIL (config_getstring("sendmail", DEFAULT_SENDMAIL))
diff --git a/mail/cyrus-imapd/patches/patch-ad b/mail/cyrus-imapd/patches/patch-ad
index b3b0f3b354d..6b39b5b0b3b 100644
--- a/mail/cyrus-imapd/patches/patch-ad
+++ b/mail/cyrus-imapd/patches/patch-ad
@@ -1,13 +1,13 @@
-$NetBSD: patch-ad,v 1.1 2000/12/10 09:46:13 jlam Exp $
+$NetBSD: patch-ad,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- tools/mkimap.orig	Tue Jan  4 15:52:22 2000
+--- tools/mkimap.orig	Wed Jan 24 21:26:51 2001
 +++ tools/mkimap
-@@ -35,7 +35,7 @@
+@@ -74,7 +74,7 @@
  	$conf = $1;
  	print "i will configure directory $conf.\n";
      }
--    if (/^sieveuserhomedir:\s(1|t|yes|on)/) {
-+    if (/^sieveusehomedir:\s(1|t|yes|on)/) {
+-    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";
      }
diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae
index 4804789c690..df3c6046640 100644
--- a/mail/cyrus-imapd/patches/patch-ae
+++ b/mail/cyrus-imapd/patches/patch-ae
@@ -1,13 +1,13 @@
-$NetBSD: patch-ae,v 1.1 2000/12/10 19:33:03 jlam Exp $
+$NetBSD: patch-ae,v 1.2 2001/09/18 21:56:30 skrll Exp $
 
---- man/Makefile.in.orig	Mon Sep 27 13:24:48 1999
+--- man/Makefile.in.orig	Sun Jul 15 19:08:15 2001
 +++ man/Makefile.in
-@@ -52,7 +52,7 @@
+@@ -65,7 +65,7 @@
  MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5
+ MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
  MAN8 = $(srcdir)/arbitron.8 $(srcdir)/collectnews.8 $(srcdir)/deliver.8 \
 -	$(srcdir)/fud.8 $(srcdir)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
 +	$(srcdir)/fud.8 $(srcdir)/cyrus-imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
  	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
- 	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
+ 	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8 $(srcdir)/master.8 \
+ 	$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
index c9ce9422116..4d71c44274b 100644
--- a/mail/cyrus-imapd/patches/patch-af
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -1,10 +1,11 @@
-$NetBSD: patch-af,v 1.1 2000/12/10 19:33:03 jlam Exp $
+$NetBSD: patch-af,v 1.2 2001/09/18 21:56:31 skrll Exp $
 
---- man/imapd.conf.5.orig	Tue Dec 28 18:58:43 1999
+--- man/imapd.conf.5.orig	Sat Jun 23 02:01:50 2001
 +++ man/imapd.conf.5
-@@ -176,4 +176,4 @@
- 
+@@ -228,5 +228,5 @@
+ Unix domain socket that the new mail notification daemon listens on.
  .SH SEE ALSO
  .PP
--\fBimapd(8)\fR, \fBtimsieved(8)\fR, \fBdeliver(8)\fR
-+\fBcyrus-imapd(8)\fR, \fBtimsieved(8)\fR, \fBdeliver(8)\fR
+-\fBimapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, \fBtimsieved(8)\fR,
++\fBcyrus-imapd(8)\fR, \fBpop3d(8)\fR, \fBlmtpd(8)\fR, \fBtimsieved(8)\fR,
+ \fBidled(8)\fR, \fBdeliver(8)\fR, \fBmaster(8)\fR
diff --git a/mail/cyrus-imapd/patches/patch-ag b/mail/cyrus-imapd/patches/patch-ag
index 963dba1ed66..661f1f6cb40 100644
--- a/mail/cyrus-imapd/patches/patch-ag
+++ b/mail/cyrus-imapd/patches/patch-ag
@@ -1,17 +1,12 @@
-$NetBSD: patch-ag,v 1.1 2001/02/26 20:55:05 wiz Exp $
+$NetBSD: patch-ag,v 1.2 2001/09/18 21:56:31 skrll Exp $
 
---- imap/deliver.c.orig	Tue May 16 22:18:18 2000
-+++ imap/deliver.c
-@@ -833,7 +833,12 @@
-     }
- }
+--- master/master.c.orig	Mon Jul 16 19:23:11 2001
++++ master/master.c
+@@ -84,6 +84,7 @@
+ #include <ucd-snmp/ucd-snmp-agent-includes.h>
  
-+#ifdef __NetBSD__
-+#include <paths.h>
-+#define SENDMAIL _PATH_SENDMAIL
-+#else
- #define SENDMAIL "/usr/lib/sendmail"
-+#endif
- #define POSTMASTER "postmaster"
+ #include "cyrusMasterMIB.h"
++int smux_listen_sd;
+ #endif
  
- static char *month[] = { "Jan", "Feb", "Mar", "Apr", "May", "Jun",
+ #include "masterconf.h"
diff --git a/mail/cyrus-imapd/patches/patch-ah b/mail/cyrus-imapd/patches/patch-ah
index 9c914acdd53..3b3ecb513cf 100644
--- a/mail/cyrus-imapd/patches/patch-ah
+++ b/mail/cyrus-imapd/patches/patch-ah
@@ -1,45 +1,20 @@
-$NetBSD: patch-ah,v 1.1 2001/07/22 01:54:53 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2001/09/18 21:56:31 skrll Exp $
 
---- imap/quota.c.orig	Fri Aug 20 15:08:30 1999
-+++ imap/quota.c	Sat Jul 21 17:13:16 2001
-@@ -132,7 +132,7 @@
- int compare_quota(a, b)
- char *a, *b;
- {
--    return strcasecmp(((struct quotaentry *)a)->quota.root,
-+    return strcmp(((struct quotaentry *)a)->quota.root,
- 		      ((struct quotaentry *)b)->quota.root);
- }
+--- perl/sieve/Makefile.in.orig	Tue Dec 26 23:07:25 2000
++++ perl/sieve/Makefile.in
+@@ -63,6 +63,7 @@
  
-@@ -172,8 +172,8 @@
- 	    /* If restricting our list, see if this quota file matches */
- 	    if (nroots) {
- 		for (i = 0; i < nroots; i++) {
--		    if (!strcasecmp(dirent->d_name, roots[i]) ||
--			(!strncasecmp(dirent->d_name, roots[i], strlen(roots[i])) &&
-+		    if (!strcmp(dirent->d_name, roots[i]) ||
-+			(!strncmp(dirent->d_name, roots[i], strlen(roots[i])) &&
- 			 dirent->d_name[strlen(roots[i])] == '.')) break;
- 		}
- 		if (i == nroots) continue;
-@@ -231,7 +231,7 @@
-     int i, len, thisquota, thisquotalen;
+ SASL_LIB=@LIB_SASL@
+ SASL_INC=@SASLFLAGS@
++EXTRA_INC=@CPPFLAGS@ @COM_ERR_CPPFLAGS@
+ CC=@CC@
+ PERL=@PERL@
  
-     while (firstquota < quota_num &&
--	   strncasecmp(name, quota[firstquota].quota.root,
-+	   strncmp(name, quota[firstquota].quota.root,
- 		       strlen(quota[firstquota].quota.root)) > 0) {
- 	r = fixquota_finish(firstquota++);
- 	if (r) return r;
-@@ -240,9 +240,9 @@
-     thisquota = -1;
-     thisquotalen = 0;
-     for (i = firstquota;
--	 i < quota_num && strcasecmp(name, quota[i].quota.root) >= 0; i++) {
-+	 i < quota_num && strcmp(name, quota[i].quota.root) >= 0; i++) {
- 	len = strlen(quota[i].quota.root);
--	if (!strncasecmp(name, quota[i].quota.root, len) &&
-+	if (!strncmp(name, quota[i].quota.root, len) &&
- 	    (!name[len] || name[len] == '.')) {
- 	    quota[i].refcount++;
- 	    if (len > thisquotalen) {
+@@ -72,6 +73,7 @@
+ 		(cd $$d; echo "### Making" all "in" `pwd`;	\
+ 			if [ -f Makefile.PL ]; then \
+ 			   SASL_LIB="$(SASL_LIB)" SASL_INC="$(SASL_INC)" CC="$(CC)" \
++			     EXTRA_INC="$(EXTRA_INC)" \
+ 			     $(PERL) Makefile.PL PREFIX=$(prefix); \
+ 			fi; \
+ 			$(MAKE) $(MFLAGS) DESTDIR=$(DESTDIR) all) || exit 1; \
diff --git a/mail/cyrus-imapd/pkg/INSTALL b/mail/cyrus-imapd/pkg/INSTALL
index 8fa024e5363..75d54a728ff 100644
--- a/mail/cyrus-imapd/pkg/INSTALL
+++ b/mail/cyrus-imapd/pkg/INSTALL
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.3 2000/12/10 09:45:32 jlam Exp $
+# $NetBSD: INSTALL,v 1.4 2001/09/18 21:56:31 skrll Exp $
 
 PKGNAME=$1
 STAGE=$2
diff --git a/mail/cyrus-imapd/pkg/PLIST b/mail/cyrus-imapd/pkg/PLIST
index b97c49f158e..912f8484ac5 100644
--- a/mail/cyrus-imapd/pkg/PLIST
+++ b/mail/cyrus-imapd/pkg/PLIST
@@ -1,52 +1,91 @@
-@comment $NetBSD: PLIST,v 1.3 2000/12/10 19:33:04 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2001/09/18 21:56:31 skrll Exp $
 bin/cyradm
 bin/imtest
 bin/installsieve
-cyrus/bin/arbitron
-cyrus/bin/collectnews
+bin/sieveshell
+cyrus/bin/ctl_deliver
+cyrus/bin/ctl_mboxlist
+cyrus/bin/cyrdump
 cyrus/bin/deliver
-cyrus/bin/dump_deliverdb
 cyrus/bin/feedcyrus
 cyrus/bin/fud
 cyrus/bin/imapd
+cyrus/bin/ipurge
+cyrus/bin/lmtpd
+cyrus/bin/master
 cyrus/bin/mbpath
 cyrus/bin/mkimap
 cyrus/bin/pop3d
 cyrus/bin/quota
 cyrus/bin/reconstruct
-cyrus/bin/syncnews
 cyrus/bin/timsieved
+include/cyrus/acap.h
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
 include/cyrus/bsearch.h
 include/cyrus/charset.h
+include/cyrus/cyrusdb.h
 include/cyrus/glob.h
 include/cyrus/gmtoff.h
+include/cyrus/hash.h
+include/cyrus/imapurl.h
 include/cyrus/imclient.h
 include/cyrus/imparse.h
 include/cyrus/lock.h
+include/cyrus/lsort.h
 include/cyrus/map.h
 include/cyrus/mkgmtime.h
 include/cyrus/nonblock.h
 include/cyrus/parseaddr.h
 include/cyrus/prot.h
 include/cyrus/retry.h
+include/cyrus/stristr.h
 include/cyrus/sysexits.h
 include/cyrus/util.h
 include/cyrus/xmalloc.h
+lib/libacap.a
 lib/libcyrus.a
+lib/perl5/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/perllocal.pod
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/IMAP.pm
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/IMAP/Admin.pm
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/IMAP/IMSP.pm
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/IMAP/Shell.pm
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/SIEVE/acap.pm
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/SIEVE/managesieve.pm
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/IMAP/.packlist
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/IMAP/IMAP.bs
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/IMAP/IMAP.so
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/acap/.packlist
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/acap/acap.bs
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/acap/acap.so
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/managesieve/.packlist
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/managesieve/managesieve.bs
+lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/managesieve/managesieve.so
 man/man1/cyradm.1
 man/man1/imtest.1
 man/man1/installsieve.1
+man/man3/Cyrus::IMAP.3
+man/man3/Cyrus::IMAP::Admin.3
+man/man3/Cyrus::IMAP::IMSP.3
+man/man3/Cyrus::IMAP::Shell.3
+man/man3/Cyrus::SIEVE::acap.3
+man/man3/Cyrus::SIEVE::managesieve.3
 man/man3/imclient.3
+man/man5/cyrus.conf.5
 man/man5/imapd.conf.5
 man/man5/krb.equiv.5
 man/man8/arbitron.8
 man/man8/collectnews.8
+man/man8/ctl_deliver.8
+man/man8/ctl_mboxlist.8
 man/man8/cyrus-imapd.8
 man/man8/deliver.8
 man/man8/fud.8
+man/man8/idled.8
+man/man8/ipurge.8
+man/man8/lmtpd.8
+man/man8/master.8
 man/man8/mbpath.8
 man/man8/pop3d.8
 man/man8/quota.8
@@ -57,17 +96,47 @@ man/man8/timsieved.8
 share/doc/html/cyrus-imapd/anoncvs.html
 share/doc/html/cyrus-imapd/bugs.html
 share/doc/html/cyrus-imapd/changes.html
+share/doc/html/cyrus-imapd/cyradm.1.html
+share/doc/html/cyrus-imapd/faq.html
+share/doc/html/cyrus-imapd/feedback.html
 share/doc/html/cyrus-imapd/index.html
+share/doc/html/cyrus-imapd/install-admin-mb.html
+share/doc/html/cyrus-imapd/install-auth.html
+share/doc/html/cyrus-imapd/install-compile.html
+share/doc/html/cyrus-imapd/install-configure.html
+share/doc/html/cyrus-imapd/install-murder.html
+share/doc/html/cyrus-imapd/install-perf.html
+share/doc/html/cyrus-imapd/install-prereq.html
+share/doc/html/cyrus-imapd/install-sieve.html
+share/doc/html/cyrus-imapd/install-snmpmon.html
+share/doc/html/cyrus-imapd/install-testing.html
+share/doc/html/cyrus-imapd/install-upgrade.html
 share/doc/html/cyrus-imapd/install.html
 share/doc/html/cyrus-imapd/mailing-list.html
+share/doc/html/cyrus-imapd/man.html
+share/doc/html/cyrus-imapd/notes.html
+share/doc/html/cyrus-imapd/os.html
 share/doc/html/cyrus-imapd/overview.html
 share/doc/html/cyrus-imapd/questions.html
 share/doc/html/cyrus-imapd/readme.html
 share/doc/html/cyrus-imapd/sieve-protocol.html
 share/doc/html/cyrus-imapd/sieve.html
+share/doc/html/cyrus-imapd/specs.html
+share/examples/cyrus-imapd/cmu.conf
 share/examples/cyrus-imapd/imapd.conf
+share/examples/cyrus-imapd/normal.conf
+share/examples/cyrus-imapd/prefork.conf
+share/examples/cyrus-imapd/small.conf
 @dirrm share/examples/cyrus-imapd
 @dirrm share/doc/html/cyrus-imapd
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/managesieve
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE/acap
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/SIEVE
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus/IMAP
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/auto/Cyrus
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/SIEVE
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus/IMAP
+@dirrm lib/perl5/site_perl/5.6.0/${MACHINE_ARCH}-${LOWER_OPSYS}/Cyrus
 @dirrm include/cyrus
 @dirrm cyrus/bin
 @dirrm cyrus