system/i8kutils: Updated for version 1.42.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

5 files changed, 28 insertions, 52 deletions

diff --git a/system/i8kutils/README b/system/i8kutils/README
index 12cf13bd97a44..4c0af641f3e75 100644
--- a/system/i8kutils/README
+++ b/system/i8kutils/README
@@ -1,19 +1,2 @@
-This is a collection of utilities to control Dell Inspiron and
-Latitude laptops. It includes programs to turn the fan on and off,
-to read fan status, CPU temperature, BIOS version and to handle the
-volume buttons and Fn-keys. The package includes also a small Tk
-applet, designed to be swallowed in the GNOME panel, which monitors
-the CPU temperature and controls automatically the fans accordingly
-to user defined thresholds. 
-
-Make sure the i8k module is loaded before using i8kutils.
-
-- i8kutils tarball includes a diagnostic utility named smm, claimed
-to be dangerous by the developer (see comments at the top of smm
-source file, smm.c). Compilation of smm is therefore disabled by
-default; set the variable SMM=yes to enable it, e.g.
-	# SMM=yes ./i8kutils.SlackBuild
-
-Mind also that compilation of smm should fail on Slackware64, but 
-the SlackBuild will try anyway.  smm can damage your data and your 
-hardware, so be careful and use it only if you know what you're doing.
+This package contains user-space programs for controlling the fans on Dell
+laptops. Make sure the i8k module is loaded before using i8kutils.
diff --git a/system/i8kutils/i8kutils.SlackBuild b/system/i8kutils/i8kutils.SlackBuild
index 990aa4d4845af..09d300374075e 100644
--- a/system/i8kutils/i8kutils.SlackBuild
+++ b/system/i8kutils/i8kutils.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for i8kutils
 
-# Copyright 2013 Fabio Sangiovanni <sjh+sbo@sanjioh.org>
+# Copyright 2015 Fabio Sangiovanni <sjh+sbo@sanjioh.org>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=i8kutils
-VERSION=${VERSION:-1.33}
+VERSION=${VERSION:-1.42}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -59,9 +59,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_${VERSION}.tar.gz
-cd $PRGNAM-$VERSION
+rm -rf $PRGNAM
+tar xvf $CWD/${PRGNAM}_${VERSION}.tar.xz
+cd $PRGNAM
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -73,18 +73,11 @@ find -L . \
 mkdir -p $PKG/{etc,usr/{bin,man/man1}}
 
 # Override Makefile CFLAGS with ours
-# Override Makefile PREFIX to avoid redundant '/' in paths
 make CFLAGS="$SLKCFLAGS"
-make install DESTDIR=$PKG PREFIX=usr
-
-# Optional build of smm diagnostic utility - DANGEROUS!
-# Compilation should fail on Slackware64
-SMM=${SMM:-no}
-if [ "$SMM" == 'yes' ]; then
-  mkdir -p $PKG/usr/sbin
-  make smm CFLAGS="$SLKCFLAGS"
-  make install-smm DESTDIR=$PKG PREFIX=usr
-fi
+
+cp -a \
+  i8kctl i8kfan i8kmon probe_i8k_calls_time \
+  $PKG/usr/bin
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
@@ -93,7 +86,7 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 cp -a i8kmon.conf $PKG/etc/i8kmon.conf.new
 
 # Copy man pages
-cp -a i8kbuttons.1 i8kctl.1 i8kmon.1 $PKG/usr/man/man1
+cp -a i8kctl.1 i8kmon.1 $PKG/usr/man/man1
 
 find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
@@ -105,7 +98,7 @@ cp -a \
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 # Decomment the following line if you want extra documentation to be included
-#cp -a debian examples patches redhat $PKG/usr/doc/$PRGNAM-$VERSION
+#cp -a debian redhat $PKG/usr/doc/$PRGNAM-$VERSION
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/i8kutils/i8kutils.info b/system/i8kutils/i8kutils.info
index 8fe9341c5f50f..de2f14884c15a 100644
--- a/system/i8kutils/i8kutils.info
+++ b/system/i8kutils/i8kutils.info
@@ -1,10 +1,10 @@
 PRGNAM="i8kutils"
-VERSION="1.33"
-HOMEPAGE="http://packages.debian.org/i8kutils"
-DOWNLOAD="http://ftp.de.debian.org/debian/pool/main/i/i8kutils/i8kutils_1.33.tar.gz"
-MD5SUM="1ab077b301dbb0f4be8ef52eb3b97628"
+VERSION="1.42"
+HOMEPAGE="https://launchpad.net/i8kutils"
+DOWNLOAD="https://launchpad.net/i8kutils/trunk/1.42/+download/i8kutils_1.42.tar.xz"
+MD5SUM="7470b2908b39a41e3f26b8b3398e189d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES=""
+REQUIRES="acpi"
 MAINTAINER="Fabio Sangiovanni"
 EMAIL="sjh+sbo@sanjioh.org"
diff --git a/system/i8kutils/rc.i8kmon b/system/i8kutils/rc.i8kmon
index 1d88d42ccbb57..18640a137156e 100644
--- a/system/i8kutils/rc.i8kmon
+++ b/system/i8kutils/rc.i8kmon
@@ -14,12 +14,12 @@ i8kmon_start() {
 # Stop i8kmon
 i8kmon_stop() {
   echo "Stopping i8kmon daemon"
-  pkill -f "tclsh /usr/bin/i8kmon -- $I8KMON_PARAMS"
+  pkill -f "tclsh /usr/bin/i8kmon $I8KMON_PARAMS"
 }
 
 # Check status
 i8kmon_status() {
-  pgrep -f "tclsh /usr/bin/i8kmon -- $I8KMON_PARAMS" > /dev/null
+  pgrep -f "tclsh /usr/bin/i8kmon $I8KMON_PARAMS" > /dev/null
   local I8KMON_STATUS=$?
   if [ $I8KMON_STATUS -ne 0 ]; then
     return 1
diff --git a/system/i8kutils/slack-desc b/system/i8kutils/slack-desc
index 8d658d1aab12b..db9ee18a3cf74 100644
--- a/system/i8kutils/slack-desc
+++ b/system/i8kutils/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-i8kutils: i8kutils (utilities for Dell Inspiron and Latitude laptops)
+i8kutils: i8kutils (utilities for Dell laptops)
+i8kutils:
+i8kutils: This package contains user-space programs for controlling the fans on
+i8kutils: Dell laptops.
+i8kutils: Homepage: https://launchpad.net/i8kutils
+i8kutils:
+i8kutils:
+i8kutils:
 i8kutils:
-i8kutils: This is a collection of utilities to control Dell Inspiron and
-i8kutils: Latitude laptops. It includes programs to turn the fan on and off,
-i8kutils: to read fan status, CPU temperature, BIOS version and to handle the
-i8kutils: volume buttons and Fn-keys. The package includes also a small Tk
-i8kutils: applet, designed to be swallowed in the GNOME panel, which monitors
-i8kutils: the CPU temperature and controls automatically the fans accordingly
-i8kutils: to user defined thresholds.
 i8kutils:
 i8kutils: