upgrate to scilab 2.7

PR:		50219 and 50221
Submitted by:	Jean-Sebastien Roy <js@jeannot.org>

27 files changed, 17 insertions, 384 deletions

diff --git a/math/scilab/files/patch-aa b/math/scilab/files/patch-aa
deleted file mode 100644
index 710f01fcfd55..000000000000
--- a/math/scilab/files/patch-aa
+++ /dev/null
@@ -1,11 +0,0 @@
---- routines/pvm/Makefile	Mon Apr 30 21:48:16 2001
-+++ routines/pvm/Makefile	Mon Apr 30 21:52:03 2001
-@@ -10,7 +10,7 @@
- 
- include ../../Makefile.incl
- 
--CFLAGS = $(CC_OPTIONS)  -I${PVMROOT}/include
-+CFLAGS = $(CC_OPTIONS)  -I${PVM_INCLUDE}
- 
- FFLAGS = $(FC_OPTIONS)
- 
diff --git a/math/scilab/files/patch-ab b/math/scilab/files/patch-ab
deleted file mode 100644
index cb016c3fe533..000000000000
--- a/math/scilab/files/patch-ab
+++ /dev/null
@@ -1,43 +0,0 @@
---- Makefile.in.orig	Mon Mar 26 09:59:13 2001
-+++ Makefile.in	Fri Jan 25 16:38:50 2002
-@@ -111,12 +111,6 @@
- 	$(SCIBASE)/macros \
- 	$(SCIBASE)/man \
- 	$(SCIBASE)/maple \
--	$(SCIBASE)/pvm3/lib/pvm \
--	$(SCIBASE)/pvm3/lib/pvmd \
--	$(SCIBASE)/pvm3/lib/pvmtmparch \
--	$(SCIBASE)/pvm3/lib/pvmgetarch \
--	$(SCIBASE)/pvm3/lib/@PVMARCH@/pvmd3 \
--	$(SCIBASE)/pvm3/lib/@PVMARCH@/pvmgs \
- 	$(SCIBASE)/routines/*.h \
- 	$(SCIBASE)/routines/Make.lib \
- 	$(SCIBASE)/routines/default/FCreate \
-@@ -147,7 +141,7 @@
- 	cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)
- 	$(RM) .binary
- 
--LIBPREFIX = @prefix@/lib
-+LIBPREFIX = @prefix@
- 
- install:
- 	@if test `pwd` != ${LIBPREFIX}/$(SCIBASE); then \
-@@ -159,12 +153,12 @@
- 		(cd ${LIBPREFIX}/$(SCIBASE); make); \
- 		$(RM) .binary; \
- 	fi
--	$(RM) /usr/bin/scilab
--	ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/scilab /usr/bin/scilab
--	$(RM) /usr/bin/intersci
--	ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci /usr/bin/intersci
--	$(RM) /usr/bin/intersci-n
--	ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci-n /usr/bin/intersci-n
-+	$(RM) @prefix@/bin/scilab
-+	ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/scilab @prefix@/bin/scilab
-+	$(RM) @prefix@/bin/intersci
-+	ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci @prefix@/bin/intersci
-+	$(RM) @prefix@/bin/intersci-n
-+	ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci-n @prefix@/bin/intersci-n
- 
- uninstall:
- 	$(RM) -r ${LIBPREFIX}/$(SCIBASE)
diff --git a/math/scilab/files/patch-ac b/math/scilab/files/patch-ac
deleted file mode 100644
index d69dbaf8ecaa..000000000000
--- a/math/scilab/files/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure	Mon Apr 30 22:08:50 2001
-+++ configure	Mon Apr 30 22:10:33 2001
-@@ -2528,15 +2528,15 @@
- # FreeBSD  systems (not supported by INRIA)
-   *-*-freebsd*)
-      GCC=yes
--     CC=gcc
--     CC_OPTIONS='-O2 -Dfreebsd'
-+     CC=cc
-+     CC_OPTIONS="${CFLAGS} -Dfreebsd"
-      CC_LDFLAGS=-lm
-      CC_PICFLAGS='-fPIC'
-      # script shell f77 have bugs, get ours
-      FC=f77
--     FC_OPTIONS='-O2 -Dfreebsd'
-+     FC_OPTIONS="${CFLAGS} -Dfreebsd"
-      FC_OPTIONS_O0='-Dfreebsd'
--     FC_LDFLAGS=-lm
-+     FC_LDFLAGS='-lm -Wl,--export-dynamic'
-      FC_PICFLAGS='-fPIC'
-      LD=ld
-      LD_LDFLAGS=-lm
-@@ -4635,8 +4635,8 @@
- EOF
- 
-   PVMARCH="$ac_cv_PVM_arch"
--  PVMGLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libgpvm3.a"
--  PVMLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libpvm3.a"
-+  PVMGLIB="${PVM_LIB}/libgpvm3.a"
-+  PVMLIB="${PVM_LIB}/libpvm3.a"
-   PVMSCIDIR=pvm
-   PVMSCILIB="\$(SCIDIR)/libs/pvm.a"
- fi
diff --git a/math/scilab/files/patch-ad b/math/scilab/files/patch-ad
deleted file mode 100644
index e58316878683..000000000000
--- a/math/scilab/files/patch-ad
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/callsci/callsciC/config/callsci.sh	Fri Jul  6 10:53:00 2001
-+++ examples/callsci/callsciC/config/callsci.sh	Fri Jul  6 11:01:20 2001
-@@ -36,8 +36,6 @@
-     export PATH
-     XAPPLRESDIR=$SCI/X11_defaults
-     export XAPPLRESDIR
--    XLESSHELPFILE=$SCI/X11_defaults/xless.help
--    export XLESSHELPFILE
-     NETHELPDIR=$SCI/X11_defaults
-     export NETHELPDIR
-     tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z'
diff --git a/math/scilab/files/patch-ae b/math/scilab/files/patch-ae
deleted file mode 100644
index ac93a7a273a5..000000000000
--- a/math/scilab/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/callsci/callsciC/myprog.sh	Fri Jul  6 10:53:00 2001
-+++ examples/callsci/callsciC/myprog.sh	Fri Jul  6 11:01:47 2001
-@@ -36,8 +36,6 @@
-     export PATH
-     XAPPLRESDIR=$SCI/X11_defaults
-     export XAPPLRESDIR
--    XLESSHELPFILE=$SCI/X11_defaults/xless.help
--    export XLESSHELPFILE
-     NETHELPDIR=$SCI/X11_defaults
-     export NETHELPDIR
-     tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z'
diff --git a/math/scilab/files/patch-af b/math/scilab/files/patch-af
deleted file mode 100644
index 1f3480014653..000000000000
--- a/math/scilab/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- examples/callsci/callsciFortran/config/callsci.sh	Fri Jul  6 10:53:00 2001
-+++ examples/callsci/callsciFortran/config/callsci.sh	Fri Jul  6 11:02:03 2001
-@@ -36,8 +36,6 @@
-     export PATH
-     XAPPLRESDIR=$SCI/X11_defaults
-     export XAPPLRESDIR
--    XLESSHELPFILE=$SCI/X11_defaults/xless.help
--    export XLESSHELPFILE
-     NETHELPDIR=$SCI/X11_defaults
-     export NETHELPDIR
-     tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z'
diff --git a/math/scilab/files/patch-ag b/math/scilab/files/patch-ag
deleted file mode 100644
index 52af70c55253..000000000000
--- a/math/scilab/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- macros/scicos/do_block_info.sci	Fri Jul  6 10:51:58 2001
-+++ macros/scicos/do_block_info.sci	Fri Jul  6 11:09:23 2001
-@@ -43,7 +43,7 @@
- 	out_f = strsubsTMPDIR,'/','\')+'\scs_info';
-   	hos''"'+strsubsSCI,'/','\')+'\bin\xless.exe'" '+ out_f);
-     else 
--        unix_s(SCI+'/bin/xless '+TMPDIR+'/scs_info&')
-+        unix_s('xless '+TMPDIR+'/scs_info&')
-     end
-   end
- else
diff --git a/math/scilab/files/patch-ah b/math/scilab/files/patch-ah
deleted file mode 100644
index 5c87dd93ecde..000000000000
--- a/math/scilab/files/patch-ah
+++ /dev/null
@@ -1,11 +0,0 @@
---- macros/util/unix_x.sci	Fri Jul  6 10:51:58 2001
-+++ macros/util/unix_x.sci	Fri Jul  6 11:07:57 2001
-@@ -28,7 +28,7 @@
-   if MSDOS then 
-   	hos""""+strsubsSCI,'/','\')+'\bin\xless.exe"" '+ tmp);
-   else 
--  	host('$SCI/bin/xless '+tmp+' & 2>/dev/null;')
-+  	host('xless '+tmp+' & 2>/dev/null;')
-   end
- case -1 then // host failed
-   erro85)
diff --git a/math/scilab/files/patch-ai b/math/scilab/files/patch-ai
deleted file mode 100644
index 830da26f00fb..000000000000
--- a/math/scilab/files/patch-ai
+++ /dev/null
@@ -1,11 +0,0 @@
---- routines/sun/h_help_data.c	Fri Jul  6 10:52:43 2001
-+++ routines/sun/h_help_data.c	Fri Jul  6 11:11:08 2001
-@@ -163,7 +163,7 @@
-     }
- #else
-   int i;
--  static char format1[]= "$SCI/bin/xless %s/%s.cat 2> /dev/null &";
-+  static char format1[]= "xless %s/%s.cat 2> /dev/null &";
-   static char format2[]= "cat %s/%s.cat | more ";
-   C2xscion&i);
-   if i != 0 )
diff --git a/math/scilab/files/patch-aj b/math/scilab/files/patch-aj
deleted file mode 100644
index 67fec060643d..000000000000
--- a/math/scilab/files/patch-aj
+++ /dev/null
@@ -1,38 +0,0 @@
---- scripts/scilab.g	Fri Jul  6 10:52:53 2001
-+++ scripts/scilab.g	Fri Jul  6 11:12:00 2001
-@@ -46,8 +46,6 @@
-     export PATH
-     XAPPLRESDIR=$SCI/X11_defaults
-     export XAPPLRESDIR
--    XLESSHELPFILE=$SCI/X11_defaults/xless.help
--    export XLESSHELPFILE
-     NETHELPDIR=$SCI/X11_defaults
-     export NETHELPDIR
-     tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z'
-@@ -60,8 +58,6 @@
-     export PATH
-     XAPPLRESDIR=$SCI/X11_defaults
-     export XAPPLRESDIR
--    XLESSHELPFILE=$SCI/X11_defaults/xless.help
--    export XLESSHELPFILE
-     NETHELPDIR=$SCI/X11_defaults
-     export NETHELPDIR
-     tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z'
-@@ -122,7 +118,7 @@
-     then 
- 	exit 19
-     else
--	( $SCI/bin/xless /tmp/Sci_mankx ;rm -f  /tmp/Sci_mankx  ) &
-+	( xless /tmp/Sci_mankx ;rm -f  /tmp/Sci_mankx  ) &
-     fi 
- }
- 
-@@ -162,7 +158,7 @@
- 		f=`ls  $mpath/$1.cat 2> /dev/null`
- 		if  test -n "$f"
- 		then 
--			$SCI/bin/xless $mpath/$1.cat &
-+			xless $mpath/$1.cat &
- 			tst="found"
- 			break
- 		fi 
diff --git a/math/scilab/files/patch-ak b/math/scilab/files/patch-ak
deleted file mode 100644
index 2305308e3565..000000000000
--- a/math/scilab/files/patch-ak
+++ /dev/null
@@ -1,11 +0,0 @@
---- intersci/intersci.c.orig	Wed Aug 15 16:21:17 2001
-+++ intersci/intersci.c	Wed Aug 15 16:21:58 2001
-@@ -3326,7 +3326,7 @@
- 	  white(f,7+indent);
- 	  count = 7+indent;
- 	}
--      if ( count == 72 && sbuf[i] != '\n' ) { fprintf(f,"\n     $ ");count=7;}
-+      if ( count == 72 && sbuf[i] != '\n' ) { fprintf(f,"\n     /");count=6;}
-       if ( sbuf[i] == '\n') count = -1 ;
-       fprintf(f,"%c",sbuf[i]);
-       count++;
diff --git a/math/scilab/files/patch-al b/math/scilab/files/patch-al
deleted file mode 100644
index ef7ee5ae2eb1..000000000000
--- a/math/scilab/files/patch-al
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/scilab.g.orig	Mon Mar 19 10:27:27 2001
-+++ scripts/scilab.g	Mon Jan 21 21:36:25 2002
-@@ -29,7 +29,7 @@
- export VERSION
- 
- if test "$PVM_ROOT" = ""; then
--  PVM_ROOT=$SCI/pvm3
-+  PVM_ROOT="%%PVM_ROOT%%"
- fi
- if test "$PVM_ARCH" = ""; then
-   PVM_ARCH=`$PVM_ROOT/lib/pvmgetarch`
diff --git a/math/scilab/files/patch-am b/math/scilab/files/patch-am
deleted file mode 100644
index 304ef3efa7b3..000000000000
--- a/math/scilab/files/patch-am
+++ /dev/null
@@ -1,5 +0,0 @@
---- .pvmd.conf.orig	Mon Jan 21 22:21:01 2002
-+++ .pvmd.conf	Mon Jan 21 22:22:11 2002
-@@ -1 +1 @@
--* dx=$SCI/pvm3/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH
-+* dx=$PVM_ROOT/lib/pvmd ep=$SCI/bin:$PVM_ROOT/bin/$PVM_ARCH
diff --git a/math/scilab/files/patch-an b/math/scilab/files/patch-an
deleted file mode 100644
index 36dd4d607f5d..000000000000
--- a/math/scilab/files/patch-an
+++ /dev/null
@@ -1,21 +0,0 @@
---- routines/signal/sigelm.f.orig	Mon Feb  5 10:19:36 2001
-+++ routines/signal/sigelm.f	Sun Jun  3 18:52:29 2001
-@@ -134,8 +134,18 @@
-  22   continue
- c     rhs=4
-       ilinc=iadr(lstk(top))
-+      if (istk(ilinc).ne.1) then  !protect the 4th arg. (GA 2001) 
-+         err=4
-+         call error(53)
-+         return
-+      endif
-       linc=sadr(ilinc+4)
-       nspn=int(stk(linc))
-+      if (nspn.eq.0) then  !protect the 4th arg. (GA 2001)
-+         err=4
-+         call error(36)
-+         return
-+      endif
-       top=top-1
-       iln=iadr(lstk(top))
-       ln=sadr(iln+4)
diff --git a/math/scilab/files/patch-ao b/math/scilab/files/patch-ao
deleted file mode 100644
index 786e302ec102..000000000000
--- a/math/scilab/files/patch-ao
+++ /dev/null
@@ -1,11 +0,0 @@
---- routines/interf/strelm.f.orig	Wed Feb 28 05:17:35 2001
-+++ routines/interf/strelm.f	Wed Dec 12 16:17:42 2001
-@@ -1478,6 +1478,6 @@
-          lr=ilr+6
-          do 20 i=0,n-1
--            m=int(stk(l+i))
--            istk(lr+i)=getcode(m)
-+            c=char(int(stk(l+i)))
-+            istk(lr+i)=getcode(c)
-  20      continue
-          lstk(top+1)=sadr(lr+n)
diff --git a/math/scilab/files/patch-ap b/math/scilab/files/patch-ap
deleted file mode 100644
index 3532b93e913e..000000000000
--- a/math/scilab/files/patch-ap
+++ /dev/null
@@ -1,40 +0,0 @@
---- macros/util/formatman.sci.orig	Fri Mar  2 03:50:36 2001
-+++ macros/util/formatman.sci	Thu Dec 20 17:34:38 2001
-@@ -389,5 +389,5 @@
-   end
- end
--function wh=asciiwhatis(path,fnam)
-+function wh_out=asciiwhatis(path,fnam)
- txt=mgetl(path)
- d=find(part(txt,1:8)=='.SH NAME')
-@@ -401,5 +401,17 @@
- wh=stripblanks(wh)
- k=find(wh=='');if k<>[] then wh(k)=[];end
--wh=wh+'  @'+fnam
-+sz=size(wh);
-+for i=1:sz(1),
-+// pad the output to make the descriptions all line up on the left
-+ind=min(strindex(wh(i,:),' - '))-1;
-+ind=ind(1);
-+tmps=sprintf('%-15s%s',part(wh(i),1:ind),part(wh(i),(ind+1):length(wh(i))));
-+tmps=tmps +'  @'+fnam
-+if (i == 1),
-+  wh_out = tmps;
-+else
-+  wh_out=sprintf('%s\n%s',wh_out,tmps);
-+end
-+end
- 
- function wh=texwhatis(path,fnam)
-@@ -426,5 +438,10 @@
-   p=p(1)
- 
--  whk=part(whk,1:p-1)+'</a>'+part(whk,p:length(whk))
-+  // pad the output to make the descriptions all line up on the left
-+  pad='';
-+  for i=1:(15-p),
-+    pad=pad+'&nbsp';
-+  end
-+  whk=part(whk,1:p-1)+'</a>'+pad+part(whk,p:length(whk))
-   wh(k)='<br><a href=""'+fnam+'"">'+whk+'<br>'
- end
diff --git a/math/scilab/files/patch-aq b/math/scilab/files/patch-aq
deleted file mode 100644
index 85828e0e9525..000000000000
--- a/math/scilab/files/patch-aq
+++ /dev/null
@@ -1,9 +0,0 @@
---- man/control/sysfact.man.orig	Thu Aug  9 10:03:06 2001
-+++ man/control/sysfact.man	Thu Aug  9 10:05:23 2001
-@@ -2,5 +2,5 @@
- .so ../sci.an 
- .SH NAME
--sysfact- system factorization
-+sysfact - system factorization
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-ar b/math/scilab/files/patch-ar
deleted file mode 100644
index 9f7acd7bf20c..000000000000
--- a/math/scilab/files/patch-ar
+++ /dev/null
@@ -1,9 +0,0 @@
---- man/nonlinear/derivative.man.orig	Thu Aug  9 09:31:56 2001
-+++ man/nonlinear/derivative.man	Thu Aug  9 10:08:41 2001
-@@ -2,5 +2,5 @@
- .so ../sci.an 
- .SH NAME
--derivative- approximate derivative
-+derivative - approximate derivative
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-as b/math/scilab/files/patch-as
deleted file mode 100644
index dd56a7d98cd5..000000000000
--- a/math/scilab/files/patch-as
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/pvm/pvm_barrier.man.orig	Thu Aug  9 09:31:56 2001
-+++ man/pvm/pvm_barrier.man	Thu Aug  9 10:12:55 2001
-@@ -2,6 +2,5 @@
- .so ../sci.an
- .SH NAME
--pvm_barrier - blocks the calling process until all processes
--in a group have called it.
-+pvm_barrier - blocks the calling process until all processes in a group have called it.
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-at b/math/scilab/files/patch-at
deleted file mode 100644
index 008940ce2691..000000000000
--- a/math/scilab/files/patch-at
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/pvm/pvm_error.man.orig	Thu Aug  9 09:31:56 2001
-+++ man/pvm/pvm_error.man	Thu Aug  9 10:15:38 2001
-@@ -2,6 +2,5 @@
- .so ../sci.an
- .SH NAME
--pvm_error - Prints  message  describing  an error  returned by a PVM call.
--group.
-+pvm_error - Prints  message  describing  an error  returned by a PVM call. 
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-au b/math/scilab/files/patch-au
deleted file mode 100644
index 1d7a85a85216..000000000000
--- a/math/scilab/files/patch-au
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/pvm/pvm_gettid.man.orig	Thu Aug  9 09:31:56 2001
-+++ man/pvm/pvm_gettid.man	Thu Aug  9 10:16:23 2001
-@@ -2,6 +2,5 @@
- .so ../sci.an
- .SH NAME
--pvm_gettid - returns the tid of the process identified by a
--group name and instance number.
-+pvm_gettid - returns the tid of the process identified by a group name and instance number.
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-av b/math/scilab/files/patch-av
deleted file mode 100644
index da19a28df296..000000000000
--- a/math/scilab/files/patch-av
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/pvm/pvm_parent.man.orig	Thu Aug  9 09:31:56 2001
-+++ man/pvm/pvm_parent.man	Thu Aug  9 10:17:22 2001
-@@ -2,6 +2,5 @@
- .so ../sci.an
- .SH NAME
--pvm_parent - returns the tid of the process that spawned
--the calling process.
-+pvm_parent - returns the tid of the process that spawned the calling process.
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-aw b/math/scilab/files/patch-aw
deleted file mode 100644
index b53613d607c7..000000000000
--- a/math/scilab/files/patch-aw
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/pvm/pvm_reduce.man.orig	Thu Aug  9 09:31:56 2001
-+++ man/pvm/pvm_reduce.man	Thu Aug  9 10:18:01 2001
-@@ -2,6 +2,5 @@
- .so ../sci.an
- .SH NAME
--pvm_reduce - Performs a reduce operation over members of the specified
--group.
-+pvm_reduce - Performs a reduce operation over members of the specified group.
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-ax b/math/scilab/files/patch-ax
deleted file mode 100644
index 39c33411829a..000000000000
--- a/math/scilab/files/patch-ax
+++ /dev/null
@@ -1,10 +0,0 @@
---- man/pvm/pvm_tasks.man.orig	Thu Aug  9 09:31:56 2001
-+++ man/pvm/pvm_tasks.man	Thu Aug  9 10:18:46 2001
-@@ -2,6 +2,5 @@
- .so ../sci.an
- .SH NAME
--pvm_tasks - returns information about the tasks running
--on the virtual machine.
-+pvm_tasks - returns information about the tasks running on the virtual machine.
- .SH CALLING SEQUENCE
- .nf
diff --git a/math/scilab/files/patch-ay b/math/scilab/files/patch-ay
index 9a196f79a558..09fc76a12ad8 100644
--- a/math/scilab/files/patch-ay
+++ b/math/scilab/files/patch-ay
@@ -4,8 +4,8 @@
  #include <errno.h>
  
  #ifndef linux 
--#if !defined(__bsdi__) && !defined(__NetBSD__)
-+#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+-#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
index b7d779fb7d98..9ff666998a76 100644
--- a/math/scilab/files/patch-az
+++ b/math/scilab/files/patch-az
@@ -4,22 +4,12 @@
  
  /* #include "wf_fig.h" */ /** for sys_errlist **/
  #ifndef linux 
--#if !defined(__bsdi__) && !defined(__NetBSD__)
-+#if !defined(__bsdi__) && !defined(__NetBSD__) && !defined(__FreeBSD__)
+-#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)
-+#if (! (defined(BSD) && (BSD >= 199306))) && !defined(__FreeBSD__)
+-#if (! (defined(BSD) && (BSD >= 199306))) && !defined(freebsd)  && !defined(__APPLE__)
++#if (! (defined(BSD) && (BSD >= 199306))) && !defined(__FreeBSD__)  && !defined(__APPLE__)
  extern char    *sys_errlist[];
  #endif
  #endif
-@@ -523,7 +523,9 @@
- char *SysErrorMsg(n)
-   int n;
- {
-+#ifndef __FreeBSD__
-   extern int sys_nerr;
-+#endif /* !__FreeBSD__ */
-   return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : UE );
- }
-
diff --git a/math/scilab/files/patch-ba b/math/scilab/files/patch-ba
new file mode 100644
index 000000000000..4f60811e235e
--- /dev/null
+++ b/math/scilab/files/patch-ba
@@ -0,0 +1,11 @@
+--- Makefile.in	Fri Feb  7 13:53:28 2003
++++ Makefile.in.new	Sat Feb 15 14:02:38 2003
+@@ -179,7 +179,7 @@
+ 		@STRIP@ $(SCIDIR)/bin/scilex; \
+ 		(cd tests; make distclean); \
+ 		(cd examples; make distclean); \
+-		(cd .. ; tar cf - $(BINDISTFILES) @PVMINST@ | (cd ${LIBPREFIX}; tar xf -)); \
++		(cd .. ; for file in $(BINDISTFILES) @PVMINST@; do tar cf - $${file}  | (cd ${LIBPREFIX}; tar xf -); done); \
+ 		(cd ${LIBPREFIX}/$(SCIBASE); make); \
+ 		$(RM) .binary; \
+ 	fi