libraries/gdal: Updated for version 1.6.3

4 files changed, 33 insertions, 29 deletions

diff --git a/libraries/gdal/README b/libraries/gdal/README
index a7768f7c398a..eac68ea9ab98 100644
--- a/libraries/gdal/README
+++ b/libraries/gdal/README
@@ -8,9 +8,4 @@ command-line utilities for data translation and processing.
 The related OGR library (which is part of the GDAL source tree)
 provides a similar capability for simple features vector data.
 
-- Dependencies 
- libcurl >= 7.19.2-i486-1
- zlib >= 1.2.3-i486-2
- swig >= 1.3.35-i486-1_SBo
- geos >= 3.0.0-i486-1_SBo
- proj >= 4.6.0-i486-1_SBo
\ No newline at end of file
+This requires geos and proj.
diff --git a/libraries/gdal/gdal.SlackBuild b/libraries/gdal/gdal.SlackBuild
index e23fd2136490..b242ae1a6ab3 100644
--- a/libraries/gdal/gdal.SlackBuild
+++ b/libraries/gdal/gdal.SlackBuild
@@ -3,7 +3,7 @@
 # Written by Marco Cecchetti <mrc.ild@gmail.com> 
 
 PRGNAM=gdal
-VERSION=1.6.0
+VERSION=1.6.3
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -15,19 +15,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"
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
 
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+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 \) \
@@ -39,39 +43,42 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --enable-static=no \
   --with-threads \
   --with-geos=yes \
   --with-ogr=yes \
-  --with-libz=/usr/lib \
+  --with-libz=/usr/lib${LIBDIRSUFFIX} \
   --with-libtiff=internal \
   --with-hide-internal-symbols=yes \
   --with-curl=/usr/bin/curl-config \
   --without-grib \
   --with-static-proj4 \
-  --build=$ARCH-slackware-linux \
-  --host=$ARCH-slackware-linux \
-  || exit 1
+  --build=$ARCH-slackware-linux
   
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+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
-  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
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null
 )
 
 cp -a man/ $PKG/usr/
 gzip -9 $PKG/usr/man/man?/* || exit 1
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a COMMITERS HOWTO-RELEASE LICENSE.TXT NEWS PROVENANCE.TXT VERSION doc/* \
- $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  COMMITERS HOWTO-RELEASE LICENSE.TXT NEWS PROVENANCE.TXT VERSION doc/* \
+   $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/gdal/gdal.info b/libraries/gdal/gdal.info
index 0c8b5fa1f9ba..617c6cff7c8f 100644
--- a/libraries/gdal/gdal.info
+++ b/libraries/gdal/gdal.info
@@ -1,8 +1,10 @@
 PRGNAM="gdal"
-VERSION="1.6.0"
+VERSION="1.6.3"
 HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/gdal-1.6.0.tar.gz"
-MD5SUM="0c53697511f489455f8b60e843986568"
-MAINTAINER="Marco Cecchetti"
-EMAIL="mrc.ildp@gmail.com"
+DOWNLOAD="http://download.osgeo.org/gdal/gdal-1.6.3.tar.gz"
+MD5SUM="a8aade344a29ae4a92a0f17cc33f561a"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="David Spencer"
+EMAIL="nobbutl@yahoo.co.uk"
 APPROVED="dsomero"
diff --git a/libraries/gdal/slack-desc b/libraries/gdal/slack-desc
index 907ecb24b77f..4cc9fd840c54 100644
--- a/libraries/gdal/slack-desc
+++ b/libraries/gdal/slack-desc
@@ -13,7 +13,7 @@ gdal: C/C++ API for accessing raster geospatial data, and currently
 gdal: includes formats like GeoTIFF, Erdas Imagine, Arc/Info Binary,
 gdal: CEOS, DTED, GXF, and SDTS.
 gdal: 
-gdal: GDAL home page is:
-gdal:   http://www.gdal.org/
+gdal: Homepage: http://www.gdal.org
+gdal:
 gdal:
 gdal: