system/lbench: Updated for version 1.7

Signed-off-by: Erik Hanson <erik@slackbuilds.org>

3 files changed, 36 insertions, 12 deletions

diff --git a/system/lbench/doinst.sh b/system/lbench/doinst.sh
index 4e8ba7071d..5fb28930db 100644
--- a/system/lbench/doinst.sh
+++ b/system/lbench/doinst.sh
@@ -1,4 +1,3 @@
 if [ -x /usr/bin/update-desktop-database ]; then
   /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
-
diff --git a/system/lbench/lbench.SlackBuild b/system/lbench/lbench.SlackBuild
index 0cebcd543a..c03722cd6f 100644
--- a/system/lbench/lbench.SlackBuild
+++ b/system/lbench/lbench.SlackBuild
@@ -3,11 +3,30 @@
 # Slackware build script for lbench
 # simple Linux multithread benchmarking tool
 
-# Written by Niels Horn <niels.horn@gmail.com>
-# Revision date 2010/12/23
+# Copyright 2010-2011 Niels Horn, Rio de Janeiro, RJ, Brazil
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# Revision date 2011/12/28
 
 PRGNAM=lbench
-VERSION=${VERSION:-1.6}
+VERSION=${VERSION:-1.7}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -53,12 +72,19 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+# Fix makefile to not "install" the .desktop file
+sed -i "s/xdg-desktop/# xdg-desktop/g" Makefile
+
 CXXFLAGS="$SLKCFLAGS" \
 PREFIX=/usr \
-make DOCDIR=/usr/doc/$PRGNAM-$VERSION
+make
 
 PREFIX=/usr \
-make install DOCDIR=/usr/doc/$PRGNAM-$VERSION DESTDIR=$PKG
+make install \
+  DOCDIR=/usr/doc/$PRGNAM-$VERSION \
+  MANDIR=/usr/man/man1 \
+  MENUFILE=/usr/share/applications/$PRGNAM.desktop \
+  DESTDIR=$PKG
 
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -68,9 +94,8 @@ cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/usr/share/{applications,pixmaps}
 cat desktop | \
-  sed -e "s|/usr/local/bin/lbench|lbench|" \
-      -e "s|/usr/local/share/lbench/icons/lbench.png|lbench|" \
-      -e "s|^# ||g" \
+  sed -e "s|/usr/bin/lbench|lbench|" \
+      -e "s|/usr/share/lbench/icons/lbench.png|lbench|" \
   > $PKG/usr/share/applications/$PRGNAM.desktop
 cp icons/$PRGNAM.png $PKG/usr/share/pixmaps/
 
diff --git a/system/lbench/lbench.info b/system/lbench/lbench.info
index 32dbdc3101..a81d770dd5 100644
--- a/system/lbench/lbench.info
+++ b/system/lbench/lbench.info
@@ -1,8 +1,8 @@
 PRGNAM="lbench"
-VERSION="1.6"
+VERSION="1.7"
 HOMEPAGE="http://kornelix.squarespace.com/lbench/"
-DOWNLOAD="http://kornelix.squarespace.com/storage/downloads/lbench-1.6.tar.gz"
-MD5SUM="ddcbe2ffb4b1b50a11a45ef3cc28b5d0"
+DOWNLOAD="http://kornelix.squarespace.com/storage/downloads/lbench-1.7.tar.gz"
+MD5SUM="cfbf0edb0fd1bbac552ccddf02585eda"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Niels Horn"