system/xbindkeys: Updated for version 1.8.3

4 files changed, 37 insertions, 17 deletions

diff --git a/system/xbindkeys/README b/system/xbindkeys/README
index 811cfe84f2..7fbbd7a9e4 100644
--- a/system/xbindkeys/README
+++ b/system/xbindkeys/README
@@ -1,5 +1,4 @@
-xbindkeys is a program that allows you to launch shell commands
-with your keyboard or your mouse under X Windows. It links commands
-to keys or mouse buttons, using a configuration file. It's
-independant of the window manager and can capture all keyboard keys
-(ex: Power, Wake...).
+xbindkeys is a program that allows you to launch shell commands with your 
+keyboard or your mouse under X Windows.  It links commands to keys or mouse 
+buttons, using a configuration file.  It's independant of the window manager 
+and can capture all keyboard keys (ex: Power, Wake...).
diff --git a/system/xbindkeys/slack-desc b/system/xbindkeys/slack-desc
index 9ee23e7088..4236a3fa32 100644
--- a/system/xbindkeys/slack-desc
+++ b/system/xbindkeys/slack-desc
@@ -5,9 +5,9 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+         |-----handy-ruler------------------------------------------------------|
 xbindkeys: XBindKeys (xbindkeys)
-xbindkeys: 
+xbindkeys:
 xbindkeys: xbindkeys is a program that allows you to launch shell commands
 xbindkeys: with your keyboard or your mouse under X Windows. It links commands
 xbindkeys: to keys or mouse buttons, using a configuration file. It's
diff --git a/system/xbindkeys/xbindkeys.SlackBuild b/system/xbindkeys/xbindkeys.SlackBuild
index 1949c441e2..9cd41b539f 100644
--- a/system/xbindkeys/xbindkeys.SlackBuild
+++ b/system/xbindkeys/xbindkeys.SlackBuild
@@ -1,8 +1,26 @@
 #!/bin/sh
-
+#
 # Slackware build script for xbindkeys
-# Written by Erik Hanson erik@slackbuilds.org
-# Modified by the SlackBuilds.org project
+#
+# Copyright 2009  Erik W. Hanson, Minneapolis, MN, USA
+# 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.
 
 PRGNAM=xbindkeys
 VERSION=1.8.3
@@ -15,8 +33,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-set -eu
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
   LIBDIRSUFFIX=""
@@ -28,6 +44,8 @@ elif [ "$ARCH" = "x86_64" ]; then
   LIBDIRSUFFIX="64"
 fi
 
+set -eu
+
 rm -rf $PKG
 mkdir -p $PKG $TMP $OUTPUT
 cd $TMP
@@ -41,8 +59,8 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --localstatedir=/var \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --localstatedir=/var \
   --sysconfdir=/etc \
   --mandir=/usr/man \
   --build=$ARCH-slackware-linux
@@ -53,12 +71,13 @@ make install-strip DESTDIR=$PKG
 gzip -9 $PKG/usr/man/man?/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO xbindkeysrc \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS BUGS COPYING ChangeLog INSTALL NEWS README TODO xbindkeysrc \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/xbindkeys/xbindkeys.info b/system/xbindkeys/xbindkeys.info
index d3d0d1f7a4..98db9d2482 100644
--- a/system/xbindkeys/xbindkeys.info
+++ b/system/xbindkeys/xbindkeys.info
@@ -1,8 +1,10 @@
 PRGNAM="xbindkeys"
 VERSION="1.8.3"
 HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
-DOWNLOAD="http://www.nongnu.org/xbindkeys/xbindkeys-1.8.3.tar.gz"
+DOWNLOAD="http://hocwp.free.fr/xbindkeys/xbindkeys-1.8.3.tar.gz"
 MD5SUM="393dd74f85850a4ba0803b5a78bc598b"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Erik Hanson"
 EMAIL="erik@slackbuilds.org"
 APPROVED="rworkman"