3 files changed, 48 insertions, 22 deletions

diff --git a/net-p2p/tribler/Makefile b/net-p2p/tribler/Makefile
index 363db488fc8e..46ba5243497c 100644
--- a/net-p2p/tribler/Makefile
+++ b/net-p2p/tribler/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tribler
-PORTVERSION=	6.5.1
-PORTREVISION=	1
+PORTVERSION=	6.5.2
 CATEGORIES=	net-p2p
 MASTER_SITES=	https://github.com/Tribler/tribler/releases/download/v${PORTVERSION}/
 DISTNAME=	Tribler-v${PORTVERSION}
@@ -33,8 +32,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}apsw>0:databases/py-apsw \
 NO_ARCH=	yes
 NO_WRKSUBDIR=	yes
 
-USES=		desktop-file-utils python:2,run tar:xz twisted:run,web
-USE_OPENSSL=	yes
+USES=		desktop-file-utils python:2,run ssl:run tar:xz twisted:run,web
 USE_WX=		2.8
 WX_COMPS=	python
 INSTALLS_ICONS=	yes
diff --git a/net-p2p/tribler/distinfo b/net-p2p/tribler/distinfo
index c5c117468a90..fd8fabfdd67b 100644
--- a/net-p2p/tribler/distinfo
+++ b/net-p2p/tribler/distinfo
@@ -1,2 +1,3 @@
-SHA256 (Tribler-v6.5.1.tar.xz) = 6ad240c1cfebc0b141657a023d5c21640fdf1a76bd738a433c6323f47a89fedd
-SIZE (Tribler-v6.5.1.tar.xz) = 10141936
+TIMESTAMP = 1477295360
+SHA256 (Tribler-v6.5.2.tar.xz) = c3dc59136999778e238cdc12295b44ca424ca15ebc88756794f314e8618afe0f
+SIZE (Tribler-v6.5.2.tar.xz) = 9995388
diff --git a/net-p2p/tribler/pkg-plist b/net-p2p/tribler/pkg-plist
index 25d7ea6fec38..26cb9f9ded9c 100644
--- a/net-p2p/tribler/pkg-plist
+++ b/net-p2p/tribler/pkg-plist
@@ -1588,6 +1588,8 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/community/tunnel/tunnel_community.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/.gitignore
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/.gitmodules
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/CONTRIBUTING.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/README.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/__init__.pyo
@@ -1615,6 +1617,8 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/destination.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/destination.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/destination.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/diff/minimal_bootstrap.diff
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/diff/walk_multiplier.diff
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/discovery/__init__.pyo
@@ -1639,22 +1643,25 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/distribution.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/distribution.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/distribution.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_permission.org
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_synchronisation.org
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_walker.org
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/component_walker.pdf
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/filter_code.py
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/filter_code.pyc
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/filter_code.pyo
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/determine-lan-wan.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/walk-identity.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/walk.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/image/who-to-introduce.png
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/minimal_bootstrap.diff
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/tutorial-part1.org
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/walk_multiplier.diff
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/wireprotocol_1.org
-%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/doc/wireprotocol_2.org
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/Makefile
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/api/dispersy.discovery.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/api/dispersy.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/api/dispersy.tool.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/api/dispersy.tracker.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/api/modules.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/conf.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/conf.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/conf.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/contributing.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/images/walk-identity.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/images/walk.png
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/index.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/installation.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/introduction.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/make.bat
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/system_overview.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/usage.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/docs/wire_protocol.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/endpoint.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/endpoint.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/endpoint.pyo
@@ -1664,6 +1671,7 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/.gitignore
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/.pylintrc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/.testing.pylintrc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/.travis.yml
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/AUTHORS
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/LICENSE
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/MANIFEST.in
@@ -1689,6 +1697,10 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.3.3.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.3.4.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.4.0.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.4.1.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.4.2.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.4.3.rst
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/1.4.4.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/releases/index.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/secret.rst
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/doc/topics/sign.rst
@@ -1735,6 +1747,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_auth_verify.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_auth_verify.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_auth_verify.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_blake.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_blake.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_blake.pyo
@@ -1759,6 +1774,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_random.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_random.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_random.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_secret.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_secret.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_secret.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_sign.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_sign.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_raw_sign.pyo
@@ -1771,6 +1789,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_sign.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_sign.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_sign.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_verify.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_verify.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_verify.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_version.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_version.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/libnacl/tests/unit/test_version.pyo
@@ -1836,6 +1857,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_classification.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_classification.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_classification.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_clean_observers.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_clean_observers.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_clean_observers.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_crypto.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_crypto.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tests/test_crypto.pyo
@@ -1905,6 +1929,9 @@ bin/tribler
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/__init__.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/__init__.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/__init__.pyo
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/clean_observers.py
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/clean_observers.pyc
+%%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/clean_observers.pyo
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/createkey.py
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/createkey.pyc
 %%PYTHON_SITELIBDIR%%/tribler/Tribler/dispersy/tool/createkey.pyo