From owner-svn-ports-all@FreeBSD.ORG Thu Jul 10 20:33:35 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 57E0CC33; Thu, 10 Jul 2014 20:33:35 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 38E7821C9; Thu, 10 Jul 2014 20:33:35 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6AKXZMo098973; Thu, 10 Jul 2014 20:33:35 GMT (envelope-from danilo@svn.freebsd.org) Received: (from danilo@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6AKXYTd098971; Thu, 10 Jul 2014 20:33:34 GMT (envelope-from danilo@svn.freebsd.org) Message-Id: <201407102033.s6AKXYTd098971@svn.freebsd.org> From: Danilo Egea Gondolfo Date: Thu, 10 Jul 2014 20:33:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361489 - 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.18 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: Thu, 10 Jul 2014 20:33:35 -0000 Author: danilo Date: Thu Jul 10 20:33:34 2014 New Revision: 361489 URL: http://svnweb.freebsd.org/changeset/ports/361489 QAT: https://qat.redports.org/buildarchive/r361489/ Log: - Add stage support - Use @sample while here - Use @owner and @group PR: ports/191521 Submitted by: bsd@dino.sk Modified: head/mail/courier-pythonfilter/Makefile head/mail/courier-pythonfilter/pkg-plist Modified: head/mail/courier-pythonfilter/Makefile ============================================================================== --- head/mail/courier-pythonfilter/Makefile Thu Jul 10 20:30:29 2014 (r361488) +++ head/mail/courier-pythonfilter/Makefile Thu Jul 10 20:33:34 2014 (r361489) @@ -20,11 +20,16 @@ MAILUID= 465 MAILGID= 465 LOCALSTATEDIR= /var/spool/courier -SCRIPTSDIR= ${PREFIX}/libexec/filters +PYSCRIPTSDIR= ${PREFIX}/libexec/filters + +PLIST_SUB+= MAILOWN="${MAILOWN}" MAILGRP="${MAILGRP}" \ + MAILUID="${MAILUID}" MAILGID="${MAILGID}" \ + LOCALSTATEDIR="${LOCALSTATEDIR}" +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 + COMEAGAIN GREYLIST DIALBACK RATELIMIT ATTACHMENTS QUOTA WHITELIST_SPF DEBUG_DESC= debug module NODUPLICATES_DESC= noduplicates module @@ -37,7 +42,7 @@ WHITELIST_RELAY_DESC= whitelist_relaycli WHITELIST_AUTH_DESC= whitelist_auth module WHITELIST_BLOCK_DESC= whitelist_block module WHITELIST_DNSWL_DESC= whitelist_dnswl module -WHITELIST_SP_DESC= Fwhitelist_spf module +WHITELIST_SP_DESC= whitelist_spf module DELIVEREDTO_DESC= deliveredto module PRIVATEADDR_DESC= privateaddr module SPFCHECK_DESC= spfcheck module @@ -55,10 +60,9 @@ RG1_DESC= ClamAV Filter Option OPTIONS_DEFAULT= DEBUG WHITELIST_RELAY WHITELIST_AUTH -NO_STAGE= yes .include -PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${SCRIPTSDIR} +PYDISTUTILS_INSTALLARGS:=${PYDISTUTILS_INSTALLARGS} --install-scripts=${PYSCRIPTSDIR} .if ${PORT_OPTIONS:MCLAMAV_CLAMD} && ! ${PORT_OPTIONS:MCLAMAV_LIB} RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/pyclamd.py:${PORTSDIR}/security/py-pyclamd @@ -143,9 +147,6 @@ post-patch: @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/pythonfilter post-install: - ${MKDIR} ${LOCALSTATEDIR}/pythonfilter - ${CHOWN} ${MAILOWN}:${MAILGRP} ${LOCALSTATEDIR}/pythonfilter - @if [ ! -f ${PREFIX}/etc/pythonfilter.conf ]; then cp -p ${PREFIX}/etc/pythonfilter.conf.sample ${PREFIX}/etc/pythonfilter.conf; fi - @if [ ! -f ${PREFIX}/etc/pythonfilter-modules.conf ]; then cp -p ${PREFIX}/etc/pythonfilter-modules.conf.sample ${PREFIX}/etc/pythonfilter-modules.conf; fi + @${MKDIR} ${STAGEDIR}${LOCALSTATEDIR}/pythonfilter .include Modified: head/mail/courier-pythonfilter/pkg-plist ============================================================================== --- head/mail/courier-pythonfilter/pkg-plist Thu Jul 10 20:30:29 2014 (r361488) +++ head/mail/courier-pythonfilter/pkg-plist Thu Jul 10 20:33:34 2014 (r361489) @@ -1,9 +1,5 @@ -@unexec if cmp -s %D/etc/pythonfilter.conf %D/etc/pythonfilter.conf.sample; then rm -f %D/etc/pythonfilter.conf; fi -etc/pythonfilter.conf.sample -@exec if [ ! -f %D/etc/pythonfilter.conf ]; then cp -p %D/etc/pythonfilter.conf.sample %D/etc/pythonfilter.conf; fi -@unexec if cmp -s %D/etc/pythonfilter-modules.conf %D/etc/pythonfilter-modules.conf.sample; then rm -f %D/etc/pythonfilter-modules.conf; fi -etc/pythonfilter-modules.conf.sample -@exec if [ ! -f %D/etc/pythonfilter-modules.conf ]; then cp -p %D/etc/pythonfilter-modules.conf.sample %D/etc/pythonfilter-modules.conf; fi +@sample etc/pythonfilter.conf.sample +@sample etc/pythonfilter-modules.conf.sample libexec/filters/pythonfilter libexec/filters/pythonfilter-quarantine %%PYTHON_SITELIBDIR%%/courier/__init__.py @@ -102,5 +98,17 @@ libexec/filters/pythonfilter-quarantine %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.py %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyc %%PYTHON_SITELIBDIR%%/pythonfilter/whitelist_spf.pyo +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/PKG-INFO +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/SOURCES.txt +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/dependency_links.txt +%%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info/top_level.txt +@owner courier +@group courier +@dirrmtry %%LOCALSTATEDIR%%/pythonfilter +@group courier +@owner courier +@dirrmtry %%LOCALSTATEDIR%% @dirrm %%PYTHON_SITELIBDIR%%/courier @dirrm %%PYTHON_SITELIBDIR%%/pythonfilter +@dirrm %%PYTHON_SITELIBDIR%%/courier_pythonfilter-1.6-py2.7.egg-info +@dirrmtry libexec/filters