4 files changed, 73 insertions, 15 deletions
diff --git a/academic/qgis/README b/academic/qgis/README
index 7421f41a057a7..eaaa7f3e8cfb6 100644
--- a/academic/qgis/README
+++ b/academic/qgis/README
@@ -1,8 +1,11 @@
-Quantum GIS (QGIS) is a user friendly Geographic Information System that 
-runs on Linux, Unix, Mac OSX, and Windows.  QGIS lets you browse and create 
-map data on your computer.  It supports many common spatial data formats 
-(e.g. ESRI ShapeFile, geotiff).
+Quantum GIS (QGIS) is a user friendly Geographic Information System
+that runs on Linux, Unix, Mac OSX, and Windows.  QGIS lets you browse
+and create map data on your computer.  It supports many common spatial
+data formats (e.g. ESRI ShapeFile, geotiff).
 
-This requires proj, geos, gdal, gsl, numpy, and qwt. 
+This requires proj, geos, gdal, gsl, numpy, and qwt.
 
 Optional dependencies include grass, postgresql, postgis, and gpsbabel.
+
+If you want to build the optional QGIS Server, you also need fcgi;
+see README.server for more details.
diff --git a/academic/qgis/README.server b/academic/qgis/README.server
new file mode 100644
index 0000000000000..5ab3b45d1a7da
--- /dev/null
+++ b/academic/qgis/README.server
@@ -0,0 +1,23 @@
+QGIS Server is a WMS server for your QGS project.  It requires fcgi.  It is
+optionally built at the same time as QGIS; you need to specify SERVER=yes
+to the SlackBuild, for example
+
+  SERVER=yes sh qgis.SlackBuild
+
+By default, the server is installed into /var/www/cgi-bin/qgis, and so the
+WMS URL is 'http://<hostname>/cgi-bin/qgis/qgis_mapserv.fcgi'.  However, a
+different directory can be specified by passing CGIBINDIR=<path> to the
+SlackBuild script.
+
+After installing QGIS (and the server), you will need to set up the server.
+To serve a single QGIS project, this can be done as follows:
+
+* In the qgis 'Project Properties' window, on the 'General' tab, ensure
+that 'Save paths' is set to 'absolute', and on the 'WMS Server' tab, fill
+in all relevant details (particularly including 'Coordinate Systems 
+Restrictions').
+
+* Create a symlink to your QGIS project file from /var/www/cgi-bin/qgis/,
+e.g.,
+
+  ln -s /home/user/maps/mymap.qgs /var/www/cgi-bin/qgis/
diff --git a/academic/qgis/qgis.SlackBuild b/academic/qgis/qgis.SlackBuild
index d9e6ebaeccbc2..7cc73c5b60e92 100644
--- a/academic/qgis/qgis.SlackBuild
+++ b/academic/qgis/qgis.SlackBuild
@@ -1,11 +1,28 @@
 #!/bin/sh
 
 # Slackware build script for Quantum GIS
-# Written by David Spencer <baildon.research@googlemail.com>
-# This script is dedicated to the public domain
+# Copyright 2011 David Spencer, Baildon, West Yorkshire, U.K.
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
+#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
+#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=qgis
-VERSION=${VERSION:-1.6.0}
+VERSION=${VERSION:-1.7.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -56,14 +73,21 @@ if pkg-config --exists grass; then
   WITHGRASS="-DGRASS_PREFIX=$(pkg-config --variable=prefix grass)"
 fi
 
+WITHSERVER="-DWITH_MAPSERVER=FALSE"
+CGIBINDIR="${CGIBINDIR:-/var/www/cgi-bin/qgis}"
+if [ "${SERVER:-no}" = "yes" ]; then
+  WITHSERVER="-DWITH_MAPSERVER=TRUE -DQGIS_CGIBIN_SUBDIR=$CGIBINDIR"
+fi
+
 cmake . \
   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
   -DCMAKE_INSTALL_PREFIX=/usr \
+  -DCMAKE_VERBOSE_MAKEFILE:BOOL="on" \
   -DQGIS_LIB_SUBDIR=lib${LIBDIRSUFFIX} \
   -DQGIS_LIBEXEC_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
   -DQGIS_PLUGIN_SUBDIR=lib${LIBDIRSUFFIX}/qgis \
-  -DWITH_MAPSERVER=FALSE \
+  $WITHSERVER \
   $WITHGRASS
 
 make
@@ -81,12 +105,20 @@ install -D -m 0644 $CWD/$PRGNAM.png \
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  AUTHORS BUGS CODING CONTRIBUTORS COPYING ChangeLog \
-  DONORS Exception_to_GPL_for_Qt.txt INSTALL \
-  PROVENANCE README SPONSORS TODO TRANSLATORS \
+  doc/AUTHORS BUGS CODING doc/CONTRIBUTORS COPYING ChangeLog \
+  doc/DONORS Exception_to_GPL_for_Qt.txt INSTALL \
+  PROVENANCE README doc/SPONSORS TODO doc/TRANSLATORS \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
+# Move a couple of optional server files to a more appropriate place -- they
+# need to be properly customised (and the server works without them).
+if [ -d $PKG/$CGIBINDIR ]; then
+  mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/examples
+  mv $PKG/$CGIBINDIR/wms_metadata.xml $PKG/$CGIBINDIR/admin.sld \
+    $PKG/usr/doc/$PRGNAM-$VERSION/examples
+fi
+
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh  > $PKG/install/doinst.sh
diff --git a/academic/qgis/qgis.info b/academic/qgis/qgis.info
index 871f94643ce3f..cb6d2580c1b2c 100644
--- a/academic/qgis/qgis.info
+++ b/academic/qgis/qgis.info
@@ -1,8 +1,8 @@
 PRGNAM="qgis"
-VERSION="1.6.0"
+VERSION="1.7.0"
 HOMEPAGE="http://qgis.org/"
-DOWNLOAD="http://qgis.org/downloads/qgis-1.6.0.tar.bz2"
-MD5SUM="9ea8a784d970f5009b0e6271820248f6"
+DOWNLOAD="http://qgis.org/downloads/qgis-1.7.0.tar.bz2"
+MD5SUM="d8506990f52563d39c7b916f500f282f"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Spencer"