3 files changed, 80 insertions, 18 deletions

diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index 6de0304f86ae..af71ea81c665 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	tornado
-PORTVERSION=	1.2.1
-PORTREVISION=	1
+PORTVERSION=	2.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP \
 		http://github.com/downloads/facebook/tornado/
@@ -20,7 +19,7 @@ LICENSE=	ASL
 
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	2.5-2.7
 USE_PYDISTUTILS=	easy_install
 
 FETCH_ARGS=	-pRr
diff --git a/www/py-tornado/distinfo b/www/py-tornado/distinfo
index eb65a0a9264e..cd2e861206e5 100644
--- a/www/py-tornado/distinfo
+++ b/www/py-tornado/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tornado-1.2.1.tar.gz) = a0cc7385f85061211816d3e0fa54b2bce30ff6338806f3167de3303ee01beee4
-SIZE (tornado-1.2.1.tar.gz) = 269248
+SHA256 (tornado-2.1.tar.gz) = 036b2987b96341f8d9075f72a171a27a59b403e2c385446696c7d1a11497f1ab
+SIZE (tornado-2.1.tar.gz) = 318159
diff --git a/www/py-tornado/pkg-plist b/www/py-tornado/pkg-plist
index 2dbbf2ff3ecc..d6e2c0a48664 100644
--- a/www/py-tornado/pkg-plist
+++ b/www/py-tornado/pkg-plist
@@ -12,12 +12,19 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/autoreload.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/autoreload.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/autoreload.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/ca-certificates.crt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/curl_httpclient.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/curl_httpclient.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/curl_httpclient.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/database.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/database.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/database.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/escape.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/escape.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/escape.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/gen.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/gen.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/gen.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpclient.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpclient.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpclient.pyo
@@ -36,35 +43,82 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/locale.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/locale.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/locale.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/netutil.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/netutil.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/netutil.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/options.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/options.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/options.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/s3server.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/s3server.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/s3server.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/stack_context.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/stack_context.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/stack_context.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/auto.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/auto.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/auto.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/interface.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/interface.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/interface.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/posix.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/posix.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/posix.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/twisted.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/twisted.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/twisted.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/windows.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/windows.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/windows.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/process.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/process.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/process.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/simple_httpclient.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/simple_httpclient.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/simple_httpclient.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/ca-certificates.crt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/stack_context.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/stack_context.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/stack_context.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/README
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/auth_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/auth_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/auth_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/curl_httpclient_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/curl_httpclient_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/curl_httpclient_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/escape_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/escape_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/escape_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/gen_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/gen_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/gen_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httpclient_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httpclient_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httpclient_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httpserver_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httpserver_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httpserver_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httputil_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httputil_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/httputil_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/import_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/import_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/import_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/ioloop_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/ioloop_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/ioloop_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/iostream_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/iostream_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/iostream_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/process_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/process_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/process_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/run_pyversion_tests.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/run_pyversion_tests.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/run_pyversion_tests.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/runtests.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/runtests.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/runtests.pyo
@@ -74,33 +128,42 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/stack_context_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/stack_context_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/stack_context_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/static/robots.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/template_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/template_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/template_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/test.crt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/test.key
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/testing_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/testing_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/testing_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/twisted_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/twisted_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/twisted_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/web_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/web_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/web_test.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/wsgi_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/wsgi_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/wsgi_test.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/testing.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/testing.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/testing.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/web.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/web.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/web.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/websocket.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/websocket.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/websocket.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/win32_support.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/win32_support.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/win32_support.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/wsgi.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/wsgi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/wsgi.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/static
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%