From 744138b5f749391e5bdddbf2cf3ecd3c39bd77fc Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Wed, 15 Dec 2010 09:20:39 -0200
Subject: libraries/gdal: Updated for version 1.7.3.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 libraries/gdal/README          | 4 ++++
 libraries/gdal/gdal.SlackBuild | 8 +++++---
 libraries/gdal/gdal.info       | 8 ++++----
 libraries/gdal/slack-desc      | 2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'libraries/gdal')

diff --git a/libraries/gdal/README b/libraries/gdal/README
index eac68ea9ab..dc4607d340 100644
--- a/libraries/gdal/README
+++ b/libraries/gdal/README
@@ -9,3 +9,7 @@ The related OGR library (which is part of the GDAL source tree)
 provides a similar capability for simple features vector data.
 
 This requires geos and proj.
+
+To include gdal's optional support for grass, rebuild gdal after
+grass is installed.  If you don't want grass support, pass
+GRASS=no to the script.
diff --git a/libraries/gdal/gdal.SlackBuild b/libraries/gdal/gdal.SlackBuild
index 120ef7c106..ead65586c9 100644
--- a/libraries/gdal/gdal.SlackBuild
+++ b/libraries/gdal/gdal.SlackBuild
@@ -4,7 +4,7 @@
 # Maintained by David Spencer <baildon.research@googlemail.com>
 
 PRGNAM=gdal
-VERSION=1.7.2
+VERSION=${VERSION:-1.7.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -51,8 +51,10 @@ find . \
  -exec chmod 644 {} \;
 
 WITHLIST=""
-if [[ "$GRASS" = "yes" ]]; then
-  WITHLIST+=" --with-grass=/usr/lib${LIBDIRSUFFIX}/grass"
+if pkg-config --exists grass; then
+  if [ ${GRASS:-yes} = "yes" ]; then
+    WITHLIST+=" --with-grass=$(pkg-config --variable=prefix grass)"
+  fi
 fi
 
 CFLAGS="$SLKCFLAGS" \
diff --git a/libraries/gdal/gdal.info b/libraries/gdal/gdal.info
index e05cb7672d..f2a7c1a65b 100644
--- a/libraries/gdal/gdal.info
+++ b/libraries/gdal/gdal.info
@@ -1,10 +1,10 @@
 PRGNAM="gdal"
-VERSION="1.7.2"
+VERSION="1.7.3"
 HOMEPAGE="http://www.gdal.org/"
-DOWNLOAD="http://download.osgeo.org/gdal/gdal-1.7.2.tar.gz"
-MD5SUM="05351f8cb61761ae579667e24a297fe6"
+DOWNLOAD="http://download.osgeo.org/gdal/gdal-1.7.3.tar.gz"
+MD5SUM="c4673970bd2285032de9ae9bbd82754a"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
-APPROVED="Erik Hanson"
+APPROVED="Niels Horn"
diff --git a/libraries/gdal/slack-desc b/libraries/gdal/slack-desc
index 4cc9fd840c..a17ab6f6e9 100644
--- a/libraries/gdal/slack-desc
+++ b/libraries/gdal/slack-desc
@@ -12,7 +12,7 @@ gdal: The Geospatial Data Abstraction Library (GDAL) is a unifying
 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: Homepage: http://www.gdal.org
 gdal:
 gdal:
-- 
cgit v1.2.3