academic/GMT: Updated for version 4.5.1

3 files changed, 73 insertions, 44 deletions

diff --git a/academic/GMT/GMT.SlackBuild b/academic/GMT/GMT.SlackBuild
index ad5f84eb9e..2308a85974 100644
--- a/academic/GMT/GMT.SlackBuild
+++ b/academic/GMT/GMT.SlackBuild
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=GMT
-VERSION=4.4.0
+VERSION=4.5.1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,16 +33,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2 -fPIC"
-  LIBDIRSUFFIX="64"
-fi
+COASTNAME=GSHHS
+COASTVER=2.0.1
 
 # 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
@@ -52,11 +44,16 @@ fi
 # by default; should you need to change this behaviour, set SHEWCHUK to 
 # "no" below:
 SHEWCHUK=${SHEWCHUK:-yes}
+if [ $SHEWCHUK == "yes" ]; then
+   SHEWCHUK_STATUS="--enable-triangle"
+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 61.7MB 
-# (full). They come in 3 separate archives (GSHHS1.10_coast, 
-# GSHHS1.10_high and GSHHS1.10_full). The first contains the low, intermediate
+# 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, 
@@ -65,10 +62,23 @@ SHEWCHUK=${SHEWCHUK:-yes}
 # coarse resolutions. At least one resolution is required.
 COASTS=${COASTS:-"coast high full"}
 
-if [ $SHEWCHUK == "yes" ]; then
-   SHEWCHUK_STATUS="--enable-triangle"
+# Set the 64bit flag prefix, which may change depending on $ARCH
+SIXTYFOURBIT=${SIXTYFOURBIT:-dis}
+if [ "$ARCH" = "x86_64" ]; then
+  SIXTYFOURBIT="--enable-64 "
 else
-   SHEWCHUK_STATUS=""
+  SIXTYFOURBIT="--disable-64 "
+fi
+
+if [ "$ARCH" = "i486" ]; then
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
 set -e
@@ -84,7 +94,7 @@ if [ $SHEWCHUK == "yes" ]; then
    tar xvf $CWD/${PRGNAM}${VERSION}_triangle.tar.bz2
 fi
 for RES in $COASTS; do
-   tar xvf $CWD/GSHHS1.10_${RES}.tar.bz2 -C ${PRGNAM}${VERSION}
+   tar xvf $CWD/${COASTNAME}${COASTVER}_${RES}.tar.bz2 -C ${PRGNAM}${VERSION}
 done
 cd ${PRGNAM}${VERSION}
 chown -R root:root .
@@ -99,10 +109,14 @@ CXXFLAGS="$SLKCFLAGS" \
    --mandir=/usr/man \
    --libdir=/usr/lib${LIBDIRSUFFIX} \
    --docdir=/usr/doc/${PRGNAM}-${VERSION} \
+   --pdfdir=/usr/doc/${PRGNAM}-${VERSION}/pdf \
+   --htmldir=/usr/doc/${PRGNAM}-${VERSION}/html \
+   --datarootdir=/usr/share/${PRGNAM} \
    --enable-netcdf=/usr \
    --disable-mex \
-   --build=$ARCH-slackware-linux \
-   $SHEWCHUK_STATUS
+   $SIXTYFOURBIT \
+   $SHEWCHUK_STATUS \
+   --build=$ARCH-slackware-linux
 
 make all
 make install-all DESTDIR=$PKG
@@ -110,19 +124,16 @@ make install-all DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
    | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man || exit 1
-   find . -type f -exec gzip -9 {} +
-   for i in $(find . -type l); do
-      ln -s $(readlink $i).gz $i.gz
-      rm $i
-   done
+( cd $PKG/usr/man
+  find . -type f -exec gzip -9 {} \;
+  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 if [ $SHEWCHUK == "yes" ]; then
    cp -a src/README.TRIANGLE $PKG/usr/doc/$PRGNAM-$VERSION
 fi
-cp -a COPYING ChangeLog README README.gshhs $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE.TXT README README.TXT $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 cat $CWD/README > $PKG/usr/doc/$PRGNAM-$VERSION/README$TAG
 
@@ -132,4 +143,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/academic/GMT/GMT.info b/academic/GMT/GMT.info
index a67c1f624c..2558a1decd 100644
--- a/academic/GMT/GMT.info
+++ b/academic/GMT/GMT.info
@@ -1,8 +1,24 @@
 PRGNAM="GMT"
-VERSION="4.4.0"
+VERSION="4.5.1"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
-DOWNLOAD="ftp://ftp.soest.hawaii.edu/gmt/GMT4.4.0_src.tar.bz2"
-MD5SUM="e5aa473a2bb93001942730f3da7c915f"
+DOWNLOAD="ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.1_doc.tar.bz2 
+          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.1_share.tar.bz2 
+          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.1_src.tar.bz2 
+          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.1_suppl.tar.bz2 
+          ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.1_triangle.tar.bz2
+          ftp://ftp.soest.hawaii.edu/gmt/GSHHS2.0.1_coast.tar.bz2 
+          ftp://ftp.soest.hawaii.edu/gmt/GSHHS2.0.1_full.tar.bz2 
+          ftp://ftp.soest.hawaii.edu/gmt/GSHHS2.0.1_high.tar.bz2"
+MD5SUM="124b2206be03e0d4d8c2bed582a30187
+        1380a82348b9fdd0c32474787a90a95f
+        a0e7b410e8470d6c47bd56830fd1158f
+        c771a72a7eed44678134ae0b51edd606
+        d71fc58ee47240afd2a3494341eb5ad8
+        75a1e1e04b473699eee3a31c89b8dbfa
+        dbffea06d9ccf2899a9788dfac99c387
+        0e1855e73bb079ab1879dd24895e99e9"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Pierre Cazenave"
 EMAIL="pwcazenave <at> gmail {dot} com"
 APPROVED="dsomero"
diff --git a/academic/GMT/README b/academic/GMT/README
index f6c9c057ee..208c1305d5 100644
--- a/academic/GMT/README
+++ b/academic/GMT/README
@@ -14,11 +14,11 @@ GMT requires netcdf, available at SlackBuilds.org.
 
 In order to build GMT, there are a number of required archives:
 
-GMT4.4.0_doc.tar.bz2 
-GMT4.4.0_share.tar.bz2 
-GMT4.4.0_src.tar.bz2
-GMT4.4.0_suppl.tar.bz2 
-GMT4.4.0_triangle.tar.bz2 (if you require Shewchuk's triangulation 
+GMT4.5.1_doc.tar.bz2 
+GMT4.5.1_share.tar.bz2 
+GMT4.5.1_src.tar.bz2
+GMT4.5.1_suppl.tar.bz2 
+GMT4.5.1_triangle.tar.bz2 (if you require Shewchuk's triangulation 
 routine (see below)).
 
 These must all be downloaded and placed in the same directory as the
@@ -28,9 +28,9 @@ 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:
 
-GSHHS1.10_coast.tar.bz2 
-GSHHS1.10_high.tar.bz2 
-GSHHS1.10_full.tar.bz2
+GSHHS2.0.1_coast.tar.bz2 
+GSHHS2.0.1_high.tar.bz2 
+GSHHS2.0.1_full.tar.bz2
 
 The first contains the low, intermediate and coarse resolutions,
 the second the high resolution, and the third the full resolution. I
@@ -38,14 +38,16 @@ prefer to have all of them installed (disk space is cheap), but you
 may not. Therefore, by default, all three sets will be installed,
 unless you choose otherwise in the script. e.g. ${COASTS:-"coast"}
 would install only the low, intermediate and coarse resolutions. A
-minimum of GSHHS1.10_coast.tar.bz2 is required.
+minimum of GSHHS2.0.1_coast.tar.bz2 is required.
 
 To download all the files, the following works: 
-wget ftp://ftp.soest.hawaii.edu/gmt/GMT4.4.0_{doc,share,src,suppl,triangle}.tar.bz2 ftp://ftp.soest.hawaii.edu/gmt/GSHHS1.10_{full,coast,high}.tar.bz2
+wget \
+  ftp://ftp.soest.hawaii.edu/gmt/GMT4.5.1_{doc,share,src,suppl,triangle}.tar.bz2 \
+  ftp://ftp.soest.hawaii.edu/gmt/GSHHS2.0.1_{full,coast,high}.tar.bz2
 
 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 organisation, you should read Shewchuk's copyright statement
-(in $PKG/src/README.TRIANGLE) first. This script enables the (much
-faster) Shewchuk triangulation routine by default; should you need to
-change this behaviour, set SHEWCHUK to "no" in the build script.
+(in $TMP/$PRGNAM-$VERSION/src/README.TRIANGLE) first. This script enables 
+the (much faster) Shewchuk triangulation routine by default; should you 
+need to change this behaviour, set SHEWCHUK to "no" in the build script.