Rename the manpages {deliver,imapd,master,pop3d}.8 to cyrus-*.8 as well as

changing all cross-references to them.  This prevents name collisions with
other packages' manpages.  This addresses pkg/14245 by Kimmo Suominen
<kim@tac.nyc.ny.us> (cyrus: master(8) conflicts).

5 files changed, 24 insertions, 34 deletions

diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile
index f800a51dd94..ff410b8849d 100644
--- a/mail/cyrus-imapd/Makefile
+++ b/mail/cyrus-imapd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2001/09/25 21:48:17 skrll Exp $
+# $NetBSD: Makefile,v 1.19 2001/10/15 21:30:36 jlam Exp $
 
 DISTNAME=		cyrus-imapd-2.0.16
 CATEGORIES=		mail
@@ -66,8 +66,24 @@ PERL5_PACKLIST= \
 	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/acap/.packlist \
 	${PERL5_SITEARCH}/auto/Cyrus/SIEVE/managesieve/.packlist
 
-post-extract:
-	cd ${WRKSRC}/man; ${MV} imapd.8 cyrus-imapd.8
+# Change references of some manpages from foo.8 to cyrus-foo.8 to avoid
+# manpage conflicts with other packages.
+#
+post-patch:
+	cd ${WRKSRC}/man;						\
+	for man in deliver.8 imapd.8 master.8 pop3d.8; do		\
+		${MV} $${man} cyrus-$${man};				\
+		name=$${man%.*};					\
+		suffix=$${man##*.};					\
+		for file in *.[0-9]*; do				\
+			${SED} -e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
+				$${file} > $${file}.fixed;		\
+			${MV} -f $${file}.fixed $${file};		\
+		done;							\
+		${SED} -e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g"	\
+			Makefile.in > Makefile.in.fixed;		\
+		${MV} -f Makefile.in.fixed Makefile.in;			\
+	done
 
 pre-install:
 	${SED}	-e "s,@AWK@,${AWK},g" \
diff --git a/mail/cyrus-imapd/distinfo b/mail/cyrus-imapd/distinfo
index ae22490cc89..3883ea07120 100644
--- a/mail/cyrus-imapd/distinfo
+++ b/mail/cyrus-imapd/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.4 2001/09/18 21:56:29 skrll Exp $
+$NetBSD: distinfo,v 1.5 2001/10/15 21:30:36 jlam Exp $
 
 SHA1 (cyrus-imapd-2.0.16.tar.gz) = 7aa83f4b01d164f57cfd4cfe195f85551212b962
 Size (cyrus-imapd-2.0.16.tar.gz) = 1383996 bytes
@@ -6,8 +6,6 @@ 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
diff --git a/mail/cyrus-imapd/patches/patch-ae b/mail/cyrus-imapd/patches/patch-ae
deleted file mode 100644
index df3c6046640..00000000000
--- a/mail/cyrus-imapd/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.2 2001/09/18 21:56:30 skrll Exp $
-
---- man/Makefile.in.orig	Sun Jul 15 19:08:15 2001
-+++ man/Makefile.in
-@@ -65,7 +65,7 @@
- MAN3 = $(srcdir)/imclient.3
- 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)/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
deleted file mode 100644
index 4d71c44274b..00000000000
--- a/mail/cyrus-imapd/patches/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-af,v 1.2 2001/09/18 21:56:31 skrll Exp $
-
---- man/imapd.conf.5.orig	Sat Jun 23 02:01:50 2001
-+++ man/imapd.conf.5
-@@ -228,5 +228,5 @@
- Unix domain socket that the new mail notification daemon listens on.
- .SH SEE ALSO
- .PP
--\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/pkg/PLIST b/mail/cyrus-imapd/pkg/PLIST
index e587b916452..6ba66fad6e3 100644
--- a/mail/cyrus-imapd/pkg/PLIST
+++ b/mail/cyrus-imapd/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2001/09/25 21:48:18 skrll Exp $
+@comment $NetBSD: PLIST,v 1.6 2001/10/15 21:30:39 jlam Exp $
 bin/imtest
 bin/installsieve
 bin/sieveshell
@@ -55,15 +55,15 @@ man/man8/arbitron.8
 man/man8/collectnews.8
 man/man8/ctl_deliver.8
 man/man8/ctl_mboxlist.8
+man/man8/cyrus-deliver.8
 man/man8/cyrus-imapd.8
-man/man8/deliver.8
+man/man8/cyrus-master.8
+man/man8/cyrus-pop3d.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
 man/man8/reconstruct.8
 man/man8/rmnews.8