4 files changed, 33 insertions, 26 deletions
diff --git a/libraries/libgeotiff/README b/libraries/libgeotiff/README
index 453a7b7c219a8..0cd1c2d607cc4 100644
--- a/libraries/libgeotiff/README
+++ b/libraries/libgeotiff/README
@@ -1,6 +1,2 @@
 libgeotiff (GeoTIFF support library) It is designed for reading and writing
 coordinate system information from/to GeoTIFF files.
-
-The library depends on libtiff.
-
-
diff --git a/libraries/libgeotiff/libgeotiff.SlackBuild b/libraries/libgeotiff/libgeotiff.SlackBuild
index a6ba215c1025b..e111515f6d523 100644
--- a/libraries/libgeotiff/libgeotiff.SlackBuild
+++ b/libraries/libgeotiff/libgeotiff.SlackBuild
@@ -16,18 +16,23 @@ OUTPUT=${OUTPUT:-/tmp}
 
 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
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $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 \) \
@@ -40,28 +45,32 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --datadir=/usr/share \
   --infodir=/usr/info \
   --with-libtiff=/usr/lib \
-|| exit 1
-
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+  --build=$ARCH-slackware-linux
 
+make
+make install DESTDIR=$PKG
 
 ( 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
+  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
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE HOWTO-RELEASE README* docs/* $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  ChangeLog LICENSE HOWTO-RELEASE README* docs/* \
+    $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/libraries/libgeotiff/libgeotiff.info b/libraries/libgeotiff/libgeotiff.info
index 97356081c016d..6afcbc2413c3d 100644
--- a/libraries/libgeotiff/libgeotiff.info
+++ b/libraries/libgeotiff/libgeotiff.info
@@ -2,7 +2,9 @@ PRGNAM="libgeotiff"
 VERSION="1.2.5"
 HOMEPAGE="http://www.remotesensing.org/geotiff/geotiff.html"
 DOWNLOAD="http://download.osgeo.org/geotiff/libgeotiff/libgeotiff-1.2.5.tar.gz"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MD5SUM="000f247a88510f1b38d4b314d1e47048"
-MAINTAINER="Marco Cecchetti"
-EMAIL="mrc.ildp@gmail.com"
-APPROVED="David Somero"
+MAINTAINER="David Spencer"
+EMAIL="nobbutl@yahoo.co.uk"
+APPROVED="rworkman"
diff --git a/libraries/libgeotiff/slack-desc b/libraries/libgeotiff/slack-desc
index d6aef4676f07b..85c3a2e612db8 100644
--- a/libraries/libgeotiff/slack-desc
+++ b/libraries/libgeotiff/slack-desc
@@ -7,13 +7,13 @@
 
           |-----handy-ruler------------------------------------------------------|
 libgeotiff: libgeotiff (GeoTIFF support library)
-libgeotiff: It is designed for reading and writing coordinate system 
+libgeotiff:
+libgeotiff: libgeotiff is designed for reading and writing coordinate system 
 libgeotiff: information from/to GeoTIFF files
-libgeotiff: 
-libgeotiff: The library depends on libtiff.
-libgeotiff:  
-libgeotiff: 
-libgeotiff: 
-libgeotiff: 
-libgeotiff: 
-libgeotiff: 
+libgeotiff:
+libgeotiff:
+libgeotiff:
+libgeotiff:
+libgeotiff:
+libgeotiff:
+libgeotiff: