imapd.8 -> cyrus-imapd.8 so as not to conflict with identically named

manpage from the UW IMAP package (imap-uw).

5 files changed, 32 insertions, 4 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index 38b63c03601..851f41c4348 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2000/12/10 09:45:32 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2000/12/10 19:33:03 jlam Exp $
 
 DISTNAME=		cyrus-imapd-1.6.24
 PKGNAME=		${DISTNAME}nb1
@@ -61,6 +61,9 @@ INSTALL_FILE=		${WKRDIR}/INSTALL
 HTMLDIR=		${PREFIX}/share/doc/html/cyrus-imapd
 EGDIR=			${PREFIX}/share/examples/cyrus-imapd
 
+post-extract:
+	cd ${WRKSRC}/man; ${MV} imapd.8 cyrus-imapd.8
+
 pre-install:
 	${SED}	-e "s,@AWK@,${AWK},g" \
 		-e "s,@CAT@,${CAT},g" \
diff --git a/mail/cyrus-imapd/files/patch-sum b/mail/cyrus-imapd/files/patch-sum
index 0995b01780f..10ebb92033e 100644
--- a/mail/cyrus-imapd/files/patch-sum
+++ b/mail/cyrus-imapd/files/patch-sum
@@ -1,6 +1,8 @@
-$NetBSD: patch-sum,v 1.1 2000/12/10 09:46:44 jlam Exp $
+$NetBSD: patch-sum,v 1.2 2000/12/10 19:33:03 jlam Exp $
 
 MD5 (patch-aa) = 7b81faee7b191cd939c3d50fd8b92fa4
 MD5 (patch-ab) = 33c91bb720acf869041cbc899ec38a7a
 MD5 (patch-ac) = e75d469847ca79db2451dffcdc9d4d08
 MD5 (patch-ad) = f13481144f16b2bc2b20a6851d460c9b
+MD5 (patch-ae) = 17eddbef725397756cbec49d727258bc
+MD5 (patch-af) = d39c52583e021204c2057d0448d3b779
diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae
new file mode 100644
index 00000000000..4804789c690
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-ae
@@ -0,0 +1,13 @@
+$NetBSD: patch-ae,v 1.1 2000/12/10 19:33:03 jlam Exp $
+
+--- man/Makefile.in.orig	Mon Sep 27 13:24:48 1999
++++ man/Makefile.in
+@@ -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)/cyrus-imapd.8 $(srcdir)/pop3d.8 $(srcdir)/quota.8 \
+ 	$(srcdir)/reconstruct.8 $(srcdir)/rmnews.8 $(srcdir)/syncnews.8 \
+ 	$(srcdir)/mbpath.8 $(srcdir)/timsieved.8
+ 
diff --git a/mail/cyrus-imapd/patches/patch-af b/mail/cyrus-imapd/patches/patch-af
new file mode 100644
index 00000000000..c9ce9422116
--- /dev/null
+++ b/mail/cyrus-imapd/patches/patch-af
@@ -0,0 +1,10 @@
+$NetBSD: patch-af,v 1.1 2000/12/10 19:33:03 jlam Exp $
+
+--- man/imapd.conf.5.orig	Tue Dec 28 18:58:43 1999
++++ man/imapd.conf.5
+@@ -176,4 +176,4 @@
+ 
+ .SH SEE ALSO
+ .PP
+-\fBimapd(8)\fR, \fBtimsieved(8)\fR, \fBdeliver(8)\fR
++\fBcyrus-imapd(8)\fR, \fBtimsieved(8)\fR, \fBdeliver(8)\fR
diff --git a/mail/cyrus-imapd/pkg/PLIST b/mail/cyrus-imapd/pkg/PLIST
index e8d4cb5e5e3..b97c49f158e 100644
--- a/mail/cyrus-imapd/pkg/PLIST
+++ b/mail/cyrus-imapd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2000/12/10 09:45:32 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2000/12/10 19:33:04 jlam Exp $
 bin/cyradm
 bin/imtest
 bin/installsieve
@@ -44,9 +44,9 @@ man/man5/imapd.conf.5
 man/man5/krb.equiv.5
 man/man8/arbitron.8
 man/man8/collectnews.8
+man/man8/cyrus-imapd.8
 man/man8/deliver.8
 man/man8/fud.8
-man/man8/imapd.8
 man/man8/mbpath.8
 man/man8/pop3d.8
 man/man8/quota.8