3 files changed, 13 insertions, 51 deletions

diff --git a/mail/cyrus-imapd22/files/patch-Makefile.in b/mail/cyrus-imapd22/files/patch-Makefile.in
index 823e5cd22f4c..318dfe1d4710 100644
--- a/mail/cyrus-imapd22/files/patch-Makefile.in
+++ b/mail/cyrus-imapd22/files/patch-Makefile.in
@@ -1,7 +1,7 @@
 Index: Makefile.in
 diff -u Makefile.in.orig Makefile.in
 --- Makefile.in.orig	Tue Jan 13 06:02:09 2004
-+++ Makefile.in	Thu Mar 11 01:34:50 2004
++++ Makefile.in	Sat Apr  3 00:04:36 2004
 @@ -90,13 +90,13 @@
  	touch distcvs
  
@@ -19,7 +19,7 @@ diff -u Makefile.in.orig Makefile.in
 +	$(INSTALL) -d ${DESTDIR}$(prefix)/man/man1
 +	$(INSTALL) -d ${DESTDIR}$(prefix)/man/man3
 +	$(INSTALL) -d ${DESTDIR}$(prefix)/man/man5
-+	$(INSTALL) -d ${DESTDIR}$(prefix)/man/man8
++	$(INSTALL) -d ${DESTDIR}$(cyrus_prefix)/man/man8
  	@for d in  $(SUBDIRS); \
  	do \
  		(cd $$d; echo "### Making" install "in" `pwd`;	\
diff --git a/mail/cyrus-imapd22/files/patch-aa b/mail/cyrus-imapd22/files/patch-aa
index 616c7b3c61fe..7a285d51115f 100644
--- a/mail/cyrus-imapd22/files/patch-aa
+++ b/mail/cyrus-imapd22/files/patch-aa
@@ -1,13 +1,13 @@
 Index: man/Makefile.in
 diff -u man/Makefile.in.orig man/Makefile.in
---- man/Makefile.in.orig	Fri Jun 20 05:49:50 2003
-+++ man/Makefile.in	Fri Jul 18 00:30:05 2003
-@@ -69,7 +69,7 @@
- MAN3 = $(srcdir)/imclient.3
- MAN5 = imapd.conf.5 $(srcdir)/krb.equiv.5 $(srcdir)/cyrus.conf.5
- MAN8 = $(srcdir)/arbitron.8 $(srcdir)/cyr_expire.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 $(srcdir)/master.8 \
- 	$(srcdir)/lmtpd.8 $(srcdir)/idled.8 $(srcdir)/ctl_mboxlist.8 \
+--- man/Makefile.in.orig	Sat Nov  8 06:33:54 2003
++++ man/Makefile.in	Fri Apr  2 23:50:30 2004
+@@ -102,7 +102,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-imapd22/files/patch-ab b/mail/cyrus-imapd22/files/patch-ab
deleted file mode 100644
index 1fc68c171063..000000000000
--- a/mail/cyrus-imapd22/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