Index: branches/2018Q2/security/py-obfsproxy-tor/Makefile
===================================================================
--- branches/2018Q2/security/py-obfsproxy-tor/Makefile	(revision 468405)
+++ branches/2018Q2/security/py-obfsproxy-tor/Makefile	(revision 468406)
@@ -1,31 +1,35 @@
 # Created by: Carlo Strub
 # $FreeBSD$
 
 PORTNAME=	obfsproxy
 PORTVERSION=	0.2.13
 PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	security net python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 PKGNAMESUFFIX=	-tor
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	Pluggable transport proxy
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pyptlib>=0.0.5:security/py-pyptlib@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${FLAVOR}
+TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${FLAVOR}
 
 USES=		python:2.7
 USE_PYTHON=	distutils autoplist
 SUB_FILES=	pkg-message
 NO_ARCH=	yes
 
 PYDISTUTILS_PKGNAME=	obfsproxy
+
+do-test:
+	@(cd ${TEST_WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest)
 
 .include <bsd.port.mk>
Index: branches/2018Q2/security/py-obfsproxy-tor/distinfo
===================================================================
--- branches/2018Q2/security/py-obfsproxy-tor/distinfo	(revision 468405)
+++ branches/2018Q2/security/py-obfsproxy-tor/distinfo	(revision 468406)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1519975368
-SHA256 (obfsproxy-0.2.13.tar.gz) = c29582f2f5b0316cbc7184e0529a5b246dfeeabd4e6c4dcb05b800256d6c9dd6
-SIZE (obfsproxy-0.2.13.tar.gz) = 95813
+TIMESTAMP = 1512989600
+SHA256 (obfsproxy-0.2.13.tar.gz) = 1e26c2faef1cfcf856ddf60e9647058a7c78fb0d47f05b58a0f847ed7cc41a66
+SIZE (obfsproxy-0.2.13.tar.gz) = 93435
Index: branches/2018Q2/security/py-obfsproxy-tor/files/patch-setup.py
===================================================================
--- branches/2018Q2/security/py-obfsproxy-tor/files/patch-setup.py	(revision 468405)
+++ branches/2018Q2/security/py-obfsproxy-tor/files/patch-setup.py	(revision 468406)
@@ -1,19 +1,10 @@
---- setup.py.orig	2014-12-31 15:34:31 UTC
+--- setup.py.orig	2014-08-21 09:28:57 UTC
 +++ setup.py
-@@ -31,12 +31,14 @@ setup(
-     install_requires = [
+@@ -32,7 +32,6 @@ setup(
          'setuptools',
          'PyCrypto',
--        'Twisted',
+         'Twisted',
 -        'argparse',
-+        'Twisted_Core',
          'pyptlib >= 0.0.6',
          'pyyaml'
          ],
- 
-+    #if sys.version_info < (2, 7):
-+    #    install_requires.append('argparse')
-+
-     extras_require = {
-         'SOCKS': ["txsocksx"]
-         }
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 468405)
+++ branches/2018Q2	(revision 468406)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r468181