Upgrade to 3.1.1.

Note: gcc-3.2 is still needed on FreeBSD > 5.3; without it Scilab hangs
on floating point computations.

PR:		ports/81885
Submitted by:	maintainer

2 files changed, 48 insertions, 26 deletions

diff --git a/math/scilab/files/patch-ba b/math/scilab/files/patch-ba
index 171c2da..170d7de 100644
--- a/math/scilab/files/patch-ba
+++ b/math/scilab/files/patch-ba
@@ -1,11 +1,32 @@
---- Makefile.in	Tue Jul  6 16:12:37 2004
-+++ Makefile.in.new	Sat Jul 24 10:50:09 2004
-@@ -190,7 +190,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; \
+--- Makefile.in.orig	Fri Jun  3 18:28:51 2005
++++ Makefile.in	Fri Jun  3 18:27:33 2005
+@@ -263,7 +263,7 @@
+ 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); \
+ 		(cd $(PREFIX)/lib/$(SCIBASE);touch .binary; make postinstall PREFIX=$(PREFIX) ) \
  	fi
+ 	install -d $(PREFIX)/share/doc/$(DOCNAME)/
+@@ -272,9 +272,9 @@
+ 	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 dbc5cbb..22531fe 100644
--- a/math/scilab/files/patch-bb
+++ b/math/scilab/files/patch-bb
@@ -1,10 +1,10 @@
---- configure.orig	Fri Jul  9 10:28:05 2004
-+++ configure	Sun Jan 16 14:45:09 2005
-@@ -21087,12 +21087,12 @@
+--- configure.orig	Wed May 25 17:00:45 2005
++++ configure	Sat Jun  4 21:48:15 2005
+@@ -21331,12 +21331,12 @@
  # FreeBSD  systems (not supported by INRIA)
    *-*-freebsd*)
       GCC=yes
--     CC=cc
+-     CC=gcc
 +     CC=$CC
       CC_OPTIONS="${CFLAGS} -Dfreebsd"
       CC_LDFLAGS=-lm
@@ -15,21 +15,22 @@
       FC_OPTIONS="${CFLAGS} -Dfreebsd"
       FC_OPTIONS_O0='-Dfreebsd'
       FC_LDFLAGS='-lm -Wl,--export-dynamic'
-@@ -21106,7 +21106,7 @@
-      fi
-      if test "$WITH_G77" = yes; then
-        # On FreeBSD the gnu fortran compiler is named f77
--       FC=f77
-+       FC=$F77
-      fi
-     DLDLIB='${SCIDIR}/libs/libdld.a'
-     DLD_SUBDIR=dld
-@@ -26503,7 +26503,7 @@
+@@ -24208,7 +24208,8 @@
+ cat confdefs.h >>conftest.$ac_ext
+ cat >>conftest.$ac_ext <<_ACEOF
+ /* end confdefs.h.  */
+-#include <X11/IntrinsicP.h> #include <X11/Xaw3d/ViewportP.h>
++#include <X11/IntrinsicP.h>
++#include <X11/Xaw3d/ViewportP.h>
+ int
+ main ()
+ {
+@@ -26321,7 +26322,7 @@
      ;;
  esac
  
--GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.so
-+GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.so
+-GETLIBTK=libtk$TK_MAJOR_VERSION.$TK_MINOR_VERSION.$SONAME
++GETLIBTK=libtk$TK_MAJOR_VERSION$TK_MINOR_VERSION.$SONAME
  
  case "$host" in
    *-*-darwin*)