Update.

1 files changed, 46 insertions, 67 deletions

diff --git a/xbindkeys/build/xbindkeys.SlackBuild b/xbindkeys/build/xbindkeys.SlackBuild
index 43777eca..1e5e1598 100755
--- a/xbindkeys/build/xbindkeys.SlackBuild
+++ b/xbindkeys/build/xbindkeys.SlackBuild
@@ -1,6 +1,25 @@
 #!/bin/sh
 # $Id$
 # Copyright (c) 2007 Eric Hameleers <alien@slackware.com>
+# All rights reserved.
+#
+#   Permission to use, copy, modify, and distribute this software for
+#   any purpose with or without fee is hereby granted, provided that
+#   the above copyright notice and this permission notice appear in all
+#   copies.
+#
+#   THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED 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 AUTHORS AND COPYRIGHT HOLDERS AND THEIR
+#   CONTRIBUTORS 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.
 # -----------------------------------------------------------------------------
 #
 # Slackware SlackBuild script 
@@ -13,6 +32,8 @@
 # Changelog:
 # 1.8.0-1:   27/Jan/2007 by Eric Hameleers <alien@slackware.com>
 #            * Initial build.
+# 1.8.2-1:   26/Jul/2007 by Eric Hameleers <alien@slackware.com>
+#            * Update.
 # 
 # Run 'sh xbindkeys.SlackBuild --cleanup' to build a Slackware package.
 # The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -20,11 +41,10 @@
 #
 # -----------------------------------------------------------------------------
 
-# --- INIT ---
 # Set initial variables:
 
 PRGNAM=xbindkeys
-VERSION=${VERSION:-1.8.0}
+VERSION=${VERSION:-1.8.2}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 
@@ -40,7 +60,7 @@ TMP=${TMP:-/tmp/build}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Input URL: http://hocwp.free.fr/xbindkeys/xbindkeys-1.8.0.tar.gz
+# Input URL: http://hocwp.free.fr/xbindkeys/xbindkeys-1.8.2.tar.gz
 SOURCE="$SRCDIR/${PRGNAM}-${VERSION}.tar.gz"
 SRCURL="http://hocwp.free.fr/${PRGNAM}/${PRGNAM}-${VERSION}.tar.gz"
 
@@ -83,36 +103,22 @@ case "$ARCH" in
              ;;
 esac
 
-if [ ! -d $TMP/tmp-$PRGNAM ]; then
-  mkdir -p $TMP/tmp-$PRGNAM # location to build the source
-elif [ "$P1" != "--oldbuild" ]; then
-  # If the "--oldbuild" parameter is present, we keep
-  #  the old build files and continue;
-  # By default we remove the remnants of previous build and continue:
-  rm -rf $TMP/tmp-$PRGNAM/*
-fi
-
-if [ ! -d $PKG ]; then
-  mkdir -p $PKG  # place for the package to be built
-else
-  rm -rf $PKG/*  # We always erase old package's contents:
-fi
-
-if [ ! -d $OUTPUT ]; then
-  mkdir -p $OUTPUT  # place for the package to be saved
-fi
-
-
-# --- SOURCE FILE AVAILABILITY ---
+# Create working directories:
+mkdir -p $TMP/tmp-$PRGNAM # location to build the source
+rm -rf $TMP/tmp-$PRGNAM/* # By default we remove the remnants of previous build
+mkdir -p $PKG     # place for the package to be built
+rm -rf $PKG/*     # We always erase old package's contents:
+mkdir -p $OUTPUT  # place for the package to be saved
 
+# Source file availability:
 if ! [ -f ${SOURCE} ]; then
   if ! [ "x${SRCURL}" == "x" ]; then
     # Check if the $SRCDIR is writable at all - if not, download to $OUTPUT
     [ -w "$SRCDIR" ] || SOURCE="$OUTPUT/`basename $SOURCE`"
     echo "Source '`basename ${SOURCE}`' not available yet..."
     echo "Will download file to `dirname $SOURCE`"
-    wget -nv -O "${SOURCE}" "${SRCURL}" || true
-    if [ $? -ne 0 ]; then
+    wget -nv --connect-timeout=30 -O "${SOURCE}" "${SRCURL}" || true
+    if [ $? -ne 0 -o ! -s "${SOURCE}" ]; then
       echo "Downloading '`basename ${SOURCE}`' failed... aborting the build."
       mv -f "${SOURCE}" "${SOURCE}".FAIL
       exit 1
@@ -136,24 +142,17 @@ echo "++"
 
 cd $TMP/tmp-$PRGNAM
 
-# --- TARBALL EXTRACTION,PATCH,MODIFY ---
-
 echo "Extracting the source archive(s) for $PRGNAM..."
 if `file ${SOURCE} | grep -q ": bzip2"`; then
   tar -xjvf ${SOURCE}
-else
+elif `file ${SOURCE} | grep -q ": gzip"`; then
   tar -xzvf ${SOURCE}
 fi
 cd ${PRGNAM}-${VERSION}
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
-
-# --- BUILDING ---
-
 echo Building ...
-
 # Add libpthread or else all kind of build errors:
 LDFLAGS="$SLKLDFLAGS -lpthread" \
 CFLAGS="$SLKCFLAGS" \
@@ -161,16 +160,13 @@ CFLAGS="$SLKCFLAGS" \
             --libdir=/usr/lib${LIBDIRSUFFIX} \
             --localstatedir=/var \
             --sysconfdir=/etc \
-            --mandir=/usr/man \
             --program-prefix="" \
             --program-suffix="" \
-            $ARCH-slackware-linux \
+            --build=$ARCH-slackware-linux \
             2>&1 | tee $OUTPUT/configure-${PRGNAM}.log
 make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
 
-#
 # Install all the needed stuff to the package dir
-#
 # Use installwatch if available, to produce a logfile of the installation
 # process that is more easily readable:
 if `which installwatch  > /dev/null 2>&1`; then
@@ -179,52 +175,35 @@ else
   make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
 fi
 
-
-# --- DOCUMENTATION ---
-
+# Add documentation:
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION || true
 chmod -R a-w $PKG/usr/doc/$PRGNAM-$VERSION/*
 
-# Compress the man page(s)
+# Compress the man page(s):
 if [ -d $PKG/usr/man ]; then
   find $PKG/usr/man -type f -name "*.?" -exec gzip -9f {} \;
   for i in `find $PKG/usr/man -type l -name "*.?"` ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 fi
 
-# Strip binaries
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
-)
-
-
-# --- OWNERSHIP, RIGHTS ---
-
-chmod -R o-w $PKG
-
-
-# --- PACKAGE DESCRIPTION ---
+# Strip binaries:
+cd $PKG
+find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+cd -
 
+# Add a package description:
 mkdir -p $PKG/install
 cat $SRCDIR/slack-desc > $PKG/install/slack-desc
-if [ -f $SRCDIR/doinst.sh ]; then
-  cat $SRCDIR/doinst.sh >> $PKG/install/doinst.sh
-fi
-
-
-# --- BUILDING ---
 
 # Build the package:
 cd $PKG
-makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz \
-  2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
-(cd $OUTPUT && md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5)
+makepkg --linkadd y --chown n $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz 2>&1 | tee $OUTPUT/makepkg-${PRGNAM}.log
+cd $OUTPUT
+md5sum ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz > ${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.tgz.md5
+cd -
 cat $PKG/install/slack-desc | grep "^${PRGNAM}" > $OUTPUT/${PRGNAM}-${VERSION}-${ARCH}-${BUILD}.txt
 
-
-# --- CLEANUP ---
-
 # Clean up the extra stuff:
 if [ "$P1" = "--cleanup" ]; then
   rm -rf $TMP/tmp-$PRGNAM