Sat Oct 12 20:07:40 2019 UTC ()
mail/cyrus-imapd: fix location of HTML documentation


(rillig)
diff -r1.112 -r1.113 pkgsrc/mail/cyrus-imapd/Makefile
diff -r1.13 -r1.14 pkgsrc/mail/cyrus-imapd/PLIST
cvs diff -r1.112 -r1.113 pkgsrc/mail/cyrus-imapd/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd/Attic/Makefile 2019/08/11 13:21:26 1.112
+++ pkgsrc/mail/cyrus-imapd/Attic/Makefile 2019/10/12 20:07:40 1.113
@@ -1,17 +1,17 @@ @@ -1,17 +1,17 @@
1# $NetBSD: Makefile,v 1.112 2019/08/11 13:21:26 wiz Exp $ 1# $NetBSD: Makefile,v 1.113 2019/10/12 20:07:40 rillig Exp $
2 2
3DISTNAME= cyrus-imapd-2.2.13p1 3DISTNAME= cyrus-imapd-2.2.13p1
4PKGREVISION= 18 4PKGREVISION= 19
5CATEGORIES= mail 5CATEGORIES= mail
6MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/ 6MASTER_SITES= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/
7MASTER_SITES+= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/ 7MASTER_SITES+= ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/OLD-VERSIONS/imap/
8 8
9MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= https://www.cyrusimap.org/ 10HOMEPAGE= https://www.cyrusimap.org/
11COMMENT= Cyrus IMAP server 11COMMENT= Cyrus IMAP server
12 12
13MAKE_JOBS_SAFE= no 13MAKE_JOBS_SAFE= no
14 14
15USE_TOOLS+= perl 15USE_TOOLS+= perl
16USE_PKGLOCALEDIR= yes 16USE_PKGLOCALEDIR= yes
17GNU_CONFIGURE= yes 17GNU_CONFIGURE= yes
@@ -109,27 +109,27 @@ CYRUS_IDLE?= poll @@ -109,27 +109,27 @@ CYRUS_IDLE?= poll
109BUILD_DEFS+= CYRUS_IDLE 109BUILD_DEFS+= CYRUS_IDLE
110PLIST_VARS+= idled 110PLIST_VARS+= idled
111.if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \ 111.if (${CYRUS_IDLE} != "poll") && (${CYRUS_IDLE} != "idled") && \
112 (${CYRUS_IDLE} != "no") 112 (${CYRUS_IDLE} != "no")
113PKG_FAIL_REASON+= "CYRUS_IDLE must be poll, idled or no" 113PKG_FAIL_REASON+= "CYRUS_IDLE must be poll, idled or no"
114.endif 114.endif
115CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE:Q} 115CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE:Q}
116.if ${CYRUS_IDLE} == "idled" 116.if ${CYRUS_IDLE} == "idled"
117PLIST.idled= yes 117PLIST.idled= yes
118.endif 118.endif
119 119
120MAKE_ENV+= PERL=${PERL5:Q} 120MAKE_ENV+= PERL=${PERL5:Q}
121 121
122HTMLDIR= ${PREFIX}/share/doc/html/cyrus-imapd 122HTMLDIR= ${PREFIX}/share/doc/cyrus-imapd
123EGDIR= ${PREFIX}/share/examples/cyrus-imapd 123EGDIR= ${PREFIX}/share/examples/cyrus-imapd
124CONF_FILES= ${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf 124CONF_FILES= ${EGDIR}/imapd.conf ${PKG_SYSCONFDIR}/imapd.conf
125CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf 125CONF_FILES+= ${EGDIR}/normal.conf ${PKG_SYSCONFDIR}/cyrus.conf
126RCD_SCRIPTS= cyrus 126RCD_SCRIPTS= cyrus
127FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf 127FILES_SUBST+= IMAPDCONF=${PKG_SYSCONFDIR}/imapd.conf
128 128
129# Fix path to /bin/sh that was replaced by Perl's MakeMaker to 129# Fix path to /bin/sh that was replaced by Perl's MakeMaker to
130# point to the shell in the tools directory. 130# point to the shell in the tools directory.
131# 131#
132SUBST_CLASSES+= sh 132SUBST_CLASSES+= sh
133SUBST_STAGE.sh= post-build 133SUBST_STAGE.sh= post-build
134SUBST_FILES.sh= perl/imap/blib/script/cyradm 134SUBST_FILES.sh= perl/imap/blib/script/cyradm
135SUBST_SED.sh+= -e 's|^\#!.*|\#!/bin/sh|' 135SUBST_SED.sh+= -e 's|^\#!.*|\#!/bin/sh|'
cvs diff -r1.13 -r1.14 pkgsrc/mail/cyrus-imapd/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/mail/cyrus-imapd/Attic/PLIST 2014/03/11 14:05:02 1.13
+++ pkgsrc/mail/cyrus-imapd/Attic/PLIST 2019/10/12 20:07:40 1.14
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.13 2014/03/11 14:05:02 jperkin Exp $ 1@comment $NetBSD: PLIST,v 1.14 2019/10/12 20:07:40 rillig Exp $
2bin/imtest 2bin/imtest
3bin/installsieve 3bin/installsieve
4bin/lmtptest 4bin/lmtptest
5bin/mupdatetest 5bin/mupdatetest
6bin/nntptest 6bin/nntptest
7bin/pop3test 7bin/pop3test
8bin/sieveshell 8bin/sieveshell
9bin/sivtest 9bin/sivtest
10bin/smtptest 10bin/smtptest
11cyrus/bin/arbitron 11cyrus/bin/arbitron
12cyrus/bin/chk_cyrus 12cyrus/bin/chk_cyrus
13cyrus/bin/ctl_cyrusdb 13cyrus/bin/ctl_cyrusdb
14cyrus/bin/ctl_deliver 14cyrus/bin/ctl_deliver
@@ -115,51 +115,51 @@ man/man8/cyrus-notifyd.8 @@ -115,51 +115,51 @@ man/man8/cyrus-notifyd.8
115man/man8/cyrus-pop3d.8 115man/man8/cyrus-pop3d.8
116man/man8/cyrus-quota.8 116man/man8/cyrus-quota.8
117man/man8/fud.8 117man/man8/fud.8
118man/man8/ipurge.8 118man/man8/ipurge.8
119man/man8/mbexamine.8 119man/man8/mbexamine.8
120man/man8/mbpath.8 120man/man8/mbpath.8
121man/man8/reconstruct.8 121man/man8/reconstruct.8
122man/man8/rmnews.8 122man/man8/rmnews.8
123man/man8/smmapd.8 123man/man8/smmapd.8
124man/man8/squatter.8 124man/man8/squatter.8
125man/man8/syncnews.8 125man/man8/syncnews.8
126man/man8/timsieved.8 126man/man8/timsieved.8
127man/man8/tls_prune.8 127man/man8/tls_prune.8
128share/doc/html/cyrus-imapd/altnamespace.html 128share/doc/cyrus-imapd/altnamespace.html
129share/doc/html/cyrus-imapd/anoncvs.html 129share/doc/cyrus-imapd/anoncvs.html
130share/doc/html/cyrus-imapd/bugs.html 130share/doc/cyrus-imapd/bugs.html
131share/doc/html/cyrus-imapd/changes.html 131share/doc/cyrus-imapd/changes.html
132share/doc/html/cyrus-imapd/cyrusv2.mc 132share/doc/cyrus-imapd/cyrusv2.mc
133share/doc/html/cyrus-imapd/faq.html 133share/doc/cyrus-imapd/faq.html
134share/doc/html/cyrus-imapd/feedback.html 134share/doc/cyrus-imapd/feedback.html
135share/doc/html/cyrus-imapd/index.html 135share/doc/cyrus-imapd/index.html
136share/doc/html/cyrus-imapd/install-admin-mb.html 136share/doc/cyrus-imapd/install-admin-mb.html
137share/doc/html/cyrus-imapd/install-auth.html 137share/doc/cyrus-imapd/install-auth.html
138share/doc/html/cyrus-imapd/install-compile.html 138share/doc/cyrus-imapd/install-compile.html
139share/doc/html/cyrus-imapd/install-configure.html 139share/doc/cyrus-imapd/install-configure.html
140share/doc/html/cyrus-imapd/install-murder.html 140share/doc/cyrus-imapd/install-murder.html
141share/doc/html/cyrus-imapd/install-netnews.html 141share/doc/cyrus-imapd/install-netnews.html
142share/doc/html/cyrus-imapd/install-perf.html 142share/doc/cyrus-imapd/install-perf.html
143share/doc/html/cyrus-imapd/install-prereq.html 143share/doc/cyrus-imapd/install-prereq.html
144share/doc/html/cyrus-imapd/install-sieve.html 144share/doc/cyrus-imapd/install-sieve.html
145share/doc/html/cyrus-imapd/install-snmpmon.html 145share/doc/cyrus-imapd/install-snmpmon.html
146share/doc/html/cyrus-imapd/install-testing.html 146share/doc/cyrus-imapd/install-testing.html
147share/doc/html/cyrus-imapd/install-upgrade.html 147share/doc/cyrus-imapd/install-upgrade.html
148share/doc/html/cyrus-imapd/install-virtdomains.html 148share/doc/cyrus-imapd/install-virtdomains.html
149share/doc/html/cyrus-imapd/install.html 149share/doc/cyrus-imapd/install.html
150share/doc/html/cyrus-imapd/mailing-list.html 150share/doc/cyrus-imapd/mailing-list.html
151share/doc/html/cyrus-imapd/man.html 151share/doc/cyrus-imapd/man.html
152share/doc/html/cyrus-imapd/notes.html 152share/doc/cyrus-imapd/notes.html
153share/doc/html/cyrus-imapd/os.html 153share/doc/cyrus-imapd/os.html
154share/doc/html/cyrus-imapd/overview.html 154share/doc/cyrus-imapd/overview.html
155share/doc/html/cyrus-imapd/questions.html 155share/doc/cyrus-imapd/questions.html
156share/doc/html/cyrus-imapd/readme.html 156share/doc/cyrus-imapd/readme.html
157share/doc/html/cyrus-imapd/sieve-protocol.html 157share/doc/cyrus-imapd/sieve-protocol.html
158share/doc/html/cyrus-imapd/sieve.html 158share/doc/cyrus-imapd/sieve.html
159share/doc/html/cyrus-imapd/specs.html 159share/doc/cyrus-imapd/specs.html
160share/examples/cyrus-imapd/cmu-backend.conf 160share/examples/cyrus-imapd/cmu-backend.conf
161share/examples/cyrus-imapd/cmu-frontend.conf 161share/examples/cyrus-imapd/cmu-frontend.conf
162share/examples/cyrus-imapd/imapd.conf 162share/examples/cyrus-imapd/imapd.conf
163share/examples/cyrus-imapd/normal.conf 163share/examples/cyrus-imapd/normal.conf
164share/examples/cyrus-imapd/prefork.conf 164share/examples/cyrus-imapd/prefork.conf
165share/examples/cyrus-imapd/small.conf 165share/examples/cyrus-imapd/small.conf