3 files changed, 72 insertions, 52 deletions

diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index d67a78687c64..bfc0b86280f0 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -6,19 +6,23 @@
 #
 
 PORTNAME=	tornado
-PORTVERSION=	0.2
+PORTVERSION=	1.0.1
 CATEGORIES=	www python
-MASTER_SITES=	http://www.tornadoweb.org/static/
+MASTER_SITES=	http://github.com/downloads/facebook/tornado/
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	python
 
 MAINTAINER=	khsing.cn@gmail.com
 COMMENT=	Python Web Server from FriendFeed
 
+LICENSE=	ASL
+
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl \
 		${PYTHON_PKGNAMEPREFIX}simplejson>0:${PORTSDIR}/devel/py-simplejson
 
 USE_PYTHON=	2.5+
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
+
+FETCH_ARGS=	-pRr
 
 .include <bsd.port.mk>
diff --git a/www/py-tornado/distinfo b/www/py-tornado/distinfo
index 82ec096e96c5..13ecf953e0d6 100644
--- a/www/py-tornado/distinfo
+++ b/www/py-tornado/distinfo
@@ -1,3 +1,3 @@
-MD5 (python/tornado-0.2.tar.gz) = 4704cbf8baab2562c1e648c76de87b60
-SHA256 (python/tornado-0.2.tar.gz) = 4cafe276892cf1f1b9758258a32e4c62939136c44bf696c6d39f91973440111f
-SIZE (python/tornado-0.2.tar.gz) = 200680
+MD5 (python/tornado-1.0.1.tar.gz) = fe0295f52668961a4ba664e2b8c358a7
+SHA256 (python/tornado-1.0.1.tar.gz) = 556bd8299dfc0b65312fa1f1ac6fcac25fc19851b859b9803ffe5ccdb1cee9cc
+SIZE (python/tornado-1.0.1.tar.gz) = 125634
diff --git a/www/py-tornado/pkg-plist b/www/py-tornado/pkg-plist
index a66bc14b1ee2..eaeabf019e4e 100644
--- a/www/py-tornado/pkg-plist
+++ b/www/py-tornado/pkg-plist
@@ -1,46 +1,62 @@
-%%PYTHON_SITELIBDIR%%/tornado/__init__.py
-%%PYTHON_SITELIBDIR%%/tornado/__init__.pyc
-%%PYTHON_SITELIBDIR%%/tornado/__init__.pyo
-%%PYTHON_SITELIBDIR%%/tornado/auth.py
-%%PYTHON_SITELIBDIR%%/tornado/auth.pyc
-%%PYTHON_SITELIBDIR%%/tornado/auth.pyo
-%%PYTHON_SITELIBDIR%%/tornado/autoreload.py
-%%PYTHON_SITELIBDIR%%/tornado/autoreload.pyc
-%%PYTHON_SITELIBDIR%%/tornado/autoreload.pyo
-%%PYTHON_SITELIBDIR%%/tornado/database.py
-%%PYTHON_SITELIBDIR%%/tornado/database.pyc
-%%PYTHON_SITELIBDIR%%/tornado/database.pyo
-%%PYTHON_SITELIBDIR%%/tornado/escape.py
-%%PYTHON_SITELIBDIR%%/tornado/escape.pyc
-%%PYTHON_SITELIBDIR%%/tornado/escape.pyo
-%%PYTHON_SITELIBDIR%%/tornado/httpclient.py
-%%PYTHON_SITELIBDIR%%/tornado/httpclient.pyc
-%%PYTHON_SITELIBDIR%%/tornado/httpclient.pyo
-%%PYTHON_SITELIBDIR%%/tornado/httpserver.py
-%%PYTHON_SITELIBDIR%%/tornado/httpserver.pyc
-%%PYTHON_SITELIBDIR%%/tornado/httpserver.pyo
-%%PYTHON_SITELIBDIR%%/tornado/ioloop.py
-%%PYTHON_SITELIBDIR%%/tornado/ioloop.pyc
-%%PYTHON_SITELIBDIR%%/tornado/ioloop.pyo
-%%PYTHON_SITELIBDIR%%/tornado/iostream.py
-%%PYTHON_SITELIBDIR%%/tornado/iostream.pyc
-%%PYTHON_SITELIBDIR%%/tornado/iostream.pyo
-%%PYTHON_SITELIBDIR%%/tornado/locale.py
-%%PYTHON_SITELIBDIR%%/tornado/locale.pyc
-%%PYTHON_SITELIBDIR%%/tornado/locale.pyo
-%%PYTHON_SITELIBDIR%%/tornado/options.py
-%%PYTHON_SITELIBDIR%%/tornado/options.pyc
-%%PYTHON_SITELIBDIR%%/tornado/options.pyo
-%%PYTHON_SITELIBDIR%%/tornado/s3server.py
-%%PYTHON_SITELIBDIR%%/tornado/s3server.pyc
-%%PYTHON_SITELIBDIR%%/tornado/s3server.pyo
-%%PYTHON_SITELIBDIR%%/tornado/template.py
-%%PYTHON_SITELIBDIR%%/tornado/template.pyc
-%%PYTHON_SITELIBDIR%%/tornado/template.pyo
-%%PYTHON_SITELIBDIR%%/tornado/web.py
-%%PYTHON_SITELIBDIR%%/tornado/web.pyc
-%%PYTHON_SITELIBDIR%%/tornado/web.pyo
-%%PYTHON_SITELIBDIR%%/tornado/wsgi.py
-%%PYTHON_SITELIBDIR%%/tornado/wsgi.pyc
-%%PYTHON_SITELIBDIR%%/tornado/wsgi.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/tornado
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/auth.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/auth.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/auth.pyo
+%%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/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/httpclient.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpclient.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpclient.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpserver.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpserver.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httpserver.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httputil.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httputil.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/httputil.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/ioloop.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/ioloop.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/ioloop.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/iostream.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/iostream.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/iostream.pyo
+%%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/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/simple_httpclient.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/simple_httpclient.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/simple_httpclient.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/web.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/web.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/tornado/web.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
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%