3 files changed, 26 insertions, 18 deletions

diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index df51e2b36667..303cf61a1194 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phoronix-test-suite
-PORTVERSION=	3.8.0
+PORTVERSION=	4.0.0
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.phoronix-test-suite.com/releases/
 
@@ -16,10 +16,7 @@ COMMENT=	Phoronix Benchmarking Suite
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-OPTIONS=	BASH_COMPLETIONS "Install bash completions" off \
-		X11 "Install X11 icons and mimetypes" on
-
-USE_PHP=	zip json openssl gd zlib pcntl posix curl
+USE_PHP=	zip json openssl gd zlib pcntl posix curl ctype
 USE_PHP_BUILD=	yes
 WANT_PHP_CLI=	yes
 NO_BUILD=	yes
@@ -27,26 +24,31 @@ WRKSRC=		${WRKDIR}/phoronix-test-suite
 MAN1=		phoronix-test-suite.1
 
 PORTDOCS=	*
-
 DOCFILES1=	CHANGE-LOG AUTHORS
-
 DOCFILES2=	phoronix-test-suite.html
 
+OPTIONS_DEFINE=	BASH_COMPLETIONS X11
+OPTIONS_DEFAULT=	X11
+
+BASH_COMPLETIONS_DESC=	Install bash completions
+X11_DESC=		Install X11 icons and mimetypes
+
 .include <bsd.port.options.mk>
 
-.if !defined(WITHOUT_X11)
-X11_DEPENDS=	${LOCALBASE}/bin/xdg-mime:${PORTSDIR}/devel/xdg-utils \
+.if ${PORT_OPTIONS:MX11}
+BUILD_DEPENDS+=	${LOCALBASE}/bin/xdg-mime:${PORTSDIR}/devel/xdg-utils \
+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+		${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
+RUN_DEPENDS+=	${LOCALBASE}/bin/xdg-mime:${PORTSDIR}/devel/xdg-utils \
 		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
 		${LOCALBASE}/bin/update-mime-database:${PORTSDIR}/misc/shared-mime-info
-BUILD_DEPENDS+=	${X11_DEPENDS}
-RUN_DEPENDS+=	${X11_DEPENDS}
 PLIST_SUB+=	X11=""
 .else
 INSTALL_OPTS=	WITHOUT_X11=yes
 PLIST_SUB+=	X11="@comment "
 .endif
 
-.if defined(WITH_BASH_COMPLETIONS)
+.if ${PORT_OPTIONS:MBASH_COMPLETIONS}
 INSTALL_OPTS+=	WITH_BASH_COMPLETIONS=yes
 PLIST_SUB+=	BASH_COMPLETIONS=""
 .else
@@ -71,7 +73,7 @@ do-install:
 	cd ${WRKSRC} && ${INSTALL_OPTS} ./install-sh ${PREFIX}
 
 post-install:
-.if !defined(NOPORTDOCS)
+.if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCFILES1}
 	@${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR}/${FILE}
@@ -79,7 +81,7 @@ post-install:
 .for FILE in ${DOCFILES2}
 	@${INSTALL_DATA} ${WRKSRC}/documentation/${FILE} ${DOCSDIR}/${FILE}
 .endfor
-.for DIR in html_stubs includes
+.for DIR in stubs includes
 	@${CP} -rf ${WRKSRC}/documentation/${DIR} ${DOCSDIR}
 .endfor
 	@${ECHO_MSG} "===> Docs installed in ${DOCSDIR}."
diff --git a/benchmarks/phoronix-test-suite/distinfo b/benchmarks/phoronix-test-suite/distinfo
index 9c8acb78af61..e3c2e91848cf 100644
--- a/benchmarks/phoronix-test-suite/distinfo
+++ b/benchmarks/phoronix-test-suite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phoronix-test-suite-3.8.0.tar.gz) = 951ed041dcf06178b4eb92535b4a6d5c97d62415c85af0feb04a0db3cbb342fb
-SIZE (phoronix-test-suite-3.8.0.tar.gz) = 471257
+SHA256 (phoronix-test-suite-4.0.0.tar.gz) = 434f4325d494458ecd063eef74701b95091272465a6b0c560508f3206e71792c
+SIZE (phoronix-test-suite-4.0.0.tar.gz) = 491906
diff --git a/benchmarks/phoronix-test-suite/pkg-plist b/benchmarks/phoronix-test-suite/pkg-plist
index 1b41830fbb3d..27e08c6ecd53 100644
--- a/benchmarks/phoronix-test-suite/pkg-plist
+++ b/benchmarks/phoronix-test-suite/pkg-plist
@@ -55,6 +55,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/module_info.php
 %%DATADIR%%/pts-core/commands/module_setup.php
 %%DATADIR%%/pts-core/commands/network_setup.php
+%%DATADIR%%/pts-core/commands/ob_test_profile_analyze.php
 %%DATADIR%%/pts-core/commands/openbenchmarking_changes.php
 %%DATADIR%%/pts-core/commands/openbenchmarking_launcher.php
 %%DATADIR%%/pts-core/commands/openbenchmarking_login.php
@@ -62,7 +63,6 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/openbenchmarking_repositories.php
 %%DATADIR%%/pts-core/commands/pts_version.php
 %%DATADIR%%/pts-core/commands/rebuild_composite_xml.php
-%%DATADIR%%/pts-core/commands/recover_run.php
 %%DATADIR%%/pts-core/commands/refresh_graphs.php
 %%DATADIR%%/pts-core/commands/remove_from_result_file.php
 %%DATADIR%%/pts-core/commands/remove_installed_test.php
@@ -87,6 +87,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/validate_result_file.php
 %%DATADIR%%/pts-core/commands/validate_test_profile.php
 %%DATADIR%%/pts-core/commands/validate_test_suite.php
+%%DATADIR%%/pts-core/commands/webui.php
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-angstrom-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-arch-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-debian-packages.sh
@@ -195,6 +196,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/phodevi/phodevi_device_interface.php
 %%DATADIR%%/pts-core/objects/phodevi/phodevi_device_property.php
 %%DATADIR%%/pts-core/objects/phodevi/phodevi_sensor.php
+%%DATADIR%%/pts-core/objects/phodevi/phodevi_vfs.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/cpu_fanspeed.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/cpu_freq.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/cpu_power.php
@@ -219,7 +221,9 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/phodevi/sensors/sys_v12.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/sys_v3.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/sys_v5.php
+%%DATADIR%%/pts-core/objects/pts_Graph/pts_BlockDiagramGraph.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_CandleStickGraph.php
+%%DATADIR%%/pts-core/objects/pts_Graph/pts_DetailedSystemComponentTable.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_FilledLineGraph.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_Graph.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_HeatMapBarGraph.php
@@ -236,6 +240,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_ResultFileSystemsTable.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_ResultFileTable.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_ScatterPlot.php
+%%DATADIR%%/pts-core/objects/pts_Graph/pts_SideViewTable.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_Table.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_TestCountPassGraph.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_VerticalBarGraph.php
@@ -299,7 +304,8 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/results-viewer/horizontal-nav-bg-hover.png
 %%DATADIR%%/pts-core/results-viewer/horizontal-nav-bg.png
 %%DATADIR%%/pts-core/results-viewer/phoronix-test-suite.css
-%%DATADIR%%/pts-core/results-viewer/pts-header.png
+%%DATADIR%%/pts-core/results-viewer/pts-logo-bottom.png
+%%DATADIR%%/pts-core/results-viewer/pts-logo-top.png
 %%DATADIR%%/pts-core/results-viewer/pts-results-viewer.xsl
 %%DATADIR%%/pts-core/results-viewer/pts.js
 %%DATADIR%%/pts-core/static/certificates/openbenchmarking-server.pem