3 files changed, 20 insertions, 160 deletions

diff --git a/www/py-twistedWeb2/Makefile b/www/py-twistedWeb2/Makefile
index 062995290548..d4b737e419fc 100644
--- a/www/py-twistedWeb2/Makefile
+++ b/www/py-twistedWeb2/Makefile
@@ -5,13 +5,13 @@
 # $FreeBSD$
 
 PORTNAME=	twistedWeb2
-PORTVERSION=	0.2.0
+PORTVERSION=	8.1.0
 CATEGORIES=	www devel python
-MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Web2/
+MASTER_SITES=	http://tmrc.mit.edu/mirror/twisted/Web2/${PORTVERSION:R}/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	TwistedWeb2-${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	python@FreeBSD.org
 COMMENT=	The next generation Web Server Framework built with Twisted
 
 BUILD_DEPENDS=	${PYTHON_SITELIBDIR}/twisted:${PORTSDIR}/devel/py-twistedCore
@@ -20,7 +20,7 @@ RUN_DEPENDS=	${BUILD_DEPENDS}
 WRKSRC=		${WRKDIR}/TwistedWeb2-${PORTVERSION}
 
 USE_BZIP2=	yes
-USE_PYTHON=	2.3+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_PKGNAME=	Twisted_Web2
 
diff --git a/www/py-twistedWeb2/distinfo b/www/py-twistedWeb2/distinfo
index c79d47e1eef7..39b729774f8d 100644
--- a/www/py-twistedWeb2/distinfo
+++ b/www/py-twistedWeb2/distinfo
@@ -1,3 +1,3 @@
-MD5 (TwistedWeb2-0.2.0.tar.bz2) = 7d6dea006d7f1e004df9f6aad730fbee
-SHA256 (TwistedWeb2-0.2.0.tar.bz2) = aedfae893e5fd9561b1855734eb4bc6464df4d6d714794d3747bae3c02ae498a
-SIZE (TwistedWeb2-0.2.0.tar.bz2) = 157790
+MD5 (TwistedWeb2-8.1.0.tar.bz2) = e34b48edf6fef075bd41ddbd215aed32
+SHA256 (TwistedWeb2-8.1.0.tar.bz2) = 0f016d498b1db0216861e9b8fbf8ad49b5b587fa64a18f1640095c1e4f93e391
+SIZE (TwistedWeb2-8.1.0.tar.bz2) = 133921
diff --git a/www/py-twistedWeb2/pkg-plist b/www/py-twistedWeb2/pkg-plist
index 6be65691be95..4ab505516b29 100644
--- a/www/py-twistedWeb2/pkg-plist
+++ b/www/py-twistedWeb2/pkg-plist
@@ -44,143 +44,12 @@
 %%PYTHON_SITELIBDIR%%/twisted/web2/client/http.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/client/http.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/client/http.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web2/client/interfaces.py
+%%PYTHON_SITELIBDIR%%/twisted/web2/client/interfaces.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web2/client/interfaces.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/compat.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/compat.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/compat.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/__init__.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/__init__.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/acl.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/acl.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/acl.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/davxml.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/davxml.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/davxml.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/__init__.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/__init__.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/base.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/base.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/base.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/parser.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/parser.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/parser.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc2518.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc2518.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc2518.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc3253.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc3253.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc3253.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc3744.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc3744.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/rfc3744.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/util.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/util.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/util.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/xmlext.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/xmlext.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/element/xmlext.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/fileop.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/fileop.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/fileop.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/http.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/http.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/http.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/idav.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/idav.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/idav.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/__init__.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/__init__.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/copymove.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/copymove.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/copymove.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/delete.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/delete.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/delete.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/lock.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/lock.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/lock.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/mkcol.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/mkcol.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/mkcol.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/propfind.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/propfind.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/propfind.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/proppatch.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/proppatch.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/proppatch.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/put.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/put.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/put.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/report.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/report.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/report.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/report_expand.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/report_expand.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/method/report_expand.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/noneprops.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/noneprops.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/noneprops.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/resource.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/resource.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/resource.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/static.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/static.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/static.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/TODO.txt
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/__init__.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/__init__.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml/PROPFIND_bad.xml
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml/PROPFIND_nonamespace.xml
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml/PROPFIND_request.xml
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml/PROPFIND_response.xml
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml/PROPPATCH_request.xml
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml/REPORT_request.xml
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml/REPORT_response.xml
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_copy.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_copy.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_copy.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_delete.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_delete.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_delete.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_lock.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_lock.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_lock.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_mkcol.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_mkcol.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_mkcol.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_move.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_move.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_move.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_options.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_options.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_options.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_prop.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_prop.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_prop.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_put.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_put.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_put.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_report.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_report.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_report.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_report_expand.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_report_expand.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_report_expand.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_util.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_util.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/test_util.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/util.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/util.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/util.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/util.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/util.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/util.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/xattrprops.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/xattrprops.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/dav/xattrprops.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/dirlist.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/dirlist.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/dirlist.pyo
@@ -196,6 +65,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web2/filter/gzip.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/filter/gzip.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/filter/gzip.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web2/filter/location.py
+%%PYTHON_SITELIBDIR%%/twisted/web2/filter/location.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web2/filter/location.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/filter/range.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/filter/range.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/filter/range.pyo
@@ -217,24 +89,12 @@
 %%PYTHON_SITELIBDIR%%/twisted/web2/proxy.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/proxy.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/proxy.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/requtil.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/requtil.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/requtil.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/resource.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/resource.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/resource.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/responsecode.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/responsecode.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/responsecode.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/script.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/script.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/script.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/scripts/__init__.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/scripts/__init__.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/scripts/__init__.pyo
-%%PYTHON_SITELIBDIR%%/twisted/web2/scripts/websetroot.py
-%%PYTHON_SITELIBDIR%%/twisted/web2/scripts/websetroot.pyc
-%%PYTHON_SITELIBDIR%%/twisted/web2/scripts/websetroot.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/server.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/server.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/server.pyo
@@ -264,6 +124,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_compat.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_compat.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_compat.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web2/test/test_fastcgi.py
+%%PYTHON_SITELIBDIR%%/twisted/web2/test/test_fastcgi.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web2/test/test_fastcgi.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_fileupload.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_fileupload.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_fileupload.pyo
@@ -282,6 +145,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_plugin.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_plugin.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_plugin.pyo
+%%PYTHON_SITELIBDIR%%/twisted/web2/test/test_resource.py
+%%PYTHON_SITELIBDIR%%/twisted/web2/test/test_resource.pyc
+%%PYTHON_SITELIBDIR%%/twisted/web2/test/test_resource.pyo
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_scgi.py
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_scgi.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/test/test_scgi.pyo
@@ -319,15 +185,9 @@
 %%PYTHON_SITELIBDIR%%/twisted/web2/xmlrpc.pyc
 %%PYTHON_SITELIBDIR%%/twisted/web2/xmlrpc.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/scripts
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/filter
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data/xml
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/dav/test/data
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/dav/test
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/dav/method
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/dav/element
-@dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/dav
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/client
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/channel
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/web2/auth
 @dirrm %%PYTHON_SITELIBDIR%%/twisted/web2
+@dirrmtry %%PYTHON_SITELIBDIR%%/twisted/plugins