4 files changed, 58 insertions, 29 deletions

diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index cf09190b968e..37ebb5c28444 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	tornado
-PORTVERSION=	2.4.1
+PORTVERSION=	3.0.1
 CATEGORIES=	www python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -11,17 +11,21 @@ COMMENT=	Python Web Server from FriendFeed
 
 LICENSE=	AL2
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl
-
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 GH_TAGNAME=	v${PORTVERSION}
-GH_COMMIT=	50af6cc
+GH_COMMIT=	31cef1a
 
-USE_PYTHON=		2.5-2.7
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
 
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 300
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl
+.endif
+
 regression-test: build
 	@cd ${WRKSRC} && ${PYTHON_CMD} -m tornado.test.runtests
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/www/py-tornado/distinfo b/www/py-tornado/distinfo
index b30ca2a0c8af..bd343fcbf639 100644
--- a/www/py-tornado/distinfo
+++ b/www/py-tornado/distinfo
@@ -1,2 +1,2 @@
-SHA256 (tornado-2.4.1.tar.gz) = 0866e991517516049be98d9e865f341ad677789b0b488773dee24c2d495cc1c1
-SIZE (tornado-2.4.1.tar.gz) = 429432
+SHA256 (tornado-3.0.1.tar.gz) = 918844fb8e9bd285cf87798842adef3ccf6182e3b935ca4395db2051be7e59f5
+SIZE (tornado-3.0.1.tar.gz) = 420991
diff --git a/www/py-tornado/files/patch-setup.py b/www/py-tornado/files/patch-setup.py
index 13e6e0ae6aba..e727a5331d5c 100644
--- a/www/py-tornado/files/patch-setup.py
+++ b/www/py-tornado/files/patch-setup.py
@@ -1,21 +1,12 @@
---- ./setup.py.orig	2012-09-04 15:09:29.000000000 +1000
-+++ ./setup.py	2012-11-19 19:24:33.000000000 +1100
-@@ -25,6 +25,8 @@
- 
- kwargs = {}
- 
-+kwargs["zip_safe"] = False
-+
- # Build the epoll extension for Linux systems with Python < 2.6
- extensions = []
- major, minor = sys.version_info[:2]
-@@ -54,9 +56,6 @@
-             "test.key",
-             "static/robots.txt",
-             "templates/utf8.html",
+--- setup.py.orig	2013-04-29 08:46:17.852783104 +0200
++++ setup.py	2013-04-29 08:46:30.135662912 +0200
+@@ -41,9 +41,6 @@
+         # in the sdist tarball)
+         "tornado.test": [
+             "README",
 -            "csv_translations/fr_FR.csv",
 -            "gettext_translations/fr_FR/LC_MESSAGES/tornado_test.mo",
 -            "gettext_translations/fr_FR/LC_MESSAGES/tornado_test.po",
-             ],
-         },
-     ext_modules = extensions,
+             "options_test.cfg",
+             "static/robots.txt",
+             "templates/utf8.html",
diff --git a/www/py-tornado/pkg-plist b/www/py-tornado/pkg-plist
index 4b70fee5c94d..0fac8bfd1e2c 100644
--- a/www/py-tornado/pkg-plist
+++ b/www/py-tornado/pkg-plist
@@ -13,12 +13,12 @@
 %%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/concurrent.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/concurrent.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/concurrent.pyo
 %%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
@@ -43,6 +43,9 @@
 %%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/log.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/log.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/log.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/netutil.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/netutil.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/netutil.pyo
@@ -55,15 +58,27 @@
 %%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/caresresolver.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/caresresolver.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/caresresolver.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/common.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/common.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/common.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/epoll.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/epoll.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/epoll.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/kqueue.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/kqueue.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/kqueue.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/select.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/select.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/platform/select.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
@@ -79,6 +94,9 @@
 %%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/tcpserver.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/tcpserver.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/tcpserver.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/template.pyo
@@ -89,6 +107,9 @@
 %%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/concurrent_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/concurrent_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/concurrent_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
@@ -119,6 +140,13 @@
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/locale_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/locale_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/locale_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/log_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/log_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/log_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/netutil_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/netutil_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/netutil_test.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/options_test.cfg
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/options_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/options_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/options_test.pyo
@@ -147,12 +175,18 @@
 %%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/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/util_test.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/util_test.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/util_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/test/websocket_test.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/websocket_test.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/test/websocket_test.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