Index: head/www/py-gunicorn/Makefile
===================================================================
--- head/www/py-gunicorn/Makefile	(revision 308080)
+++ head/www/py-gunicorn/Makefile	(revision 308081)
@@ -1,55 +1,65 @@
 # Created by: Kristaps Kulis <kristaps.kulis@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	gunicorn
-PORTVERSION=	0.15.0
+PORTVERSION=	0.16.1
 CATEGORIES=	www python
-MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	koobs.freebsd@gmail.com
 COMMENT=	Python WSGI server for unix
 
 LICENSE=	MIT
 
-TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+USE_GITHUB=	yes
+GH_ACCOUNT=	benoitc
+GH_TAGNAME=	0.16.1
+GH_COMMIT=	0d91a51
 
-USE_PYTHON=		-2.7
+# Python3 Ready
+USE_PYTHON=		yes
 USE_PYDISTUTILS=	easy_install
 
 OPTIONS_DEFINE=	EVENTLET GEVENT TORNADO SETPROC TESTS
 EVENTLET_DESC=	Add Eventlet async worker
 GEVENT_DESC=	Add Gevent async worker
 TORNADO_DESC=	Add Tornado async worker
 SETPROC_DESC=	Support changing process title (setproctitle)
-TESTS_DESC=	Install nose for running unittests
+TESTS_DESC=	Install tools for running unittests
 
-OPTIONSFILE=		${PORT_DBDIR}/py-${PORTNAME}/options
+OPTIONSFILE?=		${PORT_DBDIR}/py-${PORTNAME}/options
 NO_OPTIONS_SORT=	yes
 
-.include <bsd.port.options.mk>
+.include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MEVENTLET}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}eventlet>=0.9:${PORTSDIR}/net/py-eventlet
 .endif
 
 .if ${PORT_OPTIONS:MGEVENT}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gevent>0:${PORTSDIR}/devel/py-gevent
 .endif
 
 .if ${PORT_OPTIONS:MTORNADO}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tornado>=2.2:${PORTSDIR}/www/py-tornado
 .endif
 
 .if ${PORT_OPTIONS:MSETPROC}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}setproctitle>0:${PORTSDIR}/devel/py-setproctitle
 .endif
 
 .if ${PORT_OPTIONS:MTESTS}
-BUILD_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}nose>0:${PORTSDIR}/devel/py-nose
+BUILD_DEPENDS:=	${TEST_DEPENDS} \
+		${RUN_DEPENDS}
 .endif
 
+TEST_DEPENDS:=	${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest
+
 regression-test: build
-	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} nosetests
+	@cd ${WRKSRC} && ${PYTHON_CMD} ${PYSETUP} test
 
-.include <bsd.port.mk>
+.if ${PYTHON_REL} >= 320
+.include "${PORTSDIR}/devel/py-virtualenv/files/py3k-fix-pkg-plist.inc"
+.endif
+
+.include <bsd.port.post.mk>
Index: head/www/py-gunicorn/distinfo
===================================================================
--- head/www/py-gunicorn/distinfo	(revision 308080)
+++ head/www/py-gunicorn/distinfo	(revision 308081)
@@ -1,2 +1,2 @@
-SHA256 (gunicorn-0.15.0.tar.gz) = 811f7e9b6b81f5ef4ba07ba071ee8f09ce2c9b16824b75fcaf6452af8bc9a9ad
-SIZE (gunicorn-0.15.0.tar.gz) = 119108
+SHA256 (gunicorn-0.16.1.tar.gz) = e1972878b7a742302fb5281cb4d4c64f4c0eace2c58a814e88bd09754149ff40
+SIZE (gunicorn-0.16.1.tar.gz) = 333263
Index: head/www/py-gunicorn/files/patch-requirements_dev.txt
===================================================================
--- head/www/py-gunicorn/files/patch-requirements_dev.txt	(nonexistent)
+++ head/www/py-gunicorn/files/patch-requirements_dev.txt	(revision 308081)
@@ -0,0 +1,5 @@
+--- ./requirements_dev.txt.orig	2012-11-20 18:50:15.000000000 +1100
++++ ./requirements_dev.txt	2012-11-20 18:50:21.000000000 +1100
+@@ -1,2 +1 @@
+ pytest
+-pytest-cov

Property changes on: head/www/py-gunicorn/files/patch-requirements_dev.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/www/py-gunicorn/pkg-plist
===================================================================
--- head/www/py-gunicorn/pkg-plist	(revision 308080)
+++ head/www/py-gunicorn/pkg-plist	(revision 308081)
@@ -1,122 +1,122 @@
 bin/gunicorn
 bin/gunicorn_django
 bin/gunicorn_paster
 %%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/entry_points.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/base.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/django_wsgi.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/django_wsgi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/django_wsgi.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/djangoapp.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/djangoapp.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/djangoapp.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/pasterapp.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/pasterapp.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/pasterapp.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/wsgiapp.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/wsgiapp.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app/wsgiapp.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/arbiter.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/arbiter.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/arbiter.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/config.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/config.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/config.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/debug.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/debug.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/debug.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/errors.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/errors.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/errors.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/glogging.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/glogging.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/glogging.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/_sendfile.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/_sendfile.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/_sendfile.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/body.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/body.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/body.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/errors.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/errors.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/errors.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/message.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/message.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/message.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/parser.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/parser.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/parser.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/unreader.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/unreader.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/unreader.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/wsgi.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/wsgi.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http/wsgi.pyo
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/logging_config.py
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/logging_config.pyc
-%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/logging_config.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/commands/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/commands/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/commands/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/commands/run_gunicorn.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/commands/run_gunicorn.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/commands/run_gunicorn.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/pidfile.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/pidfile.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/pidfile.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/six.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/six.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/six.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/sock.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/sock.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/sock.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/util.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/util.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/util.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/__init__.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/__init__.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/__init__.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/async.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/async.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/async.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/base.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/base.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/base.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/geventlet.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/geventlet.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/geventlet.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/ggevent.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/ggevent.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/ggevent.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/gtornado.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/gtornado.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/gtornado.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/sync.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/sync.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/sync.pyo
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/workertmp.py
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/workertmp.pyc
 %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers/workertmp.pyo
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/workers
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management/commands
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/management
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/http
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn/app
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/gunicorn
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
 @dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%