From be4ecf7dc13067703fb1b0a36cddc0e3bb65d12e Mon Sep 17 00:00:00 2001
From: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Date: Tue, 5 Nov 2013 00:11:33 +0700
Subject: academic/GMT: Updated for version 4.5.9.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackware-id.org>
Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 academic/GMT/GMT.SlackBuild    | 16 +++++++++++-----
 academic/GMT/GMT.info          |  8 ++++----
 academic/GMT/gmtdigitize.patch | 10 ++++++++++
 3 files changed, 25 insertions(+), 9 deletions(-)
 create mode 100644 academic/GMT/gmtdigitize.patch

(limited to 'academic')

diff --git a/academic/GMT/GMT.SlackBuild b/academic/GMT/GMT.SlackBuild
index 4653d28fc2..4d43b6d7b1 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.5.8
+VERSION=${VERSION:-4.5.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-COASTNAME=gshhs
-COASTVER=2.2.0
+COASTNAME=gshhg-gmt-nc3
+COASTVER=2.2.3
 
 # 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
@@ -91,7 +91,13 @@ 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 .
+find -L . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+
+patch -p0 < $CWD/gmtdigitize.patch
 
 LDFLAGS="-L/usr/lib$LIBDIRSUFFIX -L/lib$LIBDIRSUFFIX" \
 CFLAGS="$SLKCFLAGS" \
@@ -122,7 +128,7 @@ find $PKG/usr/man -type f -exec gzip -9 {} \;
 for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
    
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a ChangeLog LICENSE.TXT README README.TXT $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a ChangeLog LICENSE.TXT README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 find $PKG/usr/doc/$PRGNAM-$VERSION -type f -exec chmod 644 {} +
 
diff --git a/academic/GMT/GMT.info b/academic/GMT/GMT.info
index cad9939ccc..666e57bd87 100644
--- a/academic/GMT/GMT.info
+++ b/academic/GMT/GMT.info
@@ -1,10 +1,10 @@
 PRGNAM="GMT"
 VERSION="4.5.8"
 HOMEPAGE="http://gmt.soest.hawaii.edu/"
-DOWNLOAD="ftp://ftp.soest.hawaii.edu/gmt/gmt-4.5.8.tar.bz2 \
-          ftp://ftp.soest.hawaii.edu/gmt/gshhs-2.2.0.tar.bz2"
-MD5SUM="8a3fa928bcb8a82ebaed68d62ba8f1ba \
-        db98bff37adc0d51fdf0ffa3834d45ad"
+DOWNLOAD="ftp://ftp.soest.hawaii.edu/gmt/gmt-4.5.9.tar.bz2 \
+          ftp://ftp.soest.hawaii.edu/gmt/gshhg-gmt-nc3-2.2.3.tar.bz2"
+MD5SUM="9f241e97774eadd1fe79f4d7022fcaed \
+        b2ed98b31a141264baee9585e15ac831"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="netcdf"
diff --git a/academic/GMT/gmtdigitize.patch b/academic/GMT/gmtdigitize.patch
new file mode 100644
index 0000000000..a3a0eb75ab
--- /dev/null
+++ b/academic/GMT/gmtdigitize.patch
@@ -0,0 +1,10 @@
+--- src/misc/old_gmtdigitize.c	2013-01-07 11:39:53.769177645 +0100
++++ src/misc/gmtdigitize.c	2013-01-07 11:40:22.244936205 +0100
+@@ -38,6 +38,7 @@
+  */
+  
+ #include "gmt.h"
++#include <sys/types.h>
+ 
+ #ifndef WIN32
+ #include <termios.h>
-- 
cgit v1.2.3