Changes 12.0.0:

Features
--------
 - The interface argument to IReactorTCP.listenTCP may now be an IPv6
   address literal, allowing the creation of IPv6 TCP servers.
 - twisted.python.constants.Names now provides a way to define
   collections of named constants, similar to the "enum type" feature
   of C or Java.
 - twisted.python.constants.Values now provides a way to define
   collections of named constants with arbitrary values.

Bugfixes
--------
 - Fixed an obscure case where connectionLost wasn't called on the
   protocol when using half-close.
 - UDP ports handle socket errors better on Windows.
 - When idle, the gtk2 and glib2 reactors no longer wake up 10 times a
   second.
 - Prevent a rare situation involving TLS transports, where a producer
   may be erroneously left unpaused.
 - twisted.internet.iocpreactor.iocpsupport now has fewer 64-bit
   compile warnings.
 - The GTK2 reactor is now more responsive on Windows.
 - TLS transports now correctly handle producer registration after the
   connection has been lost.
 - twisted.protocols.htb.Bucket now empties properly with a non-zero
   drip rate.
 - IReactorSSL and ITCPTransport.startTLS now synchronously propagate
   errors from the getContext method of context factories, instead of
   being capturing them and logging them as unhandled.

Improved Documentation
----------------------
 - The multicast documentation has been expanded.
 - twisted.internet.defer.Deferred now documents more return values.
 - Show a better starting page at
   http://twistedmatrix.com/documents/current

Deprecations and Removals
-------------------------
 - Remove the deprecated module twisted.enterprise.reflector.
 - Removed the deprecated module twisted.enterprise.row.
 - Remove the deprecated module twisted.enterprise.sqlreflector.
 - Removed the deprecated module twisted.enterprise.util, as well as
   twisted.enterprise.adbapi.safe.
 - Python 2.4 is no longer supported on any platform.
 - Removed printTraceback and noOperation from twisted.spread.pb,
   deprecated since Twisted 8.2.

5 files changed, 106 insertions, 57 deletions

diff --git a/net/py-twisted-docs/Makefile b/net/py-twisted-docs/Makefile
index ac5e44d8012..029300efecd 100644
--- a/net/py-twisted-docs/Makefile
+++ b/net/py-twisted-docs/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2010/11/04 19:40:02 adam Exp $
+# $NetBSD: Makefile,v 1.13 2012/04/20 18:47:37 adam Exp $
 
-PKGNAME=	py-twisted-docs-${TWISTED_VERSION}
+PKGNAME=	${PYPKGPREFIX}-twisted-docs-${TWISTED_VERSION}
 COMMENT=	Framework for writing networked applications (documentation)
 .include "../../net/py-twisted/Makefile.common"
 
diff --git a/net/py-twisted/Makefile.common b/net/py-twisted/Makefile.common
index 62176a69465..4537254c8a2 100644
--- a/net/py-twisted/Makefile.common
+++ b/net/py-twisted/Makefile.common
@@ -1,16 +1,17 @@
-# $NetBSD: Makefile.common,v 1.8 2011/10/17 03:47:57 schnoebe Exp $
+# $NetBSD: Makefile.common,v 1.9 2012/04/20 18:47:37 adam Exp $
 # used by net/py-twisted/Makefile
 # used by net/py-twisted-docs/Makefile
 
-TWISTED_VERSION=	11.0.0
-DISTNAME=		Twisted-${TWISTED_VERSION}
-CATEGORIES=		net python
-MASTER_SITES=		http://twistedmatrix.com/Releases/Twisted/11.0/
-EXTRACT_SUFX=		.tar.bz2
+TWISTED_VERSION=	12.0.0
 
-MAINTAINER=		pkgsrc-users@NetBSD.org
-HOMEPAGE=		http://www.twistedmatrix.com/
-LICENSE=		mit
+DISTNAME=	Twisted-${TWISTED_VERSION}
+CATEGORIES=	net python
+MASTER_SITES=	http://twistedmatrix.com/Releases/Twisted/12.0/
+EXTRACT_SUFX=	.tar.bz2
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://www.twistedmatrix.com/
+LICENSE=	mit
 
 DISTINFO_FILE?=		${.CURDIR}/../py-twisted/distinfo
 PATCHDIR?=		${.CURDIR}/../py-twisted/patches
diff --git a/net/py-twisted/PLIST b/net/py-twisted/PLIST
index 62ccbe8afee..2eb89c66365 100644
--- a/net/py-twisted/PLIST
+++ b/net/py-twisted/PLIST
@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST,v 1.8 2011/10/17 03:47:57 schnoebe Exp $
+@comment $NetBSD: PLIST,v 1.9 2012/04/20 18:47:37 adam Exp $
 bin/cftp
 bin/ckeygen
 bin/conch
 bin/lore
 bin/mailmail
 bin/manhole
-bin/mktap
 bin/pyhtmlizer
 bin/tap2deb
 bin/tap2rpm
@@ -259,6 +258,9 @@ ${PYSITELIB}/twisted/conch/test/test_openssh_compat.pyo
 ${PYSITELIB}/twisted/conch/test/test_recvline.py
 ${PYSITELIB}/twisted/conch/test/test_recvline.pyc
 ${PYSITELIB}/twisted/conch/test/test_recvline.pyo
+${PYSITELIB}/twisted/conch/test/test_scripts.py
+${PYSITELIB}/twisted/conch/test/test_scripts.pyc
+${PYSITELIB}/twisted/conch/test/test_scripts.pyo
 ${PYSITELIB}/twisted/conch/test/test_session.py
 ${PYSITELIB}/twisted/conch/test/test_session.pyc
 ${PYSITELIB}/twisted/conch/test/test_session.pyo
@@ -333,18 +335,6 @@ ${PYSITELIB}/twisted/enterprise/__init__.pyo
 ${PYSITELIB}/twisted/enterprise/adbapi.py
 ${PYSITELIB}/twisted/enterprise/adbapi.pyc
 ${PYSITELIB}/twisted/enterprise/adbapi.pyo
-${PYSITELIB}/twisted/enterprise/reflector.py
-${PYSITELIB}/twisted/enterprise/reflector.pyc
-${PYSITELIB}/twisted/enterprise/reflector.pyo
-${PYSITELIB}/twisted/enterprise/row.py
-${PYSITELIB}/twisted/enterprise/row.pyc
-${PYSITELIB}/twisted/enterprise/row.pyo
-${PYSITELIB}/twisted/enterprise/sqlreflector.py
-${PYSITELIB}/twisted/enterprise/sqlreflector.pyc
-${PYSITELIB}/twisted/enterprise/sqlreflector.pyo
-${PYSITELIB}/twisted/enterprise/util.py
-${PYSITELIB}/twisted/enterprise/util.pyc
-${PYSITELIB}/twisted/enterprise/util.pyo
 ${PYSITELIB}/twisted/internet/__init__.py
 ${PYSITELIB}/twisted/internet/__init__.pyc
 ${PYSITELIB}/twisted/internet/__init__.pyo
@@ -354,6 +344,12 @@ ${PYSITELIB}/twisted/internet/_baseprocess.pyo
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.py
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyc
 ${PYSITELIB}/twisted/internet/_dumbwin32proc.pyo
+${PYSITELIB}/twisted/internet/_newtls.py
+${PYSITELIB}/twisted/internet/_newtls.pyc
+${PYSITELIB}/twisted/internet/_newtls.pyo
+${PYSITELIB}/twisted/internet/_oldtls.py
+${PYSITELIB}/twisted/internet/_oldtls.pyc
+${PYSITELIB}/twisted/internet/_oldtls.pyo
 ${PYSITELIB}/twisted/internet/_pollingfile.py
 ${PYSITELIB}/twisted/internet/_pollingfile.pyc
 ${PYSITELIB}/twisted/internet/_pollingfile.pyo
@@ -368,6 +364,9 @@ ${PYSITELIB}/twisted/internet/_sigchld.so
 ${PYSITELIB}/twisted/internet/_signals.py
 ${PYSITELIB}/twisted/internet/_signals.pyc
 ${PYSITELIB}/twisted/internet/_signals.pyo
+${PYSITELIB}/twisted/internet/_ssl.py
+${PYSITELIB}/twisted/internet/_ssl.pyc
+${PYSITELIB}/twisted/internet/_ssl.pyo
 ${PYSITELIB}/twisted/internet/_sslverify.py
 ${PYSITELIB}/twisted/internet/_sslverify.pyc
 ${PYSITELIB}/twisted/internet/_sslverify.pyo
@@ -507,6 +506,15 @@ ${PYSITELIB}/twisted/internet/tcp.pyo
 ${PYSITELIB}/twisted/internet/test/__init__.py
 ${PYSITELIB}/twisted/internet/test/__init__.pyc
 ${PYSITELIB}/twisted/internet/test/__init__.pyo
+${PYSITELIB}/twisted/internet/test/_posixifaces.py
+${PYSITELIB}/twisted/internet/test/_posixifaces.pyc
+${PYSITELIB}/twisted/internet/test/_posixifaces.pyo
+${PYSITELIB}/twisted/internet/test/_win32ifaces.py
+${PYSITELIB}/twisted/internet/test/_win32ifaces.pyc
+${PYSITELIB}/twisted/internet/test/_win32ifaces.pyo
+${PYSITELIB}/twisted/internet/test/connectionmixins.py
+${PYSITELIB}/twisted/internet/test/connectionmixins.pyc
+${PYSITELIB}/twisted/internet/test/connectionmixins.pyo
 ${PYSITELIB}/twisted/internet/test/fake_CAs/not-a-certificate
 ${PYSITELIB}/twisted/internet/test/fake_CAs/thing1.pem
 ${PYSITELIB}/twisted/internet/test/fake_CAs/thing2-duplicate.pem
@@ -523,6 +531,9 @@ ${PYSITELIB}/twisted/internet/test/process_helper.pyo
 ${PYSITELIB}/twisted/internet/test/reactormixins.py
 ${PYSITELIB}/twisted/internet/test/reactormixins.pyc
 ${PYSITELIB}/twisted/internet/test/reactormixins.pyo
+${PYSITELIB}/twisted/internet/test/test_abstract.py
+${PYSITELIB}/twisted/internet/test/test_abstract.pyc
+${PYSITELIB}/twisted/internet/test/test_abstract.pyo
 ${PYSITELIB}/twisted/internet/test/test_address.py
 ${PYSITELIB}/twisted/internet/test/test_address.pyc
 ${PYSITELIB}/twisted/internet/test/test_address.pyo
@@ -535,12 +546,18 @@ ${PYSITELIB}/twisted/internet/test/test_baseprocess.pyo
 ${PYSITELIB}/twisted/internet/test/test_core.py
 ${PYSITELIB}/twisted/internet/test/test_core.pyc
 ${PYSITELIB}/twisted/internet/test/test_core.pyo
+${PYSITELIB}/twisted/internet/test/test_default.py
+${PYSITELIB}/twisted/internet/test/test_default.pyc
+${PYSITELIB}/twisted/internet/test/test_default.pyo
 ${PYSITELIB}/twisted/internet/test/test_endpoints.py
 ${PYSITELIB}/twisted/internet/test/test_endpoints.pyc
 ${PYSITELIB}/twisted/internet/test/test_endpoints.pyo
 ${PYSITELIB}/twisted/internet/test/test_fdset.py
 ${PYSITELIB}/twisted/internet/test/test_fdset.pyc
 ${PYSITELIB}/twisted/internet/test/test_fdset.pyo
+${PYSITELIB}/twisted/internet/test/test_filedescriptor.py
+${PYSITELIB}/twisted/internet/test/test_filedescriptor.pyc
+${PYSITELIB}/twisted/internet/test/test_filedescriptor.pyo
 ${PYSITELIB}/twisted/internet/test/test_gtkreactor.py
 ${PYSITELIB}/twisted/internet/test/test_gtkreactor.pyc
 ${PYSITELIB}/twisted/internet/test/test_gtkreactor.pyo
@@ -550,12 +567,18 @@ ${PYSITELIB}/twisted/internet/test/test_inlinecb.pyo
 ${PYSITELIB}/twisted/internet/test/test_inotify.py
 ${PYSITELIB}/twisted/internet/test/test_inotify.pyc
 ${PYSITELIB}/twisted/internet/test/test_inotify.pyo
+${PYSITELIB}/twisted/internet/test/test_interfaces.py
+${PYSITELIB}/twisted/internet/test/test_interfaces.pyc
+${PYSITELIB}/twisted/internet/test/test_interfaces.pyo
 ${PYSITELIB}/twisted/internet/test/test_iocp.py
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyc
 ${PYSITELIB}/twisted/internet/test/test_iocp.pyo
 ${PYSITELIB}/twisted/internet/test/test_main.py
 ${PYSITELIB}/twisted/internet/test/test_main.pyc
 ${PYSITELIB}/twisted/internet/test/test_main.pyo
+${PYSITELIB}/twisted/internet/test/test_newtls.py
+${PYSITELIB}/twisted/internet/test/test_newtls.pyc
+${PYSITELIB}/twisted/internet/test/test_newtls.pyo
 ${PYSITELIB}/twisted/internet/test/test_pollingfile.py
 ${PYSITELIB}/twisted/internet/test/test_pollingfile.pyc
 ${PYSITELIB}/twisted/internet/test/test_pollingfile.pyo
@@ -574,6 +597,9 @@ ${PYSITELIB}/twisted/internet/test/test_protocol.pyo
 ${PYSITELIB}/twisted/internet/test/test_qtreactor.py
 ${PYSITELIB}/twisted/internet/test/test_qtreactor.pyc
 ${PYSITELIB}/twisted/internet/test/test_qtreactor.pyo
+${PYSITELIB}/twisted/internet/test/test_serialport.py
+${PYSITELIB}/twisted/internet/test/test_serialport.pyc
+${PYSITELIB}/twisted/internet/test/test_serialport.pyo
 ${PYSITELIB}/twisted/internet/test/test_sigchld.py
 ${PYSITELIB}/twisted/internet/test/test_sigchld.pyc
 ${PYSITELIB}/twisted/internet/test/test_sigchld.pyo
@@ -592,6 +618,9 @@ ${PYSITELIB}/twisted/internet/test/test_tls.pyo
 ${PYSITELIB}/twisted/internet/test/test_udp.py
 ${PYSITELIB}/twisted/internet/test/test_udp.pyc
 ${PYSITELIB}/twisted/internet/test/test_udp.pyo
+${PYSITELIB}/twisted/internet/test/test_udp_internals.py
+${PYSITELIB}/twisted/internet/test/test_udp_internals.pyc
+${PYSITELIB}/twisted/internet/test/test_udp_internals.pyo
 ${PYSITELIB}/twisted/internet/test/test_unix.py
 ${PYSITELIB}/twisted/internet/test/test_unix.pyc
 ${PYSITELIB}/twisted/internet/test/test_unix.pyo
@@ -700,6 +729,9 @@ ${PYSITELIB}/twisted/lore/test/test_lore.pyo
 ${PYSITELIB}/twisted/lore/test/test_man2lore.py
 ${PYSITELIB}/twisted/lore/test/test_man2lore.pyc
 ${PYSITELIB}/twisted/lore/test/test_man2lore.pyo
+${PYSITELIB}/twisted/lore/test/test_scripts.py
+${PYSITELIB}/twisted/lore/test/test_scripts.pyc
+${PYSITELIB}/twisted/lore/test/test_scripts.pyo
 ${PYSITELIB}/twisted/lore/test/test_slides.py
 ${PYSITELIB}/twisted/lore/test/test_slides.pyc
 ${PYSITELIB}/twisted/lore/test/test_slides.pyo
@@ -795,6 +827,9 @@ ${PYSITELIB}/twisted/mail/test/test_pop3.pyo
 ${PYSITELIB}/twisted/mail/test/test_pop3client.py
 ${PYSITELIB}/twisted/mail/test/test_pop3client.pyc
 ${PYSITELIB}/twisted/mail/test/test_pop3client.pyo
+${PYSITELIB}/twisted/mail/test/test_scripts.py
+${PYSITELIB}/twisted/mail/test/test_scripts.pyc
+${PYSITELIB}/twisted/mail/test/test_scripts.pyo
 ${PYSITELIB}/twisted/mail/test/test_smtp.py
 ${PYSITELIB}/twisted/mail/test/test_smtp.pyc
 ${PYSITELIB}/twisted/mail/test/test_smtp.pyo
@@ -821,6 +856,12 @@ ${PYSITELIB}/twisted/manhole/service.pyo
 ${PYSITELIB}/twisted/manhole/telnet.py
 ${PYSITELIB}/twisted/manhole/telnet.pyc
 ${PYSITELIB}/twisted/manhole/telnet.pyo
+${PYSITELIB}/twisted/manhole/test/__init__.py
+${PYSITELIB}/twisted/manhole/test/__init__.pyc
+${PYSITELIB}/twisted/manhole/test/__init__.pyo
+${PYSITELIB}/twisted/manhole/test/test_explorer.py
+${PYSITELIB}/twisted/manhole/test/test_explorer.pyc
+${PYSITELIB}/twisted/manhole/test/test_explorer.pyo
 ${PYSITELIB}/twisted/manhole/ui/__init__.py
 ${PYSITELIB}/twisted/manhole/ui/__init__.pyc
 ${PYSITELIB}/twisted/manhole/ui/__init__.pyo
@@ -894,6 +935,9 @@ ${PYSITELIB}/twisted/names/test/test_common.pyo
 ${PYSITELIB}/twisted/names/test/test_dns.py
 ${PYSITELIB}/twisted/names/test/test_dns.pyc
 ${PYSITELIB}/twisted/names/test/test_dns.pyo
+${PYSITELIB}/twisted/names/test/test_hosts.py
+${PYSITELIB}/twisted/names/test/test_hosts.pyc
+${PYSITELIB}/twisted/names/test/test_hosts.pyo
 ${PYSITELIB}/twisted/names/test/test_names.py
 ${PYSITELIB}/twisted/names/test/test_names.pyc
 ${PYSITELIB}/twisted/names/test/test_names.pyo
@@ -993,15 +1037,18 @@ ${PYSITELIB}/twisted/persisted/journal/base.pyo
 ${PYSITELIB}/twisted/persisted/journal/picklelog.py
 ${PYSITELIB}/twisted/persisted/journal/picklelog.pyc
 ${PYSITELIB}/twisted/persisted/journal/picklelog.pyo
-${PYSITELIB}/twisted/persisted/journal/rowjournal.py
-${PYSITELIB}/twisted/persisted/journal/rowjournal.pyc
-${PYSITELIB}/twisted/persisted/journal/rowjournal.pyo
 ${PYSITELIB}/twisted/persisted/sob.py
 ${PYSITELIB}/twisted/persisted/sob.pyc
 ${PYSITELIB}/twisted/persisted/sob.pyo
 ${PYSITELIB}/twisted/persisted/styles.py
 ${PYSITELIB}/twisted/persisted/styles.pyc
 ${PYSITELIB}/twisted/persisted/styles.pyo
+${PYSITELIB}/twisted/persisted/test/__init__.py
+${PYSITELIB}/twisted/persisted/test/__init__.pyc
+${PYSITELIB}/twisted/persisted/test/__init__.pyo
+${PYSITELIB}/twisted/persisted/test/test_styles.py
+${PYSITELIB}/twisted/persisted/test/test_styles.pyc
+${PYSITELIB}/twisted/persisted/test/test_styles.pyo
 ${PYSITELIB}/twisted/plugin.py
 ${PYSITELIB}/twisted/plugin.pyc
 ${PYSITELIB}/twisted/plugin.pyo
@@ -1169,22 +1216,24 @@ ${PYSITELIB}/twisted/python/_inotify.pyo
 ${PYSITELIB}/twisted/python/_release.py
 ${PYSITELIB}/twisted/python/_release.pyc
 ${PYSITELIB}/twisted/python/_release.pyo
-${PYSITELIB}/twisted/python/_twisted_zsh_stub
+${PYSITELIB}/twisted/python/_shellcomp.py
+${PYSITELIB}/twisted/python/_shellcomp.pyc
+${PYSITELIB}/twisted/python/_shellcomp.pyo
 ${PYSITELIB}/twisted/python/compat.py
 ${PYSITELIB}/twisted/python/compat.pyc
 ${PYSITELIB}/twisted/python/compat.pyo
 ${PYSITELIB}/twisted/python/components.py
 ${PYSITELIB}/twisted/python/components.pyc
 ${PYSITELIB}/twisted/python/components.pyo
+${PYSITELIB}/twisted/python/constants.py
+${PYSITELIB}/twisted/python/constants.pyc
+${PYSITELIB}/twisted/python/constants.pyo
 ${PYSITELIB}/twisted/python/context.py
 ${PYSITELIB}/twisted/python/context.pyc
 ${PYSITELIB}/twisted/python/context.pyo
 ${PYSITELIB}/twisted/python/deprecate.py
 ${PYSITELIB}/twisted/python/deprecate.pyc
 ${PYSITELIB}/twisted/python/deprecate.pyo
-${PYSITELIB}/twisted/python/dispatch.py
-${PYSITELIB}/twisted/python/dispatch.pyc
-${PYSITELIB}/twisted/python/dispatch.pyo
 ${PYSITELIB}/twisted/python/dist.py
 ${PYSITELIB}/twisted/python/dist.pyc
 ${PYSITELIB}/twisted/python/dist.pyo
@@ -1263,9 +1312,15 @@ ${PYSITELIB}/twisted/python/test/__init__.pyo
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.py
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.pyc
 ${PYSITELIB}/twisted/python/test/deprecatedattributes.pyo
+${PYSITELIB}/twisted/python/test/modules_helpers.py
+${PYSITELIB}/twisted/python/test/modules_helpers.pyc
+${PYSITELIB}/twisted/python/test/modules_helpers.pyo
 ${PYSITELIB}/twisted/python/test/test_components.py
 ${PYSITELIB}/twisted/python/test/test_components.pyc
 ${PYSITELIB}/twisted/python/test/test_components.pyo
+${PYSITELIB}/twisted/python/test/test_constants.py
+${PYSITELIB}/twisted/python/test/test_constants.pyc
+${PYSITELIB}/twisted/python/test/test_constants.pyo
 ${PYSITELIB}/twisted/python/test/test_deprecate.py
 ${PYSITELIB}/twisted/python/test/test_deprecate.pyc
 ${PYSITELIB}/twisted/python/test/test_deprecate.pyo
@@ -1290,6 +1345,9 @@ ${PYSITELIB}/twisted/python/test/test_release.pyo
 ${PYSITELIB}/twisted/python/test/test_runtime.py
 ${PYSITELIB}/twisted/python/test/test_runtime.pyc
 ${PYSITELIB}/twisted/python/test/test_runtime.pyo
+${PYSITELIB}/twisted/python/test/test_shellcomp.py
+${PYSITELIB}/twisted/python/test/test_shellcomp.pyc
+${PYSITELIB}/twisted/python/test/test_shellcomp.pyo
 ${PYSITELIB}/twisted/python/test/test_syslog.py
 ${PYSITELIB}/twisted/python/test/test_syslog.pyc
 ${PYSITELIB}/twisted/python/test/test_syslog.pyo
@@ -1305,6 +1363,9 @@ ${PYSITELIB}/twisted/python/test/test_win32.pyo
 ${PYSITELIB}/twisted/python/test/test_zipstream.py
 ${PYSITELIB}/twisted/python/test/test_zipstream.pyc
 ${PYSITELIB}/twisted/python/test/test_zipstream.pyo
+${PYSITELIB}/twisted/python/test/test_zshcomp.py
+${PYSITELIB}/twisted/python/test/test_zshcomp.pyc
+${PYSITELIB}/twisted/python/test/test_zshcomp.pyo
 ${PYSITELIB}/twisted/python/text.py
 ${PYSITELIB}/twisted/python/text.pyc
 ${PYSITELIB}/twisted/python/text.pyo
@@ -1314,6 +1375,7 @@ ${PYSITELIB}/twisted/python/threadable.pyo
 ${PYSITELIB}/twisted/python/threadpool.py
 ${PYSITELIB}/twisted/python/threadpool.pyc
 ${PYSITELIB}/twisted/python/threadpool.pyo
+${PYSITELIB}/twisted/python/twisted-completion.zsh
 ${PYSITELIB}/twisted/python/urlpath.py
 ${PYSITELIB}/twisted/python/urlpath.pyc
 ${PYSITELIB}/twisted/python/urlpath.pyo
@@ -1335,7 +1397,7 @@ ${PYSITELIB}/twisted/python/zippath.pyo
 ${PYSITELIB}/twisted/python/zipstream.py
 ${PYSITELIB}/twisted/python/zipstream.pyc
 ${PYSITELIB}/twisted/python/zipstream.pyo
-${PYSITELIB}/twisted/python/zsh/README
+${PYSITELIB}/twisted/python/zsh/README.txt
 ${PYSITELIB}/twisted/python/zsh/_cftp
 ${PYSITELIB}/twisted/python/zsh/_ckeygen
 ${PYSITELIB}/twisted/python/zsh/_conch
@@ -1377,9 +1439,6 @@ ${PYSITELIB}/twisted/runner/procmon.pyo
 ${PYSITELIB}/twisted/runner/procmontap.py
 ${PYSITELIB}/twisted/runner/procmontap.pyc
 ${PYSITELIB}/twisted/runner/procmontap.pyo
-${PYSITELIB}/twisted/runner/procutils.py
-${PYSITELIB}/twisted/runner/procutils.pyc
-${PYSITELIB}/twisted/runner/procutils.pyo
 ${PYSITELIB}/twisted/runner/test/__init__.py
 ${PYSITELIB}/twisted/runner/test/__init__.pyc
 ${PYSITELIB}/twisted/runner/test/__init__.pyo
@@ -1406,9 +1465,6 @@ ${PYSITELIB}/twisted/scripts/htmlizer.pyo
 ${PYSITELIB}/twisted/scripts/manhole.py
 ${PYSITELIB}/twisted/scripts/manhole.pyc
 ${PYSITELIB}/twisted/scripts/manhole.pyo
-${PYSITELIB}/twisted/scripts/mktap.py
-${PYSITELIB}/twisted/scripts/mktap.pyc
-${PYSITELIB}/twisted/scripts/mktap.pyo
 ${PYSITELIB}/twisted/scripts/tap2deb.py
 ${PYSITELIB}/twisted/scripts/tap2deb.pyc
 ${PYSITELIB}/twisted/scripts/tap2deb.pyo
@@ -1421,9 +1477,9 @@ ${PYSITELIB}/twisted/scripts/tapconvert.pyo
 ${PYSITELIB}/twisted/scripts/test/__init__.py
 ${PYSITELIB}/twisted/scripts/test/__init__.pyc
 ${PYSITELIB}/twisted/scripts/test/__init__.pyo
-${PYSITELIB}/twisted/scripts/test/test_mktap.py
-${PYSITELIB}/twisted/scripts/test/test_mktap.pyc
-${PYSITELIB}/twisted/scripts/test/test_mktap.pyo
+${PYSITELIB}/twisted/scripts/test/test_scripts.py
+${PYSITELIB}/twisted/scripts/test/test_scripts.pyc
+${PYSITELIB}/twisted/scripts/test/test_scripts.pyo
 ${PYSITELIB}/twisted/scripts/test/test_tap2rpm.py
 ${PYSITELIB}/twisted/scripts/test/test_tap2rpm.pyc
 ${PYSITELIB}/twisted/scripts/test/test_tap2rpm.pyo
@@ -1639,9 +1695,6 @@ ${PYSITELIB}/twisted/test/test_dirdbm.pyo
 ${PYSITELIB}/twisted/test/test_doc.py
 ${PYSITELIB}/twisted/test/test_doc.pyc
 ${PYSITELIB}/twisted/test/test_doc.pyo
-${PYSITELIB}/twisted/test/test_enterprise.py
-${PYSITELIB}/twisted/test/test_enterprise.pyc
-${PYSITELIB}/twisted/test/test_enterprise.pyo
 ${PYSITELIB}/twisted/test/test_epoll.py
 ${PYSITELIB}/twisted/test/test_epoll.pyc
 ${PYSITELIB}/twisted/test/test_epoll.pyo
@@ -1669,6 +1722,9 @@ ${PYSITELIB}/twisted/test/test_formmethod.pyo
 ${PYSITELIB}/twisted/test/test_ftp.py
 ${PYSITELIB}/twisted/test/test_ftp.pyc
 ${PYSITELIB}/twisted/test/test_ftp.pyo
+${PYSITELIB}/twisted/test/test_ftp_options.py
+${PYSITELIB}/twisted/test/test_ftp_options.pyc
+${PYSITELIB}/twisted/test/test_ftp_options.pyo
 ${PYSITELIB}/twisted/test/test_hook.py
 ${PYSITELIB}/twisted/test/test_hook.pyc
 ${PYSITELIB}/twisted/test/test_hook.pyo
@@ -1762,9 +1818,6 @@ ${PYSITELIB}/twisted/test/test_rebuild.pyo
 ${PYSITELIB}/twisted/test/test_reflect.py
 ${PYSITELIB}/twisted/test/test_reflect.pyc
 ${PYSITELIB}/twisted/test/test_reflect.pyo
-${PYSITELIB}/twisted/test/test_reflector.py
-${PYSITELIB}/twisted/test/test_reflector.pyc
-${PYSITELIB}/twisted/test/test_reflector.pyo
 ${PYSITELIB}/twisted/test/test_roots.py
 ${PYSITELIB}/twisted/test/test_roots.pyc
 ${PYSITELIB}/twisted/test/test_roots.pyo
@@ -1843,9 +1896,6 @@ ${PYSITELIB}/twisted/test/test_unix.pyo
 ${PYSITELIB}/twisted/test/test_usage.py
 ${PYSITELIB}/twisted/test/test_usage.pyc
 ${PYSITELIB}/twisted/test/test_usage.pyo
-${PYSITELIB}/twisted/test/test_zshcomp.py
-${PYSITELIB}/twisted/test/test_zshcomp.pyc
-${PYSITELIB}/twisted/test/test_zshcomp.pyo
 ${PYSITELIB}/twisted/test/testutils.py
 ${PYSITELIB}/twisted/test/testutils.pyc
 ${PYSITELIB}/twisted/test/testutils.pyo
diff --git a/net/py-twisted/PLIST.Darwin b/net/py-twisted/PLIST.Darwin
deleted file mode 100644
index 18a2724b3da..00000000000
--- a/net/py-twisted/PLIST.Darwin
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST.Darwin,v 1.1 2010/11/04 19:40:02 adam Exp $
-${PYSITELIB}/twisted/internet/cfsupport.so
diff --git a/net/py-twisted/distinfo b/net/py-twisted/distinfo
index cb01e9391ca..fd7d3ef0ed4 100644
--- a/net/py-twisted/distinfo
+++ b/net/py-twisted/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2011/10/17 03:47:57 schnoebe Exp $
+$NetBSD: distinfo,v 1.10 2012/04/20 18:47:37 adam Exp $
 
-SHA1 (Twisted-11.0.0.tar.bz2) = 502368066e5644a64be67a236d39da4bd1d07d43
-RMD160 (Twisted-11.0.0.tar.bz2) = c8ca4d78cb0055f355eecde38f920baea6da68a7
-Size (Twisted-11.0.0.tar.bz2) = 2729428 bytes
+SHA1 (Twisted-12.0.0.tar.bz2) = 64b7f7fdeefbd4dd8e6bdffb12d9095106ee3d5d
+RMD160 (Twisted-12.0.0.tar.bz2) = 95228c1c8919a61f84ad1d5087c8b96719f11f25
+Size (Twisted-12.0.0.tar.bz2) = 2766488 bytes
 SHA1 (patch-ab) = 26495e5abd57025e915b923cc7089704bbd85629
 SHA1 (patch-ac) = 3881dec501db0913a600bde78e6d96a106c33156