From owner-svn-ports-all@freebsd.org Mon May 30 12:15:58 2016 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 2E5D2B51313; Mon, 30 May 2016 12:15:58 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D9F3D1857; Mon, 30 May 2016 12:15:57 +0000 (UTC) (envelope-from rene@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4UCFvJe066744; Mon, 30 May 2016 12:15:57 GMT (envelope-from rene@FreeBSD.org) Received: (from rene@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4UCFvqh066743; Mon, 30 May 2016 12:15:57 GMT (envelope-from rene@FreeBSD.org) Message-Id: <201605301215.u4UCFvqh066743@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: rene set sender to rene@FreeBSD.org using -f From: Rene Ladan Date: Mon, 30 May 2016 12:15:57 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r416149 - head/mail/courier-pythonfilter X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 30 May 2016 12:15:58 -0000 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 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}