Index: branches/2016Q1/mail/py-pyspf/Makefile
===================================================================
--- branches/2016Q1/mail/py-pyspf/Makefile	(revision 407819)
+++ branches/2016Q1/mail/py-pyspf/Makefile	(revision 407820)
@@ -1,32 +1,53 @@
 # Created by: Marcus Alves Grando <mnag@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	pyspf
 PORTVERSION=	2.0.12
 DISTVERSIONSUFFIX=	t
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	mail python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	sunpoet@FreeBSD.org
-COMMENT=	Python implementation of the RFC 4408 SPF protocol
+COMMENT=	SPF (Sender Policy Framework) implemented in Python
 
 LICENSE=	PSFL
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}py3dns>=0:${PORTSDIR}/dns/py-py3dns
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}authres>=0:${PORTSDIR}/mail/py-authres
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}yaml>=0:${PORTSDIR}/devel/py-yaml
 
-NO_ARCH=	yes
-USE_PYTHON=	autoplist concurrent distutils
 USES=		python shebangfix
+USE_PYTHON=	autoplist concurrent distutils
+
+NO_ARCH=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/spf.py
-
 SHEBANG_FILES=	spf.py
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} <= 3300
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}ipaddr>=0:${PORTSDIR}/devel/py-ipaddr
+.endif
+
+.if ${PYTHON_REL} >= 3000
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}py3dns>=0:${PORTSDIR}/dns/py-py3dns
+.else
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}dns>=0:${PORTSDIR}/dns/py-dns
+.endif
+
+# Make the tests run as a module
+post-extract:
+	@${TOUCH} ${WRKSRC}/test/__init__.py
+
 post-install:
 	${CHMOD} ${BINMODE} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/spf.py
 	${LN} -s ${PYTHONPREFIX_SITELIBDIR}/spf.py ${STAGEDIR}${PREFIX}/bin/
 
-.include <bsd.port.mk>
+do-test:
+	@cd ${WRKSRC} && ${PYTHON_CMD} -m test.testspf
+
+.include <bsd.port.post.mk>
Index: branches/2016Q1/mail/py-pyspf/files/patch-test_testspf.py
===================================================================
--- branches/2016Q1/mail/py-pyspf/files/patch-test_testspf.py	(nonexistent)
+++ branches/2016Q1/mail/py-pyspf/files/patch-test_testspf.py	(revision 407820)
@@ -0,0 +1,37 @@
+--- test/testspf.py.orig	2015-01-12 22:47:56 UTC
++++ test/testspf.py
+@@ -221,9 +221,9 @@ def makeSuite(filename):
+ 
+ def suite(): 
+   suite = unittest.makeSuite(SPFTestCases,'test')
+-  suite.addTest(makeSuite('test.yml'))
+-  suite.addTest(makeSuite('rfc7208-tests.yml'))
+-  suite.addTest(makeSuite('rfc4408-tests.yml'))
++  suite.addTest(makeSuite('test/test.yml'))
++  suite.addTest(makeSuite('test/rfc7208-tests.yml'))
++  suite.addTest(makeSuite('test/rfc4408-tests.yml'))
+   import doctest
+   suite.addTest(doctest.DocTestSuite(spf))
+   return suite
+@@ -237,9 +237,9 @@ if __name__ == '__main__':
+     # a specific test selected by id from YAML files
+     if not tc:
+       tc = unittest.TestSuite()
+-      t0 = loadYAML('rfc7208-tests.yml')
+-      t1 = loadYAML('rfc4408-tests.yml')
+-      t2 = loadYAML('test.yml')
++      t0 = loadYAML('test/rfc7208-tests.yml')
++      t1 = loadYAML('test/rfc4408-tests.yml')
++      t2 = loadYAML('test/test.yml')
+     if i in t0:
+       tc.addTest(SPFTestCase(t0[i]))
+     if i in t1:
+@@ -248,7 +248,7 @@ if __name__ == '__main__':
+       tc.addTest(SPFTestCase(t2[i]))
+   if not tc:
+     # load zonedata for doctests
+-    fp = open('doctest.yml','rb')
++    fp = open('test/doctest.yml','rb')
+     try:
+       zonedata = loadZone(next(yaml.safe_load_all(fp)))
+     finally: fp.close()

Property changes on: branches/2016Q1/mail/py-pyspf/files/patch-test_testspf.py
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2016Q1/mail/py-pyspf/pkg-descr
===================================================================
--- branches/2016Q1/mail/py-pyspf/pkg-descr	(revision 407819)
+++ branches/2016Q1/mail/py-pyspf/pkg-descr	(revision 407820)
@@ -1,8 +1,6 @@
 The pyspf Python module has been released as version 2.0. pyspf 2.0 
 was the first SPF implementation to fully conform to RFC 4408. This 
 release has also added IPv6 support. pyspf is the library behind 
 several of the open SPF project's SPF record testing tools.
 
-Currently part of the pymilter project: http://pymilter.sourceforge.net
-
 WWW: https://pypi.python.org/pypi/pyspf
Index: branches/2016Q1
===================================================================
--- branches/2016Q1	(revision 407819)
+++ branches/2016Q1	(revision 407820)

Property changes on: branches/2016Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r407273