summaryrefslogtreecommitdiff
path: root/mail
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2004-05-27 05:09:04 +0000
committerjlam <jlam@pkgsrc.org>2004-05-27 05:09:04 +0000
commit641d76752a638856b213fc446f84f1897f53d7dd (patch)
tree25c761cb4a5966564cca56d9eb07b79e49d63e67 /mail
parent3ff39a1f467749fe2d22c80e084f0b9305f02ab6 (diff)
downloadpkgsrc-641d76752a638856b213fc446f84f1897f53d7dd.tar.gz
Fix the code in post-patch so that man pages correctly reference pages
that have been prepended with "cyrus-". Prepend a few more manpages with "cyrus-" to prevent any likely future collisions with other packages. Bump the PKGREVISON to 1.
Diffstat (limited to 'mail')
-rw-r--r--mail/cyrus-imapd22/Makefile36
-rw-r--r--mail/cyrus-imapd22/PLIST12
2 files changed, 28 insertions, 20 deletions
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index bb0bbf7c0c1..25b44f41f4c 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2004/05/26 22:18:05 recht Exp $
+# $NetBSD: Makefile,v 1.10 2004/05/27 05:09:04 jlam Exp $
DISTNAME= cyrus-imapd-2.2.4
+PKGREVISION= 1
CATEGORIES= mail
MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ \
ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
@@ -107,21 +108,28 @@ PERL5_PACKLIST= \
#
post-patch:
cd ${WRKSRC}/man; \
- for file in deliver.8 imapd.8 master.8 pop3d.8; do \
- ${MV} $${file} cyrus-$${file}; \
- ${SED} -e "s|\(\$$(srcdir)/\)\($${file}\)|\1cyrus-\2|g" \
- Makefile.in > Makefile.in.fixed; \
- ${MV} -f Makefile.in.fixed Makefile.in; \
+ set -- deliver 8 idled 8 imapd 8 lmtpd 8 master 8 nntpd 8 \
+ notifyd 8 pop3d 8 quota 8; \
+ while [ $$# -gt 0 ]; do \
+ man=$$1.$$2; \
+ for file in Makefile.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; \
done
- files=`${FIND} ${WRKSRC} -type f -exec ${GREP} -l \
- -e /etc/imapd\.conf -e /etc/cyrus\.conf {} \;`; \
- for file in $${files}; do \
- ${SED} -e "s|\(\\fB\)\($${name}($${suffix})\)|\1cyrus-\2|g" \
- -e "s|\(\$$(srcdir)/\)\($${man}\)|\1cyrus-\2|g" \
- -e "s|/etc/\(cyrus\.conf\)|${PKG_SYSCONFDIR}/\1|g" \
+ ${FIND} ${WRKSRC} -type f -print | \
+ ${XARGS} -n 1 ${GREP} -l -e /etc/imapd\.conf -e /etc/cyrus\.conf | \
+ 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/mail/cyrus-imapd22/PLIST b/mail/cyrus-imapd22/PLIST
index 8b5986e9e92..a844d5765b6 100644
--- a/mail/cyrus-imapd22/PLIST
+++ b/mail/cyrus-imapd22/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2004/04/23 22:07:54 reed Exp $
+@comment $NetBSD: PLIST,v 1.3 2004/05/27 05:09:04 jlam Exp $
bin/imtest
bin/installsieve
bin/lmtptest
@@ -99,19 +99,19 @@ man/man8/ctl_mboxlist.8
man/man8/cvt_cyrusdb.8
man/man8/cyr_expire.8
man/man8/cyrus-deliver.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/fetchnews.8
man/man8/fud.8
-man/man8/idled.8
man/man8/ipurge.8
-man/man8/lmtpd.8
man/man8/mbexamine.8
man/man8/mbpath.8
-man/man8/nntpd.8
-man/man8/notifyd.8
-man/man8/quota.8
man/man8/reconstruct.8
man/man8/rmnews.8
man/man8/smmapd.8