4 files changed, 62 insertions, 53 deletions

diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 1b5ba7d4cbc7..df51e2b36667 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	phoronix-test-suite
-PORTVERSION=	3.6.1
+PORTVERSION=	3.8.0
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.phoronix-test-suite.com/releases/
 
@@ -60,8 +60,12 @@ post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \
 				${WRKSRC}/phoronix-test-suite \
 				${WRKSRC}/pts-core/objects/bilde_renderer/bilde_renderer.php \
-				${WRKSRC}/pts-core/objects/pts_client.php \
+				${WRKSRC}/pts-core/objects/client/pts_client.php \
 				${WRKSRC}/pts-core/external-test-dependencies/xml/freebsd-packages.xml
+	@${RM} ${WRKSRC}/phoronix-test-suite.bak \
+		${WRKSRC}/pts-core/objects/bilde_renderer/bilde_renderer.php.bak \
+		${WRKSRC}/pts-core/objects/client/pts_client.php.bak \
+		${WRKSRC}/pts-core/external-test-dependencies/xml/freebsd-packages.xml.bak
 
 do-install:
 	cd ${WRKSRC} && ${INSTALL_OPTS} ./install-sh ${PREFIX}
diff --git a/benchmarks/phoronix-test-suite/distinfo b/benchmarks/phoronix-test-suite/distinfo
index 35fb87a31fea..9c8acb78af61 100644
--- a/benchmarks/phoronix-test-suite/distinfo
+++ b/benchmarks/phoronix-test-suite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phoronix-test-suite-3.6.1.tar.gz) = a394ae9529ed1ae37e6c8d0ee0092110c199ab6067c2c61dbb3233525377b738
-SIZE (phoronix-test-suite-3.6.1.tar.gz) = 432754
+SHA256 (phoronix-test-suite-3.8.0.tar.gz) = 951ed041dcf06178b4eb92535b4a6d5c97d62415c85af0feb04a0db3cbb342fb
+SIZE (phoronix-test-suite-3.8.0.tar.gz) = 471257
diff --git a/benchmarks/phoronix-test-suite/files/patch-install-sh b/benchmarks/phoronix-test-suite/files/patch-install-sh
index 172a327b8c03..d206d91c6eb8 100644
--- a/benchmarks/phoronix-test-suite/files/patch-install-sh
+++ b/benchmarks/phoronix-test-suite/files/patch-install-sh
@@ -1,14 +1,13 @@
---- install-sh.orig	2011-02-15 19:34:54.000000000 +0100
-+++ install-sh	2011-03-15 23:12:11.058903759 +0100
-@@ -45,33 +45,34 @@
+--- install-sh.orig	2012-01-04 17:43:26.000000000 +0100
++++ install-sh	2012-03-27 11:05:34.486846351 +0200
+@@ -47,33 +47,34 @@
  fi
  
  rm -rf $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/
 -rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
  
  mkdir -p $DESTDIR$INSTALL_PREFIX/bin/
-+if [ -z "$WITHOUT_X11" ]
-+then
++if [ -z "$WITHOUT_X11" ]; then
  mkdir -p $DESTDIR$INSTALL_PREFIX/share/applications/
  mkdir -p $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/
 +fi
@@ -16,7 +15,7 @@
  mkdir -p $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/
 -mkdir -p $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
 -mkdir -p $DESTDIR$INSTALL_PREFIX/../etc/bash_completion.d/
--
+ 
 -cp CHANGE-LOG $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
 -cp COPYING $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
 -cp AUTHORS $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
@@ -39,26 +38,29 @@
 +if [ -z "$WITHOUT_X11" ]
 +then
  cp pts-core/static/images/phoronix-test-suite.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/phoronix-test-suite.png
- cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/apps/openbenchmarking.png
  cp pts-core/static/phoronix-test-suite.desktop $DESTDIR$INSTALL_PREFIX/share/applications/
+ cp pts-core/static/phoronix-test-suite-launcher.desktop $DESTDIR$INSTALL_PREFIX/share/applications/
 +fi
  
  rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts/etc/scripts/package-build-*
 -cp -r pts-core/ $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/
 +cp -r pts-core $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/
  rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/phoronix-test-suite.desktop
- 
- sed 's:PTS_DIR=`pwd`:PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite
-@@ -79,14 +80,16 @@
+ rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/phoronix-test-suite-launcher.desktop
+ rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/openbenchmarking.org/openbenchmarking-mime.xml
+@@ -87,6 +88,8 @@
  
  # sed 's:\$url = PTS_PATH . \"documentation\/index.html\";:\$url = \"'"$INSTALL_PREFIX"'\/share\/doc\/packages\/phoronix-test-suite\/index.html\";:g' pts-core/commands/gui_gtk.php > $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/commands/gui_gtk.php
  
 +if [ -z "$WITHOUT_X11" ]
 +then
  # XDG MIME OpenBenchmarking support
- xdg-mime install pts-core/openbenchmarking.org/openbenchmarking-mime.xml
- xdg-mime default phoronix-test-suite.desktop application/x-openbenchmarking
- xdg-icon-resource install --context mimetypes --size 64 pts-core/static/images/openbenchmarking.png application-x-openbenchmarking
+ if [ "X$DESTDIR" = "X" ]
+ then
+@@ -101,10 +104,10 @@
+ 	cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png
+ 
+ fi
 +fi
  
  echo -e "\nPhoronix Test Suite Installation Completed\n
diff --git a/benchmarks/phoronix-test-suite/pkg-plist b/benchmarks/phoronix-test-suite/pkg-plist
index 48e081e9f417..1b41830fbb3d 100644
--- a/benchmarks/phoronix-test-suite/pkg-plist
+++ b/benchmarks/phoronix-test-suite/pkg-plist
@@ -1,8 +1,8 @@
 bin/phoronix-test-suite
 %%BASH_COMPLETIONS%%etc/bash_completion.d/phoronix-test-suite
 %%X11%%share/applications/phoronix-test-suite.desktop
+%%X11%%share/applications/phoronix-test-suite-launcher.desktop
 %%X11%%share/icons/hicolor/48x48/apps/phoronix-test-suite.png
-%%X11%%share/icons/hicolor/64x64/apps/openbenchmarking.png
 %%X11%%share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png
 %%X11%%share/icons/hicolor/64x64/mimetypes/gnome-mime-application-x-openbenchmarking.png
 %%X11%%share/mime/application/x-openbenchmarking.xml
@@ -107,7 +107,6 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/external-test-dependencies/xml/arch-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/fedora-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/freebsd-packages.xml
-%%DATADIR%%/pts-core/external-test-dependencies/xml/freebsd-packages.xml.bak
 %%DATADIR%%/pts-core/external-test-dependencies/xml/generic-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/gentoo-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
@@ -138,18 +137,38 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/bilde_renderer/bilde_jpg_renderer.php
 %%DATADIR%%/pts-core/objects/bilde_renderer/bilde_png_renderer.php
 %%DATADIR%%/pts-core/objects/bilde_renderer/bilde_renderer.php
-%%DATADIR%%/pts-core/objects/bilde_renderer/bilde_renderer.php.bak
 %%DATADIR%%/pts-core/objects/bilde_renderer/bilde_renderer_web.php
 %%DATADIR%%/pts-core/objects/bilde_renderer/bilde_svg_renderer.php
 %%DATADIR%%/pts-core/objects/bilde_renderer/bilde_svgz_renderer.php
 %%DATADIR%%/pts-core/objects/bilde_renderer/bilde_swf_renderer.php
-%%DATADIR%%/pts-core/objects/display_modes/pts_basic_display_mode.php
-%%DATADIR%%/pts-core/objects/display_modes/pts_concise_display_mode.php
-%%DATADIR%%/pts-core/objects/display_modes/pts_display_mode_interface.php
+%%DATADIR%%/pts-core/objects/client/display_modes/pts_basic_display_mode.php
+%%DATADIR%%/pts-core/objects/client/display_modes/pts_concise_display_mode.php
+%%DATADIR%%/pts-core/objects/client/display_modes/pts_display_mode_interface.php
+%%DATADIR%%/pts-core/objects/client/pts_argument_check.php
+%%DATADIR%%/pts-core/objects/client/pts_client.php
+%%DATADIR%%/pts-core/objects/client/pts_config.php
+%%DATADIR%%/pts-core/objects/client/pts_documentation.php
+%%DATADIR%%/pts-core/objects/client/pts_download_speed_manager.php
+%%DATADIR%%/pts-core/objects/client/pts_external_dependencies.php
+%%DATADIR%%/pts-core/objects/client/pts_installed_test.php
+%%DATADIR%%/pts-core/objects/client/pts_module.php
+%%DATADIR%%/pts-core/objects/client/pts_module_interface.php
+%%DATADIR%%/pts-core/objects/client/pts_module_manager.php
+%%DATADIR%%/pts-core/objects/client/pts_module_option.php
+%%DATADIR%%/pts-core/objects/client/pts_openbenchmarking_client.php
+%%DATADIR%%/pts-core/objects/client/pts_option_interface.php
+%%DATADIR%%/pts-core/objects/client/pts_phoroscript_interpreter.php
+%%DATADIR%%/pts-core/objects/client/pts_test_execution.php
+%%DATADIR%%/pts-core/objects/client/pts_test_file_download.php
+%%DATADIR%%/pts-core/objects/client/pts_test_install_manager.php
+%%DATADIR%%/pts-core/objects/client/pts_test_install_request.php
+%%DATADIR%%/pts-core/objects/client/pts_test_installer.php
+%%DATADIR%%/pts-core/objects/client/pts_test_notes_manager.php
+%%DATADIR%%/pts-core/objects/client/pts_test_run_manager.php
+%%DATADIR%%/pts-core/objects/client/pts_tests.php
 %%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_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
 %%DATADIR%%/pts-core/objects/nye_Xml/pts_suite_nye_XmlReader.php
@@ -221,49 +240,30 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_TestCountPassGraph.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_VerticalBarGraph.php
 %%DATADIR%%/pts-core/objects/pts_Graph/pts_graph_ir_value.php
-%%DATADIR%%/pts-core/objects/pts_argument_check.php
 %%DATADIR%%/pts-core/objects/pts_arrays.php
 %%DATADIR%%/pts-core/objects/pts_c.php
-%%DATADIR%%/pts-core/objects/pts_client.php
-%%DATADIR%%/pts-core/objects/pts_client.php.bak
-%%DATADIR%%/pts-core/objects/pts_compatibility.php
 %%DATADIR%%/pts-core/objects/pts_compression.php
-%%DATADIR%%/pts-core/objects/pts_config.php
-%%DATADIR%%/pts-core/objects/pts_documentation.php
-%%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
 %%DATADIR%%/pts-core/objects/pts_merge.php
-%%DATADIR%%/pts-core/objects/pts_module.php
-%%DATADIR%%/pts-core/objects/pts_module_interface.php
-%%DATADIR%%/pts-core/objects/pts_module_manager.php
-%%DATADIR%%/pts-core/objects/pts_module_option.php
 %%DATADIR%%/pts-core/objects/pts_network.php
 %%DATADIR%%/pts-core/objects/pts_openbenchmarking.php
-%%DATADIR%%/pts-core/objects/pts_openbenchmarking_client.php
-%%DATADIR%%/pts-core/objects/pts_option_interface.php
 %%DATADIR%%/pts-core/objects/pts_pdf_template.php
-%%DATADIR%%/pts-core/objects/pts_phoroscript_interpreter.php
 %%DATADIR%%/pts-core/objects/pts_render.php
 %%DATADIR%%/pts-core/objects/pts_result_file.php
 %%DATADIR%%/pts-core/objects/pts_result_file_analyze_manager.php
 %%DATADIR%%/pts-core/objects/pts_result_file_analyzer.php
 %%DATADIR%%/pts-core/objects/pts_result_file_merge_manager.php
+%%DATADIR%%/pts-core/objects/pts_result_file_output.php
 %%DATADIR%%/pts-core/objects/pts_result_file_writer.php
 %%DATADIR%%/pts-core/objects/pts_result_merge_select.php
 %%DATADIR%%/pts-core/objects/pts_storage_object.php
 %%DATADIR%%/pts-core/objects/pts_strings.php
-%%DATADIR%%/pts-core/objects/pts_test_execution.php
-%%DATADIR%%/pts-core/objects/pts_test_file_download.php
-%%DATADIR%%/pts-core/objects/pts_test_install_manager.php
-%%DATADIR%%/pts-core/objects/pts_test_install_request.php
-%%DATADIR%%/pts-core/objects/pts_test_installer.php
-%%DATADIR%%/pts-core/objects/pts_test_notes_manager.php
+%%DATADIR%%/pts-core/objects/pts_svg_dom.php
+%%DATADIR%%/pts-core/objects/pts_svg_dom_gd.php
 %%DATADIR%%/pts-core/objects/pts_test_option.php
 %%DATADIR%%/pts-core/objects/pts_test_profile.php
 %%DATADIR%%/pts-core/objects/pts_test_profile_downloads_writer.php
@@ -271,22 +271,21 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/pts_test_profile_writer.php
 %%DATADIR%%/pts-core/objects/pts_test_result.php
 %%DATADIR%%/pts-core/objects/pts_test_result_buffer.php
+%%DATADIR%%/pts-core/objects/pts_test_result_buffer_extra.php
 %%DATADIR%%/pts-core/objects/pts_test_result_buffer_item.php
 %%DATADIR%%/pts-core/objects/pts_test_result_parser.php
 %%DATADIR%%/pts-core/objects/pts_test_result_parser_writer.php
 %%DATADIR%%/pts-core/objects/pts_test_result_regression_marker.php
-%%DATADIR%%/pts-core/objects/pts_test_run_manager.php
 %%DATADIR%%/pts-core/objects/pts_test_run_options.php
 %%DATADIR%%/pts-core/objects/pts_test_suite.php
 %%DATADIR%%/pts-core/objects/pts_test_suite_parser.php
 %%DATADIR%%/pts-core/objects/pts_test_suite_writer.php
-%%DATADIR%%/pts-core/objects/pts_tests.php
 %%DATADIR%%/pts-core/objects/pts_tracker.php
 %%DATADIR%%/pts-core/objects/pts_types.php
 %%DATADIR%%/pts-core/objects/pts_user_io.php
 %%DATADIR%%/pts-core/objects/pts_validation.php
 %%DATADIR%%/pts-core/objects/pts_virtual_test_suite.php
-%%DATADIR%%/pts-core/openbenchmarking.org/openbenchmarking-mime.xml
+%%DATADIR%%/pts-core/objects/pts_web.php
 %%DATADIR%%/pts-core/openbenchmarking.org/schemas/result-file.xsd
 %%DATADIR%%/pts-core/openbenchmarking.org/schemas/results-parser.xsd
 %%DATADIR%%/pts-core/openbenchmarking.org/schemas/test-profile-downloads.xsd
@@ -303,7 +302,6 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/results-viewer/pts-header.png
 %%DATADIR%%/pts-core/results-viewer/pts-results-viewer.xsl
 %%DATADIR%%/pts-core/results-viewer/pts.js
-%%DATADIR%%/pts-core/static/bash_completion
 %%DATADIR%%/pts-core/static/certificates/openbenchmarking-server.pem
 %%DATADIR%%/pts-core/static/certificates/phoromatic-com.pem
 %%DATADIR%%/pts-core/static/examples/apt-full-upgrade
@@ -312,9 +310,13 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/static/examples/phoromatic-tracker-update-kernel
 %%DATADIR%%/pts-core/static/examples/update-kernel-from-ubuntu-daily-ppa
 %%DATADIR%%/pts-core/static/examples/update-ubuntu-aptitude-full
-%%DATADIR%%/pts-core/static/graph-config-defaults.xml
-%%DATADIR%%/pts-core/static/images/openbenchmarking.png
 %%DATADIR%%/pts-core/static/images/phoronix-test-suite.png
+%%DATADIR%%/pts-core/static/images/ob-10x16.png
+%%DATADIR%%/pts-core/static/images/ob-fulltext-183x32.png
+%%DATADIR%%/pts-core/static/images/pts-77x40-white.png
+%%DATADIR%%/pts-core/static/images/pts-80x42.png
+%%DATADIR%%/pts-core/static/images/pts-80x42-white.png
+%%DATADIR%%/pts-core/static/images/pts-160x83.png
 %%DATADIR%%/pts-core/static/images/pts-106x55.png
 %%DATADIR%%/pts-core/static/images/pts-158x82.jpg
 %%DATADIR%%/pts-core/static/images/pts-158x82.png
@@ -345,7 +347,8 @@ bin/phoronix-test-suite
 @dirrm %%DATADIR%%/pts-core/objects/phodevi/components
 @dirrm %%DATADIR%%/pts-core/objects/phodevi
 @dirrm %%DATADIR%%/pts-core/objects/nye_Xml
-@dirrm %%DATADIR%%/pts-core/objects/display_modes
+@dirrm %%DATADIR%%/pts-core/objects/client/display_modes
+@dirrm %%DATADIR%%/pts-core/objects/client
 @dirrm %%DATADIR%%/pts-core/objects/bilde_renderer
 @dirrm %%DATADIR%%/pts-core/objects
 @dirrm %%DATADIR%%/pts-core/modules