gis/saga-gis: Updated for version 9.1.0.

Signed-off-by: Andrew Clemons <andrew.clemons@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 43 insertions, 6 deletions

diff --git a/gis/saga-gis/README b/gis/saga-gis/README
index 92157708cdb7..2d8c2dbb1c8f 100644
--- a/gis/saga-gis/README
+++ b/gis/saga-gis/README
@@ -26,5 +26,9 @@ WARNINGS:
    is found. These drivers are in conflict so, if you have installed 
    and then removed unixODBC, please make sure to reinstall libiodbc. 
    You should also consider that a package prebuilt in a Slackware 
-   with unixODBC should not be installed in a system with iODB (and 
+   with unixODBC should not be installed in a system with iODBC (and 
    vice versa).
+3) unixODBC is a required dependency in 32 bit systems: the source 
+   code of SAGA conflicts with the code of a libiodbc header 
+   (/usr/include/iodbcunix.h) and the build fails. This issue can be 
+   overcome by installing unixODBC from the SBo's slackbuild.
diff --git a/gis/saga-gis/readme.txt b/gis/saga-gis/readme.txt
new file mode 100644
index 000000000000..66560c73621e
--- /dev/null
+++ b/gis/saga-gis/readme.txt
@@ -0,0 +1,16 @@
+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 b3e3baeb7f4b..2aeb64d56b26 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.0.2}
+VERSION=${VERSION:-9.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -46,7 +46,6 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -68,6 +67,24 @@ fi
 
 set -e
 
+# 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
+    echo "";
+    echo "";
+    echo "";
+    echo "******************** WARNING *********************";
+    echo " This script cannot be executed in 32 bit systems ";
+    echo " with iODBC as default ODBC library installed.    ";
+    echo " The current process will be stopped.             ";
+    echo " Please install the unixODBC package from the     ";
+    echo " slackbuild available in the SBo repository.      ";
+    echo "**************************************************";
+    exit 1;
+  fi
+fi
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
diff --git a/gis/saga-gis/saga-gis.info b/gis/saga-gis/saga-gis.info
index dbff810aaa53..8eab4ccaa48f 100644
--- a/gis/saga-gis/saga-gis.info
+++ b/gis/saga-gis/saga-gis.info
@@ -1,8 +1,8 @@
 PRGNAM="saga-gis"
-VERSION="9.0.2"
+VERSION="9.1.0"
 HOMEPAGE="http://www.saga-gis.org"
-DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.0.2/saga-9.0.2.tar.gz"
-MD5SUM="c35d7b22ca1cf4624e6bd448d98fba4a"
+DOWNLOAD="https://sourceforge.net/projects/saga-gis/files/SAGA%20-%209/SAGA%20-%209.1.0/saga-9.1.0.tar.gz"
+MD5SUM="0b637d8b36903d268a7ecb71b0b92432"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxWidgets"