Date: Tue, 14 Jan 2014 10:24:53 +0900 (JST) From: Yasuhiro KIMURA <yasu@utahime.org> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/185762: [PATCH] mail/postfix-policyd-spf-python: support staging Message-ID: <20140114012453.31AFF188414@rolling-vm-freebsd2.home.utahime.org> Resent-Message-ID: <201401140130.s0E1U0g5006575@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 185762
>Category: ports
>Synopsis: [PATCH] mail/postfix-policyd-spf-python: support staging
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Jan 14 01:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Yasuhiro KIMURA
>Release: FreeBSD 10.0-RC5 amd64
>Organization:
>Environment:
System: FreeBSD xxxx 10.0-RC5 FreeBSD 10.0-RC5 #0 r260441: Wed Jan 8 16:36:49 JST 2014 xxxx amd64
>Description:
Support staging.
>How-To-Repeat:
>Fix:
--- patch-postfix-policyd-spf-python begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 339643)
+++ Makefile (working copy)
@@ -21,10 +21,6 @@
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 @@
OPTIONS_DEFINE= DOCS
OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
-NO_STAGE= yes
.include <bsd.port.options.mk>
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 @@
-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 <bsd.port.mk>
Index: files/patch-setup.py
===================================================================
--- files/patch-setup.py (revision 0)
+++ files/patch-setup.py (working copy)
@@ -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',
Index: pkg-plist
===================================================================
--- pkg-plist (revision 339643)
+++ pkg-plist (working copy)
@@ -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
--- patch-postfix-policyd-spf-python ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140114012453.31AFF188414>