- Update to 10.1.0

PR:		ports/149784
Submitted by:	lwhsu
Approved by:	Neal Nelson <neal AT nelson.name> (maintainer)

25 files changed, 152 insertions, 83 deletions

diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index fc38ed36d985..38a0a1fbf73f 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	devel net python
 MASTER_SITES=	# empty
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -30,7 +30,6 @@ OPTIONS=	CONCH	"SSH and SFTP protocol" on \
 		NEWS	"NNTP protocol" on \
 		RUNNER	"Process management" on \
 		WEB	"HTTP protocol" on \
-		WEB2	"HTTP/1.1 Server Framework" on \
 		WORDS	"Chat and Instant Messaging" on
 
 do-install:
diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 619b427b04ea..886b8de0c7c1 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedCore
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	devel net python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Core/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twistedCore/distinfo b/devel/py-twistedCore/distinfo
index b8fe0e996214..bd279b99a67e 100644
--- a/devel/py-twistedCore/distinfo
+++ b/devel/py-twistedCore/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedCore-9.0.0.tar.bz2) = bd1fd44a73916f050b6d96f098f3c532
-SHA256 (TwistedCore-9.0.0.tar.bz2) = 6e71eeecf5c4fa5fd4ae1b2a3f907da69d62897eda02d23135ccf0ea36a2958e
-SIZE (TwistedCore-9.0.0.tar.bz2) = 1270053
+MD5 (TwistedCore-10.1.0.tar.bz2) = 21413e225570d10d5b1662c25e87e4da
+SHA256 (TwistedCore-10.1.0.tar.bz2) = 0df2eae62d85432e52c6bd2605b3998ef83b7b84f2bcb14e1ef5510187e76089
+SIZE (TwistedCore-10.1.0.tar.bz2) = 1338502
diff --git a/devel/py-twistedCore/pkg-plist b/devel/py-twistedCore/pkg-plist
index 01f509178ab1..26ca5ef1ecfb 100644
--- a/devel/py-twistedCore/pkg-plist
+++ b/devel/py-twistedCore/pkg-plist
@@ -87,9 +87,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/_dumbwin32proc.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/_dumbwin32proc.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/_dumbwin32proc.pyo
-%%PYTHON_SITELIBDIR%%/twisted/internet/_javaserialport.py
-%%PYTHON_SITELIBDIR%%/twisted/internet/_javaserialport.pyc
-%%PYTHON_SITELIBDIR%%/twisted/internet/_javaserialport.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/_pollingfile.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/_pollingfile.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/_pollingfile.pyo
@@ -99,6 +96,11 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/_posixstdio.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/_posixstdio.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/_posixstdio.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/_sigchld.c
+%%PYTHON_SITELIBDIR%%/twisted/internet/_sigchld.so
+%%PYTHON_SITELIBDIR%%/twisted/internet/_signals.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/_signals.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/_signals.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/_sslverify.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/_sslverify.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/_sslverify.pyo
@@ -136,6 +138,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/defer.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/defer.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/defer.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/endpoints.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/endpoints.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/endpoints.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/epollreactor.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/epollreactor.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/epollreactor.pyo
@@ -154,6 +159,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/gtkreactor.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/gtkreactor.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/gtkreactor.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/inotify.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/inotify.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/inotify.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/interfaces.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/interfaces.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/interfaces.pyo
@@ -239,12 +247,18 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/inlinecb_tests.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/inlinecb_tests.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/inlinecb_tests.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/process_helper.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/process_helper.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/process_helper.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/reactormixins.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/reactormixins.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/reactormixins.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_address.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_address.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_address.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_base.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_base.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_base.pyo
@@ -254,9 +268,21 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_core.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_core.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_core.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_endpoints.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_endpoints.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_endpoints.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_fdset.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_fdset.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_fdset.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_gtkreactor.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_gtkreactor.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_gtkreactor.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_inlinecb.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_inlinecb.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_inlinecb.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_inotify.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_inotify.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_inotify.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.pyo
@@ -269,6 +295,15 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_protocol.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_protocol.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_protocol.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_qtreactor.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_qtreactor.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_qtreactor.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_sigchld.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_sigchld.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_sigchld.pyo
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tcp.py
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tcp.pyc
 %%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tcp.pyo
@@ -508,6 +543,11 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/__init__.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/_epoll.c
 %%PYTHON_SITELIBDIR%%/twisted/python/_epoll.pyx
+%%PYTHON_SITELIBDIR%%/twisted/python/_initgroups.c
+%%PYTHON_SITELIBDIR%%/twisted/python/_initgroups.so
+%%PYTHON_SITELIBDIR%%/twisted/python/_inotify.py
+%%PYTHON_SITELIBDIR%%/twisted/python/_inotify.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/_inotify.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/_release.py
 %%PYTHON_SITELIBDIR%%/twisted/python/_release.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/_release.pyo
@@ -626,6 +666,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_htmlizer.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_htmlizer.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_htmlizer.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_inotify.py
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_inotify.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_inotify.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_release.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_release.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_release.pyo
@@ -641,6 +684,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_versions.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_versions.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_versions.pyo
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_win32.py
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_win32.pyc
+%%PYTHON_SITELIBDIR%%/twisted/python/test/test_win32.pyo
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_zipstream.py
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_zipstream.pyc
 %%PYTHON_SITELIBDIR%%/twisted/python/test/test_zipstream.pyo
@@ -729,6 +775,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/scripts/test/test_mktap.py
 %%PYTHON_SITELIBDIR%%/twisted/scripts/test/test_mktap.pyc
 %%PYTHON_SITELIBDIR%%/twisted/scripts/test/test_mktap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/scripts/test/test_tap2rpm.py
+%%PYTHON_SITELIBDIR%%/twisted/scripts/test/test_tap2rpm.pyc
+%%PYTHON_SITELIBDIR%%/twisted/scripts/test/test_tap2rpm.pyo
 %%PYTHON_SITELIBDIR%%/twisted/scripts/tkunzip.py
 %%PYTHON_SITELIBDIR%%/twisted/scripts/tkunzip.pyc
 %%PYTHON_SITELIBDIR%%/twisted/scripts/tkunzip.pyo
@@ -799,9 +848,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/test/app_qtstub.py
-%%PYTHON_SITELIBDIR%%/twisted/test/app_qtstub.pyc
-%%PYTHON_SITELIBDIR%%/twisted/test/app_qtstub.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/crash_test_dummy.py
 %%PYTHON_SITELIBDIR%%/twisted/test/crash_test_dummy.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/crash_test_dummy.pyo
@@ -881,6 +927,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_consumer.py
 %%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_consumer.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_consumer.pyo
+%%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_halfclose.py
+%%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_halfclose.pyc
+%%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_halfclose.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_hostpeer.py
 %%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_hostpeer.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/stdio_test_hostpeer.pyo
@@ -911,9 +960,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/test_application.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_application.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_application.pyo
-%%PYTHON_SITELIBDIR%%/twisted/test/test_assertions.py
-%%PYTHON_SITELIBDIR%%/twisted/test/test_assertions.pyc
-%%PYTHON_SITELIBDIR%%/twisted/test/test_assertions.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/test_banana.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_banana.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_banana.pyo
@@ -1133,6 +1179,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/test/test_threads.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_threads.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_threads.pyo
+%%PYTHON_SITELIBDIR%%/twisted/test/test_timehelpers.py
+%%PYTHON_SITELIBDIR%%/twisted/test/test_timehelpers.pyc
+%%PYTHON_SITELIBDIR%%/twisted/test/test_timehelpers.pyo
 %%PYTHON_SITELIBDIR%%/twisted/test/test_timeoutqueue.py
 %%PYTHON_SITELIBDIR%%/twisted/test/test_timeoutqueue.pyc
 %%PYTHON_SITELIBDIR%%/twisted/test/test_timeoutqueue.pyo
@@ -1218,9 +1267,6 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_assertions.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_assertions.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_assertions.pyo
-%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_class.py
-%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_class.pyc
-%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_class.pyo
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_deferred.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_deferred.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_deferred.pyo
@@ -1239,6 +1285,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_output.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_output.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_output.pyo
+%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_plugins.py
+%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_plugins.pyc
+%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_plugins.pyo
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_pyunitcompat.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_pyunitcompat.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_pyunitcompat.pyo
@@ -1254,6 +1303,9 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_test_visitor.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_test_visitor.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_test_visitor.pyo
+%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_testcase.py
+%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_testcase.pyc
+%%PYTHON_SITELIBDIR%%/twisted/trial/test/test_testcase.pyo
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_tests.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_tests.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/test/test_tests.pyo
@@ -1272,33 +1324,33 @@ bin/twistd
 %%PYTHON_SITELIBDIR%%/twisted/trial/util.py
 %%PYTHON_SITELIBDIR%%/twisted/trial/util.pyc
 %%PYTHON_SITELIBDIR%%/twisted/trial/util.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/application
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/cred
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/enterprise
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/iocpreactor/iocpsupport
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/iocpreactor
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/tap
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread/ui
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/zsh
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/python
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/mice
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/gps
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/plugins
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted/journal
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole/ui
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted/journal
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/persisted
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/plugins
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/gps
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/mice
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/protocols
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/python/zsh
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/python
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/scripts
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread/ui
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/spread
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/tap
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/trial
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/test
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/iocpreactor/iocpsupport
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/iocpreactor
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/enterprise
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/cred
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/application
 @dirrm %%PYTHON_SITELIBDIR%%/twisted
diff --git a/devel/py-twistedRunner/Makefile b/devel/py-twistedRunner/Makefile
index 8bc3784f8646..d6a278aa3532 100644
--- a/devel/py-twistedRunner/Makefile
+++ b/devel/py-twistedRunner/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedRunner
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	devel net python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Runner/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/devel/py-twistedRunner/distinfo b/devel/py-twistedRunner/distinfo
index 25fde0720524..002acb9f5d0c 100644
--- a/devel/py-twistedRunner/distinfo
+++ b/devel/py-twistedRunner/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedRunner-9.0.0.tar.bz2) = 717be087cf0aef1d72767c9d9c7e4600
-SHA256 (TwistedRunner-9.0.0.tar.bz2) = 7613889bd8332a71fc32c868c89a1464a237779498827f7d9e386be65fda86d8
-SIZE (TwistedRunner-9.0.0.tar.bz2) = 9167
+MD5 (TwistedRunner-10.1.0.tar.bz2) = 07a9974ca14c9d7c53ba28dd24311632
+SHA256 (TwistedRunner-10.1.0.tar.bz2) = 53928c29c6990f4d1073627569b77f1eca87ef5b0d5c562d0d8a893d2d4557e3
+SIZE (TwistedRunner-10.1.0.tar.bz2) = 13217
diff --git a/devel/py-twistedRunner/pkg-plist b/devel/py-twistedRunner/pkg-plist
index 8808b966428f..cef8d392bb89 100644
--- a/devel/py-twistedRunner/pkg-plist
+++ b/devel/py-twistedRunner/pkg-plist
@@ -21,11 +21,21 @@
 %%PYTHON_SITELIBDIR%%/twisted/runner/procutils.py
 %%PYTHON_SITELIBDIR%%/twisted/runner/procutils.pyc
 %%PYTHON_SITELIBDIR%%/twisted/runner/procutils.pyo
+%%PYTHON_SITELIBDIR%%/twisted/runner/procmontap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/runner/procmontap.py
+%%PYTHON_SITELIBDIR%%/twisted/runner/procmontap.pyc
 %%PYTHON_SITELIBDIR%%/twisted/runner/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/runner/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/runner/test/__init__.pyo
 %%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmon.py
 %%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmon.pyc
 %%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmon.pyo
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmontap.py
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmontap.pyc
+%%PYTHON_SITELIBDIR%%/twisted/runner/test/test_procmontap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_runner.py
+%%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_runner.pyc
+%%PYTHON_SITELIBDIR%%/twisted/plugins/twisted_runner.pyo
+@dirrmtry %%PYTHON_SITELIBDIR%%/twisted/plugins
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/runner/test
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/runner
diff --git a/dns/py-twistedNames/Makefile b/dns/py-twistedNames/Makefile
index 445cce110029..32695876df95 100644
--- a/dns/py-twistedNames/Makefile
+++ b/dns/py-twistedNames/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedNames
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	dns devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Names/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/dns/py-twistedNames/distinfo b/dns/py-twistedNames/distinfo
index 8ebdc157d165..2a0bb911f316 100644
--- a/dns/py-twistedNames/distinfo
+++ b/dns/py-twistedNames/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedNames-9.0.0.tar.bz2) = b0f27585dc50a7288762c7efa44897be
-SHA256 (TwistedNames-9.0.0.tar.bz2) = 3245d83b2bf6aa4f2b7b81fcceed46514f81b4e82fc53890e702f1010652b45b
-SIZE (TwistedNames-9.0.0.tar.bz2) = 44237
+MD5 (TwistedNames-10.1.0.tar.bz2) = 74f59e4339cff8ad93b72a830b4d5619
+SHA256 (TwistedNames-10.1.0.tar.bz2) = b6ec36bb24be8461f279f927d8d0545d9964f5f058e5ddaebe4048067dce8f16
+SIZE (TwistedNames-10.1.0.tar.bz2) = 50760
diff --git a/dns/py-twistedNames/pkg-plist b/dns/py-twistedNames/pkg-plist
index b47fe02c7dcd..6d6388279e43 100644
--- a/dns/py-twistedNames/pkg-plist
+++ b/dns/py-twistedNames/pkg-plist
@@ -52,6 +52,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/names/test/test_client.py
 %%PYTHON_SITELIBDIR%%/twisted/names/test/test_client.pyc
 %%PYTHON_SITELIBDIR%%/twisted/names/test/test_client.pyo
+%%PYTHON_SITELIBDIR%%/twisted/names/test/test_common.py
+%%PYTHON_SITELIBDIR%%/twisted/names/test/test_common.pyc
+%%PYTHON_SITELIBDIR%%/twisted/names/test/test_common.pyo
 %%PYTHON_SITELIBDIR%%/twisted/names/test/test_dns.py
 %%PYTHON_SITELIBDIR%%/twisted/names/test/test_dns.pyc
 %%PYTHON_SITELIBDIR%%/twisted/names/test/test_dns.pyo
diff --git a/mail/py-twistedMail/Makefile b/mail/py-twistedMail/Makefile
index 3099a6eae277..47142f438553 100644
--- a/mail/py-twistedMail/Makefile
+++ b/mail/py-twistedMail/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedMail
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	mail devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Mail/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/mail/py-twistedMail/distinfo b/mail/py-twistedMail/distinfo
index f434b88c6b8e..4c6dda0896a7 100644
--- a/mail/py-twistedMail/distinfo
+++ b/mail/py-twistedMail/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedMail-9.0.0.tar.bz2) = 2f226725928552f2abb2ff9b22b781d4
-SHA256 (TwistedMail-9.0.0.tar.bz2) = 6320829595e0a9a84b9059cf2b93027d048e739b873f037a6e94366ec5e76656
-SIZE (TwistedMail-9.0.0.tar.bz2) = 139721
+MD5 (TwistedMail-10.1.0.tar.bz2) = 8c824a7bf4114684ff7abc27570c3949
+SHA256 (TwistedMail-10.1.0.tar.bz2) = 91abd6c00e8ea875a2fed76322baba9542ea204f59c51c8773d00440725b7f48
+SIZE (TwistedMail-10.1.0.tar.bz2) = 143736
diff --git a/net-im/py-twistedWords/Makefile b/net-im/py-twistedWords/Makefile
index af7f4f66995e..952a8bee9a31 100644
--- a/net-im/py-twistedWords/Makefile
+++ b/net-im/py-twistedWords/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedWords
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	net-im devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Words/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/net-im/py-twistedWords/distinfo b/net-im/py-twistedWords/distinfo
index 81a49f662f68..31a249411e37 100644
--- a/net-im/py-twistedWords/distinfo
+++ b/net-im/py-twistedWords/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedWords-9.0.0.tar.bz2) = 5fb53c7c9ba53cfa6f2c1915dcb4460a
-SHA256 (TwistedWords-9.0.0.tar.bz2) = 481fc9c6255a29a4e10b06bc0506d262d25098f0a2de1350d2b0c588d27e4790
-SIZE (TwistedWords-9.0.0.tar.bz2) = 177228
+MD5 (TwistedWords-10.1.0.tar.bz2) = ebad799d073a99335d650b77d0084104
+SHA256 (TwistedWords-10.1.0.tar.bz2) = 93a1a21d8cffe885f13e508204bf7c30e09a6c22001c944453eab44bbef2e646
+SIZE (TwistedWords-10.1.0.tar.bz2) = 180419
diff --git a/net-im/py-twistedWords/pkg-plist b/net-im/py-twistedWords/pkg-plist
index 94895895628a..7fbd977fa9a4 100644
--- a/net-im/py-twistedWords/pkg-plist
+++ b/net-im/py-twistedWords/pkg-plist
@@ -104,6 +104,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/words/test/__init__.py
 %%PYTHON_SITELIBDIR%%/twisted/words/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_basechat.py
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_basechat.pyc
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_basechat.pyo
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_basesupport.py
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_basesupport.pyc
 %%PYTHON_SITELIBDIR%%/twisted/words/test/test_basesupport.pyo
diff --git a/news/py-twistedNews/Makefile b/news/py-twistedNews/Makefile
index 097041c88b8e..961ded28a7cb 100644
--- a/news/py-twistedNews/Makefile
+++ b/news/py-twistedNews/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedNews
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	news devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/News/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -16,7 +16,7 @@ MAINTAINER=	neal@nelson.name
 COMMENT=	An NNTP protocol implementation with client and server
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS=	${BUILD_DEPENDS}
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
diff --git a/news/py-twistedNews/distinfo b/news/py-twistedNews/distinfo
index fd5822895ef0..2af136f395de 100644
--- a/news/py-twistedNews/distinfo
+++ b/news/py-twistedNews/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedNews-9.0.0.tar.bz2) = 24609c1c4f48347e6ef95950f0d7d797
-SHA256 (TwistedNews-9.0.0.tar.bz2) = 0855a03ee5de4b772a97f8224f733e21feb66d4ab1fbd95e8f2072faefb404a1
-SIZE (TwistedNews-9.0.0.tar.bz2) = 17074
+MD5 (TwistedNews-10.1.0.tar.bz2) = 07e1704318bf381072e8b5baa258b379
+SHA256 (TwistedNews-10.1.0.tar.bz2) = f72e92673562ab58caed226e849b39d06465a2743733daa43fc87caa2afe3f58
+SIZE (TwistedNews-10.1.0.tar.bz2) = 17139
diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index 1882b60057c2..d0c67352c28c 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	twistedConch
-PORTVERSION=	9.0.0
-PORTREVISION=	1
+PORTVERSION=	10.1.0
 CATEGORIES=	security devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Conch/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -17,12 +16,12 @@ MAINTAINER=	neal@nelson.name
 COMMENT=	An SSH and SFTP protocol implementation with clients and servers
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS=	${BUILD_DEPENDS} \
+RUN_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore \
 		${PYTHON_PKGNAMEPREFIX}asn1>=0.0.9a:${PORTSDIR}/devel/py-asn1
 
 USE_BZIP2=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
-PYDISTUTILS_PKGNAME=	Conch
+PYDISTUTILS_PKGNAME=	Twisted_Conch
 
 .include <bsd.port.mk>
diff --git a/security/py-twistedConch/distinfo b/security/py-twistedConch/distinfo
index 4367a140a9c1..5bdf1aa6968c 100644
--- a/security/py-twistedConch/distinfo
+++ b/security/py-twistedConch/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedConch-9.0.0.tar.bz2) = 13e9132589a6f4f4545fc208effd4b16
-SHA256 (TwistedConch-9.0.0.tar.bz2) = 5d13ac104244ce007555c42af85864bac54a2327cff3fa9745cab88c8c9fcd30
-SIZE (TwistedConch-9.0.0.tar.bz2) = 205096
+MD5 (TwistedConch-10.1.0.tar.bz2) = e43c944925814b47f2bc78f4ac54f47e
+SHA256 (TwistedConch-10.1.0.tar.bz2) = 74ab7d71e28b74c072f7a59adc1239a9d4b764c44c76bf15984eb5776eb0dea4
+SIZE (TwistedConch-10.1.0.tar.bz2) = 205593
diff --git a/security/py-twistedConch/pkg-plist b/security/py-twistedConch/pkg-plist
index 6e24c823720e..6b26ff0b69d3 100644
--- a/security/py-twistedConch/pkg-plist
+++ b/security/py-twistedConch/pkg-plist
@@ -110,9 +110,6 @@ bin/tkconch
 %%PYTHON_SITELIBDIR%%/twisted/conch/ssh/agent.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/ssh/agent.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/ssh/agent.pyo
-%%PYTHON_SITELIBDIR%%/twisted/conch/ssh/asn1.py
-%%PYTHON_SITELIBDIR%%/twisted/conch/ssh/asn1.pyc
-%%PYTHON_SITELIBDIR%%/twisted/conch/ssh/asn1.pyo
 %%PYTHON_SITELIBDIR%%/twisted/conch/ssh/channel.py
 %%PYTHON_SITELIBDIR%%/twisted/conch/ssh/channel.pyc
 %%PYTHON_SITELIBDIR%%/twisted/conch/ssh/channel.pyo
diff --git a/textproc/py-twistedLore/Makefile b/textproc/py-twistedLore/Makefile
index aa25dd99f6bd..30fa539b0c8a 100644
--- a/textproc/py-twistedLore/Makefile
+++ b/textproc/py-twistedLore/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedLore
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	textproc python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Lore/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/textproc/py-twistedLore/distinfo b/textproc/py-twistedLore/distinfo
index 8527d4acc4d0..f53b7f902305 100644
--- a/textproc/py-twistedLore/distinfo
+++ b/textproc/py-twistedLore/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedLore-9.0.0.tar.bz2) = 0c054504da9c986af7a28a25ed130ea0
-SHA256 (TwistedLore-9.0.0.tar.bz2) = ec55e037b7ea02c184ac92ccced2c39faf228916fcaa37465d0c53a94e79568f
-SIZE (TwistedLore-9.0.0.tar.bz2) = 87119
+MD5 (TwistedLore-10.1.0.tar.bz2) = d73fee5f589a1c44cf3100909c7aefa6
+SHA256 (TwistedLore-10.1.0.tar.bz2) = f80a3bb097d8f71db52a90c14a997a4f18a462b0158b2d1007af09ee834c13d8
+SIZE (TwistedLore-10.1.0.tar.bz2) = 87227
diff --git a/www/py-twistedWeb/Makefile b/www/py-twistedWeb/Makefile
index 7be1d65838a6..337447d25ff4 100644
--- a/www/py-twistedWeb/Makefile
+++ b/www/py-twistedWeb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	twistedWeb
-PORTVERSION=	9.0.0
+PORTVERSION=	10.1.0
 CATEGORIES=	www devel python
 MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Web/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
diff --git a/www/py-twistedWeb/distinfo b/www/py-twistedWeb/distinfo
index 8ef26bb7136f..799555565f4e 100644
--- a/www/py-twistedWeb/distinfo
+++ b/www/py-twistedWeb/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedWeb-9.0.0.tar.bz2) = 40b1a2f158b615b2fcfe288c341beac7
-SHA256 (TwistedWeb-9.0.0.tar.bz2) = 953c85334929fad46e602a53cbb5308731079b26ae1f4c1d42a151f0d3b658e0
-SIZE (TwistedWeb-9.0.0.tar.bz2) = 292173
+MD5 (TwistedWeb-10.1.0.tar.bz2) = f70a314b39d7e841107f88c0dd1bff7d
+SHA256 (TwistedWeb-10.1.0.tar.bz2) = 44f62848ce29aa163604f5ff7f2ab547d2684018f5b7228999730f6d426133be
+SIZE (TwistedWeb-10.1.0.tar.bz2) = 332994
diff --git a/www/py-twistedWeb/pkg-plist b/www/py-twistedWeb/pkg-plist
index eadf38877ae2..8a4e67b243a9 100644
--- a/www/py-twistedWeb/pkg-plist
+++ b/www/py-twistedWeb/pkg-plist
@@ -100,6 +100,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_domhelpers.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_domhelpers.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_domhelpers.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_error.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_error.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_error.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_http.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_http.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_http.pyo
@@ -130,6 +133,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_tap.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_tap.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_tap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_util.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_util.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_util.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_vhost.py
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_vhost.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web/test/test_vhost.pyo