Index: head/www/py-funkload/Makefile
===================================================================
--- head/www/py-funkload/Makefile	(revision 390438)
+++ head/www/py-funkload/Makefile	(revision 390439)
@@ -1,25 +1,23 @@
 # Created by: Li-Wen Hsu <lwhsu@lwhsu.org>
 # $FreeBSD$
 
 PORTNAME=	funkload
-PORTVERSION=	1.16.1
-PORTREVISION=	1
+PORTVERSION=	1.17.1
 CATEGORIES=	www python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	lwhsu@FreeBSD.org
-COMMENT=	FunkLoad is a functional and load web tester
+COMMENT=	Functional and load web tester
 
 LICENSE=	GPLv2
 
-RUN_DEPENDS=	${PYTHON_SITELIBDIR}/docutils/__init__.py:${PORTSDIR}/textproc/py-docutils \
+RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}docutils>0:${PORTSDIR}/textproc/py-docutils \
 		${LOCALBASE}/bin/gnuplot:${PORTSDIR}/math/gnuplot \
 		${PYTHON_PKGNAMEPREFIX}webunit>=1.3.8:${PORTSDIR}/www/py-webunit \
-		${PYXML} \
 		tcpwatch.py:${PORTSDIR}/net/tcpwatch
 
-USES=		python
-USE_PYTHON=	distutils autoplist
+USES=		python:2
+USE_PYTHON=	autoplist distutils
 
 .include <bsd.port.mk>
Index: head/www/py-funkload/distinfo
===================================================================
--- head/www/py-funkload/distinfo	(revision 390438)
+++ head/www/py-funkload/distinfo	(revision 390439)
@@ -1,2 +1,2 @@
-SHA256 (funkload-1.16.1.tar.gz) = e268a6209e3c225b1af7474031c10c3f92cd28ea8a1226facb5987cde026fb58
-SIZE (funkload-1.16.1.tar.gz) = 186031
+SHA256 (funkload-1.17.1.tar.gz) = f0518e9a306443cd03e573f80532bf4cbb014720c925403b6010a804783594da
+SIZE (funkload-1.17.1.tar.gz) = 107796
Index: head/www/py-funkload/files/patch-setup.py
===================================================================
--- head/www/py-funkload/files/patch-setup.py	(revision 390438)
+++ head/www/py-funkload/files/patch-setup.py	(revision 390439)
@@ -1,12 +1,20 @@
---- setup.py.orig	2010-01-30 02:16:39.051847143 +0800
-+++ setup.py	2010-01-30 02:16:50.065356904 +0800
-@@ -149,9 +149,6 @@
-         'Topic :: System :: Monitoring',
-     ],
-     # setuptools specific keywords
--    install_requires = ['webunit  >= 1.3.8',
--                        'docutils >= 0.3.7',
--                        'setuptools'],
-     zip_safe=True,
-     package_data={'funkload': ['data/*',
-                                'demo/simple/*', 'demo/zope/*',
+--- setup.py.orig	2015-05-06 10:37:24 UTC
++++ setup.py
+@@ -21,8 +21,6 @@
+ """FunkLoad package setup
+ 
+ """
+-import ez_setup
+-ez_setup.use_setuptools()
+ from setuptools import setup, find_packages
+ __version__ = '1.17.1'
+ 
+@@ -30,7 +28,7 @@ setup(
+     name="funkload",
+     version=__version__,
+     description="Functional and load web tester.",
+-    long_description=''.join(open('README.txt').readlines()),
++    long_description='',
+     author="Benoit Delbosc",
+     author_email="bdelbosc@nuxeo.com",
+     url="http://funkload.nuxeo.org/",