summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErik Hanson <erik@slackbuilds.org>2010-05-12 17:46:23 +0200
committerRobby Workman <rworkman@slackbuilds.org>2010-05-12 17:46:23 +0200
commit237a2c808adb0423898164183e8da28c0a7ee1ca (patch)
tree79e2bf11032270c04144ed77f7a4f68a3569b045
parenta5f8f4546ac3e6a457bed6ed905aac01e292fa10 (diff)
downloadslackbuilds-237a2c808adb0423898164183e8da28c0a7ee1ca.tar.gz
system/xbindkeys: Updated for version 1.8.3
-rw-r--r--system/xbindkeys/README1
-rw-r--r--system/xbindkeys/xbindkeys.SlackBuild20
-rw-r--r--system/xbindkeys/xbindkeys.info10
3 files changed, 18 insertions, 13 deletions
diff --git a/system/xbindkeys/README b/system/xbindkeys/README
index c18908007b..811cfe84f2 100644
--- a/system/xbindkeys/README
+++ b/system/xbindkeys/README
@@ -3,4 +3,3 @@ 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/xbindkeys.SlackBuild b/system/xbindkeys/xbindkeys.SlackBuild
index 9cfaec154b..1949c441e2 100644
--- a/system/xbindkeys/xbindkeys.SlackBuild
+++ b/system/xbindkeys/xbindkeys.SlackBuild
@@ -5,7 +5,7 @@
# Modified by the SlackBuilds.org project
PRGNAM=xbindkeys
-VERSION=1.8.2
+VERSION=1.8.3
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -15,20 +15,25 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
+set -eu
+
if [ "$ARCH" = "i486" ]; then
SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+ LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
SLKCFLAGS="-O2 -fPIC"
+ LIBDIRSUFFIX="64"
fi
rm -rf $PKG
mkdir -p $PKG $TMP $OUTPUT
-cd $TMP || exit 1
+cd $TMP
rm -rf $PRGNAM-$VERSION
-tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz || exit 1
-cd $PRGNAM-$VERSION || exit 1
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
chown -R root:root .
chmod -R u+w,go+r-w,a-s .
@@ -37,12 +42,13 @@ CXXFLAGS="$SLKCFLAGS" \
./configure \
--prefix=/usr \
--localstatedir=/var \
+ --libdir=/usr/lib${LIBDIRSUFFIX} \
--sysconfdir=/etc \
--mandir=/usr/man \
- || exit 1
+ --build=$ARCH-slackware-linux
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+make
+make install-strip DESTDIR=$PKG
gzip -9 $PKG/usr/man/man?/*
diff --git a/system/xbindkeys/xbindkeys.info b/system/xbindkeys/xbindkeys.info
index 6931039159..d3d0d1f7a4 100644
--- a/system/xbindkeys/xbindkeys.info
+++ b/system/xbindkeys/xbindkeys.info
@@ -1,8 +1,8 @@
PRGNAM="xbindkeys"
-VERSION="1.8.2"
-HOMEPAGE="http://hocwp.free.fr/xbindkeys/xbindkeys.html"
-DOWNLOAD="http://hocwp.free.fr/xbindkeys/xbindkeys-1.8.2.tar.gz"
-MD5SUM="ad1abd56e758bc108493ad0e5b862ad3"
+VERSION="1.8.3"
+HOMEPAGE="http://www.nongnu.org/xbindkeys/xbindkeys.html"
+DOWNLOAD="http://www.nongnu.org/xbindkeys/xbindkeys-1.8.3.tar.gz"
+MD5SUM="393dd74f85850a4ba0803b5a78bc598b"
MAINTAINER="Erik Hanson"
EMAIL="erik@slackbuilds.org"
-APPROVED="David Somero"
+APPROVED="rworkman"