Date: Fri, 11 Sep 2015 14:56:55 +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: r396672 - in head/mail: cyrus-imapd23 cyrus-imapd23/files cyrus-imapd24 cyrus-imapd24/files cyrus-imapd25 cyrus-imapd25/files Message-ID: <201509111456.t8BEutHN088620@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Fri Sep 11 14:56:55 2015 New Revision: 396672 URL: https://svnweb.freebsd.org/changeset/ports/396672 Log: Cleanup and modernization of mail/cyrus-imapd2*. With hat: portmgr Sponsored by: Absolight Added: head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in - copied unchanged from r396665, head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf head/mail/cyrus-imapd23/files/pkg-deinstall.in - copied unchanged from r396665, head/mail/cyrus-imapd23/pkg-deinstall head/mail/cyrus-imapd23/files/pkg-install.in - copied unchanged from r396665, head/mail/cyrus-imapd23/pkg-install head/mail/cyrus-imapd23/files/pkg-message.in - copied, changed from r396665, head/mail/cyrus-imapd23/pkg-message head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in - copied unchanged from r396665, head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf head/mail/cyrus-imapd24/files/pkg-deinstall.in - copied unchanged from r396665, head/mail/cyrus-imapd24/pkg-deinstall head/mail/cyrus-imapd24/files/pkg-install.in - copied unchanged from r396665, head/mail/cyrus-imapd24/pkg-install head/mail/cyrus-imapd24/files/pkg-message.in - copied, changed from r396665, head/mail/cyrus-imapd24/pkg-message head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf.in - copied unchanged from r396665, head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf head/mail/cyrus-imapd25/files/pkg-deinstall.in - copied unchanged from r396665, head/mail/cyrus-imapd25/pkg-deinstall head/mail/cyrus-imapd25/files/pkg-install.in - copied unchanged from r396665, head/mail/cyrus-imapd25/pkg-install head/mail/cyrus-imapd25/files/pkg-message.in - copied, changed from r396665, head/mail/cyrus-imapd25/pkg-message Deleted: head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf head/mail/cyrus-imapd23/pkg-deinstall head/mail/cyrus-imapd23/pkg-install head/mail/cyrus-imapd23/pkg-message head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf head/mail/cyrus-imapd24/pkg-deinstall head/mail/cyrus-imapd24/pkg-install head/mail/cyrus-imapd24/pkg-message head/mail/cyrus-imapd25/files/cyrus-imapd-man.conf head/mail/cyrus-imapd25/pkg-deinstall head/mail/cyrus-imapd25/pkg-install head/mail/cyrus-imapd25/pkg-message 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 14:49:20 2015 (r396671) +++ head/mail/cyrus-imapd23/Makefile Fri Sep 11 14:56:55 2015 (r396672) @@ -18,15 +18,14 @@ LIB_DEPENDS= libsasl2.so:${PORTSDIR}/sec CONFLICTS= cyrus-1.* cyrus-imapd-2.[^3].* cyrus-imapd2[^3]-2.[^3].* -PERLMAN= ${SITE_PERL_REL:S/site_perl\///} - USE_RC_SUBR= imapd USES= cpe perl5 USE_OPENSSL= yes GNU_CONFIGURE= yes +CYRUS_PREFIX= ${PREFIX}/cyrus CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ - --with-cyrus-prefix=${PREFIX}/cyrus \ + --with-cyrus-prefix=${CYRUS_PREFIX} \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ @@ -87,92 +86,49 @@ SQLITE_DESC= Enable SQLite backend (exp SQLITE_USE= SQLITE=yes SQLITE_CONFIGURE_ON= --with-sqlite=${LOCALBASE} -.include <bsd.port.pre.mk> - # Autocreate Inbox and Autosieve patches from UoA # WWW: http://email.uoa.gr/projects/cyrus/ -.if ${PORT_OPTIONS:MAUTOCREATE} || ${PORT_OPTIONS:MAUTOSIEVE} -PATCH_DIST_STRIP= -p1 -PATCH_SITES+= http://email.uoa.gr/download/cyrus/${PORTNAME}-2.3.16/ -.endif - -.if ${PORT_OPTIONS:MAUTOCREATE} AUTOCREATE_VERSION= 0.10-0 -PATCHFILES+= ${PORTNAME}-2.3.16-autocreate-${AUTOCREATE_VERSION}.diff -.endif +AUTOCREATE_PATCH_SITES= http://email.uoa.gr/download/cyrus/${PORTNAME}-2.3.16/:autocreate +AUTOCREATE_PATCHFILES= ${PORTNAME}-2.3.16-autocreate-${AUTOCREATE_VERSION}.diff:autocreate -.if ${PORT_OPTIONS:MAUTOSIEVE} AUTOSIEVE_VERSION= 0.6.0 -PATCHFILES+= ${PORTNAME}-2.3.16-autosieve-${AUTOSIEVE_VERSION}.diff -.endif +AUTOSIETE_PATCH_SITES= http://email.uoa.gr/download/cyrus/${PORTNAME}-2.3.16/:autosieve +AUTOSIEVE_PATCHFILES= ${PORTNAME}-2.3.16-autosieve-${AUTOSIEVE_VERSION}.diff +AUTOSIEVE_BROKEN= Not buildable with autosieve patch -.if ${PORT_OPTIONS:MBDB} -INVALID_BDB_VER=2 -.else -BDB_LIB_NAME= no -.endif +DRAC_EXTRA_PATCHES= ${WRKSRC}/contrib/drac_auth.patch \ + ${FILESDIR}/extra-patch-configure.in \ + ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 \ + ${FILESDIR}/extra-patch-cmulocal::sasl2.m4 +DRAC_USE= AUTOTOOLS=autoconf,autoheader -.if ${PORT_OPTIONS:MDRAC} -EXTRA_PATCHES+= ${WRKSRC}/contrib/drac_auth.patch -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-configure.in \ - ${FILESDIR}/extra-patch-cmulocal::ucdsnmp.m4 -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4 -USE_AUTOTOOLS= autoconf autoheader -.endif +MANDIRS= ${CYRUS_PREFIX}/man -.if ${OSVERSION} >= 900022 -PLIST_SUB+= MANCONF="" -.else -PLIST_SUB+= MANCONF="@comment " -.endif +PORTDOCS= * +PORTEXAMPLES= * -.if !exists(/usr/lib/libkrb5.a) -CONFIGURE_ARGS+=--disable-gssapi -.endif +SUB_FILES= pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf + +SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} CYRUS_USER?= cyrus CYRUS_GROUP?= cyrus -MAN_MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ - nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 -MAN_MAN3= imclient.3 -MAN_MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 -CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ - Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 -CYRUS_MAN8= arbitron.8 chk_cyrus.8 ctl_cyrusdb.8 ctl_deliver.8 \ - ctl_mboxlist.8 cvt_cyrusdb.8 cyr_dbtool.8 cyr_df.8 \ - cyr_expire.8 cyr_synclog.8 deliver.8 fetchnews.8 fud.8 \ - idled.8 imapd.8 ipurge.8 lmtpd.8 make_md5.8 make_sha1.8 \ - master.8 mbexamine.8 mbpath.8 nntpd.8 notifyd.8 pop3d.8 \ - quota.8 reconstruct.8 rmnews.8 smmapd.8 squatter.8 \ - sync_client.8 sync_reset.8 sync_server.8 syncnews.8 \ - timsieved.8 tls_prune.8 unexpunge.8 - -DOCS= altnamespace anoncvs bugs changes faq feedback index \ - install-admin-mb install-auth install-compile \ - install-configure install-murder install-netnews \ - install-perf install-prereq install-replication \ - install-sieve install-snmpmon install-testing \ - install-upgrade install-virtdomains install mailing-list \ - man notes os overview questions readme sieve-protocol \ - sieve specs +.include <bsd.port.options.mk> -CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ - small.conf +.if ${PORT_OPTIONS:MBDB} +INVALID_BDB_VER=2 +.else +BDB_LIB_NAME= no +.endif -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install +.if !exists(/usr/lib/libkrb5.a) +CONFIGURE_ARGS+=--disable-gssapi +.endif post-patch: - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-install > ${PKGINSTALL} - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ @@ -180,62 +136,29 @@ post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec - @${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \ - ${FILESDIR}/cyrus-imapd-man.conf \ - > ${WRKDIR}/cyrus-imapd-man.conf -.if ${PORT_OPTIONS:MDRAC} + +post-patch-DRAC-on: @${RM} -rf ${WRKSRC}/autom4te.cache -.endif post-install: -.for f in ${CYRUS_MAN3} - @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${PERLMAN}/man/man3/${f} - @${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz >>${TMPPLIST} -.endfor -.for f in ${CYRUS_MAN8} - @${GZIP_CMD} ${STAGEDIR}${PREFIX}/cyrus/man/man8/${f} - @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST} -.endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/man - @${MKDIR} ${STAGEDIR}${DOCSDIR}/text -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${STAGEDIR}${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST} -.endfor -.for f in ${MAN_MAN1} ${MAN_MAN3} ${MAN_MAN5} ${CYRUS_MAN8} - @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \ - ${STAGEDIR}${DOCSDIR}/man/${f}.html; \ - ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \ - >>${TMPPLIST}; \ - fi -.endfor -.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png - @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST} -.endfor -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} \ - ${STAGEDIR}${DOCSDIR}/text - @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} -.endfor -.endif - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_DATA} ${FILESDIR}/imapd.conf \ + ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${STAGEDIR}${EXAMPLESDIR} -.for f in ${CONFS} - @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \ - ${STAGEDIR}${EXAMPLESDIR} - @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST} -.endfor - @${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ - ${STAGEDIR}${PREFIX}/cyrus/bin/mkimap - @${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ - ${STAGEDIR}${PREFIX}/cyrus/bin/masssievec -.if ${OSVERSION} >= 900022 - @${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ + ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ + ${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap + ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ + ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec + ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf -.endif -.include <bsd.port.post.mk> +post-install-DOCS-on: + ${MKDIR} ${STAGEDIR}${DOCSDIR} + cd ${WRKSRC}/doc && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} \ + "! ( -name Makefile.dist -o -name Makefile -o -name .cvsignore )" + +# There are already files in EXAMPLESDIR at that point, so no +# need to create it. +post-install-EXAMPLES-on: + cd ${WRKSRC}/master/conf && ${COPYTREE_SHARE} . \ + ${STAGEDIR}${EXAMPLESDIR} + +.include <bsd.port.mk> Copied: head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in (from r396665, head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf.in Fri Sep 11 14:56:55 2015 (r396672, copy of r396665, head/mail/cyrus-imapd23/files/cyrus-imapd-man.conf) @@ -0,0 +1 @@ +MANPATH %%PREFIX%%/cyrus/man Copied: head/mail/cyrus-imapd23/files/pkg-deinstall.in (from r396665, head/mail/cyrus-imapd23/pkg-deinstall) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd23/files/pkg-deinstall.in Fri Sep 11 14:56:55 2015 (r396672, copy of r396665, head/mail/cyrus-imapd23/pkg-deinstall) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Created by: hetzels@westbend.net + +#set -vx + +PKG_BATCH=${BATCH:=NO} +PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} +EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} +CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} + +checkfile() { + diff -bBqw $1 $2 >/dev/null 2>&1 + case $? in + 0) # config file exists, but is the same + rm $1 + ;; + 1) # config file exists and differs + ;; + *) # no config file exists + ;; + esac +} + +# +# Modify the 'cyrus' user created from the cyrus-sasl port +# + +modify_cyrus_user() { + USER=${CYRUS_USER} + PW=/usr/sbin/pw + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then + shell=/sbin/nologin + else + shell=/nonexistent + fi + uhome=/nonexistent + + if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then + echo "*** Failed to update user \`${USER}'." + else + echo "*** Updated user \`${USER}'." + fi +} + +case $2 in + DEINSTALL) + cd ${PKG_PREFIX} + checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf + checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf + ;; + POST-DEINSTALL) + modify_cyrus_user + ;; + +esac Copied: head/mail/cyrus-imapd23/files/pkg-install.in (from r396665, head/mail/cyrus-imapd23/pkg-install) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd23/files/pkg-install.in Fri Sep 11 14:56:55 2015 (r396672, copy of r396665, head/mail/cyrus-imapd23/pkg-install) @@ -0,0 +1,61 @@ +#!/bin/sh + +#set -vx + +PKG_BATCH=${BATCH:=NO} +PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} +EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} +CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} + +# +# Modify the 'cyrus' user created from the cyrus-sasl port +# + +modify_cyrus_user() { + USER=${CYRUS_USER} + PW=/usr/sbin/pw + shell=/bin/csh + uhome=${PKG_PREFIX}/cyrus + + if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then + echo "*** Failed to update user \`${USER}'." + else + echo "*** Updated user \`${USER}'." + fi +} + + +checkfile() { + diff -bBqw $1 $2 >/dev/null 2>&1 + case $? in + 0) # config file exists, but is the same + ;; + 1) # config file exists and differs + echo "** Make sure $1 is in sync with this version"; + echo " of the port. See $1.dist for details."; + ;; + *) # no config file exists, copy it + install -c -m 644 $2 $1 + ;; + esac +} + +case $2 in + PRE-INSTALL) + ;; + + POST-INSTALL) + modify_cyrus_user + cd ${PKG_PREFIX} + checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf + checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf + if grep 'sieve' /etc/services; then + echo + else + echo + echo "** Please add an entry for the sieve protocol (4190/tcp)" + echo " to /etc/services" + echo + fi + ;; +esac Copied and modified: head/mail/cyrus-imapd23/files/pkg-message.in (from r396665, head/mail/cyrus-imapd23/pkg-message) ============================================================================== --- head/mail/cyrus-imapd23/pkg-message Fri Sep 11 12:53:04 2015 (r396665, copy source) +++ head/mail/cyrus-imapd23/files/pkg-message.in Fri Sep 11 14:56:55 2015 (r396672) @@ -1,7 +1,7 @@ **************************************************************************** -To setup mail spool, modify /usr/local/etc/imapd.conf appropriately, -then run /usr/local/cyrus/bin/mkimap. +To setup mail spool, modify %%PREFIX%%/etc/imapd.conf appropriately, +then run %%PREFIX%%/cyrus/bin/mkimap. To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your /etc/rc.conf. Modified: head/mail/cyrus-imapd23/pkg-plist ============================================================================== --- head/mail/cyrus-imapd23/pkg-plist Fri Sep 11 14:49:20 2015 (r396671) +++ head/mail/cyrus-imapd23/pkg-plist Fri Sep 11 14:56:55 2015 (r396672) @@ -57,7 +57,44 @@ cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune cyrus/bin/unexpunge -%%MANCONF%%etc/man.d/cyrus-imapd.conf +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 include/cyrus/auth.h @@ -96,13 +133,18 @@ include/cyrus/xstrlcat.h include/cyrus/xstrlcpy.h lib/libcyrus.a lib/libcyrus_min.a +%%SITE_ARCH%%/Cyrus/IMAP.pm %%SITE_ARCH%%/Cyrus/IMAP/Admin.pm %%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm %%SITE_ARCH%%/Cyrus/IMAP/Shell.pm -%%SITE_ARCH%%/Cyrus/IMAP.pm %%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 @@ -117,4 +159,3 @@ man/man3/imclient.3.gz man/man5/cyrus.conf.5.gz man/man5/imapd.conf.5.gz man/man5/krb.equiv.5.gz -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf Modified: head/mail/cyrus-imapd24/Makefile ============================================================================== --- head/mail/cyrus-imapd24/Makefile Fri Sep 11 14:49:20 2015 (r396671) +++ head/mail/cyrus-imapd24/Makefile Fri Sep 11 14:56:55 2015 (r396672) @@ -19,15 +19,14 @@ LIB_DEPENDS= libsasl2.so:${PORTSDIR}/sec CONFLICTS= cyrus-1.* cyrus-imapd-2.[^4].* cyrus-imapd2[^4]-2.[^4].* -PERLMAN= ${SITE_PERL_REL:S/site_perl\///} - USE_RC_SUBR= imapd USES= cpe perl5 USE_OPENSSL= yes GNU_CONFIGURE= yes +CYRUS_PREFIX= ${PREFIX}/cyrus CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ - --with-cyrus-prefix=${PREFIX}/cyrus \ + --with-cyrus-prefix=${CYRUS_PREFIX} \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ @@ -101,28 +100,35 @@ GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit -.include <bsd.port.pre.mk> - # Autocreate Inbox and Autosieve patches from UoA # http://email.uoa.gr/projects/cyrus/ # http://blog.vx.sk/archives/13-Cyrus-IMAP-UoA.html -.if ${PORT_OPTIONS:MAUTOCREATE} || ${PORT_OPTIONS:MAUTOSIEVE} -PATCH_DIST_STRIP= -p1 -PATCH_SITES+= LOCAL/mm -.endif - -.if ${PORT_OPTIONS:MAUTOCREATE} AUTOCREATE_VERSION= 0.10-0 -PATCHFILES+= ${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch -PLIST_FILES+= cyrus/bin/compile_sieve -.endif +AUTOCREATE_PATCH_SITES= LOCAL/mm:autocreate +AUTOCREATE_PATCHFILES= ${PORTNAME}-2.4.4-autocreate-${AUTOCREATE_VERSION}.patch:-p1:autocreate -.if ${PORT_OPTIONS:MAUTOSIEVE} AUTOSIEVE_VERSION= 0.6.0 -PATCHFILES+= ${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch -BROKEN= Not buildable with autosieve patch -.endif +AUTOSIEVE_PATCH_SITES= LOCAL/mm:autosieve +AUTOSIEVE_PATCHFILES= ${PORTNAME}-2.4.12-autosieve-${AUTOSIEVE_VERSION}.patch:-p1:autosieve +AUTOSIEVE_BROKEN= Not buildable with autosieve patch + +DRAC_EXTRA_PATCHES= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4 +DRAC_USE= AUTOTOOLS=autoconf,autoheader + +MANDIRS= ${CYRUS_PREFIX}/man + +PORTDOCS= * +PORTEXAMPLES= * + +SUB_FILES= pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf + +SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} + +CYRUS_USER?= cyrus +CYRUS_GROUP?= cyrus + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBDB} INVALID_BDB_VER=2 @@ -130,69 +136,16 @@ INVALID_BDB_VER=2 BDB_LIB_NAME= no .endif -.if ${PORT_OPTIONS:MDRAC} -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-cmulocal::sasl2.m4 -USE_AUTOTOOLS= autoconf autoheader -.endif - .if !${PORT_OPTIONS:MGSSAPI_BASE} && !${PORT_OPTIONS:MGSSAPI_HEIMDAL} && \ !${PORT_OPTIONS:MGSSAPI_MIT} CONFIGURE_ARGS+=--disable-gssapi .endif -.if ${OSVERSION} >= 900022 -PLIST_SUB+= MANCONF="" -.else -PLIST_SUB+= MANCONF="@comment " -.endif - -CYRUS_USER?= cyrus -CYRUS_GROUP?= cyrus - -MAN_MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ - nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 -MAN_MAN3= imclient.3 -MAN_MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 -CYRUS_MAN3= Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ - Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 -CYRUS_MAN8= arbitron.8 chk_cyrus.8 ctl_cyrusdb.8 ctl_deliver.8 \ - ctl_mboxlist.8 cvt_cyrusdb.8 cyr_dbtool.8 cyr_df.8 \ - cyr_expire.8 cyr_synclog.8 deliver.8 fetchnews.8 fud.8 \ - idled.8 imapd.8 ipurge.8 lmtpd.8 master.8 mbexamine.8 \ - mbpath.8 nntpd.8 notifyd.8 pop3d.8 quota.8 reconstruct.8 \ - rmnews.8 smmapd.8 squatter.8 sync_client.8 sync_reset.8 \ - sync_server.8 syncnews.8 timsieved.8 tls_prune.8 unexpunge.8 - -DOCS= ag altnamespace anoncvs bugs changes faq feedback index \ - install-admin-mb install-auth install-compile \ - install-configure install-murder install-netnews \ - install-perf install-prereq install-replication \ - install-sieve install-snmpmon install-testing \ - install-upgrade install-virtdomains install mailing-list \ - man notes os overview questions readme sieve-protocol \ - sieve specs - -CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ - small.conf - -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install - -.if ${PORT_OPTIONS:MDRAC} -pre-patch: +pre-patch-DRAC-on: ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \ < ${WRKSRC}/contrib/drac_auth.patch -.endif post-patch: - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-install > ${PKGINSTALL} - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ @@ -200,62 +153,29 @@ post-patch: @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|g" \ -e "s|/usr/sieve|/var/imap/sieve|g" \ ${WRKSRC}/tools/masssievec - @${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \ - ${FILESDIR}/cyrus-imapd-man.conf \ - > ${WRKDIR}/cyrus-imapd-man.conf -.if ${PORT_OPTIONS:MDRAC} + +post-patch-DRAC-on: @${RM} -rf ${WRKSRC}/autom4te.cache -.endif post-install: -.for f in ${CYRUS_MAN3} - @${GZIP_CMD} ${STAGEDIR}${PREFIX}/${PERLMAN}/man/man3/${f} - @${ECHO_CMD} ${PERLMAN}/man/man3/${f}.gz >>${TMPPLIST} -.endfor -.for f in ${CYRUS_MAN8} - @${GZIP_CMD} ${STAGEDIR}${PREFIX}/cyrus/man/man8/${f} - @${ECHO_CMD} cyrus/man/man8/${f}.gz >>${TMPPLIST} -.endfor -.if ${PORT_OPTIONS:MDOCS} - @${MKDIR} ${STAGEDIR}${DOCSDIR}/man - @${MKDIR} ${STAGEDIR}${DOCSDIR}/text -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/${f}.html ${STAGEDIR}${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f}.html >>${TMPPLIST} -.endfor -.for f in ${MAN_MAN1} ${MAN_MAN3} ${MAN_MAN5} ${CYRUS_MAN8} - @if [ -f ${WRKSRC}/doc/man/${f}.html ]; then \ - ${INSTALL_DATA} ${WRKSRC}/doc/man/${f}.html \ - ${STAGEDIR}${DOCSDIR}/man/${f}.html; \ - ${ECHO_CMD} share/doc/${PORTNAME}/man/${f}.html \ - >>${TMPPLIST}; \ - fi -.endfor -.for f in cyrusv2.mc murder.fig murder.png netnews.fig netnews.png - @${INSTALL_DATA} ${WRKSRC}/doc/${f} ${STAGEDIR}${DOCSDIR} - @${ECHO_CMD} share/doc/${PORTNAME}/${f} >>${TMPPLIST} -.endfor -.for f in ${DOCS} - @${INSTALL_DATA} ${WRKSRC}/doc/text/${f} \ - ${STAGEDIR}${DOCSDIR}/text - @${ECHO_CMD} share/doc/${PORTNAME}/text/${f} >>${TMPPLIST} -.endfor -.endif - @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} - @${INSTALL_DATA} ${FILESDIR}/imapd.conf \ - ${STAGEDIR}${EXAMPLESDIR} -.for f in ${CONFS} - @${INSTALL_DATA} ${WRKSRC}/master/conf/${f} \ + ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${STAGEDIR}${EXAMPLESDIR} - @${ECHO_CMD} ${EXAMPLESDIR:S,^${PREFIX}/,,}/${f} >>${TMPPLIST} -.endfor - @${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ - ${STAGEDIR}${PREFIX}/cyrus/bin/mkimap - @${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ - ${STAGEDIR}${PREFIX}/cyrus/bin/masssievec -.if ${OSVERSION} >= 900022 - @${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ + ${INSTALL_SCRIPT} ${WRKSRC}/tools/mkimap \ + ${STAGEDIR}${CYRUS_PREFIX}/bin/mkimap + ${INSTALL_SCRIPT} ${WRKSRC}/tools/masssievec \ + ${STAGEDIR}${CYRUS_PREFIX}/bin/masssievec + ${INSTALL_DATA} ${WRKDIR}/cyrus-imapd-man.conf \ ${STAGEDIR}${PREFIX}/etc/man.d/cyrus-imapd.conf -.endif -.include <bsd.port.post.mk> +post-install-docs-on: + ${mkdir} ${stagedir}${docsdir} + cd ${wrksrc}/doc && ${copytree_share} . ${stagedir}${docsdir} \ + "! ( -name makefile.dist -o -name makefile -o -name .cvsignore )" + +# there are already files in examplesdir at that point, so no +# need to create it. +post-install-examples-on: + cd ${wrksrc}/master/conf && ${copytree_share} . \ + ${stagedir}${examplesdir} + +.include <bsd.port.mk> Copied: head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in (from r396665, head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf.in Fri Sep 11 14:56:55 2015 (r396672, copy of r396665, head/mail/cyrus-imapd24/files/cyrus-imapd-man.conf) @@ -0,0 +1 @@ +MANPATH %%PREFIX%%/cyrus/man Copied: head/mail/cyrus-imapd24/files/pkg-deinstall.in (from r396665, head/mail/cyrus-imapd24/pkg-deinstall) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd24/files/pkg-deinstall.in Fri Sep 11 14:56:55 2015 (r396672, copy of r396665, head/mail/cyrus-imapd24/pkg-deinstall) @@ -0,0 +1,60 @@ +#!/bin/sh +# +# $FreeBSD$ +# +# Created by: hetzels@westbend.net + +#set -vx + +PKG_BATCH=${BATCH:=NO} +PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} +EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} +CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} + +checkfile() { + diff -bBqw $1 $2 >/dev/null 2>&1 + case $? in + 0) # config file exists, but is the same + rm $1 + ;; + 1) # config file exists and differs + ;; + *) # no config file exists + ;; + esac +} + +# +# Modify the 'cyrus' user created from the cyrus-sasl port +# + +modify_cyrus_user() { + USER=${CYRUS_USER} + PW=/usr/sbin/pw + if [ -x /usr/sbin/nologin ]; then + shell=/usr/sbin/nologin + elif [ -x /sbin/nologin ]; then + shell=/sbin/nologin + else + shell=/nonexistent + fi + uhome=/nonexistent + + if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then + echo "*** Failed to update user \`${USER}'." + else + echo "*** Updated user \`${USER}'." + fi +} + +case $2 in + DEINSTALL) + cd ${PKG_PREFIX} + checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf + checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf + ;; + POST-DEINSTALL) + modify_cyrus_user + ;; + +esac Copied: head/mail/cyrus-imapd24/files/pkg-install.in (from r396665, head/mail/cyrus-imapd24/pkg-install) ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/cyrus-imapd24/files/pkg-install.in Fri Sep 11 14:56:55 2015 (r396672, copy of r396665, head/mail/cyrus-imapd24/pkg-install) @@ -0,0 +1,61 @@ +#!/bin/sh + +#set -vx + +PKG_BATCH=${BATCH:=NO} +PKG_PREFIX=${PKG_PREFIX:=%%PREFIX%%} +EXAMPLESDIR=${EXAMPLESDIR:=%%EXAMPLESDIR%%} +CYRUS_USER=${CYRUS_USER:=%%CYRUS_USER%%} + +# +# Modify the 'cyrus' user created from the cyrus-sasl port +# + +modify_cyrus_user() { + USER=${CYRUS_USER} + PW=/usr/sbin/pw + shell=/bin/csh + uhome=${PKG_PREFIX}/cyrus + + if ! ${PW} mod user ${USER} -d "${uhome}" -s "${shell}"; then + echo "*** Failed to update user \`${USER}'." + else + echo "*** Updated user \`${USER}'." + fi +} + + +checkfile() { + diff -bBqw $1 $2 >/dev/null 2>&1 + case $? in + 0) # config file exists, but is the same + ;; + 1) # config file exists and differs + echo "** Make sure $1 is in sync with this version"; + echo " of the port. See $1.dist for details."; + ;; + *) # no config file exists, copy it + install -c -m 644 $2 $1 + ;; + esac +} + +case $2 in + PRE-INSTALL) + ;; + + POST-INSTALL) + modify_cyrus_user + cd ${PKG_PREFIX} + checkfile ${PKG_PREFIX}/etc/imapd.conf ${EXAMPLESDIR}/imapd.conf + checkfile ${PKG_PREFIX}/etc/cyrus.conf ${EXAMPLESDIR}/normal.conf + if grep 'sieve' /etc/services; then + echo + else + echo + echo "** Please add an entry for the sieve protocol (4190/tcp)" + echo " to /etc/services" + echo + fi + ;; +esac Copied and modified: head/mail/cyrus-imapd24/files/pkg-message.in (from r396665, head/mail/cyrus-imapd24/pkg-message) ============================================================================== --- head/mail/cyrus-imapd24/pkg-message Fri Sep 11 12:53:04 2015 (r396665, copy source) +++ head/mail/cyrus-imapd24/files/pkg-message.in Fri Sep 11 14:56:55 2015 (r396672) @@ -1,7 +1,7 @@ **************************************************************************** -To setup mail spool, modify /usr/local/etc/imapd.conf appropriately, -then run /usr/local/cyrus/bin/mkimap. +To setup mail spool, modify %%PREFIX%%/etc/imapd.conf appropriately, +then run %%PREFIX%%/cyrus/bin/mkimap. To run Cyrus IMAPd from startup, add cyrus_imapd_enable="YES" in your /etc/rc.conf. Modified: head/mail/cyrus-imapd24/pkg-plist ============================================================================== --- head/mail/cyrus-imapd24/pkg-plist Fri Sep 11 14:49:20 2015 (r396671) +++ head/mail/cyrus-imapd24/pkg-plist Fri Sep 11 14:56:55 2015 (r396672) @@ -11,6 +11,7 @@ bin/smtptest bin/synctest cyrus/bin/arbitron cyrus/bin/chk_cyrus +%%AUTOCREATE%%cyrus/bin/compile_sieve cyrus/bin/ctl_cyrusdb cyrus/bin/ctl_deliver cyrus/bin/ctl_mboxlist @@ -56,7 +57,42 @@ cyrus/bin/squatter cyrus/bin/timsieved cyrus/bin/tls_prune cyrus/bin/unexpunge -%%MANCONF%%etc/man.d/cyrus-imapd.conf +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 include/cyrus/auth.h @@ -97,13 +133,18 @@ include/cyrus/xstrlcat.h include/cyrus/xstrlcpy.h lib/libcyrus.a lib/libcyrus_min.a +%%SITE_ARCH%%/Cyrus/IMAP.pm %%SITE_ARCH%%/Cyrus/IMAP/Admin.pm %%SITE_ARCH%%/Cyrus/IMAP/IMSP.pm %%SITE_ARCH%%/Cyrus/IMAP/Shell.pm -%%SITE_ARCH%%/Cyrus/IMAP.pm %%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 @@ -118,4 +159,3 @@ man/man3/imclient.3.gz man/man5/cyrus.conf.5.gz man/man5/imapd.conf.5.gz man/man5/krb.equiv.5.gz -%%PORTEXAMPLES%%%%EXAMPLESDIR%%/imapd.conf Modified: head/mail/cyrus-imapd25/Makefile ============================================================================== --- head/mail/cyrus-imapd25/Makefile Fri Sep 11 14:49:20 2015 (r396671) +++ head/mail/cyrus-imapd25/Makefile Fri Sep 11 14:56:55 2015 (r396672) @@ -19,15 +19,14 @@ LIB_DEPENDS= libsasl2.so:${PORTSDIR}/sec CONFLICTS= cyrus-1.* cyrus-imapd-2.[^5].* cyrus-imapd2[^5]-2.[^5].* -PERLMAN= ${SITE_PERL_REL:S/site_perl\///} - USE_RC_SUBR= imapd USES= cpe libtool perl5 USE_OPENSSL= yes GNU_CONFIGURE= yes +CYRUS_PREFIX= ${PREFIX}/cyrus CONFIGURE_ARGS= --sysconfdir=${PREFIX}/etc \ - --with-cyrus-prefix=${PREFIX}/cyrus \ + --with-cyrus-prefix=${CYRUS_PREFIX} \ --with-cyrus-user=${CYRUS_USER} \ --with-cyrus-group=${CYRUS_GROUP} \ --with-sasl=${LOCALBASE} \ @@ -114,7 +113,19 @@ GSSAPI_MIT_USES= gssapi:mit GSSAPI_MIT_CONFIGURE_ON= --enable-gssapi="${GSSAPIBASEDIR}" \ --with-gss_impl=mit -.include <bsd.port.pre.mk> +MANDIRS= ${CYRUS_PREFIX}/man + +PORTDOCS= * +PORTEXAMPLES= * + +SUB_FILES= pkg-message pkg-install pkg-deinstall cyrus-imapd-man.conf + +SUB_LIST= CYRUS_USER=${CYRUS_USER} CYRUS_GROUP=${CYRUS_GROUP} + +CYRUS_USER?= cyrus +CYRUS_GROUP?= cyrus + +.include <bsd.port.options.mk> .if ${PORT_OPTIONS:MBDB} INVALID_BDB_VER=2 @@ -142,51 +153,6 @@ USE_SQLITE=yes CONFIGURE_ARGS+=--disable-gssapi .endif -.if ${OSVERSION} >= 900022 -PLIST_SUB+= MANCONF="" -.else -PLIST_SUB+= MANCONF="@comment " -.endif - -CYRUS_USER?= cyrus -CYRUS_GROUP?= cyrus - -MAN_MAN1= cyradm.1 imtest.1 installsieve.1 lmtptest.1 mupdatetest.1 \ - nntptest.1 pop3test.1 sieveshell.1 sivtest.1 smtptest.1 -MAN_MAN3= imclient.3 -MAN_MAN5= cyrus.conf.5 imapd.conf.5 krb.equiv.5 -CYRUS_MAN3= Cyrus::Annotator::Daemon.3 Cyrus::Annotator::Message.3 \ - Cyrus::IMAP.3 Cyrus::IMAP::Admin.3 Cyrus::IMAP::IMSP.3 \ - Cyrus::IMAP::Shell.3 Cyrus::SIEVE::managesieve.3 -CYRUS_MAN8= arbitron.8 chk_cyrus.8 ctl_cyrusdb.8 ctl_deliver.8 \ - ctl_mboxlist.8 cvt_cyrusdb.8 cyr_dbtool.8 cyr_deny.8 cyr_df.8 \ - cyr_expire.8 cyr_info.8 cyr_synclog.8 deliver.8 fud.8 idled.8 \ - imapd.8 ipurge.8 lmtpd.8 master.8 mbexamine.8 mbpath.8 \ - notifyd.8 pop3d.8 quota.8 reconstruct.8 rmnews.8 smmapd.8 \ - squatter.8 sync_client.8 sync_reset.8 sync_server.8 \ - timsieved.8 tls_prune.8 unexpunge.8 -.if ${PORT_OPTIONS:MHTTP} -CYRUS_MAN8+= ctl_zoneinfo.8 httpd.8 -.endif -.if ${PORT_OPTIONS:MNNTP} -CYRUS_MAN8+= fetchnews.8 nntpd.8 -.endif - -DOCS= ag altnamespace anoncvs bugs changes faq feedback index \ - install-admin-mb install-auth install-compile \ - install-configure install-http install-murder \ - install-netnews install-perf install-prereq \ - install-replication install-sieve install-snmpmon \ - install-testing install-upgrade install-virtdomains install \ - mailing-list man notes os overview questions readme \ - sieve-protocol sieve specs - -CONFS= cmu-frontend.conf prefork.conf cmu-backend.conf normal.conf \ - small.conf - -PKGDEINSTALL= ${WRKDIR}/pkg-deinstall -PKGINSTALL= ${WRKDIR}/pkg-install - .if ${PORT_OPTIONS:MDRAC} pre-patch: ${PATCH} -d ${PATCH_WRKSRC} --forward --quiet -E -p1 \ @@ -194,14 +160,6 @@ pre-patch: .endif post-patch: - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-install > ${PKGINSTALL} - @${SED} -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ - -e "s|%%PREFIX%%|${PREFIX}|g" \ - -e "s|%%EXAMPLESDIR%%|${EXAMPLESDIR}|g" \ - ${.CURDIR}/pkg-deinstall > ${PKGDEINSTALL} @${REINPLACE_CMD} -e "s|/etc/|${PREFIX}/etc/|" \ -e "s|%%CYRUS_USER%%|${CYRUS_USER}|g" \ -e "s|%%CYRUS_GROUP%%|${CYRUS_GROUP}|g" \ @@ -213,63 +171,30 @@ post-patch: -e 's|$$(libdir)/\(pkgconfig\)|${PREFIX}/libdata/\1|g' \ -e 's|$$(mandir)/\(man[8]\)|${PREFIX}/cyrus/man/\1|g' \ ${WRKSRC}/Makefile.in - @${SED} -e "s|%%PREFIX%%|${PREFIX}|g;" \ - ${FILESDIR}/cyrus-imapd-man.conf \ - > ${WRKDIR}/cyrus-imapd-man.conf -.if ${PORT_OPTIONS:MDRAC} *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201509111456.t8BEutHN088620>