1 files changed, 11 insertions, 28 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 .