academic/treeview: Updated for version 0.5.1.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

3 files changed, 86 insertions, 13 deletions

diff --git a/academic/treeview/cstring.patch b/academic/treeview/cstring.patch
new file mode 100644
index 0000000000..cae987703f
--- /dev/null
+++ b/academic/treeview/cstring.patch
@@ -0,0 +1,71 @@
+--- tv-0.5.1/ncl-2.0/src/charactersblock.cpp.orig	2017-08-13 08:38:11.451581249 +0700
++++ tv-0.5.1/ncl-2.0/src/charactersblock.cpp	2017-08-13 08:38:25.267599533 +0700
+@@ -8,6 +8,7 @@
+ #include "discretematrix.h"
+ #include "assumptionsblock.h"
+ #include "charactersblock.h"
++#include <cstring>
+ 
+ using namespace std;
+ 
+--- tv-0.5.1/ncl-2.0/src/nexus.cpp.orig	2017-08-13 08:40:07.443734383 +0700
++++ tv-0.5.1/ncl-2.0/src/nexus.cpp	2017-08-13 08:40:17.625747774 +0700
+@@ -2,6 +2,7 @@
+ #include "xnexus.h"
+ #include "nexustoken.h"
+ #include "nexus.h"
++#include <cstring>
+ 
+ #define NCL_NAME_AND_VERSION  "NCL version 2.01"
+ #define NCL_COPYRIGHT         "Copyright (c) 2000 by Paul O. Lewis"
+--- tv-0.5.1/ncl-2.0/src/nexustoken.cpp.orig	2017-08-13 08:41:41.569857692 +0700
++++ tv-0.5.1/ncl-2.0/src/nexustoken.cpp	2017-08-13 08:41:52.463871895 +0700
+@@ -1,6 +1,7 @@
+ #include "nexusdefs.h"
+ #include "xnexus.h"
+ #include "nexustoken.h"
++#include <cstring>
+ 
+ using namespace std;
+ 
+--- tv-0.5.1/ncl-2.0/src/nxsstring.cpp.orig	2017-08-13 08:42:36.847929712 +0700
++++ tv-0.5.1/ncl-2.0/src/nxsstring.cpp	2017-08-13 08:42:48.870945321 +0700
+@@ -20,6 +20,7 @@
+ #include <stdio.h>
+ #include <assert.h>
+ #include <math.h>
++#include <cstring>
+ #include "nxsstring.h"
+ 
+ nxsstring& nxsstring::operator+=( const double d )
+--- tv-0.5.1/TreeLib/Parse.cpp.orig	2017-08-13 08:43:50.188024809 +0700
++++ tv-0.5.1/TreeLib/Parse.cpp	2017-08-13 08:44:00.407038015 +0700
+@@ -23,6 +23,7 @@
+  
+ #include <ctype.h>
+ #include "Parse.h"
++#include <cstring>
+ 
+ // Return the next token in the string
+ tokentype Parser::NextToken ()
+--- tv-0.5.1/TreeLib/TreeLib.cpp.orig	2017-08-13 08:45:24.898146879 +0700
++++ tv-0.5.1/TreeLib/TreeLib.cpp	2017-08-13 08:45:33.518157938 +0700
+@@ -23,6 +23,7 @@
+ 
+ #include "TreeLib.h"
+ #include "Parse.h"
++#include <cstdlib>
+ 
+ #include <vector>
+ 
+--- tv-0.5.1/TreeLib/treereader.cpp.orig        2017-08-13 08:47:09.041280171 +0700
++++ tv-0.5.1/TreeLib/treereader.cpp     2017-08-13 08:51:04.192577614 +0700
+@@ -22,6 +22,8 @@
+  // $Id: treereader.cpp,v 1.5 2003/09/10 12:58:16 rdmp1c Exp $
+ 
+ #include "treereader.h"
++#include <cstring>
++#include <stdlib.h>
+ 
+ #if __MWERKS__
+        #include <string.h>
diff --git a/academic/treeview/treeview.SlackBuild b/academic/treeview/treeview.SlackBuild
index 1465f26fae..c98cb4841e 100644
--- a/academic/treeview/treeview.SlackBuild
+++ b/academic/treeview/treeview.SlackBuild
@@ -23,7 +23,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=treeview
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.5.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -31,7 +31,7 @@ SRCNAM=tv
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) export ARCH=i486 ;;
+    i?86) export ARCH=i586 ;;
     arm*) export ARCH=arm ;;
        *) export ARCH=$( uname -m ) ;;
   esac
@@ -42,8 +42,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -66,18 +66,20 @@ tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -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 {} \;
 
 # Disable SVG support. If you want it, you should build
 # wxGTK or wxPython including svg from contrib/src/svg
 # Then, of course comment the next line.
 sed "s:USE_SVG=1:USE_SVG=0:" -i configure
 
+patch -p1 < $CWD/cstring.patch
+
 CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
+CXXFLAGS="$SLKCFLAGS -fpermissive" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
diff --git a/academic/treeview/treeview.info b/academic/treeview/treeview.info
index 8310833f45..e11a5cbfd8 100644
--- a/academic/treeview/treeview.info
+++ b/academic/treeview/treeview.info
@@ -1,8 +1,8 @@
 PRGNAM="treeview"
-VERSION="0.5"
-HOMEPAGE="http://code.google.com/p/treeviewx/"
-DOWNLOAD="http://treeviewx.googlecode.com/files/tv-0.5.tar.gz"
-MD5SUM="8059a306b723e6fb4d3befcf302b2920"
+VERSION="0.5.1"
+HOMEPAGE="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/"
+DOWNLOAD="http://darwin.zoology.gla.ac.uk/~rpage/treeviewx/download/0.5/tv-0.5.1.tar.gz"
+MD5SUM="07e1ed8873c5f19ded7294668233bae1"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="wxPython"