From owner-svn-ports-head@FreeBSD.ORG Sat Feb 1 13:20:59 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A4FB9CEB; Sat, 1 Feb 2014 13:20:59 +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)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 909611E03; Sat, 1 Feb 2014 13:20:59 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id s11DKxfP078159; Sat, 1 Feb 2014 13:20:59 GMT (envelope-from pawel@svn.freebsd.org) Received: (from pawel@localhost) by svn.freebsd.org (8.14.7/8.14.7/Submit) id s11DKxbW078156; Sat, 1 Feb 2014 13:20:59 GMT (envelope-from pawel@svn.freebsd.org) Message-Id: <201402011320.s11DKxbW078156@svn.freebsd.org> From: Pawel Pekala Date: Sat, 1 Feb 2014 13:20:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r342133 - in head/mail/postfix-policyd-spf-python: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 01 Feb 2014 13:20:59 -0000 Author: pawel Date: Sat Feb 1 13:20:58 2014 New Revision: 342133 URL: http://svnweb.freebsd.org/changeset/ports/342133 QAT: https://qat.redports.org/buildarchive/r342133/ Log: Support staging PR: ports/185762 Submitted by: Yasuhiro KIMURA Approved by: maintainer timeout Added: head/mail/postfix-policyd-spf-python/files/patch-setup.py (contents, props changed) Modified: head/mail/postfix-policyd-spf-python/Makefile head/mail/postfix-policyd-spf-python/pkg-plist Modified: head/mail/postfix-policyd-spf-python/Makefile ============================================================================== --- head/mail/postfix-policyd-spf-python/Makefile Sat Feb 1 13:18:56 2014 (r342132) +++ head/mail/postfix-policyd-spf-python/Makefile Sat Feb 1 13:20:58 2014 (r342133) @@ -21,10 +21,6 @@ USE_PYTHON= yes USE_PYDISTUTILS= yes PYDISTUTILS_PKGNAME= pypolicyd-spf -MAN1= policyd-spf.1 -MAN5= policyd-spf.conf.5 \ - policyd-spf.peruser.5 - PORTDOCS= CHANGES \ COPYING \ README \ @@ -39,11 +35,10 @@ SUB_LIST= PYTHON_CMD=${PYTHON_CMD} OPTIONS_DEFINE= DOCS OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options -NO_STAGE= yes .include post-patch: - @${REINPLACE_CMD} -e '\/etc/s|/etc|etc|' ${WRKSRC}/setup.py + @${MV} ${WRKSRC}/policyd-spf.conf ${WRKSRC}/policyd-spf.conf.sample @${REINPLACE_CMD} -e "s|/etc/python-policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \ ${WRKSRC}/policyd-spf @${REINPLACE_CMD} -e "s|/etc/policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \ @@ -55,25 +50,8 @@ post-patch: -e "s|/etc/pypolicyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" \ ${WRKSRC}/policyd-spf.peruser.5 -do-install: - @# Install data to an unused directory to ensure it doesn't pollute the system - @(cd ${INSTALL_WRKSRC}; ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${PYDISTUTILS_SETUP} \ - ${PYDISTUTILS_INSTALL_TARGET} ${PYDISTUTILS_INSTALLARGS} \ - --install-data ${WRKDIR}/tmp-datadump-dir) - ${INSTALL_MAN} ${WRKSRC}/policyd-spf.1 ${MANPREFIX}/man/man1 - ${INSTALL_MAN} ${WRKSRC}/policyd-spf.conf.5 ${MANPREFIX}/man/man5 - ${INSTALL_MAN} ${WRKSRC}/policyd-spf.peruser.5 ${MANPREFIX}/man/man5 - @${INSTALL} -d ${ETCDIR}/ - ${INSTALL_DATA} ${WRKSRC}/policyd-spf.conf ${ETCDIR}/policyd-spf.conf.sample -.if ${PORT_OPTIONS:MDOCS} - @${INSTALL} -d ${DOCSDIR}/ - cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/ -.endif - post-install: -.if !exists(${ETCDIR}/policyd-spf.conf) - ${CP} -p ${ETCDIR}/policyd-spf.conf.sample ${ETCDIR}/policyd-spf.conf -.endif - @${CAT} ${PKGMESSAGE} + @${INSTALL} -d ${STAGEDIR}/${DOCSDIR} + cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR} .include Added: head/mail/postfix-policyd-spf-python/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/mail/postfix-policyd-spf-python/files/patch-setup.py Sat Feb 1 13:20:58 2014 (r342133) @@ -0,0 +1,17 @@ +--- setup.py.orig 2013-05-14 12:57:04.000000000 +0900 ++++ setup.py 2014-01-14 10:15:11.000000000 +0900 +@@ -13,10 +13,10 @@ + py_modules=['policydspfsupp', 'policydspfuser'], + keywords = ['Postfix','spf','email'], + scripts = ['policyd-spf'], +- data_files=[(os.path.join('share', 'man', 'man1'), +- ['policyd-spf.1']), (os.path.join('share', 'man', 'man5'), +- ['policyd-spf.conf.5']), (os.path.join('/etc', 'python-policyd-spf'), +- ['policyd-spf.conf']), (os.path.join('share', 'man', 'man5'), ++ data_files=[(os.path.join('man', 'man1'), ++ ['policyd-spf.1']), (os.path.join('man', 'man5'), ++ ['policyd-spf.conf.5']), (os.path.join('etc', 'postfix-policyd-spf-python'), ++ ['policyd-spf.conf.sample']), (os.path.join('man', 'man5'), + ['policyd-spf.peruser.5'])], + classifiers = [ + 'Development Status :: 5 - Production/Stable', Modified: head/mail/postfix-policyd-spf-python/pkg-plist ============================================================================== --- head/mail/postfix-policyd-spf-python/pkg-plist Sat Feb 1 13:18:56 2014 (r342132) +++ head/mail/postfix-policyd-spf-python/pkg-plist Sat Feb 1 13:20:58 2014 (r342133) @@ -2,6 +2,9 @@ %%ETCDIR%%/policyd-spf.conf.sample @exec if [ ! -f %D/%%ETCDIR%%/policyd-spf.conf ] ; then cp -p %D/%F %B/policyd-spf.conf; fi bin/policyd-spf +man/man1/policyd-spf.1.gz +man/man5/policyd-spf.conf.5.gz +man/man5/policyd-spf.peruser.5.gz %%PYTHON_SITELIBDIR%%/policydspfsupp.py %%PYTHON_SITELIBDIR%%/policydspfsupp.pyo %%PYTHON_SITELIBDIR%%/policydspfsupp.pyc