From d97e9ec9467beec467698d9b09581703320fa3df Mon Sep 17 00:00:00 2001
From: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
Date: Mon, 19 Jan 2015 22:48:57 -0800
Subject: gis/SFCGAL: Updated for version 1.1.0.

Signed-off-by: Benjamin Trigona-Harany <bosth@alumni.sfu.ca>
---
 gis/SFCGAL/SFCGAL.SlackBuild | 12 ++----------
 gis/SFCGAL/SFCGAL.info       |  6 +++---
 2 files changed, 5 insertions(+), 13 deletions(-)

(limited to 'gis/SFCGAL')

diff --git a/gis/SFCGAL/SFCGAL.SlackBuild b/gis/SFCGAL/SFCGAL.SlackBuild
index ed847df12d055..4cdd0a7128a08 100644
--- a/gis/SFCGAL/SFCGAL.SlackBuild
+++ b/gis/SFCGAL/SFCGAL.SlackBuild
@@ -25,7 +25,7 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=SFCGAL
-VERSION=${VERSION:-1.0.5}
+VERSION=${VERSION:-1.1.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -62,11 +62,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 rm -rf $TMP/$PRGNAM-$VERSION
 cd $TMP
-if [ -e $CWD/v$VERSION.tar.gz ]; then
-  tar xvf $CWD/v$VERSION.tar.gz
-else
-  tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-fi
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz || tar xvf $CWD/v$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
@@ -77,10 +73,6 @@ find -L . \
 
 WITH_DOC=${WITH_DOC:-NO}
 
-# respect LIBDIRSUFFIX
-sed -i "s|/lib|/lib$LIBDIRSUFFIX|" sfcgal-config.in CMakeLists.txt
-sed -i "s|\ lib$| lib$LIBDIRSUFFIX|" src/CMakeLists.txt
-
 mkdir -p build
 cd build
   cmake \
diff --git a/gis/SFCGAL/SFCGAL.info b/gis/SFCGAL/SFCGAL.info
index 6caabbf626a15..2bfc5485aa872 100644
--- a/gis/SFCGAL/SFCGAL.info
+++ b/gis/SFCGAL/SFCGAL.info
@@ -1,8 +1,8 @@
 PRGNAM="SFCGAL"
-VERSION="1.0.5"
+VERSION="1.1.0"
 HOMEPAGE="http://www.sfcgal.org"
-DOWNLOAD="https://github.com/Oslandia/SFCGAL/archive/v1.0.5.tar.gz"
-MD5SUM="5f51e6efc9b4f4369e544afaba9d3fe7"
+DOWNLOAD="https://github.com/Oslandia/SFCGAL/archive/v1.1.0.tar.gz"
+MD5SUM="b4817a47d17b2292cee6199f7b49c31c"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="CGAL"
-- 
cgit v1.2.3