gis/saga-gis: Updated for version 9.2.0.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>
Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 8 insertions, 27 deletions

diff --git a/gis/saga-gis/README b/gis/saga-gis/README
index 2d8c2dbb1c..04fe3024e4 100644
--- a/gis/saga-gis/README
+++ b/gis/saga-gis/README
@@ -19,6 +19,8 @@ WARNINGS:
    requires wxGTK3 => 3.1 that is not available in Slackbuilds.org at 
    the moment. If you want to build this version of SAGA you have to 
    install the package wxWidgets (also available in Slackbuilds.org).
+   If you have both wxGTK3 and wxWidgets installed in your system,
+   make sure that wxWidgets is installed after wxGTK.
 2) SAGA requires an ODBC driver in the system. It works both with 
    iODBC (installed with the libiodbc package (included in Slackware 
    15.0) and unixODBC (installed from the SBo's slackbuild). The build 
diff --git a/gis/saga-gis/readme.txt b/gis/saga-gis/readme.txt
deleted file mode 100644
index 1b82786c0f..0000000000
--- a/gis/saga-gis/readme.txt
+++ /dev/null
@@ -1,16 +0,0 @@
-Dear SAGA friends, users, and all others interested in SAGA,

-

-we like to announce the release of SAGA version 9.1.0.

-

-The files you find here:

-- 'readme.txt': this file

-- 'saga_9.1.0_src.zip': source code (zip)

-- 'saga_9.1.0.tar.gz': source code (tarball)

-- 'saga_9.1.0_api_doc.zip': SAGA API documentation for developers (HTML)

-- 'saga_9.1.0_api.chm': SAGA API documentation for developers (Microsoft compiled HTML help file)

-- 'saga_9.1.0_x64.zip': binaries for MS-Windows (64bit), just unzip and run!

-- 'saga_9.1.0_x64_setup.exe': installer for MS-Windows (64bit), needs administrator rights

-- 'saga-9.1.0_mac.zip': macOS app bundle (experimental)

-

-And now enjoy the world of SAGA,

-your SAGA Development Team

diff --git a/gis/saga-gis/saga-gis.SlackBuild b/gis/saga-gis/saga-gis.SlackBuild
index df58249eda..9a9734a4a5 100644
--- a/gis/saga-gis/saga-gis.SlackBuild
+++ b/gis/saga-gis/saga-gis.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=saga-gis
-VERSION=${VERSION:-9.1.2}
+VERSION=${VERSION:-9.2.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -53,21 +53,17 @@ OUTPUT=${OUTPUT:-/tmp}
 # issues with -O2 causing build failures
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-march=i586 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-fPIC"
-  LIBDIRSUFFIX="64"
 else
   SLKCFLAGS=""
-  LIBDIRSUFFIX=""
 fi
 
 set -e
 
-# unixODBC is needed in 32 bit systems instead of libiodbc released 
+# unixODBC is needed in 32 bit systems instead of libiodbc released
 # with Slackware 15.0. The slackbuild stops if unixODBC is not installed
 if [[ "$ARCH" = "i586" || "$ARCH" = "i686" ]] ; then
   if ! [ -f /usr/lib/libodbc.so ] ; then
@@ -90,7 +86,7 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+cd $SRCNAM-$VERSION/saga-gis
 
 chown -R root:root .
 find -L . \
@@ -98,7 +94,6 @@ find -L . \
   -o -perm 511 \) -exec chmod 755 {} \; -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-cd saga-gis
 
 mkdir -p build
 cd build
diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info
index 64311302d4..d70ae14491 100644
--- a/gis/saga-gis/saga-gis.info
+++ b/gis/saga-gis/saga-gis.info
@@ -1,8 +1,8 @@
 PRGNAM="saga-gis"
-VERSION="9.1.2"
+VERSION="9.2.0"
 HOMEPAGE="http://www.saga-gis.org"
-DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.1.2/saga-9.1.2.tar.gz/download"
-MD5SUM="4cd65860a98868c1c1c6d72e103666cd"
+DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.2.0/saga-9.2.0.tar.gz/download"
+MD5SUM="ddb4bdba4765ac749fe6877bb66bc0ef"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxWidgets"