aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsbz <sbz@FreeBSD.org>2011-09-07 17:27:54 +0800
committersbz <sbz@FreeBSD.org>2011-09-07 17:27:54 +0800
commitfd37de42ed9e56f40770601fb3ac8d2c2073b7fa (patch)
tree7bb907dbb99ef379cb74f08f2e1b03866526f7a0
parent026d72119005304983e57a5c05815ac7c3ddfdb0 (diff)
downloadfreebsd-ports-gnome-fd37de42ed9e56f40770601fb3ac8d2c2073b7fa.tar.gz
freebsd-ports-gnome-fd37de42ed9e56f40770601fb3ac8d2c2073b7fa.tar.zst
freebsd-ports-gnome-fd37de42ed9e56f40770601fb3ac8d2c2073b7fa.zip
- Update to 11.0.0
- Update MASTER_SITES - Add LICENSE Reviewed by: lwhsu@ Approved by: jadawin@ (mentor)
-rw-r--r--Mk/bsd.python.mk1
-rw-r--r--devel/py-twisted/Makefile18
-rw-r--r--devel/py-twistedCore/Makefile11
-rw-r--r--devel/py-twistedCore/distinfo4
-rw-r--r--devel/py-twistedCore/pkg-plist52
-rw-r--r--devel/py-twistedRunner/Makefile9
-rw-r--r--devel/py-twistedRunner/distinfo4
-rw-r--r--dns/py-twistedNames/Makefile9
-rw-r--r--dns/py-twistedNames/distinfo4
-rw-r--r--mail/py-twistedMail/Makefile9
-rw-r--r--mail/py-twistedMail/distinfo4
-rw-r--r--net-im/py-twistedWords/Makefile9
-rw-r--r--net-im/py-twistedWords/distinfo4
-rw-r--r--net-im/py-twistedWords/pkg-plist25
-rw-r--r--net/py-twistedPair/Makefile9
-rw-r--r--net/py-twistedPair/distinfo4
-rw-r--r--news/py-twistedNews/Makefile9
-rw-r--r--news/py-twistedNews/distinfo4
-rw-r--r--news/py-twistedNews/pkg-plist3
-rw-r--r--security/py-twistedConch/Makefile7
-rw-r--r--security/py-twistedConch/distinfo4
-rw-r--r--textproc/py-twistedLore/Makefile9
-rw-r--r--textproc/py-twistedLore/distinfo4
-rw-r--r--www/py-twistedWeb/Makefile9
-rw-r--r--www/py-twistedWeb/distinfo4
-rw-r--r--www/py-twistedWeb/pkg-plist29
26 files changed, 149 insertions, 109 deletions
diff --git a/Mk/bsd.python.mk b/Mk/bsd.python.mk
index 2eae568932a4..53d66a8da962 100644
--- a/Mk/bsd.python.mk
+++ b/Mk/bsd.python.mk
@@ -644,6 +644,7 @@ lore_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:${PORTSDIR}/textproc
mail_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail
names_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/names/__init__.py:${PORTSDIR}/dns/py-twistedNames
news_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/news/__init__.py:${PORTSDIR}/news/py-twistedNews
+pair_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/pair/__init__.py:${PORTSDIR}/net/py-twistedPair
runner_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/runner/__init__.py:${PORTSDIR}/devel/py-twistedRunner
web2_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:${PORTSDIR}/www/py-twistedWeb2
web_DEPENDS= ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
diff --git a/devel/py-twisted/Makefile b/devel/py-twisted/Makefile
index 38a0a1fbf73f..160ad83f2d61 100644
--- a/devel/py-twisted/Makefile
+++ b/devel/py-twisted/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= twisted
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= devel net python
MASTER_SITES= # empty
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
@@ -15,23 +15,27 @@ DISTFILES= # none
MAINTAINER= python@FreeBSD.org
COMMENT= Metaport of Twisted, an event-driven networking engine
+RUN_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
+
NO_BUILD= yes
USE_PYTHON= yes
PYDISTUTILS_NOEGGINFO= yes
WRKSRC= ${WRKDIR}/Twisted-${PORTVERSION}
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-
OPTIONS= CONCH "SSH and SFTP protocol" on \
LORE "Documentation generator" on \
MAIL "SMTP, IMAP and POP protocol" on \
NAMES "DNS protocol" on \
+ PAIR "Twisted Pair can do low level TCP work" on \
NEWS "NNTP protocol" on \
RUNNER "Process management" on \
WEB "HTTP protocol" on \
WORDS "Chat and Instant Messaging" on
+# bypass infrastructure bug
+OPTIONSFILE= ${PORT_DBDIR}/py-${PORTNAME}/options
+
do-install:
${DO_NADA}
@@ -41,10 +45,6 @@ do-install:
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/conch/__init__.py:${PORTSDIR}/security/py-twistedConch
.endif
-.if !defined(WITHOUT_FLOW)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/flow/__init__.py:${PORTSDIR}/devel/py-twistedFlow
-.endif
-
.if !defined(WITHOUT_MAIL)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/mail/__init__.py:${PORTSDIR}/mail/py-twistedMail
.endif
@@ -73,10 +73,6 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/lore/__init__.py:${PORTSDIR}/textproc
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/web/__init__.py:${PORTSDIR}/www/py-twistedWeb
.endif
-.if !defined(WITHOUT_WEB2)
-RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/web2/__init__.py:${PORTSDIR}/www/py-twistedWeb2
-.endif
-
.if !defined(WITHOUT_WORDS)
RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/twisted/words/__init__.py:${PORTSDIR}/net-im/py-twistedWords
.endif
diff --git a/devel/py-twistedCore/Makefile b/devel/py-twistedCore/Makefile
index 886b8de0c7c1..1096308c06bd 100644
--- a/devel/py-twistedCore/Makefile
+++ b/devel/py-twistedCore/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedCore
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= devel net python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Core/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Core/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedCore-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= An asynchronous networking framework for Python - Core module
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}zopeInterface>=3.3.0_1:${PORTSDIR}/devel/py-zopeInterface
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
# - Note that Twisted ships with some graphical examples and clients that
# require PyGNOME to run. These are not central to the funcitoning of
@@ -35,7 +38,7 @@ post-install:
@${CHMOD} -R ${SHAREMODE} ${PYTHONPREFIX_SITELIBDIR}/twisted/
@${CHMOD} -R a+X ${PYTHONPREFIX_SITELIBDIR}/twisted/
.for i in ${MAN1}
- ${INSTALL_MAN} ${WRKSRC}/doc/man/${i} ${PREFIX}/man/man1/
+ ${INSTALL_MAN} ${WRKSRC}/doc/man/${i} ${MANPREFIX}/man/man1/
.endfor
.include <bsd.port.mk>
diff --git a/devel/py-twistedCore/distinfo b/devel/py-twistedCore/distinfo
index 734c420e9616..c1aeac846695 100644
--- a/devel/py-twistedCore/distinfo
+++ b/devel/py-twistedCore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedCore-10.1.0.tar.bz2) = 0df2eae62d85432e52c6bd2605b3998ef83b7b84f2bcb14e1ef5510187e76089
-SIZE (TwistedCore-10.1.0.tar.bz2) = 1338502
+SHA256 (TwistedCore-11.0.0.tar.bz2) = 46ea3d9390ec94a3234589544fc154c48fb5714121362a582db62cd873133f2f
+SIZE (TwistedCore-11.0.0.tar.bz2) = 1396224
diff --git a/devel/py-twistedCore/pkg-plist b/devel/py-twistedCore/pkg-plist
index 26ca5ef1ecfb..40e00a0fa5f6 100644
--- a/devel/py-twistedCore/pkg-plist
+++ b/devel/py-twistedCore/pkg-plist
@@ -30,6 +30,12 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/application/strports.py
%%PYTHON_SITELIBDIR%%/twisted/application/strports.pyc
%%PYTHON_SITELIBDIR%%/twisted/application/strports.pyo
+%%PYTHON_SITELIBDIR%%/twisted/application/test/__init__.py
+%%PYTHON_SITELIBDIR%%/twisted/application/test/__init__.pyc
+%%PYTHON_SITELIBDIR%%/twisted/application/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/application/test/test_internet.py
+%%PYTHON_SITELIBDIR%%/twisted/application/test/test_internet.pyc
+%%PYTHON_SITELIBDIR%%/twisted/application/test/test_internet.pyo
%%PYTHON_SITELIBDIR%%/twisted/copyright.py
%%PYTHON_SITELIBDIR%%/twisted/copyright.pyc
%%PYTHON_SITELIBDIR%%/twisted/copyright.pyo
@@ -57,9 +63,6 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/cred/strcred.py
%%PYTHON_SITELIBDIR%%/twisted/cred/strcred.pyc
%%PYTHON_SITELIBDIR%%/twisted/cred/strcred.pyo
-%%PYTHON_SITELIBDIR%%/twisted/cred/util.py
-%%PYTHON_SITELIBDIR%%/twisted/cred/util.pyc
-%%PYTHON_SITELIBDIR%%/twisted/cred/util.pyo
%%PYTHON_SITELIBDIR%%/twisted/enterprise/__init__.py
%%PYTHON_SITELIBDIR%%/twisted/enterprise/__init__.pyc
%%PYTHON_SITELIBDIR%%/twisted/enterprise/__init__.pyo
@@ -125,13 +128,6 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/internet/cfreactor.py
%%PYTHON_SITELIBDIR%%/twisted/internet/cfreactor.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/cfreactor.pyo
-%%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport/cfdate.pxi
-%%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport/cfdecl.pxi
-%%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport/cfrunloop.pxi
-%%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport/cfsocket.pxi
-%%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport/cfsupport.c
-%%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport/cfsupport.pyx
-%%PYTHON_SITELIBDIR%%/twisted/internet/cfsupport/python.pxi
%%PYTHON_SITELIBDIR%%/twisted/internet/default.py
%%PYTHON_SITELIBDIR%%/twisted/internet/default.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/default.pyo
@@ -247,6 +243,13 @@ 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/fake_CAs/not-a-certificate
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/fake_CAs/thing1.pem
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/fake_CAs/thing2-duplicate.pem
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/fake_CAs/thing2.pem
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/fakeendpoint.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/fakeendpoint.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/fakeendpoint.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
@@ -286,12 +289,18 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.py
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_iocp.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_main.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_main.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_main.pyo
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_pollingfile.py
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_pollingfile.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_pollingfile.pyo
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixbase.py
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixbase.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixbase.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixprocess.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixprocess.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_posixprocess.pyo
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.py
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_process.pyo
@@ -316,9 +325,15 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tls.py
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tls.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_tls.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_udp.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_udp.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_udp.pyo
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_unix.py
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_unix.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_unix.pyo
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_win32events.py
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_win32events.pyc
+%%PYTHON_SITELIBDIR%%/twisted/internet/test/test_win32events.pyo
%%PYTHON_SITELIBDIR%%/twisted/internet/threads.py
%%PYTHON_SITELIBDIR%%/twisted/internet/threads.pyc
%%PYTHON_SITELIBDIR%%/twisted/internet/threads.pyo
@@ -455,8 +470,6 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/protocols/__init__.py
%%PYTHON_SITELIBDIR%%/twisted/protocols/__init__.pyc
%%PYTHON_SITELIBDIR%%/twisted/protocols/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/protocols/_c_urlarg.c
-%%PYTHON_SITELIBDIR%%/twisted/protocols/_c_urlarg.so
%%PYTHON_SITELIBDIR%%/twisted/protocols/amp.py
%%PYTHON_SITELIBDIR%%/twisted/protocols/amp.pyc
%%PYTHON_SITELIBDIR%%/twisted/protocols/amp.pyo
@@ -570,9 +583,6 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/python/dist.py
%%PYTHON_SITELIBDIR%%/twisted/python/dist.pyc
%%PYTHON_SITELIBDIR%%/twisted/python/dist.pyo
-%%PYTHON_SITELIBDIR%%/twisted/python/dxprofile.py
-%%PYTHON_SITELIBDIR%%/twisted/python/dxprofile.pyc
-%%PYTHON_SITELIBDIR%%/twisted/python/dxprofile.pyo
%%PYTHON_SITELIBDIR%%/twisted/python/failure.py
%%PYTHON_SITELIBDIR%%/twisted/python/failure.pyc
%%PYTHON_SITELIBDIR%%/twisted/python/failure.pyo
@@ -699,9 +709,6 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/python/threadpool.py
%%PYTHON_SITELIBDIR%%/twisted/python/threadpool.pyc
%%PYTHON_SITELIBDIR%%/twisted/python/threadpool.pyo
-%%PYTHON_SITELIBDIR%%/twisted/python/timeoutqueue.py
-%%PYTHON_SITELIBDIR%%/twisted/python/timeoutqueue.pyc
-%%PYTHON_SITELIBDIR%%/twisted/python/timeoutqueue.pyo
%%PYTHON_SITELIBDIR%%/twisted/python/urlpath.py
%%PYTHON_SITELIBDIR%%/twisted/python/urlpath.pyc
%%PYTHON_SITELIBDIR%%/twisted/python/urlpath.pyo
@@ -1002,9 +1009,6 @@ bin/twistd
%%PYTHON_SITELIBDIR%%/twisted/test/test_explorer.py
%%PYTHON_SITELIBDIR%%/twisted/test/test_explorer.pyc
%%PYTHON_SITELIBDIR%%/twisted/test/test_explorer.pyo
-%%PYTHON_SITELIBDIR%%/twisted/test/test_extensions.py
-%%PYTHON_SITELIBDIR%%/twisted/test/test_extensions.pyc
-%%PYTHON_SITELIBDIR%%/twisted/test/test_extensions.pyo
%%PYTHON_SITELIBDIR%%/twisted/test/test_factories.py
%%PYTHON_SITELIBDIR%%/twisted/test/test_factories.pyc
%%PYTHON_SITELIBDIR%%/twisted/test/test_factories.pyo
@@ -1182,9 +1186,6 @@ bin/twistd
%%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
%%PYTHON_SITELIBDIR%%/twisted/test/test_tpfile.py
%%PYTHON_SITELIBDIR%%/twisted/test/test_tpfile.pyc
%%PYTHON_SITELIBDIR%%/twisted/test/test_tpfile.pyo
@@ -1345,12 +1346,13 @@ bin/twistd
@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole/ui/test
@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole/ui
@dirrm %%PYTHON_SITELIBDIR%%/twisted/manhole
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/internet/test/fake_CAs
@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/test
@dirrm %%PYTHON_SITELIBDIR%%/twisted/application
@dirrm %%PYTHON_SITELIBDIR%%/twisted
diff --git a/devel/py-twistedRunner/Makefile b/devel/py-twistedRunner/Makefile
index d6a278aa3532..d904beeab2dc 100644
--- a/devel/py-twistedRunner/Makefile
+++ b/devel/py-twistedRunner/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedRunner
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= devel net python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Runner/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Runner/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedRunner-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= Runner has process management, including an inetd replacement
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/devel/py-twistedRunner/distinfo b/devel/py-twistedRunner/distinfo
index 8496f97a4c34..9773b3de8907 100644
--- a/devel/py-twistedRunner/distinfo
+++ b/devel/py-twistedRunner/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedRunner-10.1.0.tar.bz2) = 53928c29c6990f4d1073627569b77f1eca87ef5b0d5c562d0d8a893d2d4557e3
-SIZE (TwistedRunner-10.1.0.tar.bz2) = 13217
+SHA256 (TwistedRunner-11.0.0.tar.bz2) = c0f62b4960b9122e898d568cad6afde6ec9c049373e5b1b764f24533582fe3f5
+SIZE (TwistedRunner-11.0.0.tar.bz2) = 13267
diff --git a/dns/py-twistedNames/Makefile b/dns/py-twistedNames/Makefile
index 32695876df95..6d52b8b92c02 100644
--- a/dns/py-twistedNames/Makefile
+++ b/dns/py-twistedNames/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedNames
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= dns devel python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Names/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Names/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedNames-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= A DNS protocol implementation with client and server
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/dns/py-twistedNames/distinfo b/dns/py-twistedNames/distinfo
index 6188df8b0dc9..efd114c5ba95 100644
--- a/dns/py-twistedNames/distinfo
+++ b/dns/py-twistedNames/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedNames-10.1.0.tar.bz2) = b6ec36bb24be8461f279f927d8d0545d9964f5f058e5ddaebe4048067dce8f16
-SIZE (TwistedNames-10.1.0.tar.bz2) = 50760
+SHA256 (TwistedNames-11.0.0.tar.bz2) = 738f3e4fa56d2ebeddf0f3774419fbe3de9067424eb928ce234bc178a146d496
+SIZE (TwistedNames-11.0.0.tar.bz2) = 52156
diff --git a/mail/py-twistedMail/Makefile b/mail/py-twistedMail/Makefile
index 47142f438553..a9fe1449969c 100644
--- a/mail/py-twistedMail/Makefile
+++ b/mail/py-twistedMail/Makefile
@@ -6,18 +6,21 @@
#
PORTNAME= twistedMail
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= mail devel python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Mail/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Mail/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedMail-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= An SMTP, IMAP and POP protocol implementation with clients and servers
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore \
${PYTHON_SITELIBDIR}/twisted/names:${PORTSDIR}/dns/py-twistedNames
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/mail/py-twistedMail/distinfo b/mail/py-twistedMail/distinfo
index 414884b51e69..c73b7fe34cfa 100644
--- a/mail/py-twistedMail/distinfo
+++ b/mail/py-twistedMail/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedMail-10.1.0.tar.bz2) = 91abd6c00e8ea875a2fed76322baba9542ea204f59c51c8773d00440725b7f48
-SIZE (TwistedMail-10.1.0.tar.bz2) = 143736
+SHA256 (TwistedMail-11.0.0.tar.bz2) = 0f876dd80602294635cf8092260dcdc61f7dec177d75946ed21c557f534c7a8a
+SIZE (TwistedMail-11.0.0.tar.bz2) = 145928
diff --git a/net-im/py-twistedWords/Makefile b/net-im/py-twistedWords/Makefile
index 952a8bee9a31..de2b4fcf0bc0 100644
--- a/net-im/py-twistedWords/Makefile
+++ b/net-im/py-twistedWords/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedWords
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= net-im devel python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Words/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Words/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedWords-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= Twisted Words has more chat than you can handle
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/net-im/py-twistedWords/distinfo b/net-im/py-twistedWords/distinfo
index 9c3d321a1a2e..09869a613cd6 100644
--- a/net-im/py-twistedWords/distinfo
+++ b/net-im/py-twistedWords/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedWords-10.1.0.tar.bz2) = 93a1a21d8cffe885f13e508204bf7c30e09a6c22001c944453eab44bbef2e646
-SIZE (TwistedWords-10.1.0.tar.bz2) = 180419
+SHA256 (TwistedWords-11.0.0.tar.bz2) = 574ffbf706be8cc4281f2d64e006d5efa35fdaa611895494453ec9fb80cea8dd
+SIZE (TwistedWords-11.0.0.tar.bz2) = 164453
diff --git a/net-im/py-twistedWords/pkg-plist b/net-im/py-twistedWords/pkg-plist
index 7fbd977fa9a4..758995878c64 100644
--- a/net-im/py-twistedWords/pkg-plist
+++ b/net-im/py-twistedWords/pkg-plist
@@ -35,15 +35,6 @@
%%PYTHON_SITELIBDIR%%/twisted/words/im/pbsupport.py
%%PYTHON_SITELIBDIR%%/twisted/words/im/pbsupport.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/im/pbsupport.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/proxyui.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/proxyui.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/proxyui.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/tap.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/tap.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/tap.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/im/tocsupport.py
-%%PYTHON_SITELIBDIR%%/twisted/words/im/tocsupport.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/im/tocsupport.pyo
%%PYTHON_SITELIBDIR%%/twisted/words/iwords.py
%%PYTHON_SITELIBDIR%%/twisted/words/iwords.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/iwords.pyo
@@ -92,9 +83,6 @@
%%PYTHON_SITELIBDIR%%/twisted/words/protocols/oscar.py
%%PYTHON_SITELIBDIR%%/twisted/words/protocols/oscar.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/protocols/oscar.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/protocols/toc.py
-%%PYTHON_SITELIBDIR%%/twisted/words/protocols/toc.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/protocols/toc.pyo
%%PYTHON_SITELIBDIR%%/twisted/words/service.py
%%PYTHON_SITELIBDIR%%/twisted/words/service.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/service.pyo
@@ -119,6 +107,9 @@
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc_service.py
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc_service.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_irc_service.pyo
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_ircsupport.py
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_ircsupport.pyc
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_ircsupport.pyo
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberclient.py
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberclient.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberclient.pyo
@@ -131,6 +122,9 @@
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberjid.py
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberjid.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberjid.pyo
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberjstrports.py
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberjstrports.pyc
+%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabberjstrports.pyo
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabbersasl.py
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabbersasl.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_jabbersasl.pyo
@@ -155,9 +149,6 @@
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_tap.py
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_tap.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_tap.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/test/test_toc.py
-%%PYTHON_SITELIBDIR%%/twisted/words/test/test_toc.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/test/test_toc.pyo
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_xishutil.py
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_xishutil.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_xishutil.pyo
@@ -170,9 +161,6 @@
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_xpath.py
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_xpath.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/test/test_xpath.pyo
-%%PYTHON_SITELIBDIR%%/twisted/words/toctap.py
-%%PYTHON_SITELIBDIR%%/twisted/words/toctap.pyc
-%%PYTHON_SITELIBDIR%%/twisted/words/toctap.pyo
%%PYTHON_SITELIBDIR%%/twisted/words/xish/__init__.py
%%PYTHON_SITELIBDIR%%/twisted/words/xish/__init__.pyc
%%PYTHON_SITELIBDIR%%/twisted/words/xish/__init__.pyo
@@ -201,3 +189,4 @@
@dirrm %%PYTHON_SITELIBDIR%%/twisted/words/protocols
@dirrm %%PYTHON_SITELIBDIR%%/twisted/words/im
@dirrm %%PYTHON_SITELIBDIR%%/twisted/words
+@dirrmtry %%PYTHON_SITELIBDIR%%/twisted/plugins
diff --git a/net/py-twistedPair/Makefile b/net/py-twistedPair/Makefile
index 891e99ab424f..77bd372ae401 100644
--- a/net/py-twistedPair/Makefile
+++ b/net/py-twistedPair/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedPair
-PORTVERSION= 9.0.0
+PORTVERSION= 11.0.0
CATEGORIES= net devel python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Pair/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Pair/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedPair-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= Twisted Pair can do low level TCP work
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
WRKSRC= ${WRKDIR}/TwistedPair-${PORTVERSION}
diff --git a/net/py-twistedPair/distinfo b/net/py-twistedPair/distinfo
index 782f61dba3e4..3b5707046061 100644
--- a/net/py-twistedPair/distinfo
+++ b/net/py-twistedPair/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedPair-9.0.0.tar.bz2) = 486a8e30ec0a74a046a80366987030ae0fe0e4f228887b6ec3ecfbc69977d0e0
-SIZE (TwistedPair-9.0.0.tar.bz2) = 8972
+SHA256 (TwistedPair-11.0.0.tar.bz2) = 3e6bc6a11385504759ea0897a10d27bbce431b426f60233d1b36d864d420284f
+SIZE (TwistedPair-11.0.0.tar.bz2) = 9133
diff --git a/news/py-twistedNews/Makefile b/news/py-twistedNews/Makefile
index 961ded28a7cb..57689354acbe 100644
--- a/news/py-twistedNews/Makefile
+++ b/news/py-twistedNews/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedNews
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= news devel python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/News/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/News/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedNews-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= An NNTP protocol implementation with client and server
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/news/py-twistedNews/distinfo b/news/py-twistedNews/distinfo
index c19358e33eed..cab4c196bb1b 100644
--- a/news/py-twistedNews/distinfo
+++ b/news/py-twistedNews/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedNews-10.1.0.tar.bz2) = f72e92673562ab58caed226e849b39d06465a2743733daa43fc87caa2afe3f58
-SIZE (TwistedNews-10.1.0.tar.bz2) = 17139
+SHA256 (TwistedNews-11.0.0.tar.bz2) = 8a39fd6c38f89029b6028c15ebc7e29091b62a565b2e52e3ddb4e36d89773cc4
+SIZE (TwistedNews-11.0.0.tar.bz2) = 19289
diff --git a/news/py-twistedNews/pkg-plist b/news/py-twistedNews/pkg-plist
index 961003542ec5..e73aa40d8d2c 100644
--- a/news/py-twistedNews/pkg-plist
+++ b/news/py-twistedNews/pkg-plist
@@ -19,6 +19,9 @@
%%PYTHON_SITELIBDIR%%/twisted/news/test/__init__.py
%%PYTHON_SITELIBDIR%%/twisted/news/test/__init__.pyc
%%PYTHON_SITELIBDIR%%/twisted/news/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/twisted/news/test/test_database.py
+%%PYTHON_SITELIBDIR%%/twisted/news/test/test_database.pyc
+%%PYTHON_SITELIBDIR%%/twisted/news/test/test_database.pyo
%%PYTHON_SITELIBDIR%%/twisted/news/test/test_news.py
%%PYTHON_SITELIBDIR%%/twisted/news/test/test_news.pyc
%%PYTHON_SITELIBDIR%%/twisted/news/test/test_news.pyo
diff --git a/security/py-twistedConch/Makefile b/security/py-twistedConch/Makefile
index d0c67352c28c..40aa5cea61f5 100644
--- a/security/py-twistedConch/Makefile
+++ b/security/py-twistedConch/Makefile
@@ -6,15 +6,18 @@
#
PORTNAME= twistedConch
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= security devel python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Conch/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Conch/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedConch-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= An SSH and SFTP protocol implementation with clients and servers
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
RUN_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore \
${PYTHON_PKGNAMEPREFIX}asn1>=0.0.9a:${PORTSDIR}/devel/py-asn1
diff --git a/security/py-twistedConch/distinfo b/security/py-twistedConch/distinfo
index e82c7b96ae75..94ca9c56a261 100644
--- a/security/py-twistedConch/distinfo
+++ b/security/py-twistedConch/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedConch-10.1.0.tar.bz2) = 74ab7d71e28b74c072f7a59adc1239a9d4b764c44c76bf15984eb5776eb0dea4
-SIZE (TwistedConch-10.1.0.tar.bz2) = 205593
+SHA256 (TwistedConch-11.0.0.tar.bz2) = a3bd009928b8388928b24fbbb29e1dae6ea092f3a378001f426c6f6302f25504
+SIZE (TwistedConch-11.0.0.tar.bz2) = 209673
diff --git a/textproc/py-twistedLore/Makefile b/textproc/py-twistedLore/Makefile
index 30fa539b0c8a..717e5f0bc49a 100644
--- a/textproc/py-twistedLore/Makefile
+++ b/textproc/py-twistedLore/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedLore
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= textproc python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Lore/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Lore/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedLore-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= Documentation generator with HTML and LaTeX support
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/textproc/py-twistedLore/distinfo b/textproc/py-twistedLore/distinfo
index ac491c0e2bbe..6f870d170552 100644
--- a/textproc/py-twistedLore/distinfo
+++ b/textproc/py-twistedLore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedLore-10.1.0.tar.bz2) = f80a3bb097d8f71db52a90c14a997a4f18a462b0158b2d1007af09ee834c13d8
-SIZE (TwistedLore-10.1.0.tar.bz2) = 87227
+SHA256 (TwistedLore-11.0.0.tar.bz2) = d9b16d5fe4e20cb2b4259386ed9871824d94dcb9f0b6abe4c2887a366b74c36e
+SIZE (TwistedLore-11.0.0.tar.bz2) = 87252
diff --git a/www/py-twistedWeb/Makefile b/www/py-twistedWeb/Makefile
index 337447d25ff4..89a869b15b96 100644
--- a/www/py-twistedWeb/Makefile
+++ b/www/py-twistedWeb/Makefile
@@ -6,17 +6,20 @@
#
PORTNAME= twistedWeb
-PORTVERSION= 10.1.0
+PORTVERSION= 11.0.0
CATEGORIES= www devel python
-MASTER_SITES= http://tmrc.mit.edu/mirror/twisted/Web/${PORTVERSION:R}/
+MASTER_SITES= http://twistedmatrix.com/Releases/Web/${PORTVERSION:R}/
PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
DISTNAME= TwistedWeb-${PORTVERSION}
MAINTAINER= neal@nelson.name
COMMENT= An HTTP protocol implementation together with clients and servers
+LICENSE= MIT
+LICENSE_FILE= ${WRKSRC}/LICENSE
+
BUILD_DEPENDS= ${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
-RUN_DEPENDS= ${BUILD_DEPENDS}
+RUN_DEPENDS:= ${BUILD_DEPENDS}
USE_BZIP2= yes
USE_PYTHON= yes
diff --git a/www/py-twistedWeb/distinfo b/www/py-twistedWeb/distinfo
index 87199d82dbc9..b967575a605c 100644
--- a/www/py-twistedWeb/distinfo
+++ b/www/py-twistedWeb/distinfo
@@ -1,2 +1,2 @@
-SHA256 (TwistedWeb-10.1.0.tar.bz2) = 44f62848ce29aa163604f5ff7f2ab547d2684018f5b7228999730f6d426133be
-SIZE (TwistedWeb-10.1.0.tar.bz2) = 332994
+SHA256 (TwistedWeb-11.0.0.tar.bz2) = 864a08aa283ba690f35cfbc18ba939a8b336bc6ad452a2a855bdf1b388aaac53
+SIZE (TwistedWeb-11.0.0.tar.bz2) = 358074
diff --git a/www/py-twistedWeb/pkg-plist b/www/py-twistedWeb/pkg-plist
index 8a4e67b243a9..cd31c71d882f 100644
--- a/www/py-twistedWeb/pkg-plist
+++ b/www/py-twistedWeb/pkg-plist
@@ -16,9 +16,18 @@
%%PYTHON_SITELIBDIR%%/twisted/web/_auth/wrapper.py
%%PYTHON_SITELIBDIR%%/twisted/web/_auth/wrapper.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/_auth/wrapper.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/_element.py
+%%PYTHON_SITELIBDIR%%/twisted/web/_element.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/_element.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/_flatten.py
+%%PYTHON_SITELIBDIR%%/twisted/web/_flatten.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/_flatten.pyo
%%PYTHON_SITELIBDIR%%/twisted/web/_newclient.py
%%PYTHON_SITELIBDIR%%/twisted/web/_newclient.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/_newclient.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/_stan.py
+%%PYTHON_SITELIBDIR%%/twisted/web/_stan.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/_stan.pyo
%%PYTHON_SITELIBDIR%%/twisted/web/_version.py
%%PYTHON_SITELIBDIR%%/twisted/web/_version.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/_version.pyo
@@ -85,6 +94,9 @@
%%PYTHON_SITELIBDIR%%/twisted/web/tap.py
%%PYTHON_SITELIBDIR%%/twisted/web/tap.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/tap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/template.py
+%%PYTHON_SITELIBDIR%%/twisted/web/template.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/template.pyo
%%PYTHON_SITELIBDIR%%/twisted/web/test/__init__.py
%%PYTHON_SITELIBDIR%%/twisted/web/test/__init__.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/test/__init__.pyo
@@ -103,6 +115,9 @@
%%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_flatten.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_flatten.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_flatten.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
@@ -127,12 +142,18 @@
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_soap.py
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_soap.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_soap.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_stan.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_stan.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_stan.pyo
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_static.py
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_static.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_static.pyo
%%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_template.py
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_template.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web/test/test_template.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
@@ -154,9 +175,6 @@
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_xmlrpc.py
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_xmlrpc.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/test/test_xmlrpc.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web/trp.py
-%%PYTHON_SITELIBDIR%%/twisted/web/trp.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web/trp.pyo
%%PYTHON_SITELIBDIR%%/twisted/web/twcgi.py
%%PYTHON_SITELIBDIR%%/twisted/web/twcgi.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/twcgi.pyo
@@ -172,6 +190,7 @@
%%PYTHON_SITELIBDIR%%/twisted/web/xmlrpc.py
%%PYTHON_SITELIBDIR%%/twisted/web/xmlrpc.pyc
%%PYTHON_SITELIBDIR%%/twisted/web/xmlrpc.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/_auth
@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/web/_auth
+@dirrm %%PYTHON_SITELIBDIR%%/twisted/web
+@dirrmtry %%PYTHON_SITELIBDIR%%/twisted/plugins