ports/59620: Update math/scilab to tk 8.4

[Jean-Sebastien Roy]

>Number:         59620
>Category:       ports
>Synopsis:       Update math/scilab to tk 8.4
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Nov 23 13:00:34 PST 2003
>Closed-Date:
>Last-Modified:
>Originator:     Jean-Sebastien Roy
>Release:        FreeBSD 4.9-STABLE i386
>Organization:
-
>Environment:
System: FreeBSD durandal.root 4.9-STABLE FreeBSD 4.9-STABLE #1: Sat Nov 8 00:52:16 CET 2003 js at durandal.root:/mnt/backup/obj/opt/src/sys/JS i386


>Description:
- Updates the math/scilab port so it uses tk 8.4 as requested ;
- Fixes for the help system 'Chapters' ;
- Removes use of a deprecated include (values.h) (thanks to Thomas D. Dean).

>How-To-Repeat:

>Fix:

New files:
files/patch-bc
files/patch-bd
files/patch-be
files/patch-bf

Patch:
diff -ruN scilab/Makefile scilab.84/Makefile
--- scilab/Makefile	Tue Oct  7 22:14:11 2003
+++ scilab.84/Makefile	Sun Oct 19 19:30:52 2003
@@ -7,7 +7,7 @@
 
 PORTNAME=	scilab
 PORTVERSION=	2.7
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math cad parallel
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Scilab/distributions/
 EXTRACT_SUFX=	.src.tar.gz
@@ -19,8 +19,8 @@
 		f77blas.1:${PORTSDIR}/math/atlas \
 		lapack.3:${PORTSDIR}/math/lapack
 BUILD_DEPENDS=	pvm:${PORTSDIR}/net/pvm \
-		wish8.3:${PORTSDIR}/x11-toolkits/tk83
-RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
+		wish8.4:${PORTSDIR}/x11-toolkits/tk84
+RUN_DEPENDS=	wish8.4:${PORTSDIR}/x11-toolkits/tk84 \
 		pvm:${PORTSDIR}/net/pvm
 
 PVM_ROOT=	${LOCALBASE}/lib/pvm
@@ -32,9 +32,9 @@
 
 CONFIGURE_ARGS=	--with-tk \
 		--with-tk-library=${LOCALBASE}/lib \
-		--with-tk-include=${LOCALBASE}/include/tk8.3 \
+		--with-tk-include=${LOCALBASE}/include/tk8.4 \
 		--with-tcl-library=${LOCALBASE}/lib \
-		--with-tcl-include=${LOCALBASE}/include/tcl8.3 \
+		--with-tcl-include=${LOCALBASE}/include/tcl8.4 \
 		--with-pvm-library=${LOCALBASE}/lib \
 		--with-pvm-include=${LOCALBASE}/include \
 		--with-xaw3d \
diff -ruN scilab/files/patch-bb scilab.84/files/patch-bb
--- scilab/files/patch-bb	Sun Apr  6 07:52:43 2003
+++ scilab.84/files/patch-bb	Sun Oct 19 19:27:01 2003
@@ -5,7 +5,7 @@
      if TK_GetVar("isscipadinterp")=='0' then   
        TK_EvalStr("interp create scipad")
 -      TK_EvalStr("load {libtk8.3.so} Tk scipad")
-+      TK_EvalStr("load {libtk83.so} Tk scipad")
++      TK_EvalStr("load {libtk84.so} Tk scipad")
        TK_EvalStr("scipad eval {wm withdraw .}")
        TK_EvalStr("scipad alias ScilabEval ScilabEval")
      end
diff -ruN scilab/files/patch-bc scilab.84/files/patch-bc
--- scilab/files/patch-bc	Thu Jan  1 01:00:00 1970
+++ scilab.84/files/patch-bc	Sun Oct 19 19:22:38 2003
@@ -0,0 +1,11 @@
+--- Makefile.incl.orig	Sun Oct 19 19:20:40 2003
++++ Makefile.incl	Sun Oct 19 19:20:51 2003
+@@ -75,7 +75,7 @@
+ #####################
+ TK_INC_PATH = -I/usr/include
+ TCL_INC_PATH = -I/usr/include
+-TCLTK_LIBS =  -L/usr/lib -ltk8.3   -L/usr/lib -ltcl8.3  -ldl
++TCLTK_LIBS =  -L/usr/lib -ltk8.4   -L/usr/lib -ltcl8.4  -ldl
+ 
+ #####################
+ # for WIN32 version 
diff -ruN scilab/files/patch-bd scilab.84/files/patch-bd
--- scilab/files/patch-bd	Thu Jan  1 01:00:00 1970
+++ scilab.84/files/patch-bd	Sun Oct 19 19:25:57 2003
@@ -0,0 +1,11 @@
+--- examples/callsci/callsciC++/config/Makefile.incl.orig	Sun Oct 19 19:25:21 2003
++++ examples/callsci/callsciC++/config/Makefile.incl	Sun Oct 19 19:25:33 2003
+@@ -75,7 +75,7 @@
+ #####################
+ TK_INC_PATH = -I/usr/include
+ TCL_INC_PATH = -I/usr/include
+-TCLTK_LIBS =  -L/usr/lib -ltk8.3   -L/usr/lib -ltcl8.3  -ldl
++TCLTK_LIBS =  -L/usr/lib -ltk8.4   -L/usr/lib -ltcl8.4  -ldl
+ 
+ #####################
+ # for WIN32 version 
diff -ruN scilab/files/patch-be scilab.84/files/patch-be
--- scilab/files/patch-be	Thu Jan  1 01:00:00 1970
+++ scilab.84/files/patch-be	Sun Nov 23 20:27:09 2003
@@ -0,0 +1,18 @@
+--- routines/graphics/Math.h.orig	Sun Nov 23 20:22:11 2003
++++ routines/graphics/Math.h	Sun Nov 23 20:22:10 2003
+@@ -88,11 +88,15 @@
+ #if defined(THINK_C)|| defined(WIN32)
+ #define M_PI	3.14159265358979323846
+ #else
++#if defined(HAVE_LIMITS_H)
++#include <limits.h>
++#else
+ #if defined(HAVE_VALUES_H)
+ #include <values.h>
+ #else
+ #ifndef M_PI
+ #define M_PI    3.14159265358979323846 
++#endif
+ #endif
+ #endif
+ #endif
diff -ruN scilab/files/patch-bf scilab.84/files/patch-bf
--- scilab/files/patch-bf	Thu Jan  1 01:00:00 1970
+++ scilab.84/files/patch-bf	Sun Nov 23 21:14:14 2003
@@ -0,0 +1,12 @@
+--- macros/util/help.sci.orig	Sun Nov 23 21:13:37 2003
++++ macros/util/help.sci	Sun Nov 23 21:11:24 2003
+@@ -184,7 +184,8 @@
+    if MSDOS then
+      tcltk_help(path,key);
+    else
+-     unix(SCI+'/tcl/browsehelpexe ' +path+ '&');
++     tcltk_help(path,key);
++//     unix(SCI+'/tcl/browsehelpexe ' +path+ '&');
+    end
+   else
+      write(%io(2),mgetl(path))
>Release-Note:
>Audit-Trail:
>Unformatted: