5 files changed, 66 insertions, 89 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 1cb6a8fee638..e9157ed05774 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION= 	2.0.17
-#PORTREVISION=	0
+PORTREVISION=	1
 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/ \
@@ -50,9 +50,12 @@ CONFIGURE_ARGS+=--with-ucdsnmp=no
 MAN1=		cyradm.1 imtest.1 installsieve.1
 MAN3=		imclient.3
 MAN5=		cyrus.conf.5 imapd.conf.5 krb.equiv.5
-MAN8=		arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
-		cyrquota.8 deliver.8 fud.8 idled.8 imapd.8 ipurge.8 \
-		lmtpd.8 master.8 mbpath.8 pop3d.8 reconstruct.8 rmnews.8 \
+CYRUS_MAN3=	Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \
+		Cyrus::IMAP::Shell.3 Cyrus::SIEVE::acap.3 \
+		Cyrus::SIEVE::managesieve.3
+CYRUS_MAN8=	arbitron.8 collectnews.8 ctl_deliver.8 ctl_mboxlist.8 \
+		deliver.8 fud.8 idled.8 imapd.8 ipurge.8 lmtpd.8 \
+		master.8 mbpath.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 \
 		syncnews.8 timsieved.8
 
 DOCS=		HEY-YOU-WITH-THE-EDITOR README acl-extension anoncvs bugs \
@@ -73,46 +76,51 @@ post-patch:
 		@${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \
 			${WRKSRC}/tools/mkimap
 
-pre-install:
-		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
-
 post-install:
-		@ ${MV} ${PREFIX}/cyrus/bin/quota ${PREFIX}/cyrus/bin/cyrquota
+.for file in ${CYRUS_MAN3}
+		@${GZIP_CMD} ${PREFIX}/lib/perl5/${PERL_VERSION}/man/man3/${file}
+		@${ECHO_CMD} lib/perl5/${PERL_VERSION}/man/man3/${file}.gz \
+			>>${TMPPLIST}
+.endfor
+.for file in ${CYRUS_MAN8}
+		@${GZIP_CMD} ${PREFIX}/cyrus/man/man8/${file}
+		@${ECHO_CMD} cyrus/man/man8/${file}.gz >>${TMPPLIST}
+.endfor
+		@${ECHO_CMD} "@dirrm cyrus/man/man8" >>${TMPPLIST}
+		@${ECHO_CMD} "@dirrm cyrus/man" >>${TMPPLIST}
+		@${ECHO_CMD} "@dirrm cyrus" >>${TMPPLIST}
 .if !defined(NOPORTDOCS)
-		${MKDIR} ${PREFIX}/share/doc/cyrus/man
-		${MKDIR} ${PREFIX}/share/doc/cyrus/text
+		@${MKDIR} ${DOCSDIR}/man
+		@${MKDIR} ${DOCSDIR}/text
 .for file in ${HTDOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST}
+		@${INSTALL_DATA} ${WRKSRC}/doc/${file}.html ${DOCSDIR}
+		@${ECHO_CMD} share/doc/${PORTNAME}/${file}.html >>${TMPPLIST}
 .endfor
-.for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8}
-		ofile=`echo ${file} | ${SED} s/cyrquota/quota/`; \
-		if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \
-		${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \
-			${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \
-		${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \
+.for file in ${MAN1} ${MAN3} ${MAN5} ${CYRUS_MAN8}
+		@if [ -f ${WRKSRC}/doc/man/${file}.html ]; then \
+		${INSTALL_DATA} ${WRKSRC}/doc/man/${file}.html \
+			${DOCSDIR}/man/${file}.html; \
+		${ECHO_CMD} share/doc/${PORTNAME}/man/${file}.html \
+			>>${TMPPLIST}; \
 		fi
 .endfor
-		${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \
-			${PREFIX}/share/doc/cyrus
-		@${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST}
+		@${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc ${DOCSDIR}
+		@${ECHO_CMD} share/doc/${PORTNAME}/cyrusv2.mc >>${TMPPLIST}
 .for file in ${DOCS}
-		${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \
-			${PREFIX}/share/doc/cyrus/text
-		@${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST}
+		@${INSTALL_DATA} ${WRKSRC}/doc/text/${file} ${DOCSDIR}/text
+		@${ECHO_CMD} share/doc/${PORTNAME}/text/${file} >>${TMPPLIST}
 .endfor
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST}
-		@${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST}
+		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/text" >>${TMPPLIST}
+		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}/man" >>${TMPPLIST}
+		@${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST}
 .endif
-		${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
+		@${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \
 			${PREFIX}/etc/rc.d/imapd.sh.sample
-		${INSTALL_DATA} ${FILESDIR}/imapd.conf \
+		@${INSTALL_DATA} ${FILESDIR}/imapd.conf \
 			${PREFIX}/etc/imapd.conf.dist
-		${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
+		@${INSTALL_DATA} ${WRKSRC}/master/conf/normal.conf \
 			${PREFIX}/etc/cyrus.conf.dist
-		${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
+		@${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \
 			${PREFIX}/cyrus/bin/mkimap
 		@PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 		@${CAT} ${PKGMESSAGE}
diff --git a/mail/cyrus-imapd/files/patch-Makefile.in b/mail/cyrus-imapd/files/patch-Makefile.in
new file mode 100644
index 000000000000..7be201b26cf4
--- /dev/null
+++ b/mail/cyrus-imapd/files/patch-Makefile.in
@@ -0,0 +1,13 @@
+Index: Makefile.in
+diff -u Makefile.in.orig Makefile.in
+--- Makefile.in.orig	Wed Dec  4 07:21:09 2002
++++ Makefile.in	Sat Apr  3 03:40:04 2004
+@@ -98,7 +98,7 @@
+ 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man1
+ 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man3
+ 	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man5
+-	$(srcdir)/install-sh -d ${DESTDIR}$(prefix)/man/man8
++	$(srcdir)/install-sh -d ${DESTDIR}$(cyrus_prefix)/man/man8
+ 	@for d in  $(SUBDIRS); \
+ 	do \
+ 		(cd $$d; echo "### Making" install "in" `pwd`;	\
diff --git a/mail/cyrus-imapd/files/patch-aa b/mail/cyrus-imapd/files/patch-aa
index 34dc4a7d4d9b..b0cd5872b141 100644
--- a/mail/cyrus-imapd/files/patch-aa
+++ b/mail/cyrus-imapd/files/patch-aa
@@ -1,12 +1,13 @@
---- man/Makefile.in.orig	Tue Sep  1 03:49:14 1998
-+++ man/Makefile.in	Mon May 10 02:27:39 1999
-@@ -52,7 +52,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = $(srcdir)/imapd.conf.5 $(srcdir)/krb.equiv.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)/imapd.8 $(srcdir)/pop3d.8 $(srcdir)/cyrquota.8 \
- 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
-	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
- 
+Index: man/Makefile.in
+diff -u man/Makefile.in.orig man/Makefile.in
+--- man/Makefile.in.orig	Mon Jul 16 03:08:15 2001
++++ man/Makefile.in	Sat Apr  3 03:40:33 2004
+@@ -89,7 +89,7 @@
+ 	done
+ 	for file in $(MAN8); \
+ 	do \
+-		$(INSTALL) -m 644 $$file $(DESTDIR)$(prefix)/man/man8 || exit 1; \
++		$(INSTALL) -m 644 $$file $(DESTDIR)$(cyrus_prefix)/man/man8 || exit 1; \
+ 	done
  
+ .c.o:
diff --git a/mail/cyrus-imapd/files/patch-ab b/mail/cyrus-imapd/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd/files/patch-ab
+++ /dev/null
@@ -1,38 +0,0 @@
---- man/quota.8.orig	Sun May  4 22:26:33 1997
-+++ man/quota.8	Sun May  4 22:27:24 1997
-@@ -11,9 +11,9 @@
- .\" use of the code for commercial purposes or benefits by anyone
- .\" without specific, additional permission by the owner of the code.
- .SH NAME
--quota \- report and optionally fix quota usage
-+cyrquota \- report and optionally fix quota usage
- .SH SYNOPSIS
--.B quota
-+.B cyrquota
- [
- .B \-f
- ]
-@@ -21,12 +21,12 @@
- .IR mailbox-prefix ...
- ]
- .SH DESCRIPTION
--.I Quota
-+.I Cyrquota
- generates a report listing quota roots, giving their limits and usage.
- If the
- .I \-f
- option is given, 
--.I quota
-+.I cyrquota
- first fixes any inconsistencies in the quota subsystem, such as
- mailboxes with the wrong quota root or quota roots with the wrong
- quota usage reported.
-@@ -37,7 +37,7 @@
- prefixes.
- .PP
- Running
--.I quota
-+.I cyrquota
- with both the 
- .I \-f
- option and
diff --git a/mail/cyrus-imapd/pkg-plist b/mail/cyrus-imapd/pkg-plist
index 5cf28fd7971f..9e031ed9f1ea 100644
--- a/mail/cyrus-imapd/pkg-plist
+++ b/mail/cyrus-imapd/pkg-plist
@@ -5,7 +5,6 @@ bin/sieveshell
 cyrus/bin/ctl_deliver
 cyrus/bin/ctl_mboxlist
 cyrus/bin/cyrdump
-cyrus/bin/cyrquota
 cyrus/bin/deliver
 cyrus/bin/feedcyrus
 cyrus/bin/fud
@@ -16,6 +15,7 @@ cyrus/bin/master
 cyrus/bin/mbpath
 cyrus/bin/mkimap
 cyrus/bin/pop3d
+cyrus/bin/quota
 cyrus/bin/reconstruct
 cyrus/bin/timsieved
 @unexec if cmp -s %D/etc/cyrus.conf %D/etc/cyrus.conf.dist; then rm -f %D/etc/cyrus.conf; fi
@@ -53,12 +53,6 @@ include/cyrus/util.h
 include/cyrus/xmalloc.h
 lib/libacap.a
 lib/libcyrus.a
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Shell.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::IMSP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP::Admin.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::IMAP.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::acap.3
-lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
 %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Admin.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/IMSP.pm
 %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP/Shell.pm
@@ -75,7 +69,6 @@ lib/perl5/%%PERL_VERSION%%/man/man3/Cyrus::SIEVE::managesieve.3
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.bs
 %%SITE_PERL%%/%%PERL_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so
 @dirrm cyrus/bin
-@dirrm cyrus
 @dirrm include/cyrus
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/IMAP
 @dirrm %%SITE_PERL%%/%%PERL_ARCH%%/Cyrus/SIEVE