2 files changed, 7 insertions, 84 deletions

diff --git a/dns/py-namebench/Makefile b/dns/py-namebench/Makefile
index bc440600d48b..a6e62240b1bb 100644
--- a/dns/py-namebench/Makefile
+++ b/dns/py-namebench/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	namebench
 PORTVERSION=	1.3.1
+PORTREVISION=	1
 CATEGORIES=	dns python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -10,21 +11,19 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-source
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	jgh@FreeBSD.org
-COMMENT=	An open-source DNS benchmark utility
+COMMENT=	Open Source DNS benchmark utility
 
 LICENSE=	APACHE20
 
-RUN_DEPENDS+=	\
-	${PYTHON_PKGNAMEPREFIX}Jinja2>=2.5.5:${PORTSDIR}/devel/py-Jinja2 \
+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
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
-.if empty(PORT_OPTIONS:MX11)
+.if ! ${PORT_OPTIONS:MX11}
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}tkinter>=2.7.1:${PORTSDIR}/x11-toolkits/py-tkinter
 .endif
 
@@ -36,6 +35,7 @@ PORTDOCS=	README.txt
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_INSTALLARGS+=	--install-data=${PREFIX}/share
+PYDISTUTILS_AUTOPLIST=	yes
 
 NO_INSTALL_MANPAGES=	yes
 
@@ -44,9 +44,7 @@ post-patch:
 		${WRKSRC}/libnamebench/util.py
 
 post-install:
-.if ${PORT_OPTIONS:MDOCS}
-	@${INSTALL} -o ${DOCOWN} -g ${DOCGRP} -m 555 -d ${DOCSDIR}
-	@${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/dns/py-namebench/pkg-plist b/dns/py-namebench/pkg-plist
deleted file mode 100644
index bc433df61b44..000000000000
--- a/dns/py-namebench/pkg-plist
+++ /dev/null
@@ -1,75 +0,0 @@
-bin/namebench.py
-%%PYTHON_SITELIBDIR%%/libnamebench/__init__.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/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
-%%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
-@dirrm %%DATADIR%%/templates
-@dirrm %%DATADIR%%/data
-@dirrm %%DATADIR%%/config
-@dirrm %%DATADIR%%
-@dirrm %%DOCSDIR%%
-@dirrm %%PYTHON_SITELIBDIR%%/libnamebench