- Update to 2.07

- Remove DIST_SUBDIR
- Do not silence installation message

Note that there are two source tarballs (pyspf-2.0.7.tar.gz).
One is 46,283 bytes from CHEESESHOP and the other is 46,281 bytes from SF.
Since the former has a wrong entry in pyspf.spec, we choose the latter and
suspend adding CHEESESHOP to MASTER_SITES.

Changes:
- Allow for timeouts to be global for all DNS lookups instead of per DNS lookup
  to allow for MAY processing time limitsin RFC 4408 10.1.  See README for
  details.
- Use openspf.net for SPF web site instead of openspf.org
- Extend query.get_header to return either Received-SPF (still default) or RFC
  5451 Authentication Results headers (needs authres 0.3 or later)
- Rework query.parse_header:
  - Make query.parse_header automatically select Received-DPF or Authentication
    Results header types and use them to collect SPF results from trusted relays
  - Add query.parse_header_spf and query.parse_header_ar functions for header
    type specific processing
- Finish Python3 port - works with python2.6/2.7/3.2 and 2to3 is no longer
  required - will also work with newer py3dns where TXT records are returned as
  type bytes and not strings
- Accounts for new py3dns error classes coming in py3dns 3.0.2 (but fully
  backward compatible with earlier versions)
- check for 7-bit ascii on TXT and SPF records
- fix CNAME chain duplicating TXT records

2 files changed, 11 insertions, 11 deletions

diff --git a/mail/py-spf/Makefile b/mail/py-spf/Makefile
index acad3809ddcd..9d5c5eb07b21 100644
--- a/mail/py-spf/Makefile
+++ b/mail/py-spf/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	spf
-PORTVERSION=	2.0.6
+PORTVERSION=	2.0.7
 CATEGORIES=	mail python
 MASTER_SITES=	SF/pymilter/py${PORTNAME}/py${PORTNAME}-${PORTVERSION}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -15,23 +15,23 @@ DISTNAME=	py${PORTNAME}-${PORTVERSION}
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Python implementation of the RFC 4408 SPF protocol
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/DNS/__init__.py:${PORTSDIR}/dns/py-dns
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}dns>=0:${PORTSDIR}/dns/py-dns
 
-DIST_SUBDIR=	python
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	pyspf
+PYDISTUTILS_PKGNAME=	py${PORTNAME}
 
 PORTDOCS=	CHANGELOG README
 
-DOCSDIR?=	${PREFIX}/share/doc/py-${PORTNAME}
+post-patch:
+	@${REINPLACE_CMD} -e '1 s|/usr/bin/python|${PYTHON_CMD}|' ${WRKSRC}/spf.py
 
 post-install:
+	${CHMOD} ${BINMODE} ${PYTHONPREFIX_SITELIBDIR}/spf.py
+	${LN} -s ${PYTHONPREFIX_SITELIBDIR}/spf.py ${PREFIX}/bin/
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+	${MKDIR} ${DOCSDIR}/
+	cd ${WRKSRC}/ && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}/
 .endif
-	@${CHMOD} 755 ${PYTHONPREFIX_SITELIBDIR}/spf.py
-	@${LN} -s ${PYTHONPREFIX_SITELIBDIR}/spf.py ${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/mail/py-spf/distinfo b/mail/py-spf/distinfo
index 0271a86970ed..228fed1376f3 100644
--- a/mail/py-spf/distinfo
+++ b/mail/py-spf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (python/pyspf-2.0.6.tar.gz) = ed20f35d8c1d60516b195ec08ce7c8479d450be28fd37baaab58dbf570ceb429
-SIZE (python/pyspf-2.0.6.tar.gz) = 43448
+SHA256 (pyspf-2.0.7.tar.gz) = 1c108a5ffc9f7d56b087e96b4b599cbbb28d7234fab745083d3fd7a512d54334
+SIZE (pyspf-2.0.7.tar.gz) = 46281