ap/treebest: Updated.

ap/treebest/treebest-1.9.2-fix-fltk-includes.diff

@@ -0,0 +1,37 @@
+diff -Naur treebest-1.9.2.orig/flglobal.h treebest-1.9.2/flglobal.h
+--- treebest-1.9.2.orig/flglobal.h	2007-10-19 11:06:03.000000000 +0200
++++ treebest-1.9.2/flglobal.h	2013-12-23 10:52:32.867024767 +0100
+@@ -6,14 +6,14 @@
+ #define FN_DIONYSIS	1
+ #define FN_SELENA	2
+ 
+-#include <FL/Fl_Double_Window.h>
+-#include <FL/Fl_File_Chooser.h>
+-#include <FL/Fl_Int_Input.h>
+-#include <FL/Fl_Float_Input.h>
+-#include <FL/Fl_Progress.h>
+-#include <FL/Fl_Button.h>
+-#include <FL/Fl_Tabs.h>
+-#include <FL/Fl_Check_Button.h>
++#include <FL/Fl_Double_Window.H>
++#include <FL/Fl_File_Chooser.H>
++#include <FL/Fl_Int_Input.H>
++#include <FL/Fl_Float_Input.H>
++#include <FL/Fl_Progress.H>
++#include <FL/Fl_Button.H>
++#include <FL/Fl_Tabs.H>
++#include <FL/Fl_Check_Button.H>
+ #include "tree.h"
+ #include "phyml.h"
+ #include "tree_plot.h"
+diff -Naur treebest-1.9.2.orig/flworkspace.cc treebest-1.9.2/flworkspace.cc
+--- treebest-1.9.2.orig/flworkspace.cc	2007-10-19 11:06:03.000000000 +0200
++++ treebest-1.9.2/flworkspace.cc	2013-12-23 10:52:39.990931490 +0100
+@@ -1,5 +1,5 @@
+-#include <FL/Fl_Box.h>
+-#include <FL/fl_draw.h>
++#include <FL/Fl_Box.H>
++#include <FL/fl_draw.H>
+ #include <stdlib.h>
+ #include "flglobal.h"
+ #include "utils.h"

ap/treebest/treebest.SlackBuild

@@ -1,6 +1,6 @@
 #!/bin/bash
 # Build script for Slackware
-# Copyright (C) 2009 Damien Goutte-Gattat
+# Copyright (C) 2009,2013 Damien Goutte-Gattat
 #
 # Redistribution and use of this script, with or without modifications,
 # is permitted provided that the following conditions are met:
@@ -31,18 +31,19 @@
 NAMESRC=${NAMESRC:-treebest}
 VERSION=${VERSION:-1.9.2}
 ARCHIVE=${ARCHIVE:-$NAMESRC-$VERSION.tar.gz}
-WGET=${WGET:-http://puzzle.dl.sourceforge.net/sourceforge/treesoft/$ARCHIVE}
+WGET=${WGET:-http://downloads.sourceforge.net/treesoft/$ARCHIVE}
 
 # Build infos
-NAMETGZ=${NAMETGZ:-treebest}
+NAMEPKG=${NAMEPKG:-treebest}
 BUILD=${BUILD:-1GGD}
-ARCH=${ARCH:-i486}
+ARCH=${ARCH:-$(uname -m | sed 's/^i.86$/i486/;s/^arm.*/arm/')}
 JOBS=${JOBS:-1}
+EXT=${EXT:-txz}
 
 # Directories
 TMP=${TMP:-/tmp}
 OUT=${OUT:-$TMP/build}
-PKG=${PKG:-$OUT/$NAMETGZ}
+PKG=${PKG:-$OUT/$NAMEPKG}
 CWD=$(pwd)
 
 set -e  # Quit if a command returns non-zero
@@ -83,6 +84,7 @@ cd $TMP
 echo "Building $ARCHIVE..."
 tar xf $CWD/$ARCHIVE
 cd $NAME
+patch -p 1 < $CWD/treebest-1.9.2-fix-fltk-includes.diff
 CFLAGS=$CPUOPT \
 make treebest fltreebest
 
@@ -104,7 +106,7 @@ cd $PKG
 mkdir -p $OUT
 PACKAGING="
 chown root:root . -R
-/sbin/makepkg -l y -c n $OUT/$NAMETGZ-$VERSION-$ARCH-$BUILD.tgz
+/sbin/makepkg -l y -c n $OUT/$NAMEPKG-$VERSION-$ARCH-$BUILD.$EXT
 rm -rf $PKG
 rm -rf $TMP/$NAME
 "