cyrus-imapd30: avoid collisions in PLIST with postfix etc.

[Matthias Petermann <mp%petermann-it.de@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Matthias Petermann <mp%petermann-it.de@localhost>
Pushed By:	mp
Date:		Mon Mar 16 21:59:24 2020 +0100
Changeset:	c5017fed2124f1d5237ce3aac710028e19b5562d

Modified Files:
	cyrus-imapd30/Makefile
	cyrus-imapd30/PLIST

Log Message:
cyrus-imapd30: avoid collisions in PLIST with postfix etc.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=c5017fed2124f1d5237ce3aac710028e19b5562d

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 cyrus-imapd30/Makefile | 40 +++++++++++++++++++++++-----------------
 cyrus-imapd30/PLIST    | 22 +++++++++++-----------
 2 files changed, 34 insertions(+), 28 deletions(-)

diffs:
diff --git a/cyrus-imapd30/Makefile b/cyrus-imapd30/Makefile
index a5e614187b..1e7fb60792 100644
--- a/cyrus-imapd30/Makefile
+++ b/cyrus-imapd30/Makefile
@@ -1,6 +1,7 @@
 # $NetBSD: $
 
 DISTNAME=	cyrus-imapd-3.0.13
+REVISION=	1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_GITHUB:=cyrusimap/}
 GITHUB_RELEASE=	${PKGNAME_NOREV}
@@ -84,29 +85,34 @@ BUILDLINK_API_DEPENDS.cyrus-sasl+=	cyrus-sasl>=2.1.17
 # "/etc/{cyrus,imapd}.conf" into "${PKG_SYSCONFDIR}/{cyrus,imapd}.conf".
 #
 post-patch:
-	cd ${WRKSRC}/man;						\
-	set --	deliver 8 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8	\
-		nntpd 8	notifyd 8 pop3d 8 quota 8 httpd 8 httpdtest 8;			\
-	while [ $$# -gt 0 ]; do						\
-		man=$$1.$$2;						\
-		for file in *.[0-9]; do			\
+	cd ${WRKSRC}/man; \
+	set --	deliver 8 fetchnews 8 idled 8 imapd 8 lmtpd 8 master 8 \
+		nntpd 8 notifyd 8 pop3d 8 quota 8 httpd 8 httpdtest 8; \
+	while [ $$# -gt 0 ]; do	\
+		man=$$1.$$2; \
+		for file in *.[0-9]; do \
 			sed	-e "s|\(\$$(srcdir)/\)\($$man\)|\1cyrus-\2|g" \
 				-e "s|\(\\\fB\)\($$1($$2)\\\fR\)|\1cyrus-\2|g" \
-				$$file > $$file.fixed;			\
-			mv -f $$file.fixed $$file;			\
-		done;							\
-		if [ -f $$man ]; then					\
-			mv $$man cyrus-$$man;			\
-		fi;							\
-		shift 2;						\
+				$$file > $$file.fixed; \
+			mv -f $$file.fixed $$file; \
+		done; \
+		if [ -f $$man ]; then \
+			mv $$man cyrus-$$man; \
+		fi; \
+		for file in ../Makefile.in ../Makefile.am; do	\
+			sed	-e "s|man/$$man|man/cyrus-$$man|g" \
+				$$file > $$file.fixed; \
+			mv -f $$file.fixed $$file; \
+		done; \
+		shift 2; \
 	done
-	find ${WRKSRC} -type f -print |					\
+	find ${WRKSRC} -type f -print | \
 	xargs -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \
-	while read file; do						\
+	while read file; do \
 		sed	-e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
 			-e "s|/etc/\(imapd\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
-			$${file} > $${file}.fixed;			\
-		mv -f $${file}.fixed $${file};			\
+			$${file} > $${file}.fixed; \
+		mv -f $${file}.fixed $${file}; \
 	done
 
 post-install:
diff --git a/cyrus-imapd30/PLIST b/cyrus-imapd30/PLIST
index fe5fb786c6..1121fb7da5 100644
--- a/cyrus-imapd30/PLIST
+++ b/cyrus-imapd30/PLIST
@@ -147,22 +147,22 @@ man/man8/cyr_expire.8
 man/man8/cyr_info.8
 man/man8/cyr_synclog.8
 man/man8/cyr_virusscan.8
-man/man8/deliver.8
-man/man8/fetchnews.8
+man/man8/cyrus-deliver.8
+man/man8/cyrus-fetchnews.8
+${PLIST.http}man/man8/cyrus-httpd.8
+man/man8/cyrus-idled.8
+man/man8/cyrus-imapd.8
+man/man8/cyrus-lmtpd.8
+man/man8/cyrus-master.8
+man/man8/cyrus-nntpd.8
+man/man8/cyrus-notifyd.8
+man/man8/cyrus-pop3d.8
+man/man8/cyrus-quota.8
 man/man8/fud.8
-${PLIST.http}man/man8/httpd.8
-man/man8/idled.8
-man/man8/imapd.8
 man/man8/ipurge.8
-man/man8/lmtpd.8
-man/man8/master.8
 man/man8/mbexamine.8
 man/man8/mbpath.8
 man/man8/mbtool.8
-man/man8/nntpd.8
-man/man8/notifyd.8
-man/man8/pop3d.8
-man/man8/quota.8
 man/man8/reconstruct.8
 man/man8/restore.8
 man/man8/smmapd.8