From yasu@home.utahime.org  Tue Jan 14 01:24:56 2014
Return-Path: <yasu@home.utahime.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 272C26D8
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Jan 2014 01:24:56 +0000 (UTC)
Received: from gate.utahime.jp (ipq210.utahime.jp [183.180.29.210])
	by mx1.freebsd.org (Postfix) with ESMTP id C22DD1E34
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 14 Jan 2014 01:24:55 +0000 (UTC)
Received: from eastasia.home.utahime.org (eastasia.home.utahime.org [192.168.174.1])
	by gate.utahime.jp (Postfix) with ESMTP id B633261FD8;
	Tue, 14 Jan 2014 10:24:53 +0900 (JST)
Received: from eastasia.home.utahime.org (localhost [127.0.0.1])
	by localhost-backdoor.home.utahime.org (Postfix) with ESMTP id 864774E655;
	Tue, 14 Jan 2014 10:24:53 +0900 (JST)
Received: from rolling-vm-freebsd2.home.utahime.org (rolling-vm-freebsd2.home.utahime.org [192.168.174.54])
	by eastasia.home.utahime.org (Postfix) with ESMTP id 4A0284E62D;
	Tue, 14 Jan 2014 10:24:53 +0900 (JST)
Received: by rolling-vm-freebsd2.home.utahime.org (Postfix, from userid 1000)
	id 31AFF188414; Tue, 14 Jan 2014 10:24:53 +0900 (JST)
Message-Id: <20140114012453.31AFF188414@rolling-vm-freebsd2.home.utahime.org>
Date: Tue, 14 Jan 2014 10:24:53 +0900 (JST)
From: Yasuhiro KIMURA <yasu@utahime.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc:
Subject: [PATCH] mail/postfix-policyd-spf-python: support staging
X-Send-Pr-Version: 3.113
X-GNATS-Notify: me@mortis.eu

>Number:         185762
>Category:       ports
>Synopsis:       [PATCH] mail/postfix-policyd-spf-python: support staging
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    pawel
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jan 14 01:30:00 UTC 2014
>Closed-Date:    Sat Feb 01 13:21:14 UTC 2014
>Last-Modified:  Sat Feb  1 13:30:00 UTC 2014
>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:
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jan 14 01:30:07 UTC 2014 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185762 

From: Edwin Groothuis <edwin@FreeBSD.org>
To: me@mortis.eu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/185762: [PATCH] mail/postfix-policyd-spf-python: support staging
Date: Tue, 14 Jan 2014 01:30:07 UT

 Maintainer of mail/postfix-policyd-spf-python,
 
 Please note that PR ports/185762 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/185762
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org
Responsible-Changed-From-To: freebsd-ports-bugs->pawel 
Responsible-Changed-By: pawel 
Responsible-Changed-When: Sat Feb 1 13:06:06 UTC 2014 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185762 
State-Changed-From-To: feedback->closed 
State-Changed-By: pawel 
State-Changed-When: Sat Feb 1 13:21:13 UTC 2014 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=185762 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/185762: commit references a PR
Date: Sat,  1 Feb 2014 13:21:06 +0000 (UTC)

 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 <yasu@utahime.org>
   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 <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 @@ 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 <bsd.port.mk>
 
 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
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
