From ff761401ec1837481bf8c246a8b54893eb257410 Mon Sep 17 00:00:00 2001
From: David Spencer <baildon.research@googlemail.com>
Date: Wed, 22 Dec 2010 12:47:31 -0200
Subject: academic/qgis: Updated for version 1.6.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>
---
 academic/qgis/qgis.SlackBuild | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'academic/qgis/qgis.SlackBuild')

diff --git a/academic/qgis/qgis.SlackBuild b/academic/qgis/qgis.SlackBuild
index 5224ce91f7..d9e6ebaecc 100644
--- a/academic/qgis/qgis.SlackBuild
+++ b/academic/qgis/qgis.SlackBuild
@@ -5,7 +5,7 @@
 # This script is dedicated to the public domain
 
 PRGNAM=qgis
-VERSION=${VERSION:-1.5.0}
+VERSION=${VERSION:-1.6.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,7 +42,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/${PRGNAM}_$VERSION.tar.gz
+tar xvf $CWD/${PRGNAM}-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -51,6 +51,11 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+WITHGRASS=""
+if pkg-config --exists grass; then
+  WITHGRASS="-DGRASS_PREFIX=$(pkg-config --variable=prefix grass)"
+fi
+
 cmake . \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
@@ -58,7 +63,8 @@ cmake . \
   -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \
   -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
   -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
-  -DGRASS_PREFIX=/usr/lib${LIBDIRSUFFIX}/grass
+  -DWITH_MAPSERVER=FALSE \
+  $WITHGRASS
 
 make
 make install DESTDIR=$PKG
-- 
cgit v1.2.3-80-g2a13