3 files changed, 59 insertions, 11 deletions

diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index d97d6f91cc32..f0925176e88c 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	twisted
-PORTVERSION=	0.10.0
-PORTREVISION=	3
+PORTVERSION=	0.10.1
 CATEGORIES=	devel net python
 MASTER_SITES=	http://twistedmatrix.com/downloads/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -25,7 +24,7 @@ USE_PYTHON=	yes
 EXAMPLESDIR=	${PREFIX}/share/examples/twisted
 SCRIPTS=	accepttests cpyrght faucet gnusto im malyon manhole \
 		mapeditor mktap runtests twistd twistd-debug
-MAN1=		faucet.1 gnusto.1 im.1 manhole.1 mktap.1 tap2deb.1 twistd.1
+MAN1=		faucet.1 gnusto.1 im.1 manhole.1 mktap.1 twistd.1
 
 post-patch:
 	@ ${PERL} -pi -e 's/from pyunit import/import/g' \
@@ -53,7 +52,7 @@ post-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
 .endfor
 	@ ${MKDIR} ${EXAMPLESDIR}
-	@ ${INSTALL_DATA} ${WRKSRC}/doc/examples/*.py ${EXAMPLESDIR}
+	@ ${INSTALL_DATA} ${WRKSRC}/doc/examples/* ${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/py-twisted/distinfo b/devel/py-twisted/distinfo
index 336b90453784..3415be00a826 100644
--- a/devel/py-twisted/distinfo
+++ b/devel/py-twisted/distinfo
@@ -1 +1 @@
-MD5 (Twisted-0.10.0.tar.gz) = a2c41727475f8aa711a50d4d29b75809
+MD5 (Twisted-0.10.1.tar.gz) = 686e78e2a448c56b7c94901a0e0a15ee
diff --git a/devel/py-twisted/pkg-plist b/devel/py-twisted/pkg-plist
index 37694e8fbda7..bf9be221a027 100644
--- a/devel/py-twisted/pkg-plist
+++ b/devel/py-twisted/pkg-plist
@@ -4,11 +4,15 @@
 %%PORTDOCS%%share/doc/twisted/README
 %%PORTDOCS%%share/doc/twisted/TODO
 %%PORTDOCS%%share/doc/twisted/img/TwistedLogo.bmp
+%%PORTDOCS%%share/doc/twisted/twistedEnterprise.html
 %%PORTDOCS%%share/doc/twisted/writing-serves.html
 %%PORTDOCS%%share/examples/twisted/echoserv-ssl.py
 %%PORTDOCS%%share/examples/twisted/echoserv.py
+%%PORTDOCS%%share/examples/twisted/echoserv_threaded.py
 %%PORTDOCS%%share/examples/twisted/pbclient.py
 %%PORTDOCS%%share/examples/twisted/pbecho.py
+%%PORTDOCS%%share/examples/twisted/proxy.py
+%%PORTDOCS%%share/examples/twisted/server.pem
 %%PORTDOCS%%share/examples/twisted/udpechoserv.py
 bin/accepttests
 bin/cpyrght
@@ -34,15 +38,21 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbclient.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbclient.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbclient.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbserver.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbserver.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbserver.pyo
-lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbservice.py
-lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbservice.pyc
-lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/dbservice.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/drivers.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/drivers.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/drivers.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/manager.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/manager.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/manager.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/requests.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/requests.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/requests.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/servertest.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/servertest.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/servertest.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/service.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/service.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/service.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/testdb.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/testdb.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/enterprise/testdb.pyo
@@ -70,6 +80,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/ssl.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/stdio.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/stdio.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/stdio.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/stupidproxy.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/stupidproxy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/stupidproxy.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/task.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/task.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/internet/task.pyo
@@ -133,6 +146,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/__init__.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/basic.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/basic.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/basic.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/finger.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/finger.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/finger.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/ftp.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/ftp.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/ftp.pyo
@@ -142,12 +158,21 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/http.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/irc.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/irc.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/irc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/ldap.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/ldap.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/ldap.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pop3.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pop3.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pop3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/protocol.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/protocol.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/protocol.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pureber.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pureber.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pureber.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pureldap.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pureldap.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/pureldap.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/smtp.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/smtp.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/smtp.pyo
@@ -157,6 +182,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/telnet.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/toc.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/toc.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/toc.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/wire.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/wire.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/protocols/wire.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/__init__.pyo
@@ -178,6 +206,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/python/hook.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/log.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/log.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/log.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/mutablestring.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/mutablestring.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/mutablestring.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/observable.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/observable.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/observable.pyo
@@ -202,6 +233,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/python/threadpool.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/usage.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/usage.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/usage.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/util.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/util.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/python/util.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/worker.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/worker.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/python/worker.pyo
@@ -299,6 +333,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/manhole.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/reality.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/reality.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/reality.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/stupid.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/stupid.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/stupid.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/telnet.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/telnet.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/tap/telnet.pyo
@@ -356,6 +393,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_pop3.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_protocols.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_protocols.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_protocols.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_pureber.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_pureber.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_pureber.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_reality.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_reality.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/test/test_reality.pyo
@@ -398,6 +438,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/web/html.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/lmx.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/lmx.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/lmx.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/proxy.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/proxy.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/proxy.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/resource.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/resource.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/resource.pyo
@@ -425,6 +468,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/web/vhost.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/weblog.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/weblog.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/web/weblog.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/widgets.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/widgets.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/web/widgets.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/__init__.pyo
@@ -443,6 +489,9 @@ lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateway.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/__init__.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/__init__.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/__init__.pyo
+lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/irc.py
+lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/irc.pyc
+lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/irc.pyo
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/toc.py
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/toc.pyc
 lib/%%PYTHON_VERSION%%/site-packages/twisted/words/ui/gateways/toc.pyo