4 files changed, 82 insertions, 29 deletions

diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index 7a1a3d4eaf87..ee86bd1f4cb9 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -6,28 +6,43 @@
 #
 
 PORTNAME=	namebench
-PORTVERSION=	1.0
-PORTREVISION=	1
+PORTVERSION=	1.3.1
 CATEGORIES=	dns python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 EXTRACT_SUFX=	.tgz
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	jhelfman@experts-exchange.com
 COMMENT=	An open-source DNS benchmark utility
 
+LICENSE=	ASL
+
+RUN_DEPENDS+=	\
+	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:${PORTSDIR}/devel/py-Jinja2 \
+	${PYTHON_PKGNAMEPREFIX}graphy>=1.0:${PORTSDIR}/graphics/py-graphy \
+	${PYTHON_PKGNAMEPREFIX}dnspython>=1.9.4:${PORTSDIR}/dns/py-dnspython \
+	${PYTHON_PKGNAMEPREFIX}httplib2>=0.6.0:${PORTSDIR}/www/py-httplib2 \
+	${PYTHON_PKGNAMEPREFIX}simplejson>=2.1.6:${PORTSDIR}/devel/py-simplejson
+
+.if !defined(WITHOUT_X11)
+RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:${PORTSDIR}/x11-toolkits/py-tkinter
+.endif
+
 MAKE_ENV+=	NO_THIRD_PARTY=yes
+WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 PORTDOCS=	README.txt
 
-USE_PYTHON=	2.5+
+USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_INSTALLARGS+=	--install-data=${PREFIX}/share
 
 NO_INSTALL_MANPAGES=	yes
 
 post-patch:
-	@${REINPLACE_CMD} '/windows/d' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},' \
+		${WRKSRC}/libnamebench/util.py
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/dns/py-namebench/distinfo b/dns/py-namebench/distinfo
index 7df71fd3e7ec..15581543e56d 100644
--- a/dns/py-namebench/distinfo
+++ b/dns/py-namebench/distinfo
@@ -1,2 +1,2 @@
-SHA256 (namebench-1.0.tgz) = 59af0fea2ce4cb52a3999115ecf77331150cd1ccae36e05e173680bb6d68611c
-SIZE (namebench-1.0.tgz) = 2557100
+SHA256 (namebench-1.3.1-source.tgz) = 30ccf9e870c1174c6bf02fca488f62bba280203a0b1e8e4d26f3756e1a5b9425
+SIZE (namebench-1.3.1-source.tgz) = 1118505
diff --git a/dns/py-namebench/files/patch-libnamebench-util-py b/dns/py-namebench/files/patch-libnamebench-util-py
new file mode 100644
index 000000000000..0ae82585bf84
--- /dev/null
+++ b/dns/py-namebench/files/patch-libnamebench-util-py
@@ -0,0 +1,15 @@
+$FreeBSD$
+
+Missing comma causes two strings below to be concatenated, making /usr/local/share/namebench and /usr/local/etc/namebench useless. Not great for us!
+
+--- libnamebench/util.py.orig	2011-08-15 19:59:22.000000000 +0100
++++ libnamebench/util.py	2011-08-15 19:59:37.000000000 +0100
+@@ -85,7 +85,7 @@
+                   os.path.join(os.getcwd(), 'namebench.app', 'Contents', 'Resources'),
+                   os.path.join(os.getcwd(), '..'),
+                   os.path.join(sys.prefix, 'namebench'),
+-                  '/usr/local/share/namebench'
++                  '/usr/local/share/namebench',
+                   '/usr/local/etc/namebench',
+                   '/usr/local/namebench',
+                   '/etc/namebench',
diff --git a/dns/py-namebench/pkg-plist b/dns/py-namebench/pkg-plist
index 009ecac370d5..bc433df61b44 100644
--- a/dns/py-namebench/pkg-plist
+++ b/dns/py-namebench/pkg-plist
@@ -1,52 +1,75 @@
 bin/namebench.py
 %%PYTHON_SITELIBDIR%%/libnamebench/__init__.py
-%%PYTHON_SITELIBDIR%%/libnamebench/base_ui.py
-%%PYTHON_SITELIBDIR%%/libnamebench/benchmark.py
-%%PYTHON_SITELIBDIR%%/libnamebench/benchmark_test.py
-%%PYTHON_SITELIBDIR%%/libnamebench/better_webbrowser.py
-%%PYTHON_SITELIBDIR%%/libnamebench/charts.py
-%%PYTHON_SITELIBDIR%%/libnamebench/charts_test.py
-%%PYTHON_SITELIBDIR%%/libnamebench/cli.py
-%%PYTHON_SITELIBDIR%%/libnamebench/config.py
-%%PYTHON_SITELIBDIR%%/libnamebench/conn_quality.py
-%%PYTHON_SITELIBDIR%%/libnamebench/history_parser.py
-%%PYTHON_SITELIBDIR%%/libnamebench/mocks.py
-%%PYTHON_SITELIBDIR%%/libnamebench/nameserver.py
-%%PYTHON_SITELIBDIR%%/libnamebench/nameserver_list.py
-%%PYTHON_SITELIBDIR%%/libnamebench/nameserver_test.py
-%%PYTHON_SITELIBDIR%%/libnamebench/selectors.py
-%%PYTHON_SITELIBDIR%%/libnamebench/selectors_test.py
-%%PYTHON_SITELIBDIR%%/libnamebench/tk.py
-%%PYTHON_SITELIBDIR%%/libnamebench/util.py
-%%PYTHON_SITELIBDIR%%/libnamebench/util_test.py
 %%PYTHON_SITELIBDIR%%/libnamebench/__init__.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/addr_util.py
+%%PYTHON_SITELIBDIR%%/libnamebench/addr_util.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/base_ui.py
 %%PYTHON_SITELIBDIR%%/libnamebench/base_ui.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/benchmark.py
 %%PYTHON_SITELIBDIR%%/libnamebench/benchmark.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/benchmark_test.py
 %%PYTHON_SITELIBDIR%%/libnamebench/benchmark_test.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/better_webbrowser.py
 %%PYTHON_SITELIBDIR%%/libnamebench/better_webbrowser.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/charts.py
 %%PYTHON_SITELIBDIR%%/libnamebench/charts.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/charts_test.py
 %%PYTHON_SITELIBDIR%%/libnamebench/charts_test.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/cli.py
 %%PYTHON_SITELIBDIR%%/libnamebench/cli.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/config.py
 %%PYTHON_SITELIBDIR%%/libnamebench/config.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/conn_quality.py
 %%PYTHON_SITELIBDIR%%/libnamebench/conn_quality.pyc
-%%PYTHON_SITELIBDIR%%/libnamebench/history_parser.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/data_sources.py
+%%PYTHON_SITELIBDIR%%/libnamebench/data_sources.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/geoip.py
+%%PYTHON_SITELIBDIR%%/libnamebench/geoip.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/health_checks.py
+%%PYTHON_SITELIBDIR%%/libnamebench/health_checks.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/mocks.py
 %%PYTHON_SITELIBDIR%%/libnamebench/mocks.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/nameserver.py
 %%PYTHON_SITELIBDIR%%/libnamebench/nameserver.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/nameserver_list.py
 %%PYTHON_SITELIBDIR%%/libnamebench/nameserver_list.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/nameserver_test.py
 %%PYTHON_SITELIBDIR%%/libnamebench/nameserver_test.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/reporter.py
+%%PYTHON_SITELIBDIR%%/libnamebench/reporter.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/selectors.py
 %%PYTHON_SITELIBDIR%%/libnamebench/selectors.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/selectors_test.py
 %%PYTHON_SITELIBDIR%%/libnamebench/selectors_test.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/site_connector.py
+%%PYTHON_SITELIBDIR%%/libnamebench/site_connector.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/tk.py
 %%PYTHON_SITELIBDIR%%/libnamebench/tk.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/url_map.py
+%%PYTHON_SITELIBDIR%%/libnamebench/url_map.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/util.py
 %%PYTHON_SITELIBDIR%%/libnamebench/util.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/util_test.py
 %%PYTHON_SITELIBDIR%%/libnamebench/util_test.pyc
+%%PYTHON_SITELIBDIR%%/libnamebench/version.py
+%%PYTHON_SITELIBDIR%%/libnamebench/version.pyc
 %%PYTHON_SITELIBDIR%%/namebench.py
 %%PYTHON_SITELIBDIR%%/namebench.pyc
-%%DATADIR%%/namebench.cfg
+%%DOCSDIR%%/README.txt
+%%DATADIR%%/config/data_sources.cfg
+%%DATADIR%%/config/hostname_reference.cfg
+%%DATADIR%%/config/namebench.cfg
+%%DATADIR%%/data/alexa-top-2000-domains.txt
+%%DATADIR%%/data/cache-hit.txt
+%%DATADIR%%/data/cache-miss.txt
+%%DATADIR%%/data/cache-mix.txt
 %%DATADIR%%/templates/ascii.tmpl
 %%DATADIR%%/templates/html.tmpl
+%%DATADIR%%/templates/resolv.conf.tmpl
 %%DATADIR%%/templates/style.css
-%%DATADIR%%/data/alexa-top-10000-global.txt
 @dirrm %%DATADIR%%/templates
 @dirrm %%DATADIR%%/data
+@dirrm %%DATADIR%%/config
 @dirrm %%DATADIR%%
+@dirrm %%DOCSDIR%%
 @dirrm %%PYTHON_SITELIBDIR%%/libnamebench