desktop/sxhkd: Updated for version 0.5.7 + new maintainer.

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

4 files changed, 29 insertions, 27 deletions

diff --git a/desktop/sxhkd/README b/desktop/sxhkd/README
index f7af5fe948..75a23ed14d 100644
--- a/desktop/sxhkd/README
+++ b/desktop/sxhkd/README
@@ -1,4 +1,7 @@
-sxhkd - Simple X hotkey daemon
+sxhkd is an X daemon that reacts to input events by executing commands.
 
-sxhkd is a simple X hotkey daemon with a powerful and compact
-configuration syntax.
+Its configuration file is a series of bindings that define the associations
+between the input events and the commands.
+
+The format of the configuration file supports a simple notation for mapping
+multiple shortcuts to multiple commands in parallel.
diff --git a/desktop/sxhkd/slack-desc b/desktop/sxhkd/slack-desc
index a89e842979..5e49327a21 100644
--- a/desktop/sxhkd/slack-desc
+++ b/desktop/sxhkd/slack-desc
@@ -8,12 +8,12 @@
      |-----handy-ruler------------------------------------------------------|
 sxhkd: sxhkd (Simple X hotkey daemon)
 sxhkd:
-sxhkd: sxhkd is a simple X hotkey daemon with a powerful and compact
-sxhkd: configuration syntax.
-sxhkd:
-sxhkd:
-sxhkd:
-sxhkd:
+sxhkd: sxhkd is an X daemon that reacts to input events by executing
+sxhkd: commands. It's configuration file is a series of bindings that
+sxhkd: define the associations between the input events and the commands.
 sxhkd:
+sxhkd: The format of the configuration file supports a simple notation for
+sxhkd: mapping multiple shortcuts to multiple commands in parallel.
 sxhkd:
+sxhkd: Homepage: https://github.com/baskerville/sxhkd
 sxhkd:
diff --git a/desktop/sxhkd/sxhkd.SlackBuild b/desktop/sxhkd/sxhkd.SlackBuild
index 0c2137d890..c1c0c6e203 100644
--- a/desktop/sxhkd/sxhkd.SlackBuild
+++ b/desktop/sxhkd/sxhkd.SlackBuild
@@ -3,6 +3,7 @@
 # Slackware build script for sxhkd
 
 # Copyright 2013-2014 John Vogel Corning, NY USA
+# Copyright 2017 Panagiotis Nikolaou, Culver City, CA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -13,7 +14,7 @@
 #
 #  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
+#  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;
@@ -23,13 +24,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=sxhkd
-VERSION=${VERSION:-0.5.4}
+VERSION=${VERSION:-0.5.7}
 BUILD=${BUILD:-1}
 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
@@ -40,8 +41,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"
@@ -60,11 +61,6 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-if [ ! -f $CWD/$PRGNAM-$VERSION.tar.gz ]; then
-	if [ -f $CWD/$VERSION.tar.gz ]; then
-		mv $CWD/$VERSION.tar.gz $CWD/$PRGNAM-$VERSION.tar.gz
-	fi
-fi
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
@@ -74,10 +70,13 @@ 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 {} \;
 
+sed -i "s|share/man|man|" Makefile
+sed -i "s|share/doc/\$(NAME)|doc/$PRGNAM-$VERSION|" Makefile
+
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
-make PREFIX=/usr MANPREFIX=/usr/man
-make PREFIX=/usr MANPREFIX=/usr/man DESTDIR=$PKG install
+make PREFIX=/usr
+make PREFIX=/usr DESTDIR=$PKG install
 
 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
@@ -86,7 +85,7 @@ 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
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a LICENSE doc/sxhkd.1.txt examples $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a LICENSE README.md doc/* examples $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/desktop/sxhkd/sxhkd.info b/desktop/sxhkd/sxhkd.info
index f0434b0783..423e530dd2 100644
--- a/desktop/sxhkd/sxhkd.info
+++ b/desktop/sxhkd/sxhkd.info
@@ -1,10 +1,10 @@
 PRGNAM="sxhkd"
-VERSION="0.5.4"
+VERSION="0.5.7"
 HOMEPAGE="https://github.com/baskerville/sxhkd"
-DOWNLOAD="https://github.com/baskerville/sxhkd/archive/0.5.4.tar.gz"
-MD5SUM="8189596dca5ca535397ae10ffcf0ac0c"
+DOWNLOAD="https://github.com/baskerville/sxhkd/archive/0.5.7/sxhkd-0.5.7.tar.gz"
+MD5SUM="3ece57d81a406c020f96f3839b9d5c4a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="John Vogel"
-EMAIL="jvogel4@stny.rr.com"
+MAINTAINER="Panagiotis Nikolaou"
+EMAIL="hostmaster@slackonly.com"