benchmarks/phoronix-test-suite: Change "cp -r"

The "-r" option is highly discouraged in BSD although it's reluctantly
supported.  The problem is that it doesn't behave the same on all
platforms.  For example, "cp -r pts-core/ destdir/" won't always give
the same results:

On NetBSD,   pts-core files are put: /destdir/pts-core/<files>
On DragonFly pts-core files are put: /destdir/<files>

That messes the PLIST up.
This changes "cp -r <dir>/" to "cp -R <dir>" which has the same
behavior on different platforms.  Tested on NetBSD and DragonFly

3 files changed, 28 insertions, 9 deletions

diff --git a/benchmarks/phoronix-test-suite/Makefile b/benchmarks/phoronix-test-suite/Makefile
index 9be4fef858a..1ab77691565 100644
--- a/benchmarks/phoronix-test-suite/Makefile
+++ b/benchmarks/phoronix-test-suite/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.3 2012/06/16 02:50:47 taca Exp $
+# $NetBSD: Makefile,v 1.4 2012/08/15 22:08:16 marino Exp $
 #
 
 DISTNAME=	phoronix-test-suite-${PTS_VERSION}
 PTS_VERSION=	3.4.0
+PKG_REVISION=	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 843343f7642..a92c9ac98c7 100644
--- a/benchmarks/phoronix-test-suite/distinfo
+++ b/benchmarks/phoronix-test-suite/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2011/12/07 00:30:16 jym Exp $
+$NetBSD: distinfo,v 1.2 2012/08/15 22:08:16 marino Exp $
 
 SHA1 (phoronix-test-suite-3.4.0.tar.gz) = 10be51fc45c077fd73193a8f4bd6c850a9198f84
 RMD160 (phoronix-test-suite-3.4.0.tar.gz) = 858605ba618cb8c721b68a142db70d9a298ab6d7
 Size (phoronix-test-suite-3.4.0.tar.gz) = 418224 bytes
-SHA1 (patch-install-sh) = 3e67ab86388af74bfe110198783dacbf391b2162
+SHA1 (patch-install-sh) = 8b26a2ee586d5d3746cb6597db010eb961e250de
diff --git a/benchmarks/phoronix-test-suite/patches/patch-install-sh b/benchmarks/phoronix-test-suite/patches/patch-install-sh
index 68ab8b1bf2d..5f66bb4e2d8 100644
--- a/benchmarks/phoronix-test-suite/patches/patch-install-sh
+++ b/benchmarks/phoronix-test-suite/patches/patch-install-sh
@@ -1,10 +1,17 @@
-$NetBSD: patch-install-sh,v 1.1 2011/12/07 00:23:09 jym Exp $
-Handle pkgsrc hierarchy, especially paths to man pages.
-Do not execute xdg-* during installation, let the shared-mime-info
-and desktop-file-utils update their databases.
+$NetBSD: patch-install-sh,v 1.2 2012/08/15 22:08:16 marino Exp $
+
+* Handle pkgsrc hierarchy, especially paths to man pages.
+* Do not execute xdg-* during installation, let the shared-mime-info
+  and desktop-file-utils update their databases.
+* Change "cp -r <dir>/" to "cp -R <dir>".
+  -r is highly discouraged on BSD systems and they behave differently
+  (e.g. DragonFly copied only the contents of pts-core while NetBSD
+  and other platforms copied pts-core and its contents were one level
+  lower than DragonFly)
+
 --- install-sh.orig	2011-05-17 18:00:59.000000000 +0000
 +++ install-sh
-@@ -50,10 +50,9 @@ rm -rf $DESTDIR$INSTALL_PREFIX/share/doc
+@@ -50,28 +50,27 @@ rm -rf $DESTDIR$INSTALL_PREFIX/share/doc
  mkdir -p $DESTDIR$INSTALL_PREFIX/bin/
  mkdir -p $DESTDIR$INSTALL_PREFIX/share/applications/
  mkdir -p $DESTDIR$INSTALL_PREFIX/share/icons/hicolor/48x48/apps/
@@ -16,7 +23,11 @@ and desktop-file-utils update their databases.
  
  cp CHANGE-LOG $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
  cp COPYING $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
-@@ -64,8 +63,8 @@ cp -r * $DESTDIR$INSTALL_PREFIX/share/do
+ cp AUTHORS $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
+ 
+ cd documentation/
+-cp -r * $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
++cp -R * $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/
  cd ..
  rm -rf $DESTDIR$INSTALL_PREFIX/share/doc/phoronix-test-suite/man-pages/
  
@@ -27,6 +38,13 @@ and desktop-file-utils update their databases.
  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/
+ 
+ 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,11 +78,6 @@ chmod +x $DESTDIR$INSTALL_PREFIX/bin/pho
  
  # 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