12 files changed, 108 insertions, 96 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 23728c6d9afe..4d58bec4ed8d 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyrus
 PORTVERSION= 	1.6.24
+PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -26,11 +27,12 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-auth=unix \
 		--with-com-err
 
-MAN1=		cyradm.1
+MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+MAN5=		imapd.conf.5 krb.equiv.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
+		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
+		timsieved.8
 
 post-configure:
 		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
@@ -80,6 +82,7 @@ post-install:
 		@${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST}
 		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
 .endfor
+		@${ECHO} "@dirrm etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST}
diff --git a/mail/cyrus-imapd/pkg-plist b/mail/cyrus-imapd/pkg-plist
index 8c62368fdf17..8c06674f7dd2 100644
--- a/mail/cyrus-imapd/pkg-plist
+++ b/mail/cyrus-imapd/pkg-plist
@@ -1,23 +1,23 @@
-bin/imtest
 bin/cyradm
+bin/imtest
 bin/installsieve
+cyrus/bin/arbitron
 cyrus/bin/collectnews
-cyrus/bin/syncnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/dump_deliverdb
+cyrus/bin/feedcyrus
+cyrus/bin/fud
 cyrus/bin/imapd
+cyrus/bin/mbpath
 cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
 cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
+cyrus/bin/syncnews
 cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
 etc/imap/mailboxes
 etc/imapd.conf
+etc/imapd.conf.dist
+etc/inetd.conf.cyrus
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -40,5 +40,4 @@ include/cyrus/xmalloc.h
 lib/libcyrus.a
 @dirrm cyrus/bin
 @dirrm cyrus
-@dirrm etc/imap
 @dirrm include/cyrus
diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile
index 23728c6d9afe..4d58bec4ed8d 100644
--- a/mail/cyrus-imapd2/Makefile
+++ b/mail/cyrus-imapd2/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyrus
 PORTVERSION= 	1.6.24
+PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -26,11 +27,12 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-auth=unix \
 		--with-com-err
 
-MAN1=		cyradm.1
+MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+MAN5=		imapd.conf.5 krb.equiv.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
+		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
+		timsieved.8
 
 post-configure:
 		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
@@ -80,6 +82,7 @@ post-install:
 		@${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST}
 		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
 .endfor
+		@${ECHO} "@dirrm etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST}
diff --git a/mail/cyrus-imapd2/pkg-plist b/mail/cyrus-imapd2/pkg-plist
index 8c62368fdf17..8c06674f7dd2 100644
--- a/mail/cyrus-imapd2/pkg-plist
+++ b/mail/cyrus-imapd2/pkg-plist
@@ -1,23 +1,23 @@
-bin/imtest
 bin/cyradm
+bin/imtest
 bin/installsieve
+cyrus/bin/arbitron
 cyrus/bin/collectnews
-cyrus/bin/syncnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/dump_deliverdb
+cyrus/bin/feedcyrus
+cyrus/bin/fud
 cyrus/bin/imapd
+cyrus/bin/mbpath
 cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
 cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
+cyrus/bin/syncnews
 cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
 etc/imap/mailboxes
 etc/imapd.conf
+etc/imapd.conf.dist
+etc/inetd.conf.cyrus
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -40,5 +40,4 @@ include/cyrus/xmalloc.h
 lib/libcyrus.a
 @dirrm cyrus/bin
 @dirrm cyrus
-@dirrm etc/imap
 @dirrm include/cyrus
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 23728c6d9afe..4d58bec4ed8d 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyrus
 PORTVERSION= 	1.6.24
+PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -26,11 +27,12 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-auth=unix \
 		--with-com-err
 
-MAN1=		cyradm.1
+MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+MAN5=		imapd.conf.5 krb.equiv.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
+		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
+		timsieved.8
 
 post-configure:
 		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
@@ -80,6 +82,7 @@ post-install:
 		@${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST}
 		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
 .endfor
+		@${ECHO} "@dirrm etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST}
diff --git a/mail/cyrus-imapd22/pkg-plist b/mail/cyrus-imapd22/pkg-plist
index 8c62368fdf17..8c06674f7dd2 100644
--- a/mail/cyrus-imapd22/pkg-plist
+++ b/mail/cyrus-imapd22/pkg-plist
@@ -1,23 +1,23 @@
-bin/imtest
 bin/cyradm
+bin/imtest
 bin/installsieve
+cyrus/bin/arbitron
 cyrus/bin/collectnews
-cyrus/bin/syncnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/dump_deliverdb
+cyrus/bin/feedcyrus
+cyrus/bin/fud
 cyrus/bin/imapd
+cyrus/bin/mbpath
 cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
 cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
+cyrus/bin/syncnews
 cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
 etc/imap/mailboxes
 etc/imapd.conf
+etc/imapd.conf.dist
+etc/inetd.conf.cyrus
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -40,5 +40,4 @@ include/cyrus/xmalloc.h
 lib/libcyrus.a
 @dirrm cyrus/bin
 @dirrm cyrus
-@dirrm etc/imap
 @dirrm include/cyrus
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 23728c6d9afe..4d58bec4ed8d 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyrus
 PORTVERSION= 	1.6.24
+PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -26,11 +27,12 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-auth=unix \
 		--with-com-err
 
-MAN1=		cyradm.1
+MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+MAN5=		imapd.conf.5 krb.equiv.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
+		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
+		timsieved.8
 
 post-configure:
 		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
@@ -80,6 +82,7 @@ post-install:
 		@${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST}
 		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
 .endfor
+		@${ECHO} "@dirrm etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST}
diff --git a/mail/cyrus-imapd23/pkg-plist b/mail/cyrus-imapd23/pkg-plist
index 8c62368fdf17..8c06674f7dd2 100644
--- a/mail/cyrus-imapd23/pkg-plist
+++ b/mail/cyrus-imapd23/pkg-plist
@@ -1,23 +1,23 @@
-bin/imtest
 bin/cyradm
+bin/imtest
 bin/installsieve
+cyrus/bin/arbitron
 cyrus/bin/collectnews
-cyrus/bin/syncnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/dump_deliverdb
+cyrus/bin/feedcyrus
+cyrus/bin/fud
 cyrus/bin/imapd
+cyrus/bin/mbpath
 cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
 cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
+cyrus/bin/syncnews
 cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
 etc/imap/mailboxes
 etc/imapd.conf
+etc/imapd.conf.dist
+etc/inetd.conf.cyrus
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -40,5 +40,4 @@ include/cyrus/xmalloc.h
 lib/libcyrus.a
 @dirrm cyrus/bin
 @dirrm cyrus
-@dirrm etc/imap
 @dirrm include/cyrus
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index 23728c6d9afe..4d58bec4ed8d 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyrus
 PORTVERSION= 	1.6.24
+PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -26,11 +27,12 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-auth=unix \
 		--with-com-err
 
-MAN1=		cyradm.1
+MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+MAN5=		imapd.conf.5 krb.equiv.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
+		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
+		timsieved.8
 
 post-configure:
 		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
@@ -80,6 +82,7 @@ post-install:
 		@${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST}
 		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
 .endfor
+		@${ECHO} "@dirrm etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST}
diff --git a/mail/cyrus-imapd24/pkg-plist b/mail/cyrus-imapd24/pkg-plist
index 8c62368fdf17..8c06674f7dd2 100644
--- a/mail/cyrus-imapd24/pkg-plist
+++ b/mail/cyrus-imapd24/pkg-plist
@@ -1,23 +1,23 @@
-bin/imtest
 bin/cyradm
+bin/imtest
 bin/installsieve
+cyrus/bin/arbitron
 cyrus/bin/collectnews
-cyrus/bin/syncnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/dump_deliverdb
+cyrus/bin/feedcyrus
+cyrus/bin/fud
 cyrus/bin/imapd
+cyrus/bin/mbpath
 cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
 cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
+cyrus/bin/syncnews
 cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
 etc/imap/mailboxes
 etc/imapd.conf
+etc/imapd.conf.dist
+etc/inetd.conf.cyrus
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -40,5 +40,4 @@ include/cyrus/xmalloc.h
 lib/libcyrus.a
 @dirrm cyrus/bin
 @dirrm cyrus
-@dirrm etc/imap
 @dirrm include/cyrus
diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile
index 23728c6d9afe..4d58bec4ed8d 100644
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	cyrus
 PORTVERSION= 	1.6.24
+PORTREVISION=	1
 CATEGORIES=	mail tcl82
 MASTER_SITES=	ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
 		ftp://ftp.hanse.de/sites/transit/mirror/ftp.andrew.cmu.edu/pub/cyrus-mail/
@@ -26,11 +27,12 @@ CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-auth=unix \
 		--with-com-err
 
-MAN1=		cyradm.1
+MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
-MAN5=		imapd.conf.5
-MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 imapd.8 \
-		pop3d.8 reconstruct.8 rmnews.8 syncnews.8
+MAN5=		imapd.conf.5 krb.equiv.5
+MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
+		imapd.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 syncnews.8 \
+		timsieved.8
 
 post-configure:
 		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
@@ -80,6 +82,7 @@ post-install:
 		@${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST}
 		@${ECHO} "@dirrm etc/imap/${dir}" >>${TMPPLIST}
 .endfor
+		@${ECHO} "@dirrm etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CP} /dev/null %D/etc/imap/mailboxes" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST}
 		@${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST}
diff --git a/mail/cyrus/pkg-plist b/mail/cyrus/pkg-plist
index 8c62368fdf17..8c06674f7dd2 100644
--- a/mail/cyrus/pkg-plist
+++ b/mail/cyrus/pkg-plist
@@ -1,23 +1,23 @@
-bin/imtest
 bin/cyradm
+bin/imtest
 bin/installsieve
+cyrus/bin/arbitron
 cyrus/bin/collectnews
-cyrus/bin/syncnews
+cyrus/bin/cyrquota
+cyrus/bin/deliver
+cyrus/bin/dump_deliverdb
+cyrus/bin/feedcyrus
+cyrus/bin/fud
 cyrus/bin/imapd
+cyrus/bin/mbpath
 cyrus/bin/pop3d
-cyrus/bin/arbitron
-cyrus/bin/fud
 cyrus/bin/reconstruct
-cyrus/bin/dump_deliverdb
-cyrus/bin/mbpath
-cyrus/bin/deliver
-cyrus/bin/feedcyrus
+cyrus/bin/syncnews
 cyrus/bin/timsieved
-cyrus/bin/cyrquota
-etc/imapd.conf.dist
-etc/inetd.conf.cyrus
 etc/imap/mailboxes
 etc/imapd.conf
+etc/imapd.conf.dist
+etc/inetd.conf.cyrus
 include/cyrus/acl.h
 include/cyrus/assert.h
 include/cyrus/auth.h
@@ -40,5 +40,4 @@ include/cyrus/xmalloc.h
 lib/libcyrus.a
 @dirrm cyrus/bin
 @dirrm cyrus
-@dirrm etc/imap
 @dirrm include/cyrus