4 files changed, 46 insertions, 53 deletions
diff --git a/libraries/giblib/README b/libraries/giblib/README
index de401667279e8..ebd9f6c56ecda 100644
--- a/libraries/giblib/README
+++ b/libraries/giblib/README
@@ -1,5 +1,4 @@
-giblib is a utility library
-giblib incorporates doubly linked lists, string functions, and a
-wrapper for imlib2.
+giblib is a utility library that incorporates doubly linked lists,
+string functions, and a wrapper for imlib2.
  
-NOTE: giblib requires imlib2, which is available on SlackBuilds.org.
+giblib requires imlib2.
diff --git a/libraries/giblib/giblib.SlackBuild b/libraries/giblib/giblib.SlackBuild
index e2c90fcedcbd5..91ed9bb87bd01 100644
--- a/libraries/giblib/giblib.SlackBuild
+++ b/libraries/giblib/giblib.SlackBuild
@@ -1,44 +1,40 @@
 #!/bin/sh
-
-# Slackware build script for giblib 
+# Slackware build script for giblib
 
 # Copyright 2006-2009 Chess Griffin <chess@chessgriffin.com>
+# Copyright 2011 Grigorios Bouzakis <grbzks@xsmail.com>
 # 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.
+# 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 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.
+# 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.
 
 PRGNAM=giblib
-VERSION=1.2.4
+VERSION=${VERSION:-1.2.4}
 BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
 CWD=$(pwd)
-TMP=${TMP:-/tmp/SBo}	
+TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
@@ -56,12 +52,16 @@ else
   LIBDIRSUFFIX=""
 fi
 
+DOCS="COPYING NEWS"
+
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $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 .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
@@ -76,23 +76,17 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --enable-static=no \
-  || exit 1
+  --disable-static \
+  --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG docsdir=/usr/doc/$PRGNAM-$VERSION
 
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+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
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
-
-mv $PKG/usr/doc/$PRGNAM $PKG/usr/doc/$PRGNAM-$VERSION
-# All other required docs are already installed
-cp -a COPYING NEWS $PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/libraries/giblib/giblib.info b/libraries/giblib/giblib.info
index 9dec6b9ac00c6..24c3bd6ce1407 100644
--- a/libraries/giblib/giblib.info
+++ b/libraries/giblib/giblib.info
@@ -5,6 +5,6 @@ DOWNLOAD="http://linuxbrit.co.uk/downloads/giblib-1.2.4.tar.gz"
 MD5SUM="c810ef5389baf24882a1caca2954385e"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Chess Griffin"
-EMAIL="chess@chessgriffin.com"
-APPROVED="dsomero"
+MAINTAINER="Grigorios Bouzakis"
+EMAIL="grbzks@xsmail.com"
+APPROVED="rworkman"
diff --git a/libraries/giblib/slack-desc b/libraries/giblib/slack-desc
index f1c7d6253c490..af0f833f5a433 100644
--- a/libraries/giblib/slack-desc
+++ b/libraries/giblib/slack-desc
@@ -5,15 +5,15 @@
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
-      |-----handy-ruler------------------------------------------------------|
+      |-----handy-ruler-------------------------------------------------------|
 giblib: giblib (giblib utility library)
-giblib:      
+giblib:
 giblib: giblib incorporates doubly linked lists, string functions, and a
 giblib: wrapper for imlib2.
-giblib: 
-giblib: Homepage:  http://linuxbrit.co.uk/giblib/
-giblib: 
-giblib: 
-giblib: 
-giblib: 
-giblib: 
+giblib:
+giblib: Homepage:  http://linuxbrit.co.uk/giblib
+giblib:
+giblib:
+giblib:
+giblib:
+giblib: