diff options
| author | Rene Ladan <rene@FreeBSD.org> | 2016-05-30 12:15:56 +0000 |
|---|---|---|
| committer | Rene Ladan <rene@FreeBSD.org> | 2016-05-30 12:15:56 +0000 |
| commit | 791fda14039baa150af180b3bbf2e8a35139f19f (patch) | |
| tree | d432598502fec18481dc1f4f321405d2d886c61d /mail/courier-pythonfilter | |
| parent | 562522c62528385e2c72ba42856b0bcecf5dabf0 (diff) | |
| download | ports-791fda14039baa150af180b3bbf2e8a35139f19f.tar.gz ports-791fda14039baa150af180b3bbf2e8a35139f19f.zip | |
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)
Notes
Notes:
svn path=/head/; revision=416149
Diffstat (limited to 'mail/courier-pythonfilter')
| -rw-r--r-- | mail/courier-pythonfilter/Makefile | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/mail/courier-pythonfilter/Makefile b/mail/courier-pythonfilter/Makefile index 8cfd60633d55..cc1de1c9ffab 100644 --- a/mail/courier-pythonfilter/Makefile +++ b/mail/courier-pythonfilter/Makefile @@ -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} |