3 files changed, 40 insertions, 6 deletions
diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index 0fad61db51c6..79e4155d34d6 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	twistedConch
-PORTVERSION=	0.8.0
+PORTVERSION=	8.2.0
 CATEGORIES=	security devel python
-MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Conch/${PORTVERSION:S/.0//}/
+MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Conch/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	TwistedConch-${PORTVERSION}
 
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
 USE_BZIP2=	yes
-USE_PYTHON=	2.3+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Conch
 
diff --git a/security/py-twistedConch/distinfo b/security/py-twistedConch/distinfo
index 892fe03d43d2..03121ac85784 100644
--- a/security/py-twistedConch/distinfo
+++ b/security/py-twistedConch/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedConch-0.8.0.tar.bz2) = f3ccdd8da6b6e26b0a1eae5e54b9b0e2
-SHA256 (TwistedConch-0.8.0.tar.bz2) = 242ba2402d8e530a0594dc6c3668718524999f227220b0e67004b0aa9104b561
-SIZE (TwistedConch-0.8.0.tar.bz2) = 128356
+MD5 (TwistedConch-8.2.0.tar.bz2) = 1e17cef8a0108acc09fc2f9fa26be3f1
+SHA256 (TwistedConch-8.2.0.tar.bz2) = b0a668a258078b6cccceac283e07d3d04cfd85bd50074964f4399fae04eba974
+SIZE (TwistedConch-8.2.0.tar.bz2) = 186761
diff --git a/security/py-twistedConch/pkg-plist b/security/py-twistedConch/pkg-plist
index 32f12d29d4f2..33aa429eca8a 100644
--- a/security/py-twistedConch/pkg-plist
+++ b/security/py-twistedConch/pkg-plist
@@ -29,6 +29,9 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/direct.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/direct.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/direct.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/client/knownhosts.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/client/knownhosts.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/client/knownhosts.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/options.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/options.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/client/options.pyo
@@ -161,12 +164,27 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/keydata.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/keydata.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/keydata.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_agent.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_agent.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_agent.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_cftp.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_cftp.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_cftp.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_channel.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_channel.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_channel.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_checkers.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_checkers.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_checkers.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_conch.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_conch.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_conch.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_connection.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_connection.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_connection.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_filetransfer.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_filetransfer.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_filetransfer.pyo
@@ -179,12 +197,18 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_keys.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_keys.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_keys.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_knownhosts.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_knownhosts.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_knownhosts.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_manhole.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_manhole.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_manhole.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_mixin.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_mixin.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_mixin.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_openssh_compat.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_openssh_compat.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_openssh_compat.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_recvline.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_recvline.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_recvline.pyo
@@ -197,6 +221,15 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_text.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_text.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/test/test_text.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_transport.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_transport.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_transport.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_userauth.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_userauth.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_userauth.pyo
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.py
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.pyc
+%%PYTHON_SITELIBDIR%%/twisted/conch/test/test_window.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/ttymodes.pyo
@@ -215,6 +248,7 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_conch.py
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_conch.pyc
 %%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_conch.pyo
+@dirrmtry %%PYTHON_SITELIBDIR%%/twisted/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/conch/ui
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/conch/test
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/conch/ssh