Date: Mon, 30 May 2016 12:15:57 +0000 (UTC) From: Rene Ladan <rene@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416149 - head/mail/courier-pythonfilter Message-ID: <201605301215.u4UCFvqh066743@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: rene Date: Mon May 30 12:15:56 2016 New Revision: 416149 URL: https://svnweb.freebsd.org/changeset/ports/416149 Log: mail/courier-pythonfilter: remove optional dependency on expired security/py-clamav and simplify option handling. PR: 209843 Submitted by: myself Approved by: maintainer (bsd@dino.sk) Modified: head/mail/courier-pythonfilter/Makefile Modified: head/mail/courier-pythonfilter/Makefile ============================================================================== --- head/mail/courier-pythonfilter/Makefile Mon May 30 12:01:18 2016 (r416148) +++ head/mail/courier-pythonfilter/Makefile Mon May 30 12:15:56 2016 (r416149) @@ -30,13 +30,12 @@ SUB_LIST+= ${PLIST_SUB} OPTIONS_DEFINE= DEBUG NODUPLICATES LOCALSENDERS SPAMASSASSIN AUTO_WHITELIST WHITELIST_RELAY WHITELIST_AUTH \ WHITELIST_BLOCK WHITELIST_DNSWL WHITELIST_DNSWL DELIVEREDTO PRIVATEADDR SPFCHECK NOSUCCESSDSN \ - COMEAGAIN GREYLIST DIALBACK RATELIMIT ATTACHMENTS QUOTA WHITELIST_SPF + COMEAGAIN GREYLIST DIALBACK RATELIMIT ATTACHMENTS QUOTA WHITELIST_SPF CLAMAV_CLAMD DEBUG_DESC= debug module NODUPLICATES_DESC= noduplicates module LOCALSENDERS_DESC= localsenders module -CLAMAV_CLAMD_DESC= clamav filter with py-pyclamd \ mutually -CLAMAV_LIB_DESC= clamav filter with py-clamav / exclusive +CLAMAV_CLAMD_DESC= clamav filter with py-pyclamd SPAMASSASSIN_DESC= spamassassin module AUTO_WHITELIST_DESC= auto_whitelist module WHITELIST_RELAY_DESC= whitelist_relayclients module @@ -55,23 +54,13 @@ RATELIMIT_DESC= ratelimit module ATTACHMENTS_DESC= attachments module QUOTA_DESC= quota module -OPTIONS_RADIO= RG1 -OPTIONS_RADIO_RG1= CLAMAV_CLAMD CLAMAV_LIB -RG1_DESC= ClamAV Filter Option - OPTIONS_DEFAULT= DEBUG WHITELIST_RELAY WHITELIST_AUTH .include <bsd.port.pre.mk> PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR} -.if ${PORT_OPTIONS:MCLAMAV_CLAMD} && ! ${PORT_OPTIONS:MCLAMAV_LIB} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd -.endif - -.if ${PORT_OPTIONS:MCLAMAV_LIB} && ! ${PORT_OPTIONS:MCLAMAV_CLAMD} -RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pyclamav.so:security/py-clamav -.endif +CLAMAV_CLAMD_RUN_DEPENDS= ${PYTHON_SITELIBDIR}/pyclamd.py:security/py-pyclamd post-extract: ${MV} ${WRKSRC}/pythonfilter.conf ${WRKSRC}/pythonfilter.conf.sample @@ -89,7 +78,7 @@ post-configure: .if ${PORT_OPTIONS:MLOCALSENDERS} @${ECHO_MSG} localsenders >> ${WRKSRC}/pythonfilter.conf.sample .endif -.if ${PORT_OPTIONS:MCLAMAV_CLAMD} || ${PORT_OPTIONS:MCLAMAV_LIB} +.if ${PORT_OPTIONS:MCLAMAV_CLAMD} @${ECHO_MSG} clamav >> ${WRKSRC}/pythonfilter.conf.sample .endif .if ${PORT_OPTIONS:MSPAMASSASSIN}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201605301215.u4UCFvqh066743>