10 files changed, 147 insertions, 114 deletions

diff --git a/math/scilab/files/patch-Makefile.OBJ.in b/math/scilab/files/patch-Makefile.OBJ.in
index 5c3ddedc9f86..7af9a114cd0e 100644
--- a/math/scilab/files/patch-Makefile.OBJ.in
+++ b/math/scilab/files/patch-Makefile.OBJ.in
@@ -1,11 +1,13 @@
---- Makefile.OBJ.in.orig	Tue Mar 21 15:35:41 2006
-+++ Makefile.OBJ.in	Tue Mar 21 15:37:45 2006
-@@ -2,7 +2,7 @@
- ATLASDIR=@ATLAS_DIR@
- 
- STD_BLAS=$(SCIDIR)/libs/blas.a  
+--- Makefile.OBJ.in.orig	Wed Oct 19 09:37:11 2005
++++ Makefile.OBJ.in	Sat May 27 21:52:50 2006
+@@ -1,8 +1,5 @@
+-
+-ATLASDIR=@ATLAS_DIR@
+-
+-STD_BLAS=$(SCIDIR)/libs/blas.a  
 -ATLAS_LAPACKBLAS= $(ATLASDIR)/liblapack.a $(ATLASDIR)/libcblas.a $(ATLASDIR)/libf77blas.a $(ATLASDIR)/libatlas.a
-+ATLAS_LAPACKBLAS= -L$(ATLASDIR) -lalapack -lcblas -lf77blas -latlas
++STD_BLAS=$(BLAS_LIBS)
++ATLAS_LAPACKBLAS=$(BLAS_LIBS)
  
  BLAS=$(@WHICH_BLAS@) 
  
diff --git a/math/scilab/files/patch-ay b/math/scilab/files/patch-ay
deleted file mode 100644
index 09fc76a12ad8..000000000000
--- a/math/scilab/files/patch-ay
+++ /dev/null
@@ -1,11 +0,0 @@
---- routines/xsci/wf_fig.h	2003/01/25 17:23:40	1.1
-+++ routines/xsci/wf_fig.h	2003/01/25 17:24:04
-@@ -48,7 +48,7 @@
- #include <errno.h>
- 
- #ifndef linux 
--#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__APPLE__)
-+#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(__FreeBSD__)
- extern int	errno;
- extern int	sys_nerr;
- #if (! (defined(BSD) && (BSD >= 199306))) && !defined(freebsd)
diff --git a/math/scilab/files/patch-az b/math/scilab/files/patch-az
deleted file mode 100644
index 9ff666998a76..000000000000
--- a/math/scilab/files/patch-az
+++ /dev/null
@@ -1,15 +0,0 @@
---- routines/xsci/x_misc.c	2003/01/25 17:30:25	1.1
-+++ routines/xsci/x_misc.c	2003/01/25 17:34:28
-@@ -509,10 +509,10 @@
- 
- /* #include "wf_fig.h" */ /** for sys_errlist **/
- #ifndef linux 
--#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__APPLE__)
-+#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__APPLE__) && !defined(__FreeBSD__)
- extern int	errno;
- extern int	sys_nerr;
--#if (! (defined(BSD) && (BSD >= 199306))) && !defined(freebsd)  && !defined(__APPLE__)
-+#if (! (defined(BSD) && (BSD >= 199306))) && !defined(__FreeBSD__)  && !defined(__APPLE__)
- extern char    *sys_errlist[];
- #endif
- #endif
diff --git a/math/scilab/files/patch-ba b/math/scilab/files/patch-ba
index 40ce77bb74bf..00263eaadf06 100644
--- a/math/scilab/files/patch-ba
+++ b/math/scilab/files/patch-ba
@@ -1,26 +1,16 @@
---- Makefile.in.orig	Tue May 31 09:57:32 2005
-+++ Makefile.in	Tue Jun  7 21:50:08 2005
+--- Makefile.in.orig	Tue Feb 14 13:14:22 2006
++++ Makefile.in	Sat May 27 20:34:22 2006
 @@ -108,7 +108,7 @@
  	conftest conftest.c so_locations
  
  # SCIBASE for scilab binaries generation
--SCIBASE = scilab-3.1.1
+-SCIBASE = scilab-4.0
 +SCIBASE = scilab
  
  PVMBINDISTFILES = \
  	$(SCIBASE)/pvm3/Readme \
-@@ -258,23 +258,23 @@
- 	tests \
- 	util
- 
--DOCNAME=$(SCIBASE)
-+DOCNAME=scilab
- 
- install:
- 	@if test `pwd`/..  != $(PREFIX)/lib ; then \
- 		install -d $(PREFIX)/lib/$(SCIBASE); \
--		( tar cf - $(INSTBINDISTFILES) @PVMINST1@  | (cd $(PREFIX)/lib/$(SCIBASE) ; tar xf -)); \
-+		( for file in $(INSTBINDISTFILES) @PVMINST1@; do tar cf - $${file}  | (cd $(PREFIX)/lib/$(SCIBASE); tar xf -); done); \
+@@ -263,9 +263,9 @@
+ 		( for file in $(INSTBINDISTFILES) @PVMINST1@; do tar cf - $${file}  | (cd $(PREFIX)/lib/$(SCIBASE); tar xf -); done); \
  		(cd $(PREFIX)/lib/$(SCIBASE);touch .binary; make postinstall PREFIX=$(PREFIX) ) \
  	fi
 -	install -d $(PREFIX)/share/doc/$(DOCNAME)/
@@ -32,20 +22,3 @@
  	install -d $(PREFIX)/bin 
  	$(RM)  $(PREFIX)/bin/scilab
  	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/scilab $(PREFIX)/bin/scilab
--	$(RM)  $(PREFIX)$/bin/intersciXXX
-+	$(RM)  $(PREFIX)/bin/intersci
- 	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci $(PREFIX)/bin/intersci
--	$(RM)  $(PREFIX)$/bin/intersci-n
-+	$(RM)  $(PREFIX)/bin/intersci-n
- 	ln -fs $(PREFIX)/lib/$(SCIBASE)/bin/intersci-n $(PREFIX)/bin/intersci-n
- 
- # DESTDIR is the final destination of the file 
-@@ -293,7 +293,7 @@
- 	@$(RM) -f -r contrib 
- 	@mkdir contrib 
- 	@mv contrib-loader.sce contrib/loader.sce
--	@$(RM) man/*/*/*.xml 
-+	@find man -name "*.xml" -print0 | xargs -0 $(RM)
- 	@@STRIP@ bin/scilex;
- 
- uninstall:
diff --git a/math/scilab/files/patch-bb b/math/scilab/files/patch-bb
index afafd49e46bf..66079c210beb 100644
--- a/math/scilab/files/patch-bb
+++ b/math/scilab/files/patch-bb
@@ -1,23 +1,15 @@
---- configure.orig	Wed May 25 17:00:45 2005
-+++ configure	Sun Jun  5 22:59:47 2005
-@@ -21331,13 +21331,13 @@
- # FreeBSD  systems (not supported by INRIA)
-   *-*-freebsd*)
-      GCC=yes
--     CC=gcc
-+     CC=$CC
-      CC_OPTIONS="${CFLAGS} -Dfreebsd"
-      CC_LDFLAGS=-lm
+--- configure.orig	Wed Feb  1 21:47:53 2006
++++ configure	Sat May 27 19:27:55 2006
+@@ -22162,7 +22162,7 @@
       CC_PICFLAGS='-fPIC'
       # script shell f77 have bugs, get ours
--     FC=f77
+      FC=$F77
 -     FC_OPTIONS="${CFLAGS} -Dfreebsd"
-+     FC=$F77
 +     FC_OPTIONS="${FFLAGS} -Dfreebsd"
       FC_OPTIONS_O0='-Dfreebsd'
       FC_LDFLAGS='-lm -Wl,--export-dynamic'
       FC_PICFLAGS='-fPIC'
-@@ -24208,7 +24208,8 @@
+@@ -25056,7 +25056,8 @@
  cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
@@ -27,12 +19,12 @@
  int
  main ()
  {
-@@ -26321,7 +26322,7 @@
-     ;;
- esac
+@@ -27200,7 +27201,7 @@
+ 	;;
+ 	esac
  
--GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
-+GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
+-	GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
++	GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
  
- case "$host" in
-   *-*-darwin*)
+ 	case "$host" in
+ 		*-*-darwin*)
diff --git a/math/scilab/files/patch-bd b/math/scilab/files/patch-bd
deleted file mode 100644
index 81508b35956c..000000000000
--- a/math/scilab/files/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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 --git a/math/scilab/files/patch-be b/math/scilab/files/patch-be
deleted file mode 100644
index bca9365cd5e7..000000000000
--- a/math/scilab/files/patch-be
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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 --git a/math/scilab/files/patch-routines__Makefile.in b/math/scilab/files/patch-routines__Makefile.in
new file mode 100644
index 000000000000..f8605074cfd1
--- /dev/null
+++ b/math/scilab/files/patch-routines__Makefile.in
@@ -0,0 +1,11 @@
+--- routines/Makefile.in.orig	Sat May 27 21:13:55 2006
++++ routines/Makefile.in	Sat May 27 21:14:03 2006
+@@ -2,7 +2,7 @@
+ 
+ include ../Makefile.incl
+ 
+-SCIDIRS = graphics calelm blas  control default integ interf intersci \
++SCIDIRS = graphics calelm control default integ interf intersci \
+ 	lapack slicot arpack \
+ 	metanet optim poly signal sparse os_specific system system2 console\
+ 	menusX scicos fileio dcd randlib slicot arpack wintools\
diff --git a/math/scilab/files/patch-routines__os_specific__getmemory.c b/math/scilab/files/patch-routines__os_specific__getmemory.c
new file mode 100644
index 000000000000..aaffce274731
--- /dev/null
+++ b/math/scilab/files/patch-routines__os_specific__getmemory.c
@@ -0,0 +1,26 @@
+--- routines/os_specific/getmemory.c	Wed Feb  1 21:50:55 2006
++++ routines/os_specific/getmemory.c	Sat May 27 19:59:53 2006
+@@ -69,6 +69,11 @@
+    }
+ #endif
+ 
++#if defined(__FreeBSD__)
++#define MEMOK 1
++  return 0;
++#endif
++
+ #ifndef  MEMOK
+ /* Linux ,Solaris and others assumed*/
+       return (sysconf(_SC_AVPHYS_PAGES)*sysconf(_SC_PAGESIZE))/kooctet;
+@@ -132,6 +137,11 @@
+ 	  return 0;
+        }
+    }
++#endif
++
++#if defined(__FreeBSD__)
++#define MEMOK 1
++  return 0;
+ #endif
+ 
+ #ifndef  MEMOK
diff --git a/math/scilab/files/patch-scripts__Makefile.in b/math/scilab/files/patch-scripts__Makefile.in
new file mode 100644
index 000000000000..f6e7d05f029a
--- /dev/null
+++ b/math/scilab/files/patch-scripts__Makefile.in
@@ -0,0 +1,84 @@
+--- scripts/Makefile.in.orig	Sat May 27 20:41:36 2006
++++ scripts/Makefile.in	Sat May 27 20:42:07 2006
+@@ -21,14 +21,14 @@
+ 
+ all:: $(PROGRAMS)
+ 
+-CYGDRIVE= -e "s+/cygdrive/\([a-zA-Z]*\)/+\1:/+g" 
++CYGDRIVE= -e "s!/cygdrive/\([a-zA-Z]*\)/!\1:/!g" 
+ SED_CYGDRIVE= @SED_CYGDRIVE@
+ 
+ $(SBIN)/scilab: @SCILABSCRIPT@ $(IP) $(IV)
+ 	@$(RM) $(SBIN)/scilab
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" $(SED_CYGDRIVE) \
+-	-e "s+SCILAB_VERSION+$(SCIVERSION)+" \
+-	-e "s+SCILABGS+@SCILAB_GS@+" @SCILABSCRIPT@ > scilab;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" $(SED_CYGDRIVE) \
++	-e "s!SCILAB_VERSION!$(SCIVERSION)!" \
++	-e "s!SCILABGS!@SCILAB_GS@!" @SCILABSCRIPT@ > scilab;
+ 	@cp scilab $(SBIN)
+ 	@chmod 775 $(SBIN)/scilab
+ 	@$(RM) scilab
+@@ -37,7 +37,7 @@
+ 
+ $(SBIN)/Blatexpr: Blatexpr.g $(IP)
+ 	@$(RM) $(SBIN)/Blatexpr
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatexpr.g > Blatexpr;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatexpr.g > Blatexpr;
+ 	@cp Blatexpr $(SBIN)
+ 	@chmod 775 $(SBIN)/Blatexpr
+ 	@$(RM) Blatexpr
+@@ -45,7 +45,7 @@
+ 
+ $(SBIN)/BEpsf: BEpsf.g $(IP)
+ 	@$(RM) $(SBIN)/BEpsf
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" BEpsf.g > BEpsf;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" BEpsf.g > BEpsf;
+ 	@cp BEpsf $(SBIN)
+ 	@chmod 775 $(SBIN)/BEpsf
+ 	@$(RM) BEpsf
+@@ -53,7 +53,7 @@
+ 
+ $(SBIN)/Blatexpr2: Blatexpr2.g $(IP)
+ 	@$(RM) $(SBIN)/Blatexpr2
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatexpr2.g > Blatexpr2;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatexpr2.g > Blatexpr2;
+ 	@cp Blatexpr2 $(SBIN)
+ 	@chmod 775 $(SBIN)/Blatexpr2
+ 	@$(RM) Blatexpr2
+@@ -61,7 +61,7 @@
+ 
+ $(SBIN)/Blatexprs: Blatexprs.g $(IP)
+ 	@$(RM) $(SBIN)/Blatexprs
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatexprs.g > Blatexprs;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatexprs.g > Blatexprs;
+ 	@cp Blatexprs $(SBIN)
+ 	@chmod 775 $(SBIN)/Blatexprs
+ 	@$(RM) Blatexprs
+@@ -69,7 +69,7 @@
+ 
+ $(SBIN)/Blpr: Blpr.g $(IP)
+ 	@$(RM) $(SBIN)/Blpr
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blpr.g > Blpr;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blpr.g > Blpr;
+ 	@cp Blpr $(SBIN)
+ 	@chmod 775 $(SBIN)/Blpr
+ 	@$(RM) Blpr
+@@ -77,7 +77,7 @@
+ 
+ $(UTIL)/Blatdoc: Blatdoc.g $(IP)
+ 	@$(RM) $(UTIL)/Blatdoc
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatdoc.g > Blatdoc;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatdoc.g > Blatdoc;
+ 	@cp Blatdoc $(UTIL)
+ 	@chmod 775 $(UTIL)/Blatdoc
+ 	@$(RM) Blatdoc
+@@ -85,7 +85,7 @@
+ 
+ $(UTIL)/Blatdocs: Blatdocs.g $(IP)
+ 	@$(RM) $(UTIL)/Blatdocs
+-	@sed -e "s+SCILAB_DIRECTORY+$(SCIDIR)+" Blatdocs.g > Blatdocs;
++	@sed -e "s!SCILAB_DIRECTORY!$(SCIDIR)!" Blatdocs.g > Blatdocs;
+ 	@cp Blatdocs $(UTIL)
+ 	@chmod 775 $(UTIL)/Blatdocs
+ 	@$(RM) Blatdocs