4 files changed, 12 insertions, 26 deletions

diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index e9309dfa81e4..06a47a3edde8 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phoronix-test-suite
-PORTVERSION=	3.0.1
+PORTVERSION=	3.2.0
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.phoronix-test-suite.com/releases/
 
@@ -31,9 +31,7 @@ PORTDOCS=	*
 
 DOCFILES1=	CHANGE-LOG AUTHORS
 
-DOCFILES2=	phoronix-test-suite.pdf specifications_xml_test.html \
-		specifications_xml_download.html writing_your_first_module.html \
-		specifications_xml_suite.html writing_your_first_test.html
+DOCFILES2=	phoronix-test-suite.html
 
 .include <bsd.port.options.mk>
 
@@ -78,7 +76,7 @@ post-install:
 .for FILE in ${DOCFILES2}
 	@${INSTALL_DATA} ${WRKSRC}/documentation/${FILE} ${DOCSDIR}/${FILE}
 .endfor
-.for DIR in html_sections includes
+.for DIR in html_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 4c94eb0cb42d..27149a2d9914 100644
--- a/benchmarks/phoronix-test-suite/distinfo
+++ b/benchmarks/phoronix-test-suite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phoronix-test-suite-3.0.1.tar.gz) = 113804343d951e9e4380dd15efaa3e5caa2eaf5ff32f83729ee1572e2e4fc971
-SIZE (phoronix-test-suite-3.0.1.tar.gz) = 429462
+SHA256 (phoronix-test-suite-3.2.0.tar.gz) = 216cd1a5f93f2c164a15c459d41062ddf620e463154223a345f193ad6b5e3a0f
+SIZE (phoronix-test-suite-3.2.0.tar.gz) = 398351
diff --git a/benchmarks/phoronix-test-suite/files/patch-install-sh b/benchmarks/phoronix-test-suite/files/patch-install-sh
index 4527667910f0..172a327b8c03 100644
--- a/benchmarks/phoronix-test-suite/files/patch-install-sh
+++ b/benchmarks/phoronix-test-suite/files/patch-install-sh
@@ -32,7 +32,7 @@
  
  cp documentation/man-pages/*.1 $DESTDIR$INSTALL_PREFIX/share/man/man1/
 -cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/phoronix-test-suite
-+if [ -n "$WITH_BASH_COMPLETION" ]
++if [ -n "$WITH_BASH_COMPLETIONS" ]
 +then
 +cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/phoronix-test-suite
 +fi
diff --git a/benchmarks/phoronix-test-suite/pkg-plist b/benchmarks/phoronix-test-suite/pkg-plist
index d94cce898428..e057e0b07ae3 100644
--- a/benchmarks/phoronix-test-suite/pkg-plist
+++ b/benchmarks/phoronix-test-suite/pkg-plist
@@ -24,6 +24,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/default_benchmark.php
 %%DATADIR%%/pts-core/commands/default_run.php
 %%DATADIR%%/pts-core/commands/diagnostics.php
+%%DATADIR%%/pts-core/commands/download_test_files.php
 %%DATADIR%%/pts-core/commands/dump_core_storage.php
 %%DATADIR%%/pts-core/commands/dump_documentation.php
 %%DATADIR%%/pts-core/commands/dump_phodevi_smart_cache.php
@@ -35,6 +36,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/info.php
 %%DATADIR%%/pts-core/commands/install_dependencies.php
 %%DATADIR%%/pts-core/commands/install_test.php
+%%DATADIR%%/pts-core/commands/interactive.php
 %%DATADIR%%/pts-core/commands/list_available_suites.php
 %%DATADIR%%/pts-core/commands/list_available_tests.php
 %%DATADIR%%/pts-core/commands/list_available_virtual_suites.php
@@ -74,26 +76,11 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/system_sensors.php
 %%DATADIR%%/pts-core/commands/test_module.php
 %%DATADIR%%/pts-core/commands/upload_result.php
-%%DATADIR%%/pts-core/commands/user_config_get.php
 %%DATADIR%%/pts-core/commands/user_config_reset.php
 %%DATADIR%%/pts-core/commands/user_config_set.php
 %%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/definitions/compatibility.xml
-%%DATADIR%%/pts-core/definitions/download-cache.xml
-%%DATADIR%%/pts-core/definitions/external-dependencies.xml
-%%DATADIR%%/pts-core/definitions/graph-config.xml
-%%DATADIR%%/pts-core/definitions/module-phoromatic.xml
-%%DATADIR%%/pts-core/definitions/module-settings.xml
-%%DATADIR%%/pts-core/definitions/result-file.xml
-%%DATADIR%%/pts-core/definitions/results-parser.xml
-%%DATADIR%%/pts-core/definitions/test-installation.xml
-%%DATADIR%%/pts-core/definitions/test-profile-downloads.xml
-%%DATADIR%%/pts-core/definitions/test-profile.xml
-%%DATADIR%%/pts-core/definitions/test-suite.xml
-%%DATADIR%%/pts-core/definitions/user-config.xml
-%%DATADIR%%/pts-core/definitions/xsl/pts-definitions-viewer.xsl
 %%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
@@ -130,6 +117,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/external-test-dependencies/xml/xsl/pts-generic-exdep-viewer.xsl
 %%DATADIR%%/pts-core/external-test-dependencies/xml/zenwalk-packages.xml
 %%DATADIR%%/pts-core/modules/dummy_module.php
+%%DATADIR%%/pts-core/modules/ekofisk.php
 %%DATADIR%%/pts-core/modules/graphics_event_checker.php
 %%DATADIR%%/pts-core/modules/graphics_override.php
 %%DATADIR%%/pts-core/modules/phoromatic.php
@@ -153,7 +141,6 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/nye_Xml/nye_XmlReader.php
 %%DATADIR%%/pts-core/objects/nye_Xml/nye_XmlWriter.php
 %%DATADIR%%/pts-core/objects/nye_Xml/pts_config_nye_XmlReader.php
-%%DATADIR%%/pts-core/objects/nye_Xml/pts_external_dependencies_nye_XmlReader.php
 %%DATADIR%%/pts-core/objects/nye_Xml/pts_graph_config_nye_XmlReader.php
 %%DATADIR%%/pts-core/objects/nye_Xml/pts_parse_results_nye_XmlReader.php
 %%DATADIR%%/pts-core/objects/nye_Xml/pts_results_nye_XmlReader.php
@@ -187,6 +174,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/phodevi/sensors/cpu_voltage.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/gpu_fanspeed.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/gpu_freq.php
+%%DATADIR%%/pts-core/objects/phodevi/sensors/gpu_power.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/gpu_temp.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/gpu_usage.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/hdd_read_speed.php
@@ -231,6 +219,8 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/pts_download_speed_manager.php
 %%DATADIR%%/pts-core/objects/pts_external_dependencies.php
 %%DATADIR%%/pts-core/objects/pts_file_io.php
+%%DATADIR%%/pts-core/objects/pts_flags.php
+%%DATADIR%%/pts-core/objects/pts_html_template.php
 %%DATADIR%%/pts-core/objects/pts_image.php
 %%DATADIR%%/pts-core/objects/pts_installed_test.php
 %%DATADIR%%/pts-core/objects/pts_math.php
@@ -356,8 +346,6 @@ bin/phoronix-test-suite
 @dirrm %%DATADIR%%/pts-core/external-test-dependencies/xml
 @dirrm %%DATADIR%%/pts-core/external-test-dependencies/scripts
 @dirrm %%DATADIR%%/pts-core/external-test-dependencies
-@dirrm %%DATADIR%%/pts-core/definitions/xsl
-@dirrm %%DATADIR%%/pts-core/definitions
 @dirrm %%DATADIR%%/pts-core/commands
 @dirrm %%DATADIR%%/pts-core
 @dirrm %%DATADIR%%