3 files changed, 55 insertions, 27 deletions

diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 0197cd6e3971..cd4b6291be4f 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	twistedCore
-PORTVERSION=	2.0.1
+PORTVERSION=	2.1.0
 CATEGORIES=	devel net python
-MASTER_SITES=	http://twistedmatrix.com/downloads/Twisted/2.0/ \
-		http://tmrc.mit.edu/mirror/twisted/Twisted/2.0/
+MASTER_SITES=	http://twistedmatrix.com/downloads/Twisted/${PORTVERSION:R}/ \
+		http://tmrc.mit.edu/mirror/twisted/Twisted/${PORTVERSION:R}/
 #MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Twisted-${PORTVERSION}
diff --git a/devel/py-twistedCore/distinfo b/devel/py-twistedCore/distinfo
index e4fa0067d201..edd7e8838c7d 100644
--- a/devel/py-twistedCore/distinfo
+++ b/devel/py-twistedCore/distinfo
@@ -1,2 +1,2 @@
-MD5 (Twisted-2.0.1.tar.bz2) = 6cf0ebb84731f8c2c45ea125efda77fe
-SIZE (Twisted-2.0.1.tar.bz2) = 1061899
+MD5 (Twisted-2.1.0.tar.bz2) = 0aa4b877c4e34750e52c9f0b93959913
+SIZE (Twisted-2.1.0.tar.bz2) = 1078044
diff --git a/devel/py-twistedCore/pkg-plist b/devel/py-twistedCore/pkg-plist
index f80d7ee493d1..63c815dfe322 100644
--- a/devel/py-twistedCore/pkg-plist
+++ b/devel/py-twistedCore/pkg-plist
@@ -48,6 +48,9 @@ bin/twistd
 %%S%%/twisted/cred/identity.py
 %%S%%/twisted/cred/identity.pyc
 %%S%%/twisted/cred/identity.pyo
+%%S%%/twisted/cred/pamauth.py
+%%S%%/twisted/cred/pamauth.pyc
+%%S%%/twisted/cred/pamauth.pyo
 %%S%%/twisted/cred/perspective.py
 %%S%%/twisted/cred/perspective.pyc
 %%S%%/twisted/cred/perspective.pyo
@@ -143,9 +146,6 @@ bin/twistd
 %%S%%/twisted/internet/iocpreactor/client.py
 %%S%%/twisted/internet/iocpreactor/client.pyc
 %%S%%/twisted/internet/iocpreactor/client.pyo
-%%S%%/twisted/internet/iocpreactor/error.py
-%%S%%/twisted/internet/iocpreactor/error.pyc
-%%S%%/twisted/internet/iocpreactor/error.pyo
 %%S%%/twisted/internet/iocpreactor/iocpdebug.py
 %%S%%/twisted/internet/iocpreactor/iocpdebug.pyc
 %%S%%/twisted/internet/iocpreactor/iocpdebug.pyo
@@ -224,6 +224,9 @@ bin/twistd
 %%S%%/twisted/internet/tcp.py
 %%S%%/twisted/internet/tcp.pyc
 %%S%%/twisted/internet/tcp.pyo
+%%S%%/twisted/internet/threadedselectreactor.py
+%%S%%/twisted/internet/threadedselectreactor.pyc
+%%S%%/twisted/internet/threadedselectreactor.pyo
 %%S%%/twisted/internet/threads.py
 %%S%%/twisted/internet/threads.pyc
 %%S%%/twisted/internet/threads.pyo
@@ -488,9 +491,6 @@ bin/twistd
 %%S%%/twisted/python/context.py
 %%S%%/twisted/python/context.pyc
 %%S%%/twisted/python/context.pyo
-%%S%%/twisted/python/dir.py
-%%S%%/twisted/python/dir.pyc
-%%S%%/twisted/python/dir.pyo
 %%S%%/twisted/python/dispatch.py
 %%S%%/twisted/python/dispatch.pyc
 %%S%%/twisted/python/dispatch.pyo
@@ -730,6 +730,9 @@ bin/twistd
 %%S%%/twisted/test/myrebuilder2.py
 %%S%%/twisted/test/myrebuilder2.pyc
 %%S%%/twisted/test/myrebuilder2.pyo
+%%S%%/twisted/test/process_cmdline.py
+%%S%%/twisted/test/process_cmdline.pyc
+%%S%%/twisted/test/process_cmdline.pyo
 %%S%%/twisted/test/process_echoer.py
 %%S%%/twisted/test/process_echoer.pyc
 %%S%%/twisted/test/process_echoer.pyo
@@ -968,6 +971,9 @@ bin/twistd
 %%S%%/twisted/test/test_text.py
 %%S%%/twisted/test/test_text.pyc
 %%S%%/twisted/test/test_text.pyo
+%%S%%/twisted/test/test_threadable.py
+%%S%%/twisted/test/test_threadable.pyc
+%%S%%/twisted/test/test_threadable.pyo
 %%S%%/twisted/test/test_threadpool.py
 %%S%%/twisted/test/test_threadpool.pyc
 %%S%%/twisted/test/test_threadpool.pyo
@@ -1001,64 +1007,86 @@ bin/twistd
 %%S%%/twisted/test/threading_latency.py
 %%S%%/twisted/test/threading_latency.pyc
 %%S%%/twisted/test/threading_latency.pyo
-%%S%%/twisted/trial/TODO
+%%S%%/twisted/trial/NOTES
 %%S%%/twisted/trial/__init__.py
 %%S%%/twisted/trial/__init__.pyc
 %%S%%/twisted/trial/__init__.pyo
-%%S%%/twisted/trial/adapters.py
-%%S%%/twisted/trial/adapters.pyc
-%%S%%/twisted/trial/adapters.pyo
 %%S%%/twisted/trial/assertions.py
 %%S%%/twisted/trial/assertions.pyc
 %%S%%/twisted/trial/assertions.pyo
-%%S%%/twisted/trial/doctest.py
-%%S%%/twisted/trial/doctest.pyc
-%%S%%/twisted/trial/doctest.pyo
 %%S%%/twisted/trial/itrial.py
 %%S%%/twisted/trial/itrial.pyc
 %%S%%/twisted/trial/itrial.pyo
-%%S%%/twisted/trial/remote.py
-%%S%%/twisted/trial/remote.pyc
-%%S%%/twisted/trial/remote.pyo
 %%S%%/twisted/trial/reporter.py
 %%S%%/twisted/trial/reporter.pyc
 %%S%%/twisted/trial/reporter.pyo
 %%S%%/twisted/trial/runner.py
 %%S%%/twisted/trial/runner.pyc
 %%S%%/twisted/trial/runner.pyo
-%%S%%/twisted/trial/tdoctest.py
-%%S%%/twisted/trial/tdoctest.pyc
-%%S%%/twisted/trial/tdoctest.pyo
 %%S%%/twisted/trial/test/__init__.py
 %%S%%/twisted/trial/test/__init__.pyc
 %%S%%/twisted/trial/test/__init__.pyo
 %%S%%/twisted/trial/test/common.py
 %%S%%/twisted/trial/test/common.pyc
 %%S%%/twisted/trial/test/common.pyo
+%%S%%/twisted/trial/test/detests.py
+%%S%%/twisted/trial/test/detests.pyc
+%%S%%/twisted/trial/test/detests.pyo
 %%S%%/twisted/trial/test/erroneous.py
 %%S%%/twisted/trial/test/erroneous.pyc
 %%S%%/twisted/trial/test/erroneous.pyo
 %%S%%/twisted/trial/test/importErrors.py
 %%S%%/twisted/trial/test/importErrors.pyc
 %%S%%/twisted/trial/test/importErrors.pyo
+%%S%%/twisted/trial/test/moduletest.py
+%%S%%/twisted/trial/test/moduletest.pyc
+%%S%%/twisted/trial/test/moduletest.pyo
+%%S%%/twisted/trial/test/notpython
+%%S%%/twisted/trial/test/novars.py
+%%S%%/twisted/trial/test/novars.pyc
+%%S%%/twisted/trial/test/novars.pyo
 %%S%%/twisted/trial/test/numOfTests.py
 %%S%%/twisted/trial/test/numOfTests.pyc
 %%S%%/twisted/trial/test/numOfTests.pyo
 %%S%%/twisted/trial/test/pyunit.py
 %%S%%/twisted/trial/test/pyunit.pyc
 %%S%%/twisted/trial/test/pyunit.pyo
+%%S%%/twisted/trial/test/sample.py
+%%S%%/twisted/trial/test/sample.pyc
+%%S%%/twisted/trial/test/sample.pyo
+%%S%%/twisted/trial/test/scripttest.py
+%%S%%/twisted/trial/test/scripttest.pyc
+%%S%%/twisted/trial/test/scripttest.pyo
 %%S%%/twisted/trial/test/suppression.py
 %%S%%/twisted/trial/test/suppression.pyc
 %%S%%/twisted/trial/test/suppression.pyo
-%%S%%/twisted/trial/test/test_adapters.py
-%%S%%/twisted/trial/test/test_adapters.pyc
-%%S%%/twisted/trial/test/test_adapters.pyo
+%%S%%/twisted/trial/test/test_deferred.py
+%%S%%/twisted/trial/test/test_deferred.pyc
+%%S%%/twisted/trial/test/test_deferred.pyo
 %%S%%/twisted/trial/test/test_doctest.py
 %%S%%/twisted/trial/test/test_doctest.pyc
 %%S%%/twisted/trial/test/test_doctest.pyo
+%%S%%/twisted/trial/test/test_failure_formatting.py
+%%S%%/twisted/trial/test/test_failure_formatting.pyc
+%%S%%/twisted/trial/test/test_failure_formatting.pyo
+%%S%%/twisted/trial/test/test_keyboard.py
+%%S%%/twisted/trial/test/test_keyboard.pyc
+%%S%%/twisted/trial/test/test_keyboard.pyo
+%%S%%/twisted/trial/test/test_loader.py
+%%S%%/twisted/trial/test/test_loader.pyc
+%%S%%/twisted/trial/test/test_loader.pyo
+%%S%%/twisted/trial/test/test_output.py
+%%S%%/twisted/trial/test/test_output.pyc
+%%S%%/twisted/trial/test/test_output.pyo
 %%S%%/twisted/trial/test/test_reporter.py
 %%S%%/twisted/trial/test/test_reporter.pyc
 %%S%%/twisted/trial/test/test_reporter.pyo
+%%S%%/twisted/trial/test/test_script.py
+%%S%%/twisted/trial/test/test_script.pyc
+%%S%%/twisted/trial/test/test_script.pyo
+%%S%%/twisted/trial/test/test_test_visitor.py
+%%S%%/twisted/trial/test/test_test_visitor.pyc
+%%S%%/twisted/trial/test/test_test_visitor.pyo
 %%S%%/twisted/trial/test/test_tests.py
 %%S%%/twisted/trial/test/test_tests.pyc
 %%S%%/twisted/trial/test/test_tests.pyo