3 files changed, 21 insertions, 58 deletions
diff --git a/academic/GMT/GMT.SlackBuild b/academic/GMT/GMT.SlackBuild
index 24c986ff72..26c37ff8cb 100644
--- a/academic/GMT/GMT.SlackBuild
+++ b/academic/GMT/GMT.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # SlackBuild for the Generic Mapping Tools (GMT).
 
-# Copyright 2009 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
+# Copyright 2009-2011 Pierre Cazenave <pwcazenave {at} gmail [dot] com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,10 +23,12 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=GMT
-VERSION=4.5.6
+VERSION=4.5.7
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+SRCNAM=gmt
+
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
@@ -40,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-COASTNAME=GSHHS
-COASTVER=2.1.1
+COASTNAME=gshhs
+COASTVER=2.2.0
 
 # Shewchuk's triangulation routine used in some parts of GMT is not 
 # distributed under the GNU Public Licence. If you work for a for-profit
@@ -57,19 +59,7 @@ else
    SHEWCHUK_STATUS=""
 fi
 
-# There are a number of different resolution coastline files available
-# for GMT, and their size on disk varies from <2MB (low) to ~62MB 
-# (full). They come in 3 separate archives (GSHHS2.0_coast, 
-# GSHHS2.0_high and GSHHS2.0_full). The first contains the low, intermediate
-# and coarse resolutions, the second the high resolution, and the third
-# the full resolution. I prefer to have them all installed (disk space
-# is cheap), but you may not. By default, all three sets will be installed, 
-# unless you choose otherwise below.
-# e.g. ${COASTS:-"coast"} would install only the low, intermediate and
-# coarse resolutions. At least one resolution is required.
-COASTS=${COASTS:-"coast high full"}
-
-# Set the 64bit flag prefix, which may change depending on $ARCH
+# Set the 64bit flag prefix
 SIXTYFOURBIT=${SIXTYFOURBIT:-dis}
 if [ "$ARCH" = "x86_64" ]; then
   SIXTYFOURBIT="--enable-64 "
@@ -96,16 +86,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$VERSION
-for SUFFIX in doc share src suppl; do
-   tar xvf $CWD/${PRGNAM}${VERSION}_${SUFFIX}.tar.bz2
-done
-if [ $SHEWCHUK = "yes" ]; then
-   tar xvf $CWD/${PRGNAM}${VERSION}_triangle.tar.bz2
-fi
-for RES in $COASTS; do
-   tar xvf $CWD/${COASTNAME}${COASTVER}_${RES}.tar.bz2 -C ${PRGNAM}${VERSION}
-done
+rm -rf ${PRGNAM}${VERSION}
+tar xvf $CWD/${SRCNAM}-${VERSION}.tar.bz2
+tar xvf $CWD/${COASTNAME}-${COASTVER}.tar.bz2 -C ${PRGNAM}${VERSION}
 cd ${PRGNAM}${VERSION}
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
diff --git a/academic/GMT/GMT.info b/academic/GMT/GMT.info
index 724688a8af..6c094d381c 100644
--- a/academic/GMT/GMT.info
+++ b/academic/GMT/GMT.info
@@ -1,24 +1,12 @@
 PRGNAM="GMT"
-VERSION="4.5.6"
+VERSION="4.5.7"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
-DOWNLOAD="ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.6_doc.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.6_share.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.6_src.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.6_suppl.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.6_triangle.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/GSHHS2.1.1_coast.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/GSHHS2.1.1_full.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/GSHHS2.1.1_high.tar.bz2"
-MD5SUM="9a7b78d58311beff31d47b42d0d30bad \
-        9b29e35a0c939345ae593dc6487c8b00 \
-        79cdb798b48c0411483d9b1c60944163 \
-        1519e3fdfd337a852d53f5ce819ac3cc \
-        1812713d2e65edea2cabdc35b5867321 \
-	68a3f9eb6605c17b3369b6f6f5e94549 \
-	603c802f4408e33db974508ebc647ef9 \
-	78e23d1444452fa8ddc9b67e2ad89a01"
+DOWNLOAD="ftp://ftp.soest.hawaii.edu/gmt/gmt-4.5.7.tar.bz2 \
+          ftp://ftp.soest.hawaii.edu/gmt/gshhs-2.2.0.tar.bz2"
+MD5SUM="fc8a4a546ff8572c225aa7bdb56bbdf8 \
+          db98bff37adc0d51fdf0ffa3834d45ad"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave <at> gmail {dot} com"
-APPROVED="dsomero"
+APPROVED="dsomero,Niels Horn"
diff --git a/academic/GMT/README b/academic/GMT/README
index d197330ec1..0ae945e4ff 100644
--- a/academic/GMT/README
+++ b/academic/GMT/README
@@ -10,19 +10,11 @@ H. F. Smith with help from a global set of volunteers, and is supported
 by the National Science Foundation. It is released under the GNU General
 Public License.
 
-This requires netcdf.
+GMT requires netcdf.
 
-There are a number of different resolution coastline files available for
-GMT, and their size on disk varies from <2MB (low) to 61.7MB (full). 
-They come in 3 separate archives:
-  GSHHS2.1.0_coast.tar.bz2 GSHHS2.1.0_high.tar.bz2 GSHHS2.1.0_full.tar.bz2
-
-The first contains the low, intermediate and coarse resolutions, the second 
-the high resolution, and the third the full resolution. I prefer to have all 
-of them installed (disk space is cheap), but you may not. Therefore, all 
-three sets will be installed by default unless you choose otherwise in the 
-script, e.g. setting "COASTS=coast" in the environment would install only the 
-low, intermediate, and coarse resolutions. 
+With the 4.5.7 GMT release, there is only a single coastline archive to
+download. Accordingly, I've modified the script to use all the coastline
+data (removing the option of using only a subset of the coastline files).
 
 Please note, Shewchuk's triangulation routine used in some parts of GMT is 
 not distributed under the GNU Public Licence. If you work for a for-profit