4 files changed, 36 insertions, 25 deletions

diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 77ba8a9051f5..23c4f3d7f897 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -1,12 +1,9 @@
-# New ports collection makefile for:	phoronix
-# Date created:				Jul 1, 2009
-# Whom:					Kris Moore <kmoore@FreeBSD.org>
+# Created by:	Kris Moore <kmoore@FreeBSD.org>
 #
 # $FreeBSD$
-#
 
 PORTNAME=	phoronix-test-suite
-PORTVERSION=	4.0.1
+PORTVERSION=	4.6.1
 CATEGORIES=	benchmarks
 MASTER_SITES=	http://www.phoronix-test-suite.com/releases/
 
diff --git a/benchmarks/phoronix-test-suite/distinfo b/benchmarks/phoronix-test-suite/distinfo
index 03667ca3afe7..33737aa7b51e 100644
--- a/benchmarks/phoronix-test-suite/distinfo
+++ b/benchmarks/phoronix-test-suite/distinfo
@@ -1,2 +1,2 @@
-SHA256 (phoronix-test-suite-4.0.1.tar.gz) = 2dd463dbaad8763b73170e94f4ecd3c9b9578ad5d3a67ca82855ab0509a5c90a
-SIZE (phoronix-test-suite-4.0.1.tar.gz) = 492587
+SHA256 (phoronix-test-suite-4.6.1.tar.gz) = 882193e590f54490a15e981bea23c529987ca3a660240747fb5e86029d76facd
+SIZE (phoronix-test-suite-4.6.1.tar.gz) = 510999
diff --git a/benchmarks/phoronix-test-suite/files/patch-install-sh b/benchmarks/phoronix-test-suite/files/patch-install-sh
index d206d91c6eb8..0345aeefc2c2 100644
--- a/benchmarks/phoronix-test-suite/files/patch-install-sh
+++ b/benchmarks/phoronix-test-suite/files/patch-install-sh
@@ -1,13 +1,14 @@
---- 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 @@
+--- install-sh.orig	2013-05-15 22:44:54.000000000 +0200
++++ install-sh	2013-07-31 00:22:56.749475042 +0200
+@@ -47,19 +47,20 @@
  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
@@ -19,36 +20,37 @@
 -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/
--
--cd documentation/
--cp -r * $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
--cd ..
--rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/
 +if [ -n "$WITH_BASH_COMPLETIONS" ]
 +then
 +mkdir -p $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/
 +fi
  
+ cd documentation/
+ cp -r * $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
+@@ -67,10 +68,15 @@
+ rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/
+ 
  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_COMPLETIONS" ]
 +then
 +cp pts-core/static/bash_completion $DESTDIR$INSTALL_PREFIX/etc/bash_completion.d/phoronix-test-suite
 +fi
-+if [ -z "$WITHOUT_X11" ]
-+then
++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/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
- 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 @@
+ cp -r pts-core/ $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/
+@@ -81,12 +87,13 @@
+ rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/openbenchmarking.png
+ rm -f $DESTDIR$INSTALL_PREFIX/share/phoronix-test-suite/pts-core/static/images/%phoronix-test-suite.png
+ 
+-
+ sed 's:PTS_DIR=`pwd`:PTS_DIR='"$INSTALL_PREFIX"'\/share\/phoronix-test-suite:g' phoronix-test-suite > $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite
+ chmod +x $DESTDIR$INSTALL_PREFIX/bin/phoronix-test-suite
  
  # 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
  
@@ -57,7 +59,7 @@
  # XDG MIME OpenBenchmarking support
  if [ "X$DESTDIR" = "X" ]
  then
-@@ -101,10 +104,10 @@
+@@ -101,10 +108,10 @@
  	cp pts-core/static/images/openbenchmarking.png $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/64x64/mimetypes/application-x-openbenchmarking.png
  
  fi
diff --git a/benchmarks/phoronix-test-suite/pkg-plist b/benchmarks/phoronix-test-suite/pkg-plist
index 4ee2f0922171..a304b02a7c0e 100644
--- a/benchmarks/phoronix-test-suite/pkg-plist
+++ b/benchmarks/phoronix-test-suite/pkg-plist
@@ -10,6 +10,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/analyze_all_runs.php
 %%DATADIR%%/pts-core/commands/analyze_batch.php
 %%DATADIR%%/pts-core/commands/analyze_image_delta.php
+%%DATADIR%%/pts-core/commands/auto_compare.php
 %%DATADIR%%/pts-core/commands/batch_benchmark.php
 %%DATADIR%%/pts-core/commands/batch_install.php
 %%DATADIR%%/pts-core/commands/batch_run.php
@@ -20,6 +21,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/copy_run_in_result_file.php
 %%DATADIR%%/pts-core/commands/debug_install.php
 %%DATADIR%%/pts-core/commands/debug_run.php
+%%DATADIR%%/pts-core/commands/debug_self_test.php
 %%DATADIR%%/pts-core/commands/debug_test_download_links.php
 %%DATADIR%%/pts-core/commands/default_benchmark.php
 %%DATADIR%%/pts-core/commands/default_run.php
@@ -38,6 +40,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/internal_run.php
 %%DATADIR%%/pts-core/commands/interactive.php
 %%DATADIR%%/pts-core/commands/list_available_suites.php
 %%DATADIR%%/pts-core/commands/list_available_tests.php
@@ -48,6 +51,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/commands/list_missing_dependencies.php
 %%DATADIR%%/pts-core/commands/list_modules.php
 %%DATADIR%%/pts-core/commands/list_possible_dependencies.php
+%%DATADIR%%/pts-core/commands/list_recommended_tests.php
 %%DATADIR%%/pts-core/commands/list_saved_results.php
 %%DATADIR%%/pts-core/commands/list_test_usage.php
 %%DATADIR%%/pts-core/commands/list_unsupported_tests.php
@@ -92,9 +96,11 @@ bin/phoronix-test-suite
 %%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
+%%DATADIR%%/pts-core/external-test-dependencies/scripts/install-dragonfly-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-fedora-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-freebsd-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-gentoo-packages.sh
+%%DATADIR%%/pts-core/external-test-dependencies/scripts/install-macports-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-mandrivalinux-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-netbsd-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-openindiana-packages.sh
@@ -107,10 +113,12 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/external-test-dependencies/scripts/install-zenwalk-packages.sh
 %%DATADIR%%/pts-core/external-test-dependencies/xml/angstrom-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/arch-packages.xml
+%%DATADIR%%/pts-core/external-test-dependencies/xml/dragonfly-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/generic-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/gentoo-packages.xml
+%%DATADIR%%/pts-core/external-test-dependencies/xml/macports-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/mandrivalinux-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/netbsd-packages.xml
 %%DATADIR%%/pts-core/external-test-dependencies/xml/openindiana-packages.xml
@@ -193,6 +201,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/phodevi/parsers/phodevi_solaris_parser.php
 %%DATADIR%%/pts-core/objects/phodevi/parsers/phodevi_windows_parser.php
 %%DATADIR%%/pts-core/objects/phodevi/phodevi.php
+%%DATADIR%%/pts-core/objects/phodevi/phodevi_base.php
 %%DATADIR%%/pts-core/objects/phodevi/phodevi_cache.php
 %%DATADIR%%/pts-core/objects/phodevi/phodevi_device_interface.php
 %%DATADIR%%/pts-core/objects/phodevi/phodevi_device_property.php
@@ -214,6 +223,7 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/phodevi/sensors/hdd_temp.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/hdd_write_speed.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/memory_usage.php
+%%DATADIR%%/pts-core/objects/phodevi/sensors/network_usage.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/swap_usage.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/sys_fanspeed.php
 %%DATADIR%%/pts-core/objects/phodevi/sensors/sys_iowait.php
@@ -249,6 +259,8 @@ bin/phoronix-test-suite
 %%DATADIR%%/pts-core/objects/pts_arrays.php
 %%DATADIR%%/pts-core/objects/pts_c.php
 %%DATADIR%%/pts-core/objects/pts_compression.php
+%%DATADIR%%/pts-core/objects/pts_exdep_generic_parser.php
+%%DATADIR%%/pts-core/objects/pts_exdep_platform_parser.php
 %%DATADIR%%/pts-core/objects/pts_file_io.php
 %%DATADIR%%/pts-core/objects/pts_flags.php
 %%DATADIR%%/pts-core/objects/pts_html_template.php