ports/177797: [PATCH] mail/postfix-policyd-spf-python: update to 1.1 and etc.

[Yasuhiro KIMURA]

>Number:         177797
>Category:       ports
>Synopsis:       [PATCH] mail/postfix-policyd-spf-python: update to 1.1 and etc.
>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:   Fri Apr 12 02:10:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator:     Yasuhiro KIMURA
>Release:        FreeBSD 9.1-RELEASE-p2 amd64
>Organization:
>Environment:
System: FreeBSD xxxx 9.1-RELEASE-p2 FreeBSD 9.1-RELEASE-p2 #0 r249030: Sat Apr 6 22:45:59 JST 2013 xxxx amd64


	
>Description:
	- Update to 1.1.
	- Modify policyd-spf so ${PREFIX}/etc/postfix-policyd-spf-python/policyd-spf.conf is used as default configuration files
	- Change pkg-message.in accordingly
	- Modify misc file paths in man pages so they match installed ones.
	- Adopt to new options framework.
	- Add license information.
	- Trim makefile header.
	- Update WWW url in pkg-descr.

	
>How-To-Repeat:
	
>Fix:

	

--- patch-postfix-policyd-spf-python begins here ---
Index: Makefile
===================================================================
--- Makefile	(revision 315785)
+++ Makefile	(working copy)
@@ -1,12 +1,8 @@
-# New ports collection makefile for:	postfix-policyd-spf-python
-# Date created:				8 Jan 2010
-# Whom:					Giel van Schijndel <me at mortis.eu>
-#
+# Created by: Giel van Schijndel <me at mortis.eu>
 # $FreeBSD$
-#
 
 PORTNAME=	postfix-policyd-spf-python
-PORTVERSION=	1.0
+PORTVERSION=	1.1
 CATEGORIES=	mail python
 MASTER_SITES=	http://launchpad.net/pypolicyd-spf/${PORTVERSION}/${PORTVERSION}/+download/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,6 +11,8 @@
 MAINTAINER=	me at mortis.eu
 COMMENT=	Pure Python Postfix policy daemon for SPF checking
 
+LICENSE=	AL2
+
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/spf.py:${PORTSDIR}/mail/py-spf
 
 USE_PYTHON=	yes
@@ -41,8 +39,17 @@
 SUB_FILES=	pkg-message
 SUB_LIST=	PYTHON_CMD=${PYTHON_CMD}
 
+OPTIONS_DEFINE=	DOCS
+OPTIONSFILE=	${PORT_DBDIR}/py-${PORTNAME}/options
+
+.include <bsd.port.options.mk>
+
 post-patch:
 	@${REINPLACE_CMD} -e '\/etc/s|/etc|etc|' ${WRKSRC}/setup.py
+	@${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/|" -e "s|/usr/bin/policyd-spf|${PREFIX}/bin/policyd-spf|" -e "s|/etc/postfix/|${LOCALBASE}/etc/postfix/|" ${WRKSRC}/policyd-spf.1
+	@${REINPLACE_CMD} -e "s|/etc/policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" ${WRKSRC}/policyd-spf.conf.5
+	@${REINPLACE_CMD} -e "s|/etc/policyd-spf/|${PREFIX}/etc/postfix-policyd-spf-python/|" -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
@@ -52,7 +59,7 @@
 	${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 !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${INSTALL} -d ${DOCSDIR}/
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
Index: distinfo
===================================================================
--- distinfo	(revision 315785)
+++ distinfo	(working copy)
@@ -1,2 +1,2 @@
-SHA256 (pypolicyd-spf-1.0.tar.gz) = c57aa4bae4f6ed2321acf0f9361cbdce652fb4c1c948b063a0909744815e0c8d
-SIZE (pypolicyd-spf-1.0.tar.gz) = 30204
+SHA256 (pypolicyd-spf-1.1.tar.gz) = 93ca747e1e62d05a3e3fa54b9415f6c6da7fa40644e32507d0bb56980e31cc56
+SIZE (pypolicyd-spf-1.1.tar.gz) = 469687
Index: files/pkg-message.in
===================================================================
--- files/pkg-message.in	(revision 315785)
+++ files/pkg-message.in	(working copy)
@@ -7,7 +7,7 @@
  1. Add to your postfix master.cf:
 
         policyd-spf  unix  -       n       n       -       0       spawn
-            user=nobody argv=%%PYTHON_CMD%% %%PREFIX%%/bin/policyd-spf %%ETCDIR%%/policyd-spf.conf
+            user=nobody argv=%%PREFIX%%/bin/policyd-spf
       
  2. Configure the Postfix policy service in your main.cf so that the
     "smtpd_recipient_restrictions" includes a call to the policyd-spf policy
Index: pkg-descr
===================================================================
--- pkg-descr	(revision 315785)
+++ pkg-descr	(working copy)
@@ -1,6 +1,6 @@
 python-policyd-spf is a Postfix SMTPd policy engine for SPF checking. It is
 implemented in pure Python and uses the python-spf module.
 
-WWW: http://www.openspf.org/Software
+WWW: https://launchpad.net/pypolicyd-spf/
 
 Giel van Schijndel <me at mortis.eu>
--- patch-postfix-policyd-spf-python ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted: