security/obfsproxy: Unbreak; Rename to security/py-obfsproxy-tor

Port changes:
* Unbreak: removed unnecessary lines in setup.py that were failing
* Changed MASTER_SITES to CHEESESHOP
* Added PKGNAMEPREFIX as every python port should have
* Added PKGNAMESUFFIX=-tor to easily identify as being for Tor
* Added LICENSE_FILE
* Deleted pkg-plist
* Added USE_PYTHON=autoplist instead of pkg-plist
* Added USE_PYTHON=noflavors (an app)
* Added NO_ARCH
* Updated WWW

Approved by:	tcberner (mentor, implicit)
Approved by:	portmgr (port compliance, infrastructure)

8 files changed, 37 insertions, 202 deletions

diff --git a/security/Makefile b/security/Makefile
index 1f316ad4e5e1..6f0a8e9e6564 100644
--- a/security/Makefile
+++ b/security/Makefile
@@ -432,7 +432,6 @@
     SUBDIR += oath-toolkit
     SUBDIR += obfs4proxy-tor
     SUBDIR += obfsclient
-    SUBDIR += obfsproxy
     SUBDIR += ocaml-cryptgps
     SUBDIR += ocaml-cryptokit
     SUBDIR += ocaml-ssl
@@ -945,6 +944,7 @@
     SUBDIR += py-mnemonic
     SUBDIR += py-oauth2client
     SUBDIR += py-oauthlib
+    SUBDIR += py-obfsproxy-tor
     SUBDIR += py-onetime
     SUBDIR += py-openssl
     SUBDIR += py-paramiko
diff --git a/security/obfsproxy/Makefile b/security/obfsproxy/Makefile
deleted file mode 100644
index 857a34538172..000000000000
--- a/security/obfsproxy/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-# Created by: Carlo Strub
-# $FreeBSD$
-
-PORTNAME=	obfsproxy
-PORTVERSION=	0.2.13
-PORTREVISION=	2
-PORTEPOCH=	1
-CATEGORIES=	security net python
-MASTER_SITES=	http://www.c-s.li/ports/
-
-MAINTAINER=	cs@FreeBSD.org
-COMMENT=	Pluggable transport proxy
-
-LICENSE=	BSD3CLAUSE
-
-BROKEN=		fails to configure
-
-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}
-
-USES=		python:2.7
-USE_PYTHON=	distutils
-SUB_FILES=	pkg-message
-PYDISTUTILS_PKGNAME=obfsproxy
-
-.include <bsd.port.mk>
diff --git a/security/obfsproxy/pkg-plist b/security/obfsproxy/pkg-plist
deleted file mode 100644
index 40716074efcb..000000000000
--- a/security/obfsproxy/pkg-plist
+++ /dev/null
@@ -1,169 +0,0 @@
-bin/obfsproxy
-%%PYTHON_SITELIBDIR%%/obfsproxy/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/_version.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/_version.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/_version.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/aes.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/aes.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/aes.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/argparser.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/argparser.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/argparser.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/heartbeat.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/heartbeat.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/heartbeat.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/hmac_sha256.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/hmac_sha256.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/hmac_sha256.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/log.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/log.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/log.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/modexp.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/modexp.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/modexp.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/rand.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/rand.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/rand.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/serialize.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/serialize.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/serialize.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/transport_config.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/transport_config.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/common/transport_config.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/client.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/client.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/client.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/server.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/server.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/managed/server.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/buffer.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/buffer.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/buffer.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/extended_orport.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/extended_orport.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/extended_orport.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/http.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/http.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/http.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/launch_transport.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/launch_transport.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/launch_transport.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/network.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/network.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/network.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks5.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks5.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/network/socks5.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/pyobfsproxy.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/pyobfsproxy.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/pyobfsproxy.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_aes.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_aes.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_aes.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_buffer.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_buffer.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_buffer.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_obfs3_dh.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_obfs3_dh.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_obfs3_dh.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks5.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks5.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/test_socks5.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/tester.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/tester.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/tester.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_b64.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_b64.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_b64.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_obfs3_dh.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_obfs3_dh.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_obfs3_dh.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_scramblesuit.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_scramblesuit.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/test/transports/test_scramblesuit.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/b64.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/b64.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/b64.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/base.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/base.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/base.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/dummy.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/dummy.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/dummy.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs2.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs2.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs2.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3_dh.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3_dh.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/obfs3_dh.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/__init__.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/__init__.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/__init__.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/const.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/const.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/const.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/fifobuf.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/fifobuf.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/fifobuf.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/message.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/message.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/message.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/mycrypto.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/mycrypto.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/mycrypto.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/packetmorpher.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/packetmorpher.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/packetmorpher.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/probdist.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/probdist.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/probdist.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/replay.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/replay.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/replay.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/scramblesuit.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/scramblesuit.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/scramblesuit.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/state.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/state.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/state.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/ticket.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/ticket.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/ticket.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/uniformdh.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/uniformdh.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/uniformdh.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/util.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/util.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/scramblesuit/util.pyo
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.py
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.pyc
-%%PYTHON_SITELIBDIR%%/obfsproxy/transports/transports.pyo
diff --git a/security/py-obfsproxy-tor/Makefile b/security/py-obfsproxy-tor/Makefile
new file mode 100644
index 000000000000..4a443d98a252
--- /dev/null
+++ b/security/py-obfsproxy-tor/Makefile
@@ -0,0 +1,31 @@
+# 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@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pycrypto>=2.1:security/py-pycrypto@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}twisted>=0:devel/py-twisted@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR}
+
+USES=		python:2.7
+USE_PYTHON=	distutils autoplist noflavors
+SUB_FILES=	pkg-message
+NO_ARCH=	yes
+
+PYDISTUTILS_PKGNAME=	obfsproxy
+
+.include <bsd.port.mk>
diff --git a/security/obfsproxy/distinfo b/security/py-obfsproxy-tor/distinfo
index d17224a05d6d..9b61d4228533 100644
--- a/security/obfsproxy/distinfo
+++ b/security/py-obfsproxy-tor/distinfo
@@ -1,2 +1,3 @@
+TIMESTAMP = 1519975368
 SHA256 (obfsproxy-0.2.13.tar.gz) = c29582f2f5b0316cbc7184e0529a5b246dfeeabd4e6c4dcb05b800256d6c9dd6
 SIZE (obfsproxy-0.2.13.tar.gz) = 95813
diff --git a/security/obfsproxy/files/patch-setup.py b/security/py-obfsproxy-tor/files/patch-setup.py
index 71a0f24824b1..7769437ab64e 100644
--- a/security/obfsproxy/files/patch-setup.py
+++ b/security/py-obfsproxy-tor/files/patch-setup.py
@@ -1,4 +1,4 @@
---- setup.py.orig	2017-11-03 11:21:18 UTC
+--- setup.py.orig	2014-12-31 15:34:31 UTC
 +++ setup.py
 @@ -31,12 +31,14 @@ setup(
      install_requires = [
@@ -11,8 +11,8 @@
          'pyyaml'
          ],
  
-+    if sys.version_info < (2, 7):
-+        install_requires.append('argparse')
++    #if sys.version_info < (2, 7):
++    #    install_requires.append('argparse')
 +
      extras_require = {
          'SOCKS': ["txsocksx"]
diff --git a/security/obfsproxy/files/pkg-message.in b/security/py-obfsproxy-tor/files/pkg-message.in
index 171730a6ca30..171730a6ca30 100644
--- a/security/obfsproxy/files/pkg-message.in
+++ b/security/py-obfsproxy-tor/files/pkg-message.in
diff --git a/security/obfsproxy/pkg-descr b/security/py-obfsproxy-tor/pkg-descr
index 2179219eb904..b69f902eb634 100644
--- a/security/obfsproxy/pkg-descr
+++ b/security/py-obfsproxy-tor/pkg-descr
@@ -1,3 +1,3 @@
 Obfsproxy is a pluggable transport proxy written in Python.
 
-WWW: https://www.torproject.org/projects/obfsproxy.html.en
+WWW: https://www.torproject.org/docs/pluggable-transports