system/wmgtemp: New maintainer, minor fixes.

5 files changed, 51 insertions, 33 deletions

diff --git a/system/wmgtemp/README b/system/wmgtemp/README
index df5c0764f76d8..9da3f28557de0 100644
--- a/system/wmgtemp/README
+++ b/system/wmgtemp/README
@@ -1,7 +1,4 @@
-wmgtemp is a dock app for WindowMaker that graphically displays the CPU and SYS temperatures 
-using the lm_sensors package.
+wmgtemp (temperature monitoring dockapp)
 
-Note: This DockApp needs a lm_sensors config file (defaults to /etc/sensors.conf). I had
-one called "sensors3.conf" in my etc folder. So I started wmgtemp like this:
-"wmgtemp -S /etc/sensors3.conf" and it worked fine for me. If it doesn't for you, try
-writing your own configuration file.
+wmgtemp is a dock app for WindowMaker that graphically displays the CPU
+and SYS temperatures using the lm_sensors package.
diff --git a/system/wmgtemp/bugfix.diff b/system/wmgtemp/bugfix.diff
new file mode 100644
index 0000000000000..19916400c8446
--- /dev/null
+++ b/system/wmgtemp/bugfix.diff
@@ -0,0 +1,14 @@
+diff -Naur wmgtemp-1.1/src/wmgtemp.c wmgtemp-1.1.patched/src/wmgtemp.c
+--- wmgtemp-1.1/src/wmgtemp.c	2010-06-21 06:54:37.000000000 -0400
++++ wmgtemp-1.1.patched/src/wmgtemp.c	2016-08-16 08:38:01.208866564 -0400
+@@ -90,8 +90,8 @@
+ int SUBFEAT_NUM_CPU = 0;
+ int SUBFEAT_NUM_SYS = 0;
+ 
+-double cpu_history[59];
+-double sys_history[59];
++double cpu_history[60];
++double sys_history[60];
+ 
+ double display_min = 20;
+ double display_max = 35;
diff --git a/system/wmgtemp/slack-desc b/system/wmgtemp/slack-desc
index b243fb3e0a6e6..deafa801db605 100644
--- a/system/wmgtemp/slack-desc
+++ b/system/wmgtemp/slack-desc
@@ -5,15 +5,15 @@
 # You must make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':' except on otherwise blank lines.
 
-       |-----handy-ruler--------------------------------------------------------|
-wmgtemp: wmgtemp (Graphical GPU and SYS Temp Monitor DockApp)
-wmgtemp: 
-wmgtemp: wmgtemp is a dock app for WindowMaker that graphically displays the CPU  
-wmgtemp: and SYS temperatures using the lm_sensors package. 
-wmgtemp: 
-wmgtemp: Homepage: http://fluxcode.net/projects/wmgtemp 
-wmgtemp:
-wmgtemp: 
+       |-----handy-ruler------------------------------------------------------|
+wmgtemp: wmgtemp (temperature monitoring dockapp)
+wmgtemp:
+wmgtemp: wmgtemp is a dock app for WindowMaker that graphically displays the
+wmgtemp: CPU and SYS temperatures using the lm_sensors package.
+wmgtemp:
+wmgtemp:
+wmgtemp:
+wmgtemp:
 wmgtemp:
 wmgtemp:
 wmgtemp:
diff --git a/system/wmgtemp/wmgtemp.SlackBuild b/system/wmgtemp/wmgtemp.SlackBuild
index dc24f082c59e3..d48afc24a9908 100644
--- a/system/wmgtemp/wmgtemp.SlackBuild
+++ b/system/wmgtemp/wmgtemp.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for wmgtemp
 #
-# Copyright 2015 Gethyn ThomasQuail <gethyn@bloodbathsoftworks.com>
+# Copyright 2015 Gethyn ThomasQuail <email removed>
 # All rights reserved.
 #
 # Based on:
@@ -25,14 +25,25 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# Now maintained by B. Watson <yalhcru@gmail.com>
+
+# 20160816 bkw:
+# - take over maintenance
+# - BUILD=2
+# - i486 => i586
+# - install binary stripped
+# - fix array out of bounds bug
+# - default to the correct .conf for Slack's lm_sensors 3.x
+# - don't install INSTALL to doc dir
+
 PRGNAM=wmgtemp
 VERSION=${VERSION:-1.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -43,8 +54,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -72,22 +83,18 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Let's compile!
-make CC="gcc -fgnu89-inline $SLKCFLAGS"
+patch -p1 < $CWD/bugfix.diff
 
-# Create bin directory and move executable there
-mkdir -p $PKG/usr/bin
-mv src/wmgtemp $PKG/usr/bin
+sed -i 's,/etc/sensors\.conf,/etc/sensors3.conf,' src/$PRGNAM.c $PRGNAM.1
 
-# Creates man page directory
+make CCFLAGS="$SLKCFLAGS -fgnu89-inline"
+mkdir -p $PKG/usr/bin
+install -s -m0755 src/$PRGNAM $PKG/usr/bin
 mkdir -p $PKG/usr/man/man1
-
-# Compresses man page and moves it into place
-gzip -9 wmgtemp.1
-mv wmgtemp.1.gz $PKG/usr/man/man1
+gzip -9c < $PRGNAM.1 > $PKG/usr/man/man1/$PRGNAM.1.gz
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Artistic ChangeLog CREDITS INSTALL README TODO $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Artistic ChangeLog CREDITS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/system/wmgtemp/wmgtemp.info b/system/wmgtemp/wmgtemp.info
index 2ebc545318e13..8723be139c15b 100644
--- a/system/wmgtemp/wmgtemp.info
+++ b/system/wmgtemp/wmgtemp.info
@@ -6,5 +6,5 @@ MD5SUM="cce700b3a4ef74b2ec019d8e89bdf2f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Gethyn ThomasQuail"
-EMAIL="gethyn@bloodbathsoftworks.com"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"