3 files changed, 37 insertions, 10 deletions

diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index a215e638f57a..2ee7d1516e11 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	1.1.1
+PORTVERSION=	1.2.0
 CATEGORIES=	devel net python
 MASTER_SITES=	http://twisted.sourceforge.net/ \
-		http://twistedmatrix.com/downloads/
+		http://twistedmatrix.com/downloads/old/
 MASTER_SITE_SUBDIR=	${PORTNAME}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	Twisted_NoDocs-${PORTVERSION}
diff --git a/devel/py-twisted/distinfo b/devel/py-twisted/distinfo
index b7d6ac88c810..275329ba6158 100644
--- a/devel/py-twisted/distinfo
+++ b/devel/py-twisted/distinfo
@@ -1,2 +1,2 @@
-MD5 (Twisted_NoDocs-1.1.1.tar.bz2) = f12cd12b5b2b90f85e6cfb5005fdfc91
-SIZE (Twisted_NoDocs-1.1.1.tar.bz2) = 1200027
+MD5 (Twisted_NoDocs-1.2.0.tar.bz2) = d68d47c98c3dbdffe3c2fc9f1b8a57a1
+SIZE (Twisted_NoDocs-1.2.0.tar.bz2) = 1281868
diff --git a/devel/py-twisted/pkg-plist b/devel/py-twisted/pkg-plist
index 03468dba47ce..333762c625c1 100644
--- a/devel/py-twisted/pkg-plist
+++ b/devel/py-twisted/pkg-plist
@@ -293,9 +293,6 @@ bin/websetroot
 %%S%%/twisted/internet/fdesc.py
 %%S%%/twisted/internet/fdesc.pyc
 %%S%%/twisted/internet/fdesc.pyo
-%%S%%/twisted/internet/gladereactor.py
-%%S%%/twisted/internet/gladereactor.pyc
-%%S%%/twisted/internet/gladereactor.pyo
 %%S%%/twisted/internet/gtk2reactor.py
 %%S%%/twisted/internet/gtk2reactor.pyc
 %%S%%/twisted/internet/gtk2reactor.pyo
@@ -377,6 +374,9 @@ bin/websetroot
 %%S%%/twisted/internet/win32eventreactor.py
 %%S%%/twisted/internet/win32eventreactor.pyc
 %%S%%/twisted/internet/win32eventreactor.pyo
+%%S%%/twisted/internet/wxreactor.py
+%%S%%/twisted/internet/wxreactor.pyc
+%%S%%/twisted/internet/wxreactor.pyo
 %%S%%/twisted/internet/wxsupport.py
 %%S%%/twisted/internet/wxsupport.pyc
 %%S%%/twisted/internet/wxsupport.pyo
@@ -450,9 +450,18 @@ bin/websetroot
 %%S%%/twisted/manhole/__init__.py
 %%S%%/twisted/manhole/__init__.pyc
 %%S%%/twisted/manhole/__init__.pyo
+%%S%%/twisted/manhole/_inspectro.py
+%%S%%/twisted/manhole/_inspectro.pyc
+%%S%%/twisted/manhole/_inspectro.pyo
 %%S%%/twisted/manhole/explorer.py
 %%S%%/twisted/manhole/explorer.pyc
 %%S%%/twisted/manhole/explorer.pyo
+%%S%%/twisted/manhole/gladereactor.glade
+%%S%%/twisted/manhole/gladereactor.py
+%%S%%/twisted/manhole/gladereactor.pyc
+%%S%%/twisted/manhole/gladereactor.pyo
+%%S%%/twisted/manhole/inspectro.glade
+%%S%%/twisted/manhole/logview.glade
 %%S%%/twisted/manhole/service.py
 %%S%%/twisted/manhole/service.pyc
 %%S%%/twisted/manhole/service.pyo
@@ -499,6 +508,9 @@ bin/websetroot
 %%S%%/twisted/names/root.py
 %%S%%/twisted/names/root.pyc
 %%S%%/twisted/names/root.pyo
+%%S%%/twisted/names/secondary.py
+%%S%%/twisted/names/secondary.pyc
+%%S%%/twisted/names/secondary.pyo
 %%S%%/twisted/names/server.py
 %%S%%/twisted/names/server.pyc
 %%S%%/twisted/names/server.pyo
@@ -591,6 +603,9 @@ bin/websetroot
 %%S%%/twisted/protocols/http.py
 %%S%%/twisted/protocols/http.pyc
 %%S%%/twisted/protocols/http.pyo
+%%S%%/twisted/protocols/ident.py
+%%S%%/twisted/protocols/ident.pyc
+%%S%%/twisted/protocols/ident.pyo
 %%S%%/twisted/protocols/imap4.py
 %%S%%/twisted/protocols/imap4.pyc
 %%S%%/twisted/protocols/imap4.pyo
@@ -666,6 +681,9 @@ bin/websetroot
 %%S%%/twisted/protocols/socks.py
 %%S%%/twisted/protocols/socks.pyc
 %%S%%/twisted/protocols/socks.pyo
+%%S%%/twisted/protocols/stateful.py
+%%S%%/twisted/protocols/stateful.pyc
+%%S%%/twisted/protocols/stateful.pyo
 %%S%%/twisted/protocols/sux.py
 %%S%%/twisted/protocols/sux.pyc
 %%S%%/twisted/protocols/sux.pyo
@@ -747,9 +765,6 @@ bin/websetroot
 %%S%%/twisted/python/reflect.py
 %%S%%/twisted/python/reflect.pyc
 %%S%%/twisted/python/reflect.pyo
-%%S%%/twisted/python/register.py
-%%S%%/twisted/python/register.pyc
-%%S%%/twisted/python/register.pyo
 %%S%%/twisted/python/roots.py
 %%S%%/twisted/python/roots.pyc
 %%S%%/twisted/python/roots.pyo
@@ -963,6 +978,9 @@ bin/websetroot
 %%S%%/twisted/test/process_echoer.py
 %%S%%/twisted/test/process_echoer.pyc
 %%S%%/twisted/test/process_echoer.pyo
+%%S%%/twisted/test/process_fds.py
+%%S%%/twisted/test/process_fds.pyc
+%%S%%/twisted/test/process_fds.pyo
 %%S%%/twisted/test/process_reader.py
 %%S%%/twisted/test/process_reader.pyc
 %%S%%/twisted/test/process_reader.pyo
@@ -1076,6 +1094,9 @@ bin/websetroot
 %%S%%/twisted/test/test_http.py
 %%S%%/twisted/test/test_http.pyc
 %%S%%/twisted/test/test_http.pyo
+%%S%%/twisted/test/test_ident.py
+%%S%%/twisted/test/test_ident.pyc
+%%S%%/twisted/test/test_ident.pyo
 %%S%%/twisted/test/test_imap.py
 %%S%%/twisted/test/test_imap.pyc
 %%S%%/twisted/test/test_imap.pyo
@@ -1202,6 +1223,9 @@ bin/websetroot
 %%S%%/twisted/test/test_smtp.py
 %%S%%/twisted/test/test_smtp.pyc
 %%S%%/twisted/test/test_smtp.pyo
+%%S%%/twisted/test/test_soap.py
+%%S%%/twisted/test/test_soap.pyc
+%%S%%/twisted/test/test_soap.pyo
 %%S%%/twisted/test/test_sob.py
 %%S%%/twisted/test/test_sob.pyc
 %%S%%/twisted/test/test_sob.pyo
@@ -1211,6 +1235,9 @@ bin/websetroot
 %%S%%/twisted/test/test_ssl.py
 %%S%%/twisted/test/test_ssl.pyc
 %%S%%/twisted/test/test_ssl.pyo
+%%S%%/twisted/test/test_stateful.py
+%%S%%/twisted/test/test_stateful.pyc
+%%S%%/twisted/test/test_stateful.pyo
 %%S%%/twisted/test/test_strports.py
 %%S%%/twisted/test/test_strports.pyc
 %%S%%/twisted/test/test_strports.pyo