From 5f320c3e5603d770886623a58b91ab59ce652c73 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Tue, 8 Nov 2016 23:31:05 +0000
Subject: gis/grass: Updated for version 7.0.5.

Signed-off-by: David Spencer <baildon.research@googlemail.com>
---
 gis/grass/README           |  3 +++
 gis/grass/grass.SlackBuild | 13 ++++++++-----
 gis/grass/grass.info       |  6 +++---
 3 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'gis/grass')

diff --git a/gis/grass/README b/gis/grass/README
index 861e0821d5..6ae5d756b4 100644
--- a/gis/grass/README
+++ b/gis/grass/README
@@ -22,6 +22,9 @@ The following options may be enabled:
   netcdf         for netcdf export
                  (requires netcdf)
 
+  libLAS         for LAS LiDAR file support
+                 (requires libLAS)
+
   opencl         for OpenCL GPU acceleration
                  (requires opencl-headers, either nvidia-driver or amd-app-sdk,
                  and suitable GPU hardware)
diff --git a/gis/grass/grass.SlackBuild b/gis/grass/grass.SlackBuild
index a321a05a4c..b15b223d02 100644
--- a/gis/grass/grass.SlackBuild
+++ b/gis/grass/grass.SlackBuild
@@ -23,13 +23,13 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=grass
-VERSION=${VERSION:-7.0.4}
+VERSION=${VERSION:-7.0.5}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,8 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -107,7 +107,10 @@ while [ "$1" != "" ]; do
     WITHLIST="$WITHLIST --with-odbc"
     shift
     ;;
-  # If anybody needs LAS support, please submit libLAS to SBo :-)
+  libLAS | liblas )
+    WITHLIST="$WITHLIST --with-liblas"
+    shift
+    ;;
   * )
     shift
     ;;
diff --git a/gis/grass/grass.info b/gis/grass/grass.info
index 91c371b9f0..8897bf98d2 100644
--- a/gis/grass/grass.info
+++ b/gis/grass/grass.info
@@ -1,8 +1,8 @@
 PRGNAM="grass"
-VERSION="7.0.4"
+VERSION="7.0.5"
 HOMEPAGE="http://grass.osgeo.org/"
-DOWNLOAD="http://grass.osgeo.org/grass70/source/grass-7.0.4.tar.gz"
-MD5SUM="843e8942c14aa7473380ea70c9b0ec52"
+DOWNLOAD="http://grass.osgeo.org/grass70/source/grass-7.0.5.tar.gz"
+MD5SUM="55d781e3ea99d1d8b3225dd4adcb3b16"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="gdal numpy wxPython"
-- 
cgit v1.2.3