gis/saga-gis: Updated for version 2.2.3.

Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>

3 files changed, 10 insertions, 17 deletions

diff --git a/gis/saga-gis/README b/gis/saga-gis/README
index 08216175eca7..ec7f5446f7fd 100644
--- a/gis/saga-gis/README
+++ b/gis/saga-gis/README
@@ -3,7 +3,7 @@ System software with immense capabilities for geodata processing and analysis.
 
 SAGA supports the implementation of new functions with an effective API.
 Functions are organised as modules in framework independent Module Libraries
-and can be accessed via SAGA’s Graphical User Interface or various scripting
+and can be accessed via SAGA's Graphical User Interface or various scripting
 environments (shell scripts, Python, R and so on).
 
 SAGA can use these optional dependencies: postgresql, opencv and vigra.
diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild
index c86622b071c6..87e9e233cd0f 100644
--- a/gis/saga-gis/saga-gis.SlackBuild
+++ b/gis/saga-gis/saga-gis.SlackBuild
@@ -24,7 +24,7 @@
 
 PRGNAM=saga
 PKGNAM=${PRGNAM}-gis
-VERSION=${VERSION:-2.1.2}
+VERSION=${VERSION:-2.2.3}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -57,13 +57,12 @@ fi
 
 set -e
 
-SRCNAM=${PRGNAM}_${VERSION}_src
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM
-unzip $CWD/$SRCNAM.zip
-cd $SRCNAM/$PKGNAM
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -71,13 +70,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-sed -e '\#src/modules/imagery/imagery_photogrammetry/Makefile#d' -i configure.ac
-aclocal
-autoheader
-libtoolize
-automake --add-missing
-autoreconf -i
-
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -86,6 +78,7 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --enable-python \
+  --disable-odbc \
   --build=$ARCH-slackware-linux
 
 make
diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info
index 398fe1d2522a..9ec8f128ccf6 100644
--- a/gis/saga-gis/saga-gis.info
+++ b/gis/saga-gis/saga-gis.info
@@ -1,10 +1,10 @@
 PRGNAM="saga-gis"
-VERSION="2.1.2"
+VERSION="2.2.3"
 HOMEPAGE="http://www.saga-gis.org"
-DOWNLOAD="http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.1/SAGA%202.1.2/saga_2.1.2_src.zip"
-MD5SUM="527f4c703cfd4c28296728b00131dd9c" 
+DOWNLOAD="http://sourceforge.net/projects/saga-gis/files/SAGA%20-%202.2/SAGA%202.2.3/saga_2.2.3.tar.gz"
+MD5SUM=""
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-REQUIRES="gdal unixODBC wxGTK3"
+REQUIRES="gdal wxGTK3"
 MAINTAINER="Benjamin Trigona-Harany"
 EMAIL="slackbuilds@jaxartes.net"