aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsunpoet <sunpoet@FreeBSD.org>2011-09-24 04:04:45 +0800
committersunpoet <sunpoet@FreeBSD.org>2011-09-24 04:04:45 +0800
commit1fc3ca20cae48a6c0198c73d5043f91304aeb9a6 (patch)
treea14423226a267c36c3e5ecc0ca726f117f25c51b
parentd8deac0d15d3863d16ff1d548402b966d7e9ff73 (diff)
downloadfreebsd-ports-gnome-1fc3ca20cae48a6c0198c73d5043f91304aeb9a6.tar.gz
freebsd-ports-gnome-1fc3ca20cae48a6c0198c73d5043f91304aeb9a6.tar.zst
freebsd-ports-gnome-1fc3ca20cae48a6c0198c73d5043f91304aeb9a6.zip
- Set py-simplejson as conditional dependency
- Bump PORTREVISION for dependency change - Update pkg-descr PR: ports/160859 Submitted by: Ruslan Mahmatkhanov <cvs-src@yandex.ru> Approved by: khsing <khsing.cn@gmail.com> (maintainer)
-rw-r--r--www/py-tornado/Makefile12
-rw-r--r--www/py-tornado/pkg-descr21
2 files changed, 22 insertions, 11 deletions
diff --git a/www/py-tornado/Makefile b/www/py-tornado/Makefile
index b033f71acb3f..da6a1f79275d 100644
--- a/www/py-tornado/Makefile
+++ b/www/py-tornado/Makefile
@@ -7,6 +7,7 @@
PORTNAME= tornado
PORTVERSION= 1.2.1
+PORTREVISION= 1
CATEGORIES= www python
MASTER_SITES= CHEESESHOP \
http://github.com/downloads/facebook/tornado/
@@ -17,12 +18,17 @@ 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
+RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}curl>0:${PORTSDIR}/ftp/py-curl
USE_PYTHON= 2.5+
USE_PYDISTUTILS= easy_install
FETCH_ARGS= -pRr
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+
+.if ${PYTHON_REL} < 260
+RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}simplejson>=2.0.9:${PORTSDIR}/devel/py-simplejson
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/www/py-tornado/pkg-descr b/www/py-tornado/pkg-descr
index ccd6de60d643..d70dfd3d4036 100644
--- a/www/py-tornado/pkg-descr
+++ b/www/py-tornado/pkg-descr
@@ -1,10 +1,15 @@
-Tornado is an open source version of this web server and some of the tools we
-use most often at FriendFeed.
+Tornado is an open source version of the scalable, non-blocking web server and
+tools that power FriendFeed. The FriendFeed application is written using a web
+framework that looks a bit like web.py or Google's webapp, but with additional
+tools and optimizations to take advantage of the underlying non-blocking
+infrastructure.
-The framework is distinct from most mainstream web server frameworks (and
-certainly most Python frameworks) because it is non-blocking and reasonably
-fast. Because it is non-blocking and uses epoll, it can handle 1000s of
-simultaneous standing connections, which means the framework is ideal for
-real-time web services.
+The framework is distinct from most mainstream web server frameworks (and
+certainly most Python frameworks) because it is non-blocking and reasonably
+fast. Because it is non-blocking and uses epoll or kqueue, it can handle
+thousands of simultaneous standing connections, which means it is ideal for
+real-time web services. We built the web server specifically to handle
+FriendFeed's real-time features - every active user of FriendFeed maintains an
+open connection to the FriendFeed servers.
-WWW: http://www.tornadoweb.org
+WWW: http://www.tornadoweb.org/