Date: Fri, 4 Jul 2014 23:13:47 +0000 (UTC) From: Vsevolod Stakhov <vsevolod@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r360681 - in head/mail: exim exim-monitor Message-ID: <201407042313.s64NDlKm044910@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: vsevolod Date: Fri Jul 4 23:13:46 2014 New Revision: 360681 URL: http://svnweb.freebsd.org/changeset/ports/360681 QAT: https://qat.redports.org/buildarchive/r360681/ Log: - Fix issue with exim monitor depends - Correctly name DAEMON option as EXIMDAEMON Submitted by: bapt Modified: head/mail/exim-monitor/Makefile head/mail/exim/Makefile head/mail/exim/pkg-plist Modified: head/mail/exim-monitor/Makefile ============================================================================== --- head/mail/exim-monitor/Makefile Fri Jul 4 23:11:33 2014 (r360680) +++ head/mail/exim-monitor/Makefile Fri Jul 4 23:13:46 2014 (r360681) @@ -8,6 +8,7 @@ COMMENT= The Exim monitor for the Exim M MASTERDIR= ${.CURDIR}/../exim EXIMON_ONLY= yes +OPTIONS_SLAVE= EXIMON # This dependency is disabled, because it prevents package users from # using the exim-monitor package with any of the exim slave packages. Modified: head/mail/exim/Makefile ============================================================================== --- head/mail/exim/Makefile Fri Jul 4 23:11:33 2014 (r360680) +++ head/mail/exim/Makefile Fri Jul 4 23:13:46 2014 (r360681) @@ -461,10 +461,10 @@ SEDLIST+= -e 's,^\# (WITH_OLD_DEMIME=),\ .if !defined(EXIMON_ONLY) && ${PORT_OPTIONS:MDAEMON} USE_RC_SUBR= exim -PLIST_SUB+= DAEMON="" +PLIST_SUB+= EXIMDAEMON="" SUB_LIST+= LOGDIR="${LOGDIR}" .else -PLIST_SUB+= DAEMON="@comment " +PLIST_SUB+= EXIMDAEMON="@comment " .endif .if ${PORT_OPTIONS:MIPV6} @@ -564,9 +564,9 @@ post-build: .if !defined(EXIMON_ONLY) post-install: .if ${PORT_OPTIONS:MDAEMON} - @${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily + ${MKDIR} ${STAGEDIR}${PREFIX}/etc/periodic/daily .for script in ${DAILY_SCRIPTS} - @${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${STAGEDIR}${PREFIX}/etc/periodic/daily/${script} + ${INSTALL_SCRIPT} ${WRKDIR}/${script}.sh ${STAGEDIR}${PREFIX}/etc/periodic/daily/${script} .endfor .endif .if ${PORT_OPTIONS:MSO_1024} Modified: head/mail/exim/pkg-plist ============================================================================== --- head/mail/exim/pkg-plist Fri Jul 4 23:11:33 2014 (r360680) +++ head/mail/exim/pkg-plist Fri Jul 4 23:13:46 2014 (r360681) @@ -39,10 +39,10 @@ %%EXIM%%%%PORTDOCS%%%%EXAMPLESDIR%%/convert4r4 %%EXIM%%%%PORTDOCS%%%%EXAMPLESDIR%%/transport-filter.pl %%EXIM%%%%PORTDOCS%%@dirrm %%EXAMPLESDIR%% -%%DAEMON%%etc/periodic/daily/150.exim-tidydb -%%DAEMON%%etc/periodic/daily/460.exim-mail-rejects -%%DAEMON%%@dirrmtry etc/periodic/daily -%%DAEMON%%@dirrmtry etc/periodic +%%EXIMDAEMON%%etc/periodic/daily/150.exim-tidydb +%%EXIMDAEMON%%etc/periodic/daily/460.exim-mail-rejects +%%EXIMDAEMON%%@dirrmtry etc/periodic/daily +%%EXIMDAEMON%%@dirrmtry etc/periodic @sample %%ETCDIR%%/configure.sample %%SA_EXIM%%@sample %%ETCDIR%%/sa-exim.conf.sample @dirrmtry %%ETCDIR%%
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407042313.s64NDlKm044910>