academic/qgis: Updated for version 1.6.0.

Signed-off-by: Niels Horn <niels.horn@slackbuilds.org>

academic/qgis/README

@@ -5,4 +5,4 @@ map data on your computer.  It supports many common spatial data formats
 
 This requires proj, geos, gdal, R, gsl, numpy and qwt. 
 
-Optional dependencies include postgresql, postgis, and gpsbabel.
+Optional dependencies include grass, postgresql, postgis, and gpsbabel.

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

academic/qgis/qgis.info

@@ -1,10 +1,10 @@
 PRGNAM="qgis"
-VERSION="1.5.0"
+VERSION="1.6.0"
 HOMEPAGE="http://qgis.org/"
-DOWNLOAD="http://download.osgeo.org/qgis/src/qgis_1.5.0.tar.gz"
-MD5SUM="a198fbcd8d96f5ed5e85a814cbc8f033"
+DOWNLOAD="http://qgis.org/downloads/qgis-1.6.0.tar.bz2"
+MD5SUM="9ea8a784d970f5009b0e6271820248f6"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"
 EMAIL="baildon.research@googlemail.com"
-APPROVED="Erik Hanson"
+APPROVED="Niels Horn"

academic/qgis/slack-desc

@@ -1,4 +1,4 @@
-    |-----handy-ruler---------------------------------------------------------|
+    |-----handy-ruler------------------------------------------------------|
 qgis: qgis (Quantum GIS)
 qgis:
 qgis: Quantum GIS is a user friendly Geographic Information System.  It lets
@@ -9,4 +9,4 @@ qgis: Homepage: http://qgis.org/
 qgis:
 qgis:
 qgis:
-qgis:
+qgis: