Date: Fri, 11 Sep 2015 17:58:45 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r396689 - in head/mail: cyrus-imapd23 cyrus-imapd24 cyrus-imapd25 Message-ID: <201509111758.t8BHwjA5064734@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Sep 11 17:58:44 2015 New Revision: 396689 URL: https://svnweb.freebsd.org/changeset/ports/396689 Log: Put back man pages definitions in the Makefile. Requested by: maintainer Sponsored by: Absolight Modified: head/mail/cyrus-imapd23/Makefile head/mail/cyrus-imapd23/pkg-plist head/mail/cyrus-imapd24/Makefile head/mail/cyrus-imapd24/pkg-plist head/mail/cyrus-imapd25/Makefile head/mail/cyrus-imapd25/pkg-plist Modified: head/mail/cyrus-imapd23/Makefile ============================================================================== --- head/mail/cyrus-imapd23/Makefile Fri Sep 11 17:46:18 2015 (r396688) +++ head/mail/cyrus-imapd23/Makefile Fri Sep 11 17:58:44 2015 (r396689) @@ -116,6 +116,22 @@ SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus +MAN_MAN1= imtest installsieve lmtptest mupdatetest nntptest pop3test \ + sieveshell sivtest smtptest +MAN_MAN3= imclient +MAN_MAN5= cyrus.conf imapd.conf krb.equiv + +CYRUS_MAN8= arbitron chk_cyrus ctl_cyrusdb ctl_deliver ctl_mboxlist \ + cvt_cyrusdb cyr_dbtool cyr_df cyr_expire cyr_synclog deliver \ + fetchnews fud idled imapd ipurge lmtpd make_md5 make_sha1 \ + master mbexamine mbpath nntpd notifyd pop3d quota reconstruct \ + rmnews smmapd squatter sync_client sync_reset sync_server \ + syncnews timsieved tls_prune unexpunge + +CYRUS_PERL_MAN1=cyradm +CYRUS_PERL_MAN3=Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \ + Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBDB} @@ -149,6 +165,20 @@ post-install: ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf +.for s in 1 3 5 +. for m in ${MAN_MAN${s}} + @${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST} +. endfor +.endfor +.for m in ${CYRUS_PERL_MAN1} + @${ECHO_CMD} man/man1/${m}.1.gz >> ${TMPPLIST} +.endfor +.for m in ${CYRUS_PERL_MAN3} + @${ECHO_CMD} ${SITE_MAN3}/${m}.3.gz >> ${TMPPLIST} +.endfor +.for m in ${CYRUS_MAN8} + @${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST} +.endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/mail/cyrus-imapd23/pkg-plist ============================================================================== --- head/mail/cyrus-imapd23/pkg-plist Fri Sep 11 17:46:18 2015 (r396688) +++ head/mail/cyrus-imapd23/pkg-plist Fri Sep 11 17:58:44 2015 (r396689) @@ -57,43 +57,6 @@ cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune cyrus/bin/unexpunge -cyrus/man/man8/arbitron.8.gz -cyrus/man/man8/chk_cyrus.8.gz -cyrus/man/man8/ctl_cyrusdb.8.gz -cyrus/man/man8/ctl_deliver.8.gz -cyrus/man/man8/ctl_mboxlist.8.gz -cyrus/man/man8/cvt_cyrusdb.8.gz -cyrus/man/man8/cyr_dbtool.8.gz -cyrus/man/man8/cyr_df.8.gz -cyrus/man/man8/cyr_expire.8.gz -cyrus/man/man8/cyr_synclog.8.gz -cyrus/man/man8/deliver.8.gz -cyrus/man/man8/fetchnews.8.gz -cyrus/man/man8/fud.8.gz -cyrus/man/man8/idled.8.gz -cyrus/man/man8/imapd.8.gz -cyrus/man/man8/ipurge.8.gz -cyrus/man/man8/lmtpd.8.gz -cyrus/man/man8/make_md5.8.gz -cyrus/man/man8/make_sha1.8.gz -cyrus/man/man8/master.8.gz -cyrus/man/man8/mbexamine.8.gz -cyrus/man/man8/mbpath.8.gz -cyrus/man/man8/nntpd.8.gz -cyrus/man/man8/notifyd.8.gz -cyrus/man/man8/pop3d.8.gz -cyrus/man/man8/quota.8.gz -cyrus/man/man8/reconstruct.8.gz -cyrus/man/man8/rmnews.8.gz -cyrus/man/man8/smmapd.8.gz -cyrus/man/man8/squatter.8.gz -cyrus/man/man8/sync_client.8.gz -cyrus/man/man8/sync_reset.8.gz -cyrus/man/man8/sync_server.8.gz -cyrus/man/man8/syncnews.8.gz -cyrus/man/man8/timsieved.8.gz -cyrus/man/man8/tls_prune.8.gz -cyrus/man/man8/unexpunge.8.gz etc/man.d/cyrus-imapd.conf include/cyrus/acl.h include/cyrus/assert.h @@ -140,22 +103,3 @@ lib/libcyrus_min.a %%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm %%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so %%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so -%%PERL5_MAN3%%/Cyrus::IMAP.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::Admin.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::IMSP.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::Shell.3.gz -%%PERL5_MAN3%%/Cyrus::SIEVE::managesieve.3.gz -man/man1/cyradm.1.gz -man/man1/imtest.1.gz -man/man1/installsieve.1.gz -man/man1/lmtptest.1.gz -man/man1/mupdatetest.1.gz -man/man1/nntptest.1.gz -man/man1/pop3test.1.gz -man/man1/sieveshell.1.gz -man/man1/sivtest.1.gz -man/man1/smtptest.1.gz -man/man3/imclient.3.gz -man/man5/cyrus.conf.5.gz -man/man5/imapd.conf.5.gz -man/man5/krb.equiv.5.gz Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Fri Sep 11 17:46:18 2015 (r396688) +++ head/mail/cyrus-imapd24/Makefile Fri Sep 11 17:58:44 2015 (r396689) @@ -128,6 +128,22 @@ SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus +MAN_MAN1= imtest installsieve lmtptest mupdatetest nntptest pop3test \ + sieveshell sivtest smtptest +MAN_MAN3= imclient +MAN_MAN5= cyrus.conf imapd.conf krb.equiv + +CYRUS_MAN8= arbitron chk_cyrus ctl_cyrusdb ctl_deliver ctl_mboxlist \ + cvt_cyrusdb cyr_dbtool cyr_df cyr_expire cyr_synclog deliver \ + fetchnews fud idled imapd ipurge lmtpd master mbexamine \ + mbpath nntpd notifyd pop3d quota reconstruct rmnews smmapd \ + squatter sync_client sync_reset sync_server syncnews \ + timsieved tls_prune unexpunge + +CYRUS_PERL_MAN1=cyradm +CYRUS_PERL_MAN3=Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \ + Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBDB} @@ -166,6 +182,20 @@ post-install: ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf +.for s in 1 3 5 +. for m in ${MAN_MAN${s}} + @${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST} +. endfor +.endfor +.for m in ${CYRUS_PERL_MAN1} + @${ECHO_CMD} man/man1/${m}.1.gz >> ${TMPPLIST} +.endfor +.for m in ${CYRUS_PERL_MAN3} + @${ECHO_CMD} ${SITE_MAN3}/${m}.3.gz >> ${TMPPLIST} +.endfor +.for m in ${CYRUS_MAN8} + @${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST} +.endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/mail/cyrus-imapd24/pkg-plist ============================================================================== --- head/mail/cyrus-imapd24/pkg-plist Fri Sep 11 17:46:18 2015 (r396688) +++ head/mail/cyrus-imapd24/pkg-plist Fri Sep 11 17:58:44 2015 (r396689) @@ -57,41 +57,6 @@ cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune cyrus/bin/unexpunge -cyrus/man/man8/arbitron.8.gz -cyrus/man/man8/chk_cyrus.8.gz -cyrus/man/man8/ctl_cyrusdb.8.gz -cyrus/man/man8/ctl_deliver.8.gz -cyrus/man/man8/ctl_mboxlist.8.gz -cyrus/man/man8/cvt_cyrusdb.8.gz -cyrus/man/man8/cyr_dbtool.8.gz -cyrus/man/man8/cyr_df.8.gz -cyrus/man/man8/cyr_expire.8.gz -cyrus/man/man8/cyr_synclog.8.gz -cyrus/man/man8/deliver.8.gz -cyrus/man/man8/fetchnews.8.gz -cyrus/man/man8/fud.8.gz -cyrus/man/man8/idled.8.gz -cyrus/man/man8/imapd.8.gz -cyrus/man/man8/ipurge.8.gz -cyrus/man/man8/lmtpd.8.gz -cyrus/man/man8/master.8.gz -cyrus/man/man8/mbexamine.8.gz -cyrus/man/man8/mbpath.8.gz -cyrus/man/man8/nntpd.8.gz -cyrus/man/man8/notifyd.8.gz -cyrus/man/man8/pop3d.8.gz -cyrus/man/man8/quota.8.gz -cyrus/man/man8/reconstruct.8.gz -cyrus/man/man8/rmnews.8.gz -cyrus/man/man8/smmapd.8.gz -cyrus/man/man8/squatter.8.gz -cyrus/man/man8/sync_client.8.gz -cyrus/man/man8/sync_reset.8.gz -cyrus/man/man8/sync_server.8.gz -cyrus/man/man8/syncnews.8.gz -cyrus/man/man8/timsieved.8.gz -cyrus/man/man8/tls_prune.8.gz -cyrus/man/man8/unexpunge.8.gz etc/man.d/cyrus-imapd.conf include/cyrus/acl.h include/cyrus/assert.h @@ -140,22 +105,3 @@ lib/libcyrus_min.a %%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm %%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so %%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so -%%PERL5_MAN3%%/Cyrus::IMAP.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::Admin.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::IMSP.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::Shell.3.gz -%%PERL5_MAN3%%/Cyrus::SIEVE::managesieve.3.gz -man/man1/cyradm.1.gz -man/man1/imtest.1.gz -man/man1/installsieve.1.gz -man/man1/lmtptest.1.gz -man/man1/mupdatetest.1.gz -man/man1/nntptest.1.gz -man/man1/pop3test.1.gz -man/man1/sieveshell.1.gz -man/man1/sivtest.1.gz -man/man1/smtptest.1.gz -man/man3/imclient.3.gz -man/man5/cyrus.conf.5.gz -man/man5/imapd.conf.5.gz -man/man5/krb.equiv.5.gz Modified: head/mail/cyrus-imapd25/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Fri Sep 11 17:46:18 2015 (r396688) +++ head/mail/cyrus-imapd25/Makefile Fri Sep 11 17:58:44 2015 (r396689) @@ -125,6 +125,23 @@ SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus +MAN_MAN1= imtest installsieve lmtptest mupdatetest nntptest pop3test \ + sieveshell sivtest smtptest +MAN_MAN3= imclient +MAN_MAN5= cyrus.conf imapd.conf krb.equiv + +CYRUS_MAN8= arbitron chk_cyrus ctl_cyrusdb ctl_deliver ctl_mboxlist \ + cvt_cyrusdb cyr_dbtool cyr_deny cyr_df cyr_expire cyr_info \ + cyr_synclog deliver fud idled imapd ipurge lmtpd master \ + mbexamine mbpath notifyd pop3d quota reconstruct rmnews \ + smmapd squatter sync_client sync_reset sync_server timsieved \ + tls_prune unexpunge + +CYRUS_PERL_MAN1=cyradm +CYRUS_PERL_MAN3=Cyrus::Annotator::Daemon Cyrus::Annotator::Message \ + Cyrus::IMAP Cyrus::IMAP::Admin Cyrus::IMAP::IMSP \ + Cyrus::IMAP::Shell Cyrus::SIEVE::managesieve + .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBDB} @@ -153,6 +170,13 @@ USE_SQLITE=yes CONFIGURE_ARGS+=--disable-gssapi .endif +.if ${PORT_OPTIONS:MHTTP} +CYRUS_MAN8+= ctl_zoneinfo httpd +.endif +.if ${PORT_OPTIONS:MNNTP} +CYRUS_MAN8+= fetchnews nntpd +.endif + .if ${PORT_OPTIONS:MDRAC} pre-patch: ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \ @@ -180,11 +204,25 @@ post-install: ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${STAGEDIR}${EXAMPLESDIR} ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ - ${STAGEDIR}${PREFIX}/cyrus/bin/mkimap + ${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ - ${STAGEDIR}${PREFIX}/cyrus/bin/masssievec + ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf +.for s in 1 3 5 +. for m in ${MAN_MAN${s}} + @${ECHO_CMD} man/man${s}/${m}.${s}.gz >> ${TMPPLIST} +. endfor +.endfor +.for m in ${CYRUS_PERL_MAN1} + @${ECHO_CMD} man/man1/${m}.1.gz >> ${TMPPLIST} +.endfor +.for m in ${CYRUS_PERL_MAN3} + @${ECHO_CMD} ${SITE_MAN3}/${m}.3.gz >> ${TMPPLIST} +.endfor +.for m in ${CYRUS_MAN8} + @${ECHO_CMD} ${CYRUS_PREFIX}/man/man8/${m}.8.gz >> ${TMPPLIST} +.endfor post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} Modified: head/mail/cyrus-imapd25/pkg-plist ============================================================================== --- head/mail/cyrus-imapd25/pkg-plist Fri Sep 11 17:46:18 2015 (r396688) +++ head/mail/cyrus-imapd25/pkg-plist Fri Sep 11 17:58:44 2015 (r396689) @@ -63,44 +63,6 @@ cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune cyrus/bin/unexpunge -cyrus/man/man8/arbitron.8.gz -cyrus/man/man8/chk_cyrus.8.gz -cyrus/man/man8/ctl_cyrusdb.8.gz -cyrus/man/man8/ctl_deliver.8.gz -cyrus/man/man8/ctl_mboxlist.8.gz -%%HTTP%%cyrus/man/man8/ctl_zoneinfo.8.gz -cyrus/man/man8/cvt_cyrusdb.8.gz -cyrus/man/man8/cyr_dbtool.8.gz -cyrus/man/man8/cyr_deny.8.gz -cyrus/man/man8/cyr_df.8.gz -cyrus/man/man8/cyr_expire.8.gz -cyrus/man/man8/cyr_info.8.gz -cyrus/man/man8/cyr_synclog.8.gz -cyrus/man/man8/deliver.8.gz -%%NNTP%%cyrus/man/man8/fetchnews.8.gz -cyrus/man/man8/fud.8.gz -%%HTTP%%cyrus/man/man8/httpd.8.gz -cyrus/man/man8/idled.8.gz -cyrus/man/man8/imapd.8.gz -cyrus/man/man8/ipurge.8.gz -cyrus/man/man8/lmtpd.8.gz -cyrus/man/man8/master.8.gz -cyrus/man/man8/mbexamine.8.gz -cyrus/man/man8/mbpath.8.gz -%%NNTP%%cyrus/man/man8/nntpd.8.gz -cyrus/man/man8/notifyd.8.gz -cyrus/man/man8/pop3d.8.gz -cyrus/man/man8/quota.8.gz -cyrus/man/man8/reconstruct.8.gz -cyrus/man/man8/rmnews.8.gz -cyrus/man/man8/smmapd.8.gz -cyrus/man/man8/squatter.8.gz -cyrus/man/man8/sync_client.8.gz -cyrus/man/man8/sync_reset.8.gz -cyrus/man/man8/sync_server.8.gz -cyrus/man/man8/timsieved.8.gz -cyrus/man/man8/tls_prune.8.gz -cyrus/man/man8/unexpunge.8.gz etc/man.d/cyrus-imapd.conf include/cyrus/acl.h include/cyrus/arrayu64.h @@ -172,27 +134,6 @@ lib/libcyrus_sieve.so.0.0.0 %%SITE_ARCH%%/Cyrus/SIEVE/managesieve.pm %%SITE_ARCH%%/auto/Cyrus/IMAP/IMAP.so %%SITE_ARCH%%/auto/Cyrus/SIEVE/managesieve/managesieve.so -%%PERL5_MAN3%%/Cyrus::Annotator::Daemon.3.gz -%%PERL5_MAN3%%/Cyrus::Annotator::Message.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::Admin.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::IMSP.3.gz -%%PERL5_MAN3%%/Cyrus::IMAP::Shell.3.gz -%%PERL5_MAN3%%/Cyrus::SIEVE::managesieve.3.gz libdata/pkgconfig/libcyrus.pc libdata/pkgconfig/libcyrus_min.pc libdata/pkgconfig/libcyrus_sieve.pc -man/man1/cyradm.1.gz -man/man1/imtest.1.gz -man/man1/installsieve.1.gz -man/man1/lmtptest.1.gz -man/man1/mupdatetest.1.gz -man/man1/nntptest.1.gz -man/man1/pop3test.1.gz -man/man1/sieveshell.1.gz -man/man1/sivtest.1.gz -man/man1/smtptest.1.gz -man/man3/imclient.3.gz -man/man5/cyrus.conf.5.gz -man/man5/imapd.conf.5.gz -man/man5/krb.equiv.5.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509111758.t8BHwjA5064734>