2 files changed, 69 insertions, 67 deletions

diff --git a/benchmarks/pybench/Makefile b/benchmarks/pybench/Makefile
index 6287c4d507c3..f3590151a9ed 100644
--- a/benchmarks/pybench/Makefile
+++ b/benchmarks/pybench/Makefile
@@ -8,7 +8,7 @@
 PORTNAME=	pybench
 PORTVERSION=	1.0
 CATEGORIES=	benchmarks python
-MASTER_SITES=	http://www.lemburg.com/files/python/
+MASTER_SITES=	http://www.egenix.com/files/python/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible benchmark suite for Python
@@ -23,13 +23,15 @@ do-build:
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC}
 
 do-install:
-	@${MKDIR} ${PREFIX}/share/pybench
+	@${MKDIR} ${DATADIR}
 	@(cd ${WRKSRC} && ${TAR} --exclude README -c -f - .) \
-		| (cd ${PREFIX}/share/pybench && ${TAR} --unlink -x -f -)
-	@printf '#!/bin/sh\n${PYTHON_CMD} ${PREFIX}/share/pybench/pybench.py "$$@"\n' \
+		| (cd ${DATADIR} && ${TAR} --unlink -x -f -)
+	@${PRINTF} '#!/bin/sh\n${PYTHON_CMD} ${DATADIR}/pybench.py "$$@"\n' \
 		> ${WRKDIR}/pybench.sh
-	@${MKDIR} ${PREFIX}/share/doc/pybench
-	@${INSTALL_MAN} ${WRKSRC}/README ${PREFIX}/share/doc/pybench
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_MAN} ${WRKSRC}/README ${DOCSDIR}
+.endif
 	@${INSTALL_SCRIPT} ${WRKDIR}/pybench.sh ${PREFIX}/bin/pybench
 
 .include <bsd.port.mk>
diff --git a/benchmarks/pybench/pkg-plist b/benchmarks/pybench/pkg-plist
index 4d799d820643..a8719e0d18c8 100644
--- a/benchmarks/pybench/pkg-plist
+++ b/benchmarks/pybench/pkg-plist
@@ -1,62 +1,62 @@
 bin/pybench
-%%DOCSDIR%%/README
-share/pybench/Arithmetic.py
-share/pybench/Arithmetic.pyc
-share/pybench/Arithmetic.pyo
-share/pybench/Calls.py
-share/pybench/Calls.pyc
-share/pybench/Calls.pyo
-share/pybench/CommandLine.py
-share/pybench/CommandLine.pyc
-share/pybench/CommandLine.pyo
-share/pybench/Constructs.py
-share/pybench/Constructs.pyc
-share/pybench/Constructs.pyo
-share/pybench/Dict.py
-share/pybench/Dict.pyc
-share/pybench/Dict.pyo
-share/pybench/Exceptions.py
-share/pybench/Exceptions.pyc
-share/pybench/Exceptions.pyo
-share/pybench/Imports.py
-share/pybench/Imports.pyc
-share/pybench/Imports.pyo
-share/pybench/Instances.py
-share/pybench/Instances.pyc
-share/pybench/Instances.pyo
-share/pybench/Lists.py
-share/pybench/Lists.pyc
-share/pybench/Lists.pyo
-share/pybench/Lookups.py
-share/pybench/Lookups.pyc
-share/pybench/Lookups.pyo
-share/pybench/Numbers.py
-share/pybench/Numbers.pyc
-share/pybench/Numbers.pyo
-share/pybench/Setup.py
-share/pybench/Setup.pyc
-share/pybench/Setup.pyo
-share/pybench/Strings.py
-share/pybench/Strings.pyc
-share/pybench/Strings.pyo
-share/pybench/Tuples.py
-share/pybench/Tuples.pyc
-share/pybench/Tuples.pyo
-share/pybench/Unicode.py
-share/pybench/Unicode.pyc
-share/pybench/Unicode.pyo
-share/pybench/package/__init__.py
-share/pybench/package/__init__.pyc
-share/pybench/package/__init__.pyo
-share/pybench/package/submodule.py
-share/pybench/package/submodule.pyc
-share/pybench/package/submodule.pyo
-share/pybench/platform.py
-share/pybench/platform.pyc
-share/pybench/platform.pyo
-share/pybench/pybench.py
-share/pybench/pybench.pyc
-share/pybench/pybench.pyo
-@dirrm share/pybench/package
-@dirrm share/pybench
-@dirrm %%DOCSDIR%%
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%DATADIR%%/Arithmetic.py
+%%DATADIR%%/Arithmetic.pyc
+%%DATADIR%%/Arithmetic.pyo
+%%DATADIR%%/Calls.py
+%%DATADIR%%/Calls.pyc
+%%DATADIR%%/Calls.pyo
+%%DATADIR%%/CommandLine.py
+%%DATADIR%%/CommandLine.pyc
+%%DATADIR%%/CommandLine.pyo
+%%DATADIR%%/Constructs.py
+%%DATADIR%%/Constructs.pyc
+%%DATADIR%%/Constructs.pyo
+%%DATADIR%%/Dict.py
+%%DATADIR%%/Dict.pyc
+%%DATADIR%%/Dict.pyo
+%%DATADIR%%/Exceptions.py
+%%DATADIR%%/Exceptions.pyc
+%%DATADIR%%/Exceptions.pyo
+%%DATADIR%%/Imports.py
+%%DATADIR%%/Imports.pyc
+%%DATADIR%%/Imports.pyo
+%%DATADIR%%/Instances.py
+%%DATADIR%%/Instances.pyc
+%%DATADIR%%/Instances.pyo
+%%DATADIR%%/Lists.py
+%%DATADIR%%/Lists.pyc
+%%DATADIR%%/Lists.pyo
+%%DATADIR%%/Lookups.py
+%%DATADIR%%/Lookups.pyc
+%%DATADIR%%/Lookups.pyo
+%%DATADIR%%/Numbers.py
+%%DATADIR%%/Numbers.pyc
+%%DATADIR%%/Numbers.pyo
+%%DATADIR%%/Setup.py
+%%DATADIR%%/Setup.pyc
+%%DATADIR%%/Setup.pyo
+%%DATADIR%%/Strings.py
+%%DATADIR%%/Strings.pyc
+%%DATADIR%%/Strings.pyo
+%%DATADIR%%/Tuples.py
+%%DATADIR%%/Tuples.pyc
+%%DATADIR%%/Tuples.pyo
+%%DATADIR%%/Unicode.py
+%%DATADIR%%/Unicode.pyc
+%%DATADIR%%/Unicode.pyo
+%%DATADIR%%/package/__init__.py
+%%DATADIR%%/package/__init__.pyc
+%%DATADIR%%/package/__init__.pyo
+%%DATADIR%%/package/submodule.py
+%%DATADIR%%/package/submodule.pyc
+%%DATADIR%%/package/submodule.pyo
+%%DATADIR%%/platform.py
+%%DATADIR%%/platform.pyc
+%%DATADIR%%/platform.pyo
+%%DATADIR%%/pybench.py
+%%DATADIR%%/pybench.pyc
+%%DATADIR%%/pybench.pyo
+@dirrm %%DATADIR%%/package
+@dirrm %%DATADIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%