From 3ae00a0dfa58bf37717d8e161f86d3689a95217f Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sun, 22 Nov 2015 03:11:44 -0500
Subject: desktop/wmmon: Updated for version 1.1+20131205.

---
 desktop/wmmon/wmmon.SlackBuild | 20 +++++++-------------
 1 file changed, 7 insertions(+), 13 deletions(-)

(limited to 'desktop/wmmon/wmmon.SlackBuild')

diff --git a/desktop/wmmon/wmmon.SlackBuild b/desktop/wmmon/wmmon.SlackBuild
index 170840d264..84601f77db 100644
--- a/desktop/wmmon/wmmon.SlackBuild
+++ b/desktop/wmmon/wmmon.SlackBuild
@@ -7,13 +7,10 @@
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
 PRGNAM=wmmon
-VERSION=${VERSION:-1.0b2_p14}
+VERSION=${VERSION:-1.1+20131205}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-SRCVER=$(echo $VERSION | cut -d_ -f1 | sed 's,\.,_,' )
-PATCHVER=$(echo $VERSION | cut -d_ -f2)
-
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -44,8 +41,8 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM.app
-tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz
-cd $PRGNAM.app
+tar xvf $CWD/${PRGNAM}_${VERSION}.orig.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -53,11 +50,9 @@ 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 {} \;
 
-# wmmon was pretty much abandoned by the original developer 10+ years ago.
-# The Debian maintainer has added some security-related fixes, a man page,
-# better support for 2.6 kernels, and some extra features. Most people
-# would prefer to run the patched version...
-patch -p1 < $CWD/patches/${PRGNAM}_$SRCVER-$PATCHVER.diff
+# need this for -current, it doesn't hurt anything on 14.1.
+# patch snarfed from Debian:
+patch -p1 < $CWD/patches/gcc5.diff
 
 # This patch is necessary because the $#!%^#$^ wmmonrc file parser doesn't
 # fully support comments: they are allowed, but a commented-out (but
@@ -85,8 +80,7 @@ cat $CWD/wmmonrc > $PKG/etc/wmmonrc.sample
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
   BUGS CHANGES COPYING HINTS INSTALL README TODO \
-    $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a debian/changelog $PKG/usr/doc/$PRGNAM-$VERSION/changelog.debian
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
-- 
cgit v1.2.3