Update the package from scilab-2.4.1 to scilab-2.5.

Many thanks to the authors at Inria who, through their willingness
to accept feedback, have helped me remove 39 patches!

Changes to scilab include (from scilab-2.5/CHANGES):

NEW FUNCTIONALITIES
===================
Global variables have been introduced

New graphic mode has been added to allow scrollbar handling (panner
for X Window and scrollbars for Windows).
GIF export format is now available for Scilab graphic windows.

Keyboard events and window closing within graphical windows can now be
captured.

Scicos graphical user interface has been made more intuitive and
keyboard shortcuts have been added.

Scilab Binary files created by "save" are now system-independent so
they can be exchanged. In particular (compiled macros) *.bin files and
*.cos (scicos diagrams) can be exchanged.

It is now possible to dynamically link C++ procedures with Scilab.

A new data type "mlist" has been added.

A new function "genlib" allows users to compile the .sci files in a
given directory, generate associated library and load it. This
function is particularly useful under windows if VC++ is not
available.

C formatted input output functions (printf, scanf, ..) have been
interfaced to scilab.

OTHERS IMPROVEMENTS
===================
Efficiency has been improved using reference argument passing when
possible instead of value passing.

Hypermatrix opreations have been accelerated.

On X Window systems 3D Athena Widgets are preferably used instead of
standard  Athena Widgets for a better look.

The "Matlab 4" to Scilab translator has been completed and considerably
improved.

NEW TOOLBOXES
=============
True integer data types (1,2 and 4 bytes) with associated operations
and some functions acting on them have been added.

A library of procedures has been added to allow the use of Matlab
mex-files under Scilab.

PORTS
=====
Scilab has been successfully compiled with Windows ABSOFT development
environment.

INCOMPATIBILITIES
=================
New Scilab "save"d files cannot be loaded by earlier Scilab versions.
A new function "oldsave" has been added to save in old format.

Scilab help mechanism has changed. The $MANCHAPTERS/Chapter is no more
used, instead a Scilab variable "helps" is used.

59 files changed, 2777 insertions, 2856 deletions

diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 20b85022eb1..f15cd777f30 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.13 1999/11/23 16:42:01 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.14 1999/12/22 13:25:39 dmcmahill Exp $
 #
 # IMPORTANT: Before upgrading this package, please read files/README.next_rev!
 
-DISTNAME=	scilab-2.4.1-src
-PKGNAME=	scilab-2.4.1
+DISTNAME=	scilab-2.5-src
+PKGNAME=	scilab-2.5
 WRKSRC=		${WRKDIR}/${PKGNAME}
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
@@ -18,10 +18,12 @@ RESTRICTED=	"no paid distribution of SCILAB"
 NO_CDROM=	${RESTRICTED}
 
 USE_FORTRAN=	yes
+USE_LIBTOOL=    yes
 USE_X11BASE=	yes
 USE_X11=	yes
 GNU_CONFIGURE=	yes
 
+CONFIGURE_ARGS+=	--without-xless
 MAKE_ENV+=	HOME=${WRKSRC}
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
 CONFIGURE_ENV+=	X11BASE=${X11BASE}
@@ -36,7 +38,8 @@ pre-fetch:
 
 post-patch:
 	@if [ ${MACHINE_ARCH} != "alpha" ]; then \
-		${MV} ${WRKSRC}/scilab.star.orig ${WRKSRC}/scilab.star ; \
+		${RM} ${WRKSRC}/scilab.star ; \
+		${CP} ${WRKSRC}/scilab.star.orig ${WRKSRC}/scilab.star ; \
 	fi
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/scilab/files/README.next_rev b/math/scilab/files/README.next_rev
index 9383bbb699c..f6b2be8167a 100644
--- a/math/scilab/files/README.next_rev
+++ b/math/scilab/files/README.next_rev
@@ -1,47 +1,17 @@
-$NetBSD: README.next_rev,v 1.1 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: README.next_rev,v 1.2 1999/12/22 13:25:40 dmcmahill Exp $
 
-NOTE (mcmahill@alum.mit.edu, March 3, 1999):
+NOTE (dmcmahill@netbsd.org, December 21, 1999):
 
-There is a bug in NetBSD/alpha-1.3I which causes some problems with scilab.
+There is a bug in NetBSD/alpha which causes some problems with scilab.
 
-The relevent alpha bugs are:
-    
-port-alpha/6805, with  port-alpha/6634, and port-alpha/4424 looking related.
-Once those are fixed I'll update scilab to make it fully alpha functional.
+The floating point completion code is still missing which prevents
+1/0 from properly returning Inf.
 
-The effect is that any scilab operation which causes a divide by zero generates
-a floating point exception which is not trapped.  This causes a core dump.
-
-Once the alpha bugs listed above are fixed, the following changes should be made
-to the scilab package source:
-
-Once fpsetmask(0) on the alpha is fixed to no longer cause a core dump, the
-following patch files should be updated:
-patch-ai
-patch-an
-patch-ao
-patch-ap
-patch-aq
-
-The lines 
-
-+#if (defined(netbsd) && !defined(__alpha__))  || defined(freebsd)
-+  fpsetmask(0);
-+#endif
-
-should be changed to
-
-+#if defined(netbsd) || defined(freebsd)
-+  fpsetmask(0);
-+#endif
-
-
-
-In addition, once the alpha bug is fixed, patch-bt should be removed and the
-pkgsrc Makefile should have the following lines removed:
+Once the FPC code is finished, the patch "patches/patch-ak" should be 
+removed along with the following part of the package Makefile:
 
 post-patch:
       @if [ ${MACHINE_ARCH} != "alpha" ]; then \
-      ${MV} ${WRKSRC}/scilab.star.orig ${WRKSRC}/scilab.star
-
+      ${MV} ${WRKSRC}/scilab.star.orig ${WRKSRC}/scilab.star \
+      fi
 
diff --git a/math/scilab/files/md5 b/math/scilab/files/md5
index 221d5630424..0c6a2761318 100644
--- a/math/scilab/files/md5
+++ b/math/scilab/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: md5,v 1.3 1999/12/22 13:25:41 dmcmahill Exp $
 
-MD5 (scilab-2.4.1-src.tar.gz) = d035812dea97012d0353c83ee0eabab3
+MD5 (scilab-2.5-src.tar.gz) = dcccc6b9d82afac5c2f872f7a3925e5b
diff --git a/math/scilab/files/patch-sum b/math/scilab/files/patch-sum
index 20eae14e1c5..e6b2092a971 100644
--- a/math/scilab/files/patch-sum
+++ b/math/scilab/files/patch-sum
@@ -1,55 +1,16 @@
-$NetBSD: patch-sum,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
+$NetBSD: patch-sum,v 1.4 1999/12/22 13:25:41 dmcmahill Exp $
 
-MD5 (patch-aa) = c733a8902a06d35ff5a5938bc74d2a7a
-MD5 (patch-ab) = 5e2b13daee5b550646d4e9d0263ed784
-MD5 (patch-ac) = 5bc70e04a53bf69e1385cebfab6a7de8
-MD5 (patch-ad) = 7941b30677737f275521dd0f909c525c
-MD5 (patch-ae) = 9827b3e3fcfb97cd15b49e07eef07346
-MD5 (patch-af) = bbad38c30942e6db220c07d554ce7cff
-MD5 (patch-ag) = d7c0731337ae119a8b83e4b114522a7d
-MD5 (patch-ah) = a6b77e2b6ca862251624771dd1dc2acc
-MD5 (patch-ai) = fcb508bdbb966c0b368bbd2ba8b87843
-MD5 (patch-aj) = a17069eab238a44cbd49bf8b942a83a8
-MD5 (patch-ak) = 491342a544fc1200ba69d2beb0b3c009
-MD5 (patch-al) = ffac2296c85c3e9f445a56ad03a6e846
-MD5 (patch-am) = 701aa278aa310f6e84b3039f2999e7dc
-MD5 (patch-an) = f06d1c319fa77601c0b3ffd631ea8b31
-MD5 (patch-ao) = b0af4036fc38fc75420fb637512c3899
-MD5 (patch-ap) = 4eac3a07de215a59538bd7a665cb24f8
-MD5 (patch-aq) = 3195d62edb2b9050dc5101ba169eb457
-MD5 (patch-ar) = cef67f32f50fa960f7ec2675fcf362a6
-MD5 (patch-as) = ab107f334940508c8050199310d6d8fd
-MD5 (patch-at) = c4d94450ccff68396bd881c8ea76d8c4
-MD5 (patch-au) = 7da608ffa66a699220cc9758f6c0fd10
-MD5 (patch-av) = 7c69ce169e4339028ea329b39fb8e8ff
-MD5 (patch-aw) = 2841d3fa901d94a2ada4ff19c73d15bb
-MD5 (patch-ax) = ded46e72068fe653817e916e9f133873
-MD5 (patch-ay) = 42da5a7645d3c9f05734bb6db8140908
-MD5 (patch-az) = 3d27dbc49f62448c9a6b9a26a7baedda
-MD5 (patch-ba) = 7ab4556ef31b4cf17c17815804861b16
-MD5 (patch-bb) = d36dbcc2695dec9ab3a9b11288605462
-MD5 (patch-bc) = a043fcf18a2daa8acfaf6d444cf92f3c
-MD5 (patch-bd) = 788048484e14944e4e1d09276c52a9aa
-MD5 (patch-be) = 9b7221c4de1c6838455ee8e678a13332
-MD5 (patch-bf) = 379baf1f180ff208ab02200d7146bf75
-MD5 (patch-bg) = cc07349b8a27c39b2e090edc89ce8ed0
-MD5 (patch-bh) = 7c23c004dbf3b59b66bdad87d06589ba
-MD5 (patch-bi) = 20a3d7b9e44497b0fe6be7d86ee547ba
-MD5 (patch-bj) = db683dbb39793fa1621c1e6505f84510
-MD5 (patch-bk) = b16f1fc2035b54d0b86efd61e8756b58
-MD5 (patch-bl) = 4c7c6e3d2afe28f2a53abd022b7618e0
-MD5 (patch-bm) = c1280e7961c6e76095e4fe0f1597cbe6
-MD5 (patch-bn) = e0a08bf4c3af74af0f644a64f91247f2
-MD5 (patch-bo) = 3b3bb445dc1a9f9d5a02bed80139202f
-MD5 (patch-bp) = 87a062e85102189a33795fe4e2c4dcb2
-MD5 (patch-bq) = b16ad728a8d179de4c1e79b4760766db
-MD5 (patch-br) = a58c0bedfd7a36202764a813dd8247c4
-MD5 (patch-bs) = 895ce97f5e6a7ebf4a134cda2d954d60
-MD5 (patch-bt) = 22197886edadb8f13f4e9b72c2f048c5
-MD5 (patch-bu) = 0bedfd277345a6adf296af1b6b15db30
-MD5 (patch-bv) = c8ad4382004255025c38b7ca5e17d171
-MD5 (patch-bw) = 8563112e4a7074e8e30dcafe823bffb3
-MD5 (patch-bx) = d2d7599e9a39a8c0c60a8fd849a80aaa
-MD5 (patch-by) = 95c14caddbb76151af7f653c0cc39029
-MD5 (patch-bz) = 214dc68a24b97716c4d8c6f720a62c4b
-MD5 (patch-ca) = f3e444f65578f29dbd55b196d8f2934f
+MD5 (patch-aa) = 662473ff1e7d0de3f7b368bca08d4be9
+MD5 (patch-ab) = 8563112e4a7074e8e30dcafe823bffb3
+MD5 (patch-ac) = d2d7599e9a39a8c0c60a8fd849a80aaa
+MD5 (patch-ad) = 95c14caddbb76151af7f653c0cc39029
+MD5 (patch-ae) = 214dc68a24b97716c4d8c6f720a62c4b
+MD5 (patch-af) = f3e444f65578f29dbd55b196d8f2934f
+MD5 (patch-ag) = 1cc69fcbad588980b7e14b1375579194
+MD5 (patch-ah) = 5b5fc4ade823dceabb4fcd9db2559ce1
+MD5 (patch-ai) = 9fa7da574de5fde61e7d4b5ffd089ed1
+MD5 (patch-aj) = f3f825485ff48bc10129e7318e3d73e2
+MD5 (patch-ak) = 0c190279d557e1e1933bc7603783084f
+MD5 (patch-al) = b4a8a71178e4d40bc252e24c7bc72cd6
+MD5 (patch-am) = df104b6a6786ddeed792d9ce3c229514
+MD5 (patch-an) = 0129ec4c3c258a9717a2480079a48697
diff --git a/math/scilab/patches/patch-aa b/math/scilab/patches/patch-aa
index f533a5ad8cf..950fbbf9db0 100644
--- a/math/scilab/patches/patch-aa
+++ b/math/scilab/patches/patch-aa
@@ -1,158 +1,11 @@
-$NetBSD: patch-aa,v 1.4 1999/11/23 16:12:40 dmcmahill Exp $
+$NetBSD: patch-aa,v 1.5 1999/12/22 13:25:41 dmcmahill Exp $
 
---- ./configure.in.orig	Thu Sep 17 07:44:35 1998
-+++ ./configure.in	Mon Nov 22 19:55:08 1999
-@@ -684,4 +684,108 @@
-     MAKEFILE_TARGET=Makefile.gcwin32
-     ;;
-+  *-*-freebsd*)
-+     CC=gcc
-+     CC_OPTIONS='-O2 -Dfreebsd'
-+     CC_LDFLAGS=-lm
-+     CC_PICFLAGS='-fPIC'
-+     # script shell f77 have bugs, get ours
-+     FC=f77
-+     FC_OPTIONS='-O2 -Dfreebsd'
-+     FC_LDFLAGS=-lm
-+     FC_PICFLAGS='-fPIC'
-+     LD=ld
-+     LD_LDFLAGS=-lm
-+     if test "$enable_debug" = yes; then 
-+       CC_OPTIONS='-g -Dfreebsd'
-+       FC_OPTIONS=-g
-+     fi
-+     if test "$G77" = yes; then
-+       FC=g77
-+     fi
-+    DLDLIB='${SCIDIR}/libs/libdld.a'
-+    DLD_SUBDIR=dld
-+    MAKEFILE_TARGET=Makefile.freebsd
-+    ;;
-+
-+# NetBSD  systems (tested on NetBSD-1.3)
-+  *-*-netbsd*)
-+
-+    #
-+    # C Compiler
-+    #
-+    CC=cc
-+    CC_OPTIONS='-O2 -Dnetbsd'
-+    CC_LDFLAGS="-Wl,-R${X11BASE}/lib"
-+    CC_PICFLAGS='-fPIC'
-+ 
-+    # check for --export-dynamic
-+    ac_save_LDFLAGS="$LDFLAGS"
-+    LDFLAGS='-Wl,--export-dynamic'
-+    AC_MSG_CHECKING([if the linker accepts --export-dynamic])
-+    AC_TRY_LINK(,,
-+      AC_MSG_RESULT(yes)
-+      CC_LDFLAGS=["$CC_LDFLAGS  -Wl,--export-dynamic"],
-+      AC_MSG_RESULT(no))
-+    LDFLAGS="$ac_save_LDFLAGS"
-+
-+   #
-+   # Fortran Compiler
-+   #
-+   if test "$with_f2c" = yes; then
-+     AC_CHECK_PROGS(F77,f2c-f77,no)
-+     if test "$F77" = no; then
-+       AC_MSG_ERROR([Unable to configure: Fortran compiler f2c-f77 not found])
-+     fi
-+   else         
-+     AC_CHECK_PROGS(F77,"${FC}" f77 f2c-f77,no)
-+     if test "$F77" = no; then
-+       AC_MSG_ERROR([Unable to configure: Fortran, f77 or f2c-f77, compiler not found])
-+     fi
-+   fi
-+ 
-+   FC="$F77"
-+   FC_OPTIONS='-O2'
-+   FC_LDFLAGS="-Wl,-R${X11BASE}/lib"
-+   FC_PICFLAGS='-fPIC'
-+
-+
-+   # check for --export-dynamic
-+   ac_save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS='-Wl,--export-dynamic'
-+   AC_MSG_CHECKING([if the linker accepts --export-dynamic])
-+   AC_TRY_LINK(,,
-+     AC_MSG_RESULT(yes)
-+     FC_LDFLAGS=["$FC_LDFLAGS  -Wl,--export-dynamic"],
-+     AC_MSG_RESULT(no))
-+   LDFLAGS="$ac_save_LDFLAGS"
-+
-+
-+   #
-+   # Linker
-+   #
-+   LD=ld
-+   LD_LDFLAGS="-R${X11BASE}/lib"
-+   # check for --export-dynamic
-+   ac_save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS='-Wl,--export-dynamic'
-+   AC_MSG_CHECKING([if the linker accepts --export-dynamic])
-+   AC_TRY_LINK(,,
-+     AC_MSG_RESULT(yes)
-+     LD_LDFLAGS=["$LD_LDFLAGS  --export-dynamic"],
-+     AC_MSG_RESULT(no))
-+   LDFLAGS="$ac_save_LDFLAGS"
-+
-+    
-+   #
-+   # Compiler Debug Flags
-+   #
-+   if test "$enable_debug" = yes; then 
-+      CC_OPTIONS='-g -Dnetbsd -Wall'
-+      FC_OPTIONS='-g -Wall'
-+   fi
-+
-+   MAKEFILE_TARGET=Makefile.netbsd
-+   ;;
-+
-   *)
-     AC_MSG_ERROR("Unable to configure for host $host")
-@@ -849,4 +953,9 @@
- AC_CHECK_FUNCS(usleep)
+--- ./routines/pvm/Makefile.orig	Tue Dec 21 15:42:54 1999
++++ ./routines/pvm/Makefile	Tue Dec 21 15:42:54 1999
+@@ -11,5 +11,5 @@
+ include ../../Makefile.incl
  
-+########################
-+## test for header files
-+########################
-+AC_CHECK_HEADERS(values.h) 
-+
- ##################
- ## termcap library
-@@ -883,19 +992,19 @@
- if test "$with_pvm" != no; then
+-CFLAGS = $(CC_OPTIONS) 
++CFLAGS = $(CC_OPTIONS)  -I${PVMROOT}/include
  
--AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch,
--[
--ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch`
--])
--if test "$ac_cv_PVM_arch" = UNKNOWN; then
--  AC_MSG_WARN("PVM unable to find architecture: I will not use PVM")
--else
--  AC_DEFINE(WITH_PVM)
--  PVMARCH="$ac_cv_PVM_arch"
--  PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
--  PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
--  PVMSCIDIR=pvm
--  PVMSCILIB=libs/pvm.a
--  PVMTARGET=scilex-lib
--fi
-+  AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch,
-+  [
-+  ac_cv_PVM_arch=`${LOCALBASE}/pvm3/lib/pvmgetarch`
-+  ])
-+  if test "$ac_cv_PVM_arch" = UNKNOWN; then
-+    AC_MSG_WARN("PVM unable to find architecture: I will not use PVM")
-+  else
-+    AC_DEFINE(WITH_PVM)
-+    PVMARCH="$ac_cv_PVM_arch"
-+    PVMGLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
-+    PVMLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
-+    PVMSCIDIR=pvm
-+    PVMSCILIB=libs/pvm.a
-+    PVMTARGET=pvm-no-build
-+  fi
- 
- fi
+ FFLAGS = $(FC_OPTIONS)
diff --git a/math/scilab/patches/patch-ab b/math/scilab/patches/patch-ab
index 839f7c08659..94797b217e4 100644
--- a/math/scilab/patches/patch-ab
+++ b/math/scilab/patches/patch-ab
@@ -1,16 +1,11 @@
-$NetBSD: patch-ab,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: patch-ab,v 1.3 1999/12/22 13:25:41 dmcmahill Exp $
 
---- routines/graphics/periFig.c.orig	Sun Dec 13 21:20:36 1998
-+++ routines/graphics/periFig.c	Sun Dec 13 21:21:44 1998
-@@ -47,5 +47,11 @@
- #define M_PI	3.14159265358979323846
- #else
-+#if defined(HAVE_VALUES_H)
- #include <values.h>
-+#else
-+#ifndef M_PI
-+#define M_PI    3.14159265358979323846 
-+#endif
-+#endif
- #endif
+--- ./routines/pvm/pvm_grp.c.orig	Thu Apr 23 10:54:47 1998
++++ ./routines/pvm/pvm_grp.c	Mon Nov 22 21:40:11 1999
+@@ -14,5 +14,5 @@
+ #include <stdio.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
  
diff --git a/math/scilab/patches/patch-ac b/math/scilab/patches/patch-ac
index e3495185ef7..f0cbe3bbc0f 100644
--- a/math/scilab/patches/patch-ac
+++ b/math/scilab/patches/patch-ac
@@ -1,16 +1,11 @@
-$NetBSD: patch-ac,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: patch-ac,v 1.3 1999/12/22 13:25:41 dmcmahill Exp $
 
---- ./routines/graphics/Plo3d.c.orig	Sun Dec 13 21:22:37 1998
-+++ ./routines/graphics/Plo3d.c	Sun Dec 13 21:24:01 1998
-@@ -16,5 +16,11 @@
- #define M_PI	3.14159265358979323846
- #else
-+#if defined(HAVE_VALUES_H)
- #include <values.h>
-+#else
-+#ifndef M_PI
-+#define M_PI    3.14159265358979323846 
-+#endif
-+#endif
- #endif
+--- ./routines/pvm/pvm_info.c.orig	Thu Apr 23 10:56:21 1998
++++ ./routines/pvm/pvm_info.c	Mon Nov 22 21:40:22 1999
+@@ -16,5 +16,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
  
diff --git a/math/scilab/patches/patch-ad b/math/scilab/patches/patch-ad
index ab5306c2a0f..8739794eef9 100644
--- a/math/scilab/patches/patch-ad
+++ b/math/scilab/patches/patch-ad
@@ -1,46 +1,11 @@
-$NetBSD: patch-ad,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: patch-ad,v 1.3 1999/12/22 13:25:41 dmcmahill Exp $
 
---- ./routines/sparse/spConfig.h.orig	Sat Jul 18 22:31:40 1998
-+++ ./routines/sparse/spConfig.h	Sat Aug  8 13:15:56 1998
-@@ -430,5 +430,5 @@
- 
- /* VAX machine constants */
--#ifdef vax
-+#if  (defined(vax) && !defined(netbsd)) 
- #   define  MACHINE_RESOLUTION      6.93889e-18
- #   define  LARGEST_REAL            1.70141e+38
-@@ -439,5 +439,5 @@
- 
- /* MIPS machine constants */
--#ifdef mips
-+#if (defined(mips) && !defined(netbsd)) 
- #   define  MACHINE_RESOLUTION      6.93889e-18
- #   define  LARGEST_REAL            1.70141e+38
-@@ -469,5 +469,5 @@
- 
- /* Sun machine constants */
--#ifdef sun
-+#if (defined(sun) && !defined(netbsd))
- /* These values are rumored to be the correct values. */
- #   define  MACHINE_RESOLUTION      8.9e-15
-@@ -478,5 +478,5 @@
- #endif
- /* DEC alpha machine constant*/
--#ifdef __alpha 
-+#if (defined(__alpha) && !defined(netbsd)) 
- #   include <limits.h>
- #   include <float.h>
-@@ -488,4 +488,13 @@
- #endif
- #ifdef linux
-+#   include <limits.h>
-+#   include <float.h>
-+#   define  MACHINE_RESOLUTION      DBL_EPSILON
-+#   define  LARGEST_REAL            DBL_MAX
-+#   define  SMALLEST_REAL           DBL_MIN
-+#   define  LARGEST_SHORT_INTEGER   SHRT_MAX
-+#   define  LARGEST_LONG_INTEGER    LONG_MAX
-+#endif
-+#if defined(netbsd) || defined(freebsd)
- #   include <limits.h>
- #   include <float.h>
+--- ./routines/pvm/pvm_proc_ctrl.c.orig	Mon Jun 22 03:20:48 1998
++++ ./routines/pvm/pvm_proc_ctrl.c	Mon Nov 22 21:40:32 1999
+@@ -65,5 +65,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ #ifndef WIN32 
diff --git a/math/scilab/patches/patch-ae b/math/scilab/patches/patch-ae
index 257bfcb1e1d..f96c2409bd7 100644
--- a/math/scilab/patches/patch-ae
+++ b/math/scilab/patches/patch-ae
@@ -1,23 +1,11 @@
-$NetBSD: patch-ae,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: patch-ae,v 1.3 1999/12/22 13:25:41 dmcmahill Exp $
 
---- /dev/null	Fri Dec 18 02:05:39 1998
-+++ config/Makefile.freebsd	Sat Dec 19 00:06:25 1998
-@@ -0,0 +1,18 @@
-+# Copyright INRIA
-+
-+
-+FFLAGS = $(FC_OPTIONS)
-+
-+bin/scilex: scilex-lib 
-+	@x=1;if test -f $@; then  \
-+		x=`find $(DEFAULTS) $(LIBR)  \( -name '*.a' -o -name '*.o' \) \
-+		-newer $@ -print | wc -l `; \
-+	fi;\
-+	if test $$x -ne 0; then \
-+		$(RM) $@; \
-+		echo "linking"; \
-+		$(FC) $(FFLAGS) -o $@ $(DEFAULTS) $(FC_LDFLAGS) $(LIBR)  \
-+			$(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB); \
-+	else \
-+		echo bin/scilex is up to date ; \
-+	fi
+--- ./routines/pvm/pvm_recv.c.orig	Thu Apr 23 11:00:24 1998
++++ ./routines/pvm/pvm_recv.c	Mon Nov 22 21:40:38 1999
+@@ -15,5 +15,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ #include "../stack-c.h"
diff --git a/math/scilab/patches/patch-af b/math/scilab/patches/patch-af
index 2a7b19e0b12..f03db0ce2a5 100644
--- a/math/scilab/patches/patch-af
+++ b/math/scilab/patches/patch-af
@@ -1,25 +1,11 @@
-$NetBSD: patch-af,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: patch-af,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $
 
---- routines/sun/link.c.orig	Tue Aug 25 04:24:09 1998
-+++ routines/sun/link.c	Sat Dec 19 00:53:28 1998
-@@ -120,9 +120,9 @@
- 
- 
--#if defined(sun) || defined(__alpha) || defined(sgi) || (!defined(hppa_old) && defined(hppa))
-+#if defined(netbsd) || defined(freebsd) || defined(sun) || defined(__alpha) || defined(sgi) || (!defined(hppa_old) && defined(hppa))
- #include "link_SYSV.c"
- #else
- /** no more used on sun */
--#if defined(sun_old) ||  defined(mips) || defined(_IBMR2) || defined(hppa_old)
-+#if defined(sun_old) ||  (defined(mips) && !defined(netbsd)) || defined(_IBMR2) || defined(hppa_old)
- #ifdef SUNOSDLD 
- #include "link_linux.c"
-@@ -145,4 +145,8 @@
-   C2F(dyncall)() {cerro("Dynamic link not implemented");}
-   **/
-+int LinkStatus()
-+{
-+  return(0);
-+}
- 
- void SciLink(iflag,rhs,ilib,files,en_names,strf)
+--- ./routines/pvm/pvm_send.c.orig	Tue May 26 03:41:52 1998
++++ ./routines/pvm/pvm_send.c	Mon Nov 22 21:40:45 1999
+@@ -18,5 +18,5 @@
+ #include <stdlib.h>
+ #include <string.h>
+-#include "../../pvm3/include/pvm3.h"
++#include "pvm3.h"
+ #include "../machine.h"
+ #include "../stack-c.h"
diff --git a/math/scilab/patches/patch-ag b/math/scilab/patches/patch-ag
index a4b3271f4c3..466a9ae73fd 100644
--- a/math/scilab/patches/patch-ag
+++ b/math/scilab/patches/patch-ag
@@ -1,49 +1,66 @@
-$NetBSD: patch-ag,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: patch-ag,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $
 
---- routines/sun/link_SYSV.c.orig	Tue Oct 13 08:27:18 1998
-+++ routines/sun/link_SYSV.c	Sat Dec 19 23:54:03 1998
-@@ -34,5 +34,5 @@
- #endif
+--- ./configure.in.orig	Tue Dec 14 06:57:17 1999
++++ ./configure.in	Tue Dec 21 17:29:53 1999
+@@ -795,5 +795,5 @@
+      fi
+    else		
+-     AC_CHECK_PROGS(F77,f77 f2c-f77,no)
++     AC_CHECK_PROGS(F77,"${FC}" f77 f2c-f77,no)
+      if test "$F77" = no; then
+        AC_MSG_ERROR([Unable to configure: Fortran, f77 or f2c-f77, compiler not found])
+@@ -801,5 +801,5 @@
+    fi
+  
+-   FC=$F77
++   FC="$F77"
+    FC_OPTIONS='-O2'
+    FC_LDFLAGS="-Wl,-R${X11BASE}/lib"
+@@ -1055,21 +1055,30 @@
+ PVMSCILIB=
+ PVMTARGET=pvm-bidon
++PVMROOT=
  
--#ifdef linux 
-+#if defined(linux) || defined(netbsd) || defined(freebsd)
- #include <unistd.h>
- #include <sys/wait.h>
-@@ -41,4 +41,5 @@
- #ifndef linux
- #ifndef hppa
-+#if (!defined(netbsd) && !defined(freebsd))
- #if (defined(sun) && ! defined(SYSV)) 
- #else 
-@@ -47,6 +48,7 @@
- #endif
- #endif 
-+#endif
+ if test "$with_pvm" != no; then
++#check for a locally installed PVM
++if test -x $PVM_ROOT/lib/pvmgetarch ; then
++  PVMROOT=$PVM_ROOT
++  PVMTARGET=pvm-bidon
++else
++  PVMROOT="$SCIDIR/pvm3"
++  PVMTARGET=scilex-lib
++fi
  
--#ifndef linux 
-+#if  !defined(linux) && !defined(netbsd)
- #ifdef __alpha
- #include <c_asm.h>
-@@ -59,7 +61,9 @@
- #endif
+ AC_CACHE_CHECK("for PVM architecture",ac_cv_PVM_arch,
+ [
+-ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch`
++ac_cv_PVM_arch=`$PVMROOT/lib/pvmgetarch`
+ ])
+ if test "$ac_cv_PVM_arch" = UNKNOWN; then
+   AC_MSG_WARN("PVM unable to find architecture: I will not use PVM")
++  PVMTARGET=pvm-bidon
+ else
+   AC_DEFINE(WITH_PVM)
+   PVMARCH="$ac_cv_PVM_arch"
+-  PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
+-  PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
++  PVMGLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libgpvm3.a"
++  PVMLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libpvm3.a"
+   PVMSCIDIR=pvm
+   PVMSCILIB="\$(SCIDIR)/libs/pvm.a"
+-  PVMTARGET=scilex-lib
+ fi
  
-+#if !defined(netbsd)
- #if defined  __alpha || defined sgi
- #include <a.out.h>
- #endif
-+#endif
+@@ -1157,5 +1166,5 @@
+ echo "configuration of libtool"
  
- #include <string.h>
-@@ -264,8 +268,12 @@
-        "/usr/bin/ld", "-shared", "-o", 0, 0  
- #else
-+#if defined(netbsd) || defined(freebsd)
-+	"/usr/bin/ld", "-Bshareable", "-o", 0, 0
-+#else
- #ifdef hppa
-        "/bin/ld", "-b", "-o", 0, 0
- #else
-        "/bin/ld", "-shared", "-o", 0, 0  
-+#endif
- #endif
- #endif
+-AM_PROG_LIBTOOL
++#AM_PROG_LIBTOOL
+ 
+ echo "end of configuration of libtool"
+@@ -1208,4 +1217,5 @@
+ AC_SUBST(PVMGLIB)
+ AC_SUBST(PVMTARGET)
++AC_SUBST(PVMROOT)
+ AC_SUBST(TK_INC_PATH)
+ AC_SUBST(TCL_INC_PATH)
diff --git a/math/scilab/patches/patch-ah b/math/scilab/patches/patch-ah
index 640f270542d..6e9ec9e29ff 100644
--- a/math/scilab/patches/patch-ah
+++ b/math/scilab/patches/patch-ah
@@ -1,10 +1,1861 @@
-$NetBSD: patch-ah,v 1.2 1999/03/05 11:22:34 frueauf Exp $
+$NetBSD: patch-ah,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $
 
---- ./routines/default/mainsci.f.orig	Mon Jul 20 07:37:23 1998
-+++ ./routines/default/mainsci.f	Mon Jul 20 07:37:23 1998
-@@ -15,4 +15,5 @@
-       nargs = iargc()
-       call fgetarg(0,pname)
-+      call nofpex()
-       i = 0
-  10   continue
+--- ./configure.orig	Tue Dec 14 06:57:13 1999
++++ ./configure	Tue Dec 21 17:29:58 1999
+@@ -167,14 +167,4 @@
+   --with-tk-include=TK_INC_DIR    Tk include is in TK_INC_DIR 
+                           [TK_INC_DIR=TCL_INC_DIR]."
+-ac_help="$ac_help
+-  --enable-shared[=PKGS]  build shared libraries [default=yes]"
+-ac_help="$ac_help
+-  --enable-static[=PKGS]  build static libraries [default=yes]"
+-ac_help="$ac_help
+-  --enable-fast-install[=PKGS]  optimize for fast installation [default=yes]"
+-ac_help="$ac_help
+-  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]"
+-ac_help="$ac_help
+-  --disable-libtool-lock  avoid locking (might break parallel builds)"
+ 
+ # Initialize some variables set by options.
+@@ -716,5 +706,5 @@
+ 
+ echo $ac_n "checking host system type""... $ac_c" 1>&6
+-echo "configure:719: checking host system type" >&5
++echo "configure:709: checking host system type" >&5
+ 
+ host_alias=$host
+@@ -782,5 +772,5 @@
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:785: checking for $ac_word" >&5
++echo "configure:775: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GCC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -815,5 +805,5 @@
+ set dummy g77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:818: checking for $ac_word" >&5
++echo "configure:808: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -850,5 +840,5 @@
+ set dummy gcc; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:853: checking for $ac_word" >&5
++echo "configure:843: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_GCC'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -885,5 +875,5 @@
+ set dummy g77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:888: checking for $ac_word" >&5
++echo "configure:878: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -979,5 +969,5 @@
+ set dummy f77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:982: checking for $ac_word" >&5
++echo "configure:972: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1046,5 +1036,5 @@
+ set dummy f77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1049: checking for $ac_word" >&5
++echo "configure:1039: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1113,5 +1103,5 @@
+ set dummy f77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1116: checking for $ac_word" >&5
++echo "configure:1106: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1174,5 +1164,5 @@
+     LIEEELIB=
+     echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:1177: checking for main in -lieee" >&5
++echo "configure:1167: checking for main in -lieee" >&5
+ ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1182,5 +1172,5 @@
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1185 "configure"
++#line 1175 "configure"
+ #include "confdefs.h"
+ 
+@@ -1189,5 +1179,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1192: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1182: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1221,5 +1211,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1224: checking for $ac_word" >&5
++echo "configure:1214: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1258,5 +1248,5 @@
+ set dummy g77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1261: checking for $ac_word" >&5
++echo "configure:1251: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1292,5 +1282,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1295: checking for $ac_word" >&5
++echo "configure:1285: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1347,5 +1337,5 @@
+ set dummy f77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1350: checking for $ac_word" >&5
++echo "configure:1340: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1417,5 +1407,5 @@
+ set dummy f77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1420: checking for $ac_word" >&5
++echo "configure:1410: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1479,5 +1469,5 @@
+     LIEEELIB=
+     echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:1482: checking for main in -lieee" >&5
++echo "configure:1472: checking for main in -lieee" >&5
+ ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1487,5 +1477,5 @@
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1490 "configure"
++#line 1480 "configure"
+ #include "confdefs.h"
+ 
+@@ -1494,5 +1484,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1497: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1487: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1526,5 +1516,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1529: checking for $ac_word" >&5
++echo "configure:1519: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1563,5 +1553,5 @@
+ set dummy g77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1566: checking for $ac_word" >&5
++echo "configure:1556: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1597,5 +1587,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1600: checking for $ac_word" >&5
++echo "configure:1590: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1648,5 +1638,5 @@
+     LIEEELIB=
+     echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:1651: checking for main in -lieee" >&5
++echo "configure:1641: checking for main in -lieee" >&5
+ ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1656,5 +1646,5 @@
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1659 "configure"
++#line 1649 "configure"
+ #include "confdefs.h"
+ 
+@@ -1663,5 +1653,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1666: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1695,5 +1685,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1698: checking for $ac_word" >&5
++echo "configure:1688: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1732,5 +1722,5 @@
+ set dummy g77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1735: checking for $ac_word" >&5
++echo "configure:1725: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1766,5 +1756,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1769: checking for $ac_word" >&5
++echo "configure:1759: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1827,5 +1817,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1830: checking for $ac_word" >&5
++echo "configure:1820: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1864,5 +1854,5 @@
+ set dummy g77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1867: checking for $ac_word" >&5
++echo "configure:1857: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1898,5 +1888,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1901: checking for $ac_word" >&5
++echo "configure:1891: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -1947,5 +1937,5 @@
+     LIEEELIB=
+     echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
+-echo "configure:1950: checking for main in -lieee" >&5
++echo "configure:1940: checking for main in -lieee" >&5
+ ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -1955,5 +1945,5 @@
+ LIBS="-lieee  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 1958 "configure"
++#line 1948 "configure"
+ #include "confdefs.h"
+ 
+@@ -1962,5 +1952,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:1965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:1955: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -1995,5 +1985,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:1998: checking for $ac_word" >&5
++echo "configure:1988: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2032,5 +2022,5 @@
+ set dummy g77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2035: checking for $ac_word" >&5
++echo "configure:2025: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2066,5 +2056,5 @@
+ set dummy f2c; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2069: checking for $ac_word" >&5
++echo "configure:2059: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2122,5 +2112,5 @@
+ set dummy f77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2125: checking for $ac_word" >&5
++echo "configure:2115: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2189,5 +2179,5 @@
+ set dummy f77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2192: checking for $ac_word" >&5
++echo "configure:2182: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2257,5 +2247,5 @@
+ set dummy fort77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2260: checking for $ac_word" >&5
++echo "configure:2250: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2324,5 +2314,5 @@
+ set dummy fort77; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2327: checking for $ac_word" >&5
++echo "configure:2317: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2453,7 +2443,7 @@
+     LDFLAGS='-Wl,--export-dynamic'
+     echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6
+-echo "configure:2456: checking if the linker accepts --export-dynamic" >&5
++echo "configure:2446: checking if the linker accepts --export-dynamic" >&5
+     cat > conftest.$ac_ext <<EOF
+-#line 2458 "configure"
++#line 2448 "configure"
+ #include "confdefs.h"
+ 
+@@ -2462,5 +2452,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2465: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2455: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+@@ -2484,5 +2474,5 @@
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2487: checking for $ac_word" >&5
++echo "configure:2477: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2518,10 +2508,10 @@
+      fi
+    else		
+-     for ac_prog in f77 f2c-f77
++     for ac_prog in "${FC}" f77 f2c-f77
+ do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+ set dummy $ac_prog; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2526: checking for $ac_word" >&5
++echo "configure:2516: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2558,5 +2548,5 @@
+    fi
+  
+-   FC=$F77
++   FC="$F77"
+    FC_OPTIONS='-O2'
+    FC_LDFLAGS="-Wl,-R${X11BASE}/lib"
+@@ -2567,7 +2557,7 @@
+    LDFLAGS='-Wl,--export-dynamic'
+    echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6
+-echo "configure:2570: checking if the linker accepts --export-dynamic" >&5
++echo "configure:2560: checking if the linker accepts --export-dynamic" >&5
+    cat > conftest.$ac_ext <<EOF
+-#line 2572 "configure"
++#line 2562 "configure"
+ #include "confdefs.h"
+ 
+@@ -2576,5 +2566,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2579: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2569: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+@@ -2599,7 +2589,7 @@
+    LDFLAGS='-Wl,--export-dynamic'
+    echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6
+-echo "configure:2602: checking if the linker accepts --export-dynamic" >&5
++echo "configure:2592: checking if the linker accepts --export-dynamic" >&5
+    cat > conftest.$ac_ext <<EOF
+-#line 2604 "configure"
++#line 2594 "configure"
+ #include "confdefs.h"
+ 
+@@ -2608,5 +2598,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2611: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2601: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+@@ -2649,5 +2639,5 @@
+ set dummy ranlib; ac_word=$2
+ echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:2652: checking for $ac_word" >&5
++echo "configure:2642: checking for $ac_word" >&5
+ if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2682,5 +2672,5 @@
+ if test "$PERIFILE" = periX11.o; then 
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:2685: checking how to run the C preprocessor" >&5
++echo "configure:2675: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+@@ -2697,5 +2687,5 @@
+   # not just through cpp.
+   cat > conftest.$ac_ext <<EOF
+-#line 2700 "configure"
++#line 2690 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+@@ -2703,5 +2693,5 @@
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2706: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2696: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -2714,5 +2704,5 @@
+   CPP="${CC-cc} -E -traditional-cpp"
+   cat > conftest.$ac_ext <<EOF
+-#line 2717 "configure"
++#line 2707 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+@@ -2720,5 +2710,5 @@
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2723: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2713: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -2731,5 +2721,5 @@
+   CPP="${CC-cc} -nologo -E"
+   cat > conftest.$ac_ext <<EOF
+-#line 2734 "configure"
++#line 2724 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+@@ -2737,5 +2727,5 @@
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2740: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2730: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -2766,5 +2756,5 @@
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:2769: checking for X" >&5
++echo "configure:2759: checking for X" >&5
+ 
+ # Check whether --with-x or --without-x was given.
+@@ -2828,10 +2818,10 @@
+   # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 2831 "configure"
++#line 2821 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2836: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2826: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -2902,5 +2892,5 @@
+   LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2905 "configure"
++#line 2895 "configure"
+ #include "confdefs.h"
+ 
+@@ -2909,5 +2899,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2912: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:2902: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   LIBS="$ac_save_LIBS"
+@@ -3015,8 +3005,8 @@
+     "SunOS 5"*)
+       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
+-echo "configure:3018: checking whether -R must be followed by a space" >&5
++echo "configure:3008: checking whether -R must be followed by a space" >&5
+       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+       cat > conftest.$ac_ext <<EOF
+-#line 3021 "configure"
++#line 3011 "configure"
+ #include "confdefs.h"
+ 
+@@ -3025,5 +3015,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3028: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3018: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_nospace=yes
+@@ -3041,5 +3031,5 @@
+ 	LIBS="$ac_xsave_LIBS -R $x_libraries"
+ 	cat > conftest.$ac_ext <<EOF
+-#line 3044 "configure"
++#line 3034 "configure"
+ #include "confdefs.h"
+ 
+@@ -3048,5 +3038,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3051: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3041: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   ac_R_space=yes
+@@ -3080,5 +3070,5 @@
+     # the Alpha needs dnet_stub (dnet does not exist).
+     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:3083: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:3073: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3088,5 +3078,5 @@
+ LIBS="-ldnet  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3091 "configure"
++#line 3081 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3099,5 +3089,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3102: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3121,5 +3111,5 @@
+     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:3124: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:3114: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3129,5 +3119,5 @@
+ LIBS="-ldnet_stub  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3132 "configure"
++#line 3122 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3140,5 +3130,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3143: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3133: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3169,10 +3159,10 @@
+     # on Irix 5.2, according to dickey@clark.net.
+     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:3172: checking for gethostbyname" >&5
++echo "configure:3162: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3177 "configure"
++#line 3167 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -3197,5 +3187,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3200: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3190: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_gethostbyname=yes"
+@@ -3218,5 +3208,5 @@
+     if test $ac_cv_func_gethostbyname = no; then
+       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:3221: checking for gethostbyname in -lnsl" >&5
++echo "configure:3211: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3226,5 +3216,5 @@
+ LIBS="-lnsl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3229 "configure"
++#line 3219 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3237,5 +3227,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3240: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3230: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3267,10 +3257,10 @@
+     # We assume that if connect needs -lnsl, so does gethostbyname.
+     echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:3270: checking for connect" >&5
++echo "configure:3260: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3275 "configure"
++#line 3265 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -3295,5 +3285,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3298: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3288: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_connect=yes"
+@@ -3316,5 +3306,5 @@
+     if test $ac_cv_func_connect = no; then
+       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:3319: checking for connect in -lsocket" >&5
++echo "configure:3309: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3324,5 +3314,5 @@
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3327 "configure"
++#line 3317 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3335,5 +3325,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3338: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3328: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3359,10 +3349,10 @@
+     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
+     echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:3362: checking for remove" >&5
++echo "configure:3352: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3367 "configure"
++#line 3357 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -3387,5 +3377,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_remove=yes"
+@@ -3408,5 +3398,5 @@
+     if test $ac_cv_func_remove = no; then
+       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:3411: checking for remove in -lposix" >&5
++echo "configure:3401: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3416,5 +3406,5 @@
+ LIBS="-lposix  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3419 "configure"
++#line 3409 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3427,5 +3417,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3430: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3451,10 +3441,10 @@
+     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+     echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:3454: checking for shmat" >&5
++echo "configure:3444: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3459 "configure"
++#line 3449 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -3479,5 +3469,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3482: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3472: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_shmat=yes"
+@@ -3500,5 +3490,5 @@
+     if test $ac_cv_func_shmat = no; then
+       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:3503: checking for shmat in -lipc" >&5
++echo "configure:3493: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3508,5 +3498,5 @@
+ LIBS="-lipc  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3511 "configure"
++#line 3501 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3519,5 +3509,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3552,5 +3542,5 @@
+   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
+   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:3555: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:3545: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3560,5 +3550,5 @@
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3563 "configure"
++#line 3553 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -3571,5 +3561,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3574: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3612,5 +3602,5 @@
+ if test "$PERIFILE" = periX11.o; then 
+ echo $ac_n "checking "for X11 release"""... $ac_c" 1>&6
+-echo "configure:3615: checking "for X11 release"" >&5
++echo "configure:3605: checking "for X11 release"" >&5
+ if eval "test \"`echo '$''{'ac_cv_X11_release'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3661,5 +3651,5 @@
+     fi
+     echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6
+-echo "configure:3664: checking for main in -lXmu" >&5
++echo "configure:3654: checking for main in -lXmu" >&5
+ ac_lib_var=`echo Xmu'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3669,5 +3659,5 @@
+ LIBS="-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3672 "configure"
++#line 3662 "configure"
+ #include "confdefs.h"
+ 
+@@ -3676,5 +3666,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3679: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3669: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3698,5 +3688,5 @@
+ 
+     echo $ac_n "checking for main in -lXaw3d""... $ac_c" 1>&6
+-echo "configure:3701: checking for main in -lXaw3d" >&5
++echo "configure:3691: checking for main in -lXaw3d" >&5
+ ac_lib_var=`echo Xaw3d'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3706,5 +3696,5 @@
+ LIBS="-lXaw3d -lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3709 "configure"
++#line 3699 "configure"
+ #include "confdefs.h"
+ 
+@@ -3713,5 +3703,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3716: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3706: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3735,5 +3725,5 @@
+ 
+     echo $ac_n "checking for main in -lXaw""... $ac_c" 1>&6
+-echo "configure:3738: checking for main in -lXaw" >&5
++echo "configure:3728: checking for main in -lXaw" >&5
+ ac_lib_var=`echo Xaw'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3743,5 +3733,5 @@
+ LIBS="-lXaw -lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3746 "configure"
++#line 3736 "configure"
+ #include "confdefs.h"
+ 
+@@ -3750,5 +3740,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3753: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3743: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3803,5 +3793,5 @@
+ 
+ echo $ac_n "checking "for leading and/or trailing underscores"""... $ac_c" 1>&6
+-echo "configure:3806: checking "for leading and/or trailing underscores"" >&5
++echo "configure:3796: checking "for leading and/or trailing underscores"" >&5
+ cat << EOF > pipof.f
+        subroutine pipof
+@@ -3855,7 +3845,7 @@
+ 
+ echo $ac_n "checking "for use of sharpsign in CPP"""... $ac_c" 1>&6
+-echo "configure:3858: checking "for use of sharpsign in CPP"" >&5
++echo "configure:3848: checking "for use of sharpsign in CPP"" >&5
+ cat > conftest.$ac_ext <<EOF
+-#line 3860 "configure"
++#line 3850 "configure"
+ #include "confdefs.h"
+ #define C2F(name) name##_
+@@ -3864,5 +3854,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3867: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:3857: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+   rm -rf conftest*
+   echo "$ac_t""yes" 1>&6
+@@ -3883,5 +3873,5 @@
+ ##############################################################
+ echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
+-echo "configure:3886: checking for main in -lm" >&5
++echo "configure:3876: checking for main in -lm" >&5
+ ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -3891,5 +3881,5 @@
+ LIBS="-lm  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3894 "configure"
++#line 3884 "configure"
+ #include "confdefs.h"
+ 
+@@ -3898,5 +3888,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3901: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3891: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -3928,10 +3918,10 @@
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3931: checking for $ac_func" >&5
++echo "configure:3921: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3936 "configure"
++#line 3926 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -3956,5 +3946,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3959: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:3949: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+@@ -3983,10 +3973,10 @@
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:3986: checking for $ac_func" >&5
++echo "configure:3976: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 3991 "configure"
++#line 3981 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -4011,5 +4001,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4014: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4004: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+@@ -4038,10 +4028,10 @@
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4041: checking for $ac_func" >&5
++echo "configure:4031: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4046 "configure"
++#line 4036 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -4066,5 +4056,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4069: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4059: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+@@ -4093,10 +4083,10 @@
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4096: checking for $ac_func" >&5
++echo "configure:4086: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4101 "configure"
++#line 4091 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -4121,5 +4111,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4124: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4114: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+@@ -4148,10 +4138,10 @@
+ do
+ echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
+-echo "configure:4151: checking for $ac_func" >&5
++echo "configure:4141: checking for $ac_func" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4156 "configure"
++#line 4146 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+@@ -4176,5 +4166,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4179: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4169: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_func_$ac_func=yes"
+@@ -4208,15 +4198,15 @@
+ ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
+ echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
+-echo "configure:4211: checking for $ac_hdr" >&5
++echo "configure:4201: checking for $ac_hdr" >&5
+ if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   cat > conftest.$ac_ext <<EOF
+-#line 4216 "configure"
++#line 4206 "configure"
+ #include "confdefs.h"
+ #include <$ac_hdr>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:4221: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:4211: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+@@ -4250,5 +4240,5 @@
+ TERMCAPLIB=no
+ echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
+-echo "configure:4253: checking for main in -ltermcap" >&5
++echo "configure:4243: checking for main in -ltermcap" >&5
+ ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4258,5 +4248,5 @@
+ LIBS="-ltermcap  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4261 "configure"
++#line 4251 "configure"
+ #include "confdefs.h"
+ 
+@@ -4265,5 +4255,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4268: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4258: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4287,5 +4277,5 @@
+ if test "$TERMCAPLIB" = no; then
+   echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6
+-echo "configure:4290: checking for main in -ltermlib" >&5
++echo "configure:4280: checking for main in -ltermlib" >&5
+ ac_lib_var=`echo termlib'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4295,5 +4285,5 @@
+ LIBS="-ltermlib  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4298 "configure"
++#line 4288 "configure"
+ #include "confdefs.h"
+ 
+@@ -4302,5 +4292,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4305: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4295: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4325,5 +4315,5 @@
+ if test "$TERMCAPLIB" = no; then
+   echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
+-echo "configure:4328: checking for main in -lcurses" >&5
++echo "configure:4318: checking for main in -lcurses" >&5
+ ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4333,5 +4323,5 @@
+ LIBS="-lcurses  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4336 "configure"
++#line 4326 "configure"
+ #include "confdefs.h"
+ 
+@@ -4340,5 +4330,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4343: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4333: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4381,14 +4371,23 @@
+ PVMSCILIB=
+ PVMTARGET=pvm-bidon
++PVMROOT=
+ 
+ if test "$with_pvm" != no; then
++#check for a locally installed PVM
++if test -x $PVM_ROOT/lib/pvmgetarch ; then
++  PVMROOT=$PVM_ROOT
++  PVMTARGET=pvm-bidon
++else
++  PVMROOT="$SCIDIR/pvm3"
++  PVMTARGET=scilex-lib
++fi
+ 
+ echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6
+-echo "configure:4388: checking "for PVM architecture"" >&5
++echo "configure:4387: checking "for PVM architecture"" >&5
+ if eval "test \"`echo '$''{'ac_cv_PVM_arch'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
+   
+-ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch`
++ac_cv_PVM_arch=`$PVMROOT/lib/pvmgetarch`
+ 
+ fi
+@@ -4397,4 +4396,5 @@
+ if test "$ac_cv_PVM_arch" = UNKNOWN; then
+   echo "configure: warning: "PVM unable to find architecture: I will not use PVM"" 1>&2
++  PVMTARGET=pvm-bidon
+ else
+   cat >> confdefs.h <<\EOF
+@@ -4403,9 +4403,8 @@
+ 
+   PVMARCH="$ac_cv_PVM_arch"
+-  PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
+-  PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
++  PVMGLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libgpvm3.a"
++  PVMLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libpvm3.a"
+   PVMSCIDIR=pvm
+   PVMSCILIB="\$(SCIDIR)/libs/pvm.a"
+-  PVMTARGET=scilex-lib
+ fi
+ 
+@@ -4484,5 +4483,5 @@
+ 
+ echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
+-echo "configure:4487: checking for main in -ldl" >&5
++echo "configure:4486: checking for main in -ldl" >&5
+ ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4492,5 +4491,5 @@
+ LIBS="-ldl  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4495 "configure"
++#line 4494 "configure"
+ #include "confdefs.h"
+ 
+@@ -4499,5 +4498,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4502: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4501: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4540,5 +4539,5 @@
+ echo $ac_n "  Testing version (need $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later)... " $ac_c
+ cat > conftest.$ac_ext <<EOF
+-#line 4543 "configure"
++#line 4542 "configure"
+ #include "confdefs.h"
+ 
+@@ -4631,5 +4630,5 @@
+ if test "$USER_TCL_LIB_PATH" = ""
+ then echo $ac_n "checking for Tcl_DoOneEvent in -lm""... $ac_c" 1>&6
+-echo "configure:4634: checking for Tcl_DoOneEvent in -lm" >&5
++echo "configure:4633: checking for Tcl_DoOneEvent in -lm" >&5
+ ac_lib_var=`echo m'_'Tcl_DoOneEvent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4639,5 +4638,5 @@
+ LIBS="-lm  -l$NAME_LIB_TCL $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4642 "configure"
++#line 4641 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4650,5 +4649,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4652: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4672,5 +4671,5 @@
+ 
+ else echo $ac_n "checking for Tcl_DoOneEvent in -lm""... $ac_c" 1>&6
+-echo "configure:4675: checking for Tcl_DoOneEvent in -lm" >&5
++echo "configure:4674: checking for Tcl_DoOneEvent in -lm" >&5
+ ac_lib_var=`echo m'_'Tcl_DoOneEvent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4680,5 +4679,5 @@
+ LIBS="-lm  -L$USER_TCL_LIB_PATH -l$NAME_LIB_TCL $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4683 "configure"
++#line 4682 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4691,5 +4690,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4694: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4693: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4759,5 +4758,5 @@
+ echo $ac_n "  Testing version (need $CHK_TK_MAJOR.$CHK_TK_MINOR or later)... " $ac_c
+ cat > conftest.$ac_ext <<EOF
+-#line 4762 "configure"
++#line 4761 "configure"
+ #include "confdefs.h"
+ 
+@@ -4845,5 +4844,5 @@
+ if test "$USER_TK_LIB_PATH" = ""
+ then echo $ac_n "checking for Tk_BindEvent in -lm""... $ac_c" 1>&6
+-echo "configure:4848: checking for Tk_BindEvent in -lm" >&5
++echo "configure:4847: checking for Tk_BindEvent in -lm" >&5
+ ac_lib_var=`echo m'_'Tk_BindEvent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4853,5 +4852,5 @@
+ LIBS="-lm  -l$NAME_LIB_TK  -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4856 "configure"
++#line 4855 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4864,5 +4863,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4867: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4886,5 +4885,5 @@
+ 
+ else echo $ac_n "checking for Tk_BindEvent in -lm""... $ac_c" 1>&6
+-echo "configure:4889: checking for Tk_BindEvent in -lm" >&5
++echo "configure:4888: checking for Tk_BindEvent in -lm" >&5
+ ac_lib_var=`echo m'_'Tk_BindEvent | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+@@ -4894,5 +4893,5 @@
+ LIBS="-lm  -L$USER_TK_LIB_PATH -l$NAME_LIB_TK  -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 4897 "configure"
++#line 4896 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error.  */
+@@ -4905,5 +4904,5 @@
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4908: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
++if { (eval echo configure:4907: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+   rm -rf conftest*
+   eval "ac_cv_lib_$ac_lib_var=yes"
+@@ -4981,620 +4980,5 @@
+ echo "configuration of libtool"
+ 
+-# Check whether --enable-shared or --disable-shared was given.
+-if test "${enable_shared+set}" = set; then
+-  enableval="$enable_shared"
+-  p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_shared=yes ;;
+-no) enable_shared=no ;;
+-*)
+-  enable_shared=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_shared=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-else
+-  enable_shared=yes
+-fi
+-
+-# Check whether --enable-static or --disable-static was given.
+-if test "${enable_static+set}" = set; then
+-  enableval="$enable_static"
+-  p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_static=yes ;;
+-no) enable_static=no ;;
+-*)
+-  enable_static=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_static=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-else
+-  enable_static=yes
+-fi
+-
+-# Check whether --enable-fast-install or --disable-fast-install was given.
+-if test "${enable_fast_install+set}" = set; then
+-  enableval="$enable_fast_install"
+-  p=${PACKAGE-default}
+-case "$enableval" in
+-yes) enable_fast_install=yes ;;
+-no) enable_fast_install=no ;;
+-*)
+-  enable_fast_install=no
+-  # Look at the argument we got.  We use all the common list separators.
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:,"
+-  for pkg in $enableval; do
+-    if test "X$pkg" = "X$p"; then
+-      enable_fast_install=yes
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  ;;
+-esac
+-else
+-  enable_fast_install=yes
+-fi
+-
+-echo $ac_n "checking build system type""... $ac_c" 1>&6
+-echo "configure:5054: checking build system type" >&5
+-
+-build_alias=$build
+-case "$build_alias" in
+-NONE)
+-  case $nonopt in
+-  NONE) build_alias=$host_alias ;;
+-  *) build_alias=$nonopt ;;
+-  esac ;;
+-esac
+-
+-build=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $build_alias`
+-build_cpu=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
+-build_vendor=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
+-build_os=`echo $build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
+-echo "$ac_t""$build" 1>&6
+-
+-# Extract the first word of "gcc", so it can be a program name with args.
+-set dummy gcc; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5074: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_CC="gcc"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-CC="$ac_cv_prog_CC"
+-if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-if test -z "$CC"; then
+-  # Extract the first word of "cc", so it can be a program name with args.
+-set dummy cc; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5104: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_prog_rejected=no
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
+-        ac_prog_rejected=yes
+-	continue
+-      fi
+-      ac_cv_prog_CC="cc"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-if test $ac_prog_rejected = yes; then
+-  # We found a bogon in the path, so make sure we never use it.
+-  set dummy $ac_cv_prog_CC
+-  shift
+-  if test $# -gt 0; then
+-    # We chose a different compiler from the bogus one.
+-    # However, it has the same basename, so the bogon will be chosen
+-    # first if we set CC to just the basename; use the full file name.
+-    shift
+-    set dummy "$ac_dir/$ac_word" "$@"
+-    shift
+-    ac_cv_prog_CC="$@"
+-  fi
+-fi
+-fi
+-fi
+-CC="$ac_cv_prog_CC"
+-if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-  if test -z "$CC"; then
+-    case "`uname -s`" in
+-    *win32* | *WIN32*)
+-      # Extract the first word of "cl", so it can be a program name with args.
+-set dummy cl; ac_word=$2
+-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+-echo "configure:5155: checking for $ac_word" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$CC"; then
+-  ac_cv_prog_CC="$CC" # Let the user override the test.
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+-  ac_dummy="$PATH"
+-  for ac_dir in $ac_dummy; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/$ac_word; then
+-      ac_cv_prog_CC="cl"
+-      break
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-fi
+-fi
+-CC="$ac_cv_prog_CC"
+-if test -n "$CC"; then
+-  echo "$ac_t""$CC" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+- ;;
+-    esac
+-  fi
+-  test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; }
+-fi
+-
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6
+-echo "configure:5187: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5
+-
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-cat > conftest.$ac_ext << EOF
+-
+-#line 5198 "configure"
+-#include "confdefs.h"
+-
+-main(){return(0);}
+-EOF
+-if { (eval echo configure:5203: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  ac_cv_prog_cc_works=yes
+-  # If we can't run a trivial program, we are probably using a cross compiler.
+-  if (./conftest; exit) 2>/dev/null; then
+-    ac_cv_prog_cc_cross=no
+-  else
+-    ac_cv_prog_cc_cross=yes
+-  fi
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  ac_cv_prog_cc_works=no
+-fi
+-rm -fr conftest*
+-ac_ext=c
+-# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options.
+-ac_cpp='$CPP $CPPFLAGS'
+-ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
+-ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo "$ac_t""$ac_cv_prog_cc_works" 1>&6
+-if test $ac_cv_prog_cc_works = no; then
+-  { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; }
+-fi
+-echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6
+-echo "configure:5229: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5
+-echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6
+-cross_compiling=$ac_cv_prog_cc_cross
+-
+-echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6
+-echo "configure:5234: checking whether we are using GNU C" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.c <<EOF
+-#ifdef __GNUC__
+-  yes;
+-#endif
+-EOF
+-if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:5243: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then
+-  ac_cv_prog_gcc=yes
+-else
+-  ac_cv_prog_gcc=no
+-fi
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_gcc" 1>&6
+-
+-if test $ac_cv_prog_gcc = yes; then
+-  GCC=yes
+-else
+-  GCC=
+-fi
+-
+-ac_test_CFLAGS="${CFLAGS+set}"
+-ac_save_CFLAGS="$CFLAGS"
+-CFLAGS=
+-echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6
+-echo "configure:5262: checking whether ${CC-cc} accepts -g" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  echo 'void f(){}' > conftest.c
+-if test -z "`${CC-cc} -g -c conftest.c 2>&1`"; then
+-  ac_cv_prog_cc_g=yes
+-else
+-  ac_cv_prog_cc_g=no
+-fi
+-rm -f conftest*
+-
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_cc_g" 1>&6
+-if test "$ac_test_CFLAGS" = set; then
+-  CFLAGS="$ac_save_CFLAGS"
+-elif test $ac_cv_prog_cc_g = yes; then
+-  if test "$GCC" = yes; then
+-    CFLAGS="-g -O2"
+-  else
+-    CFLAGS="-g"
+-  fi
+-else
+-  if test "$GCC" = yes; then
+-    CFLAGS="-O2"
+-  else
+-    CFLAGS=
+-  fi
+-fi
+-
+-# Check whether --with-gnu-ld or --without-gnu-ld was given.
+-if test "${with_gnu_ld+set}" = set; then
+-  withval="$with_gnu_ld"
+-  test "$withval" = no || with_gnu_ld=yes
+-else
+-  with_gnu_ld=no
+-fi
+-
+-ac_prog=ld
+-if test "$ac_cv_prog_gcc" = yes; then
+-  # Check if gcc -print-prog-name=ld gives a path.
+-  echo $ac_n "checking for ld used by GCC""... $ac_c" 1>&6
+-echo "configure:5305: checking for ld used by GCC" >&5
+-  ac_prog=`($CC -print-prog-name=ld) 2>&5`
+-  case "$ac_prog" in
+-    # Accept absolute paths.
+-    [\\/]* | [A-Za-z]:[\\/]*)
+-      re_direlt='/[^/][^/]*/\.\./'
+-      # Canonicalize the path of ld
+-      ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'`
+-      while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do
+-	ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"`
+-      done
+-      test -z "$LD" && LD="$ac_prog"
+-      ;;
+-  "")
+-    # If it fails, then pretend we aren't using GCC.
+-    ac_prog=ld
+-    ;;
+-  *)
+-    # If it is relative, then search for the first ld in PATH.
+-    with_gnu_ld=unknown
+-    ;;
+-  esac
+-elif test "$with_gnu_ld" = yes; then
+-  echo $ac_n "checking for GNU ld""... $ac_c" 1>&6
+-echo "configure:5329: checking for GNU ld" >&5
+-else
+-  echo $ac_n "checking for non-GNU ld""... $ac_c" 1>&6
+-echo "configure:5332: checking for non-GNU ld" >&5
+-fi
+-if eval "test \"`echo '$''{'ac_cv_path_LD'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -z "$LD"; then
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+-      ac_cv_path_LD="$ac_dir/$ac_prog"
+-      # Check to see if the program is GNU ld.  I'd rather use --version,
+-      # but apparently some GNU ld's only accept -v.
+-      # Break only if it was the GNU/non-GNU ld that we prefer.
+-      if "$ac_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then
+-	test "$with_gnu_ld" != no && break
+-      else
+-	test "$with_gnu_ld" != yes && break
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-else
+-  ac_cv_path_LD="$LD" # Let the user override the test with a path.
+-fi
+-fi
+-
+-LD="$ac_cv_path_LD"
+-if test -n "$LD"; then
+-  echo "$ac_t""$LD" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-test -z "$LD" && { echo "configure: error: no acceptable ld found in \$PATH" 1>&2; exit 1; }
+-
+-echo $ac_n "checking if the linker ($LD) is GNU ld""... $ac_c" 1>&6
+-echo "configure:5368: checking if the linker ($LD) is GNU ld" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_gnu_ld'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  # I'd rather use --version here, but apparently some GNU ld's only accept -v.
+-if $LD -v 2>&1 </dev/null | egrep '(GNU|with BFD)' 1>&5; then
+-  ac_cv_prog_gnu_ld=yes
+-else
+-  ac_cv_prog_gnu_ld=no
+-fi
+-fi
+-
+-echo "$ac_t""$ac_cv_prog_gnu_ld" 1>&6
+-
+-
+-echo $ac_n "checking for BSD-compatible nm""... $ac_c" 1>&6
+-echo "configure:5384: checking for BSD-compatible nm" >&5
+-if eval "test \"`echo '$''{'ac_cv_path_NM'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  if test -n "$NM"; then
+-  # Let the user override the test.
+-  ac_cv_path_NM="$NM"
+-else
+-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}"
+-  for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+-    test -z "$ac_dir" && ac_dir=.
+-    if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then
+-      # Check to see if the nm accepts a BSD-compat flag.
+-      # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+-      #   nm: unknown option "B" ignored
+-      if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$ac_dir/nm -B"
+-	break
+-      elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then
+-	ac_cv_path_NM="$ac_dir/nm -p"
+-	break
+-      else
+-	ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but
+-	continue # so that we can try to find one that supports BSD flags
+-      fi
+-    fi
+-  done
+-  IFS="$ac_save_ifs"
+-  test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm
+-fi
+-fi
+-
+-NM="$ac_cv_path_NM"
+-echo "$ac_t""$NM" 1>&6
+-
+-
+-echo $ac_n "checking whether ln -s works""... $ac_c" 1>&6
+-echo "configure:5421: checking whether ln -s works" >&5
+-if eval "test \"`echo '$''{'ac_cv_prog_LN_S'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  rm -f conftestdata
+-if ln -s X conftestdata 2>/dev/null
+-then
+-  rm -f conftestdata
+-  ac_cv_prog_LN_S="ln -s"
+-else
+-  ac_cv_prog_LN_S=ln
+-fi
+-fi
+-LN_S="$ac_cv_prog_LN_S"
+-if test "$ac_cv_prog_LN_S" = "ln -s"; then
+-  echo "$ac_t""yes" 1>&6
+-else
+-  echo "$ac_t""no" 1>&6
+-fi
+-
+-
+-# Check for any special flags to pass to ltconfig.
+-libtool_flags="--cache-file=$cache_file"
+-test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared"
+-test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static"
+-test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install"
+-test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc"
+-test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld"
+-
+-
+-# Check whether --enable-libtool-lock or --disable-libtool-lock was given.
+-if test "${enable_libtool_lock+set}" = set; then
+-  enableval="$enable_libtool_lock"
+-  :
+-fi
+-
+-test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock"
+-test x"$silent" = xyes && libtool_flags="$libtool_flags --silent"
+-
+-# Some flags need to be propagated to the compiler or linker for good
+-# libtool support.
+-case "$host" in
+-*-*-irix6*)
+-  # Find out which ABI we are using.
+-  echo '#line 5465 "configure"' > conftest.$ac_ext
+-  if { (eval echo configure:5466: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
+-    case "`/usr/bin/file conftest.o`" in
+-    *32-bit*)
+-      LD="${LD-ld} -32"
+-      ;;
+-    *N32*)
+-      LD="${LD-ld} -n32"
+-      ;;
+-    *64-bit*)
+-      LD="${LD-ld} -64"
+-      ;;
+-    esac
+-  fi
+-  rm -rf conftest*
+-  ;;
+-
+-*-*-sco3.2v5*)
+-  # On SCO OpenServer 5, we need -belf to get full-featured binaries.
+-  SAVE_CFLAGS="$CFLAGS"
+-  CFLAGS="$CFLAGS -belf"
+-  echo $ac_n "checking whether the C compiler needs -belf""... $ac_c" 1>&6
+-echo "configure:5487: checking whether the C compiler needs -belf" >&5
+-if eval "test \"`echo '$''{'lt_cv_cc_needs_belf'+set}'`\" = set"; then
+-  echo $ac_n "(cached) $ac_c" 1>&6
+-else
+-  cat > conftest.$ac_ext <<EOF
+-#line 5492 "configure"
+-#include "confdefs.h"
+-
+-int main() {
+-
+-; return 0; }
+-EOF
+-if { (eval echo configure:5499: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+-  rm -rf conftest*
+-  lt_cv_cc_needs_belf=yes
+-else
+-  echo "configure: failed program was:" >&5
+-  cat conftest.$ac_ext >&5
+-  rm -rf conftest*
+-  lt_cv_cc_needs_belf=no
+-fi
+-rm -f conftest*
+-fi
+-
+-echo "$ac_t""$lt_cv_cc_needs_belf" 1>&6
+-  if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+-    # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
+-    CFLAGS="$SAVE_CFLAGS"
+-  fi
+-  ;;
+-
+-
+-esac
+-
+-
+-# Save cache, so that ltconfig can load it
+-cat > confcache <<\EOF
+-# This file is a shell script that caches the results of configure
+-# tests run on this system so they can be shared between configure
+-# scripts and configure runs.  It is not useful on other systems.
+-# If it contains results you don't want to keep, you may remove or edit it.
+-#
+-# By default, configure uses ./config.cache as the cache file,
+-# creating it if it does not exist already.  You can give configure
+-# the --cache-file=FILE option to use a different cache file; that is
+-# what configure does when it calls configure scripts in
+-# subdirectories, so they share the cache.
+-# Giving --cache-file=/dev/null disables caching, for debugging configure.
+-# config.status only pays attention to the cache file if you give it the
+-# --recheck option to rerun configure.
+-#
+-EOF
+-# The following way of writing the cache mishandles newlines in values,
+-# but we know of no workaround that is simple, portable, and efficient.
+-# So, don't put newlines in cache variables' values.
+-# Ultrix sh set writes to stderr and can't be redirected directly,
+-# and sets the high bit in the cache file unless we assign to the vars.
+-(set) 2>&1 |
+-  case `(ac_space=' '; set | grep ac_space) 2>&1` in
+-  *ac_space=\ *)
+-    # `set' does not quote correctly, so add quotes (double-quote substitution
+-    # turns \\\\ into \\, and sed turns \\ into \).
+-    sed -n \
+-      -e "s/'/'\\\\''/g" \
+-      -e "s/^\\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\\)=\\(.*\\)/\\1=\${\\1='\\2'}/p"
+-    ;;
+-  *)
+-    # `set' quotes correctly as required by POSIX, so do not add quotes.
+-    sed -n -e 's/^\([a-zA-Z0-9_]*_cv_[a-zA-Z0-9_]*\)=\(.*\)/\1=${\1=\2}/p'
+-    ;;
+-  esac >> confcache
+-if cmp -s $cache_file confcache; then
+-  :
+-else
+-  if test -w $cache_file; then
+-    echo "updating cache $cache_file"
+-    cat confcache > $cache_file
+-  else
+-    echo "not updating unwritable cache $cache_file"
+-  fi
+-fi
+-rm -f confcache
+-
+-
+-# Actually configure libtool.  ac_aux_dir is where install-sh is found.
+-CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \
+-LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \
+-LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \
+-DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \
+-${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \
+-$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $host \
+-|| { echo "configure: error: libtool configure failed" 1>&2; exit 1; }
+-
+-# Reload cache, that may have been modified by ltconfig
+-if test -r "$cache_file"; then
+-  echo "loading cache $cache_file"
+-  . $cache_file
+-else
+-  echo "creating cache $cache_file"
+-  > $cache_file
+-fi
+-
+-
+-# This can be used to rebuild libtool when needed
+-LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
+-
+-# Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+-
+-# Redirect the config.log output again, so that the ltconfig log is not
+-# clobbered by the next message.
+-exec 5>>./config.log
+-
++#AM_PROG_LIBTOOL
+ 
+ echo "end of configuration of libtool"
+@@ -5653,4 +5037,5 @@
+ 
+ 
++
+ # for Makemex
+ 
+@@ -5822,17 +5207,8 @@
+ s%@X_LIBS@%$X_LIBS%g
+ s%@X_EXTRA_LIBS@%$X_EXTRA_LIBS%g
+-s%@build@%$build%g
+-s%@build_alias@%$build_alias%g
+-s%@build_cpu@%$build_cpu%g
+-s%@build_vendor@%$build_vendor%g
+-s%@build_os@%$build_os%g
+-s%@CC@%$CC%g
+-s%@LD@%$LD%g
+-s%@NM@%$NM%g
+-s%@LN_S@%$LN_S%g
+-s%@LIBTOOL@%$LIBTOOL%g
+ s%@RM@%$RM%g
+ s%@AR@%$AR%g
+ s%@FILES_TO_CLEAN@%$FILES_TO_CLEAN%g
++s%@CC@%$CC%g
+ s%@CC_OPTIONS@%$CC_OPTIONS%g
+ s%@CC_LDFLAGS@%$CC_LDFLAGS%g
+@@ -5842,4 +5218,5 @@
+ s%@FC_LDFLAGS@%$FC_LDFLAGS%g
+ s%@FC_PICFLAGS@%$FC_PICFLAGS%g
++s%@LD@%$LD%g
+ s%@LD_LDFLAGS@%$LD_LDFLAGS%g
+ s%@SCILAB_GS@%$SCILAB_GS%g
+@@ -5873,4 +5250,5 @@
+ s%@PVMGLIB@%$PVMGLIB%g
+ s%@PVMTARGET@%$PVMTARGET%g
++s%@PVMROOT@%$PVMROOT%g
+ s%@TK_INC_PATH@%$TK_INC_PATH%g
+ s%@TCL_INC_PATH@%$TCL_INC_PATH%g
+@@ -5880,5 +5258,8 @@
+ s%@DLLTOOL@%$DLLTOOL%g
+ s%@LIBM@%$LIBM%g
++s%@LIBTOOL@%$LIBTOOL%g
+ s%@LIBTOOL_DEPS@%$LIBTOOL_DEPS%g
++s%@LN_S@%$LN_S%g
++s%@NM@%$NM%g
+ s%@OBJDUMP@%$OBJDUMP%g
+ s%@PACKAGE@%$PACKAGE%g
diff --git a/math/scilab/patches/patch-ai b/math/scilab/patches/patch-ai
index 5e50f1fc62c..bd168f70ad4 100644
--- a/math/scilab/patches/patch-ai
+++ b/math/scilab/patches/patch-ai
@@ -1,31 +1,10 @@
-$NetBSD: patch-ai,v 1.2 1999/03/05 11:22:35 frueauf Exp $
+$NetBSD: patch-ai,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $
 
---- ./routines/default/scimem.c.orig	Mon Jul 20 07:50:29 1998
-+++ ./routines/default/scimem.c	Sat Aug  8 13:13:30 1998
-@@ -8,6 +8,25 @@
- #endif
- 
--
- #include "../machine.h"
-+
-+#if defined(netbsd)
-+#include <ieeefp.h>
-+#endif
-+
-+#if defined(freebsd)
-+#include <floatingpoint.h>
-+#endif
-+
-+#if (defined(netbsd) && !defined(__alpha__)) || defined(freebsd)
-+void C2F(nofpex)()
-+{
-+  fpsetmask(0);   /* Don't dump core on FPE return Inf or NaN */
-+}
-+#else
-+void C2F(nofpex)()
-+{
-+  return;
-+}
-+#endif
- 
- char *the_p=NULL;
+--- ./Makefile.incl.in.orig	Fri Jul 10 09:43:07 1998
++++ ./Makefile.incl.in	Mon Nov 29 18:50:27 1999
+@@ -61,4 +61,5 @@
+ PVMLIB = @PVMLIB@
+ PVMGLIB = @PVMGLIB@
++PVMROOT = @PVMROOT@
+ XAWLIB = @XAWLIB@
+ XMULIB = @XMULIB@
diff --git a/math/scilab/patches/patch-aj b/math/scilab/patches/patch-aj
index 7bbb825c29e..fe529c25152 100644
--- a/math/scilab/patches/patch-aj
+++ b/math/scilab/patches/patch-aj
@@ -1,18 +1,11 @@
-$NetBSD: patch-aj,v 1.2 1999/03/05 11:22:35 frueauf Exp $
+$NetBSD: patch-aj,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $
 
---- ./routines/metanet/loadg.c.orig	Sat Aug  8 13:53:32 1998
-+++ ./routines/metanet/loadg.c	Sat Aug  8 13:58:47 1998
-@@ -1,4 +1,7 @@
- #include <stdio.h>
- #ifndef __MSC__
-+#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#endif
- #include <dirent.h>
- #endif
-@@ -14,5 +17,4 @@
- #define  getwd(x) _getcwd(x,1024)
- #endif
--
+--- ./scilab.star.orig	Mon Nov 22 09:57:54 1999
++++ ./scilab.star	Tue Dec 21 16:04:43 1999
+@@ -21,5 +21,5 @@
  
- #include "mysearch.h"
+ // Special variables definition
+-ieee(2);%inf=1/0;ieee(0);%nan=%inf-%inf;
++//ieee(2);%inf=1/0;ieee(0);%nan=%inf-%inf;
+ 
+ %s=poly(0,'s');%z=poly(0,'z');
diff --git a/math/scilab/patches/patch-ak b/math/scilab/patches/patch-ak
index e1b88d92fdd..1df717469ae 100644
--- a/math/scilab/patches/patch-ak
+++ b/math/scilab/patches/patch-ak
@@ -1,21 +1,18 @@
-$NetBSD: patch-ak,v 1.2 1999/03/05 11:22:35 frueauf Exp $
+$NetBSD: patch-ak,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $
 
---- ./routines/metanet/saveg.c.orig	Sat Aug  8 14:01:11 1998
-+++ ./routines/metanet/saveg.c	Sat Aug  8 14:06:07 1998
-@@ -1,4 +1,7 @@
- #include <stdio.h>
- #ifndef __MSC__
-+#if defined(netbsd) || defined(freebsd) 
-+#include <sys/types.h>
-+#endif
- #include <dirent.h>
- #endif
-@@ -13,4 +16,8 @@
- /** only used for x=dir[1024] **/
- #define  getwd(x) _getcwd(x,1024) 
-+#endif
-+
-+#if defined(netbsd) || defined(freebsd)
-+#include <unistd.h>
- #endif
- 
+--- ./tests/grand.tst.orig	Tue Dec 14 05:56:09 1999
++++ ./tests/grand.tst	Tue Dec 21 17:45:26 1999
+@@ -172,5 +172,5 @@
+ PS=(1:N)'/N;
+ //plot2d(RdevS,PS);
+-// theoretical result 
++// theorical result 
+ [P]=cdfchi("PQ",RdevS,A*ones(RdevS));
+ //plot2d(RdevS,P,2,"000")
+@@ -184,5 +184,5 @@
+ PS=(1:N)'/N;
+ //plot2d(RdevS,PS);
+-// theoretical result 
++// theorical result 
+ [P]=cdfpoi("PQ",RdevS,A*ones(RdevS));
+ //plot2d(RdevS,P,2,"000")
diff --git a/math/scilab/patches/patch-al b/math/scilab/patches/patch-al
index fa19b726a04..b15c6b60f44 100644
--- a/math/scilab/patches/patch-al
+++ b/math/scilab/patches/patch-al
@@ -1,12 +1,10 @@
-$NetBSD: patch-al,v 1.2 1999/03/05 11:22:35 frueauf Exp $
+$NetBSD: patch-al,v 1.3 1999/12/22 13:25:42 dmcmahill Exp $
 
---- ./routines/metanet/files.c.orig	Sat Aug  8 14:04:52 1998
-+++ ./routines/metanet/files.c	Sat Aug  8 14:06:46 1998
-@@ -1,4 +1,7 @@
- #include <stdio.h>
- #ifndef __MSC__
-+#if defined(netbsd) || defined(freebsd)
-+#include <sys/types.h>
-+#endif
- #include <dirent.h>
- #endif
+--- ./examples/man-examples/Makefile.orig	Thu Nov  4 14:38:02 1999
++++ ./examples/man-examples/Makefile	Tue Dec 21 17:52:46 1999
+@@ -17,4 +17,5 @@
+ DIRS = $(DIR1) $(DIR2) 
+ TITLES = $(TITLE1) $(TITLE2) 
++tests::	all
+ all	:: allman 
+ 
diff --git a/math/scilab/patches/patch-am b/math/scilab/patches/patch-am
index bade58dd550..3fee82099e4 100644
--- a/math/scilab/patches/patch-am
+++ b/math/scilab/patches/patch-am
@@ -1,23 +1,11 @@
-$NetBSD: patch-am,v 1.2 1999/03/05 11:22:35 frueauf Exp $
+$NetBSD: patch-am,v 1.3 1999/12/22 13:25:43 dmcmahill Exp $
 
---- ./config/Makefile.netbsd.orig	Sat Jul 18 22:31:54 1998
-+++ ./config/Makefile.netbsd	Fri Jul 24 12:00:14 1998
-@@ -0,0 +1,18 @@
-+# Copyright INRIA
-+
-+
-+FFLAGS = $(FC_OPTIONS)
-+
-+bin/scilex: scilex-lib 
-+	@x=1;if test -f $@; then  \
-+		x=`find $(DEFAULTS) $(LIBR)  \( -name '*.a' -o -name '*.o' \) \
-+		-newer $@ -print | wc -l `; \
-+	fi;\
-+	if test $$x -ne 0; then \
-+		$(RM) $@; \
-+		echo "linking"; \
-+		$(FC) $(FFLAGS) -o $@ $(DEFAULTS) $(FC_LDFLAGS) $(LIBR)  \
-+			$(TCLTK_LIBS) $(XLIBS) $(TERMCAPLIB); \
-+	else \
-+		echo bin/scilex is up to date ; \
-+	fi
+--- ./examples/mex-examples/mex-with-so/mexso.tst.orig	Tue Sep 14 03:08:57 1999
++++ ./examples/mex-examples/mex-with-so/mexso.tst	Tue Dec 21 18:31:45 1999
+@@ -3,5 +3,5 @@
+                   "pipo2"; 
+            ];
+-addinter("./libmylib.so","libmylib_gateway",scilab_functions);
++addinter("./libmylib.so.0.0","libmylib_gateway",scilab_functions);
+ 
+ //same as "exec libmylib.sce"
diff --git a/math/scilab/patches/patch-an b/math/scilab/patches/patch-an
index 833d6f714fd..3c4c39b5f57 100644
--- a/math/scilab/patches/patch-an
+++ b/math/scilab/patches/patch-an
@@ -1,32 +1,11 @@
-$NetBSD: patch-an,v 1.2 1999/03/05 11:22:35 frueauf Exp $
+$NetBSD: patch-an,v 1.3 1999/12/22 13:25:43 dmcmahill Exp $
 
---- geci/scruteur.c.orig	Tue May 27 05:13:53 1997
-+++ geci/scruteur.c	Wed Jan 13 19:34:54 1999
-@@ -11,7 +11,16 @@
- #include <errno.h>
- #include <stdio.h>
-+#include <string.h>
- #include <signal.h>
- #include <netdb.h>
- 
-+#if defined(netbsd)
-+#include <ieeefp.h>
-+#endif
-+
-+#if defined(freebsd)
-+#include <floatingpoint.h>
-+#endif
-+
- #include "listes_chainees.h"
- #include "utilitaires.h"
-@@ -46,5 +55,9 @@
-   sigset_t set,oset;
- #endif  
--  
-+
-+#if (defined(netbsd) && !defined(__alpha__)) || defined(freebsd)
-+  fpsetmask(0);
-+#endif
-+
-   signal(SIGTERM,signal_arret_scruteur);
-   signal(SIGQUIT,signal_arret_scruteur);
+--- ./examples/mex-examples/mex-with-so/mexso.dia.ref.orig	Tue Sep 14 03:08:45 1999
++++ ./examples/mex-examples/mex-with-so/mexso.dia.ref	Tue Dec 21 18:43:29 1999
+@@ -5,5 +5,5 @@
+            ];
+  
+-addinter("./libmylib.so","libmylib_gateway",scilab_functions);
++addinter("./libmylib.so.0.0","libmylib_gateway",scilab_functions);
+  
+  
diff --git a/math/scilab/patches/patch-ao b/math/scilab/patches/patch-ao
deleted file mode 100644
index 59a076012be..00000000000
--- a/math/scilab/patches/patch-ao
+++ /dev/null
@@ -1,25 +0,0 @@
-$NetBSD: patch-ao,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- imp/Slatexpr2.c.orig	Fri Dec 18 23:25:51 1998
-+++ imp/Slatexpr2.c	Fri Dec 18 23:28:00 1998
-@@ -9,4 +9,12 @@
- #include <stdio.h>
- 
-+#if defined(netbsd)
-+#include <ieeefp.h>
-+#endif
-+
-+#if defined(freebsd)
-+#include <floatingpoint.h>
-+#endif
-+
- void readOneLine();
- 
-@@ -163,4 +171,7 @@
-   FILE *fd;
-   FILE *fdo;
-+#if (defined(netbsd) && !defined(__alpha__)) || defined(freebsd)
-+  fpsetmask(0);
-+#endif
- #ifdef WIN32 
-   SciEnv();
diff --git a/math/scilab/patches/patch-ap b/math/scilab/patches/patch-ap
deleted file mode 100644
index a00dfa24bf8..00000000000
--- a/math/scilab/patches/patch-ap
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-ap,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- ./imp/Slpr.c.orig	Mon Jul 20 07:34:06 1998
-+++ ./imp/Slpr.c	Sat Aug  8 13:11:59 1998
-@@ -9,4 +9,11 @@
- #include <stdio.h>
- 
-+#if defined(netbsd)
-+#include <ieeefp.h>
-+#endif
-+
-+#if defined(freebsd)
-+#include <floatingpoint.h>
-+#endif
- 
- #ifdef __STDC__
-@@ -59,4 +66,7 @@
-   int i ;
-   FILE *fd;
-+#if (defined(netbsd) && !defined(__alpha__)) || defined(freebsd)
-+  fpsetmask(0);
-+#endif
-   if (argc <= 2) { int i=0;
- 		   while (strcmp(UsageStr[i],"fin")!=0)
diff --git a/math/scilab/patches/patch-aq b/math/scilab/patches/patch-aq
deleted file mode 100644
index c8cfc1f3fdb..00000000000
--- a/math/scilab/patches/patch-aq
+++ /dev/null
@@ -1,24 +0,0 @@
-$NetBSD: patch-aq,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- ./xmetanet/metanet.c.orig	Mon Jul 20 08:08:03 1998
-+++ ./xmetanet/metanet.c	Sat Aug  8 13:50:47 1998
-@@ -8,5 +8,10 @@
- #include <X11/Xaw/Form.h>
- #include <X11/Xaw/Label.h>
--
-+#ifdef netbsd
-+#include <ieeefp.h>
-+#endif
-+#ifdef freebsd
-+#include <floatingpoint.h>
-+#endif
- #include "defs.h"
- #include "color.h"
-@@ -221,4 +226,7 @@
- 
-   iniG = NULL;
-+#if (defined(netbsd) && !defined(__alpha__))  || defined(freebsd) 
-+  fpsetmask(0);
-+#endif
- 
-   /* Is xmetanet called by Scilab? */
diff --git a/math/scilab/patches/patch-ar b/math/scilab/patches/patch-ar
deleted file mode 100644
index 06fd0b07e06..00000000000
--- a/math/scilab/patches/patch-ar
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ar,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- ./xmetanet/graphics.c.orig	Sat Aug  8 13:28:35 1998
-+++ ./xmetanet/graphics.c	Sat Aug  8 14:17:55 1998
-@@ -2,5 +2,7 @@
- #include <X11/Intrinsic.h>
- #include <math.h>
-+#ifndef __FreeBSD__
- #include <malloc.h>
-+#endif
- #include <string.h>
- #include <stdio.h>
diff --git a/math/scilab/patches/patch-as b/math/scilab/patches/patch-as
deleted file mode 100644
index 80cab829b27..00000000000
--- a/math/scilab/patches/patch-as
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-as,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- ./xmetanet/init.c.orig	Sat Aug  8 13:47:04 1998
-+++ ./xmetanet/init.c	Sat Aug  8 14:18:41 1998
-@@ -1,6 +1,14 @@
- /* Copyright INRIA */
-+#if defined(freebsd) || defined(netbsd)
-+#include <sys/types.h>
-+#endif
-+
- #include <dirent.h>
- #include <stdlib.h>
- #include <string.h>
-+
-+#if defined(netbsd) || defined(freebsd)
-+#include <unistd.h>
-+#endif
- 
- #include "list.h"
diff --git a/math/scilab/patches/patch-at b/math/scilab/patches/patch-at
deleted file mode 100644
index 3b8db1f1880..00000000000
--- a/math/scilab/patches/patch-at
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-at,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- ./xmetanet/save.c.orig	Sat Aug  8 14:03:32 1998
-+++ ./xmetanet/save.c	Sat Aug  8 14:19:33 1998
-@@ -1,5 +1,10 @@
- /* Copyright INRIA */
-+#if defined(netbsd) || defined(freebsd)
-+#include <sys/types.h>
-+#endif
- #include <dirent.h>
-+#ifndef __FreeBSD__
- #include <malloc.h>
-+#endif
- #include <stdio.h>
- #include <string.h>
diff --git a/math/scilab/patches/patch-au b/math/scilab/patches/patch-au
deleted file mode 100644
index 4f8c7cc9981..00000000000
--- a/math/scilab/patches/patch-au
+++ /dev/null
@@ -1,1605 +0,0 @@
-$NetBSD: patch-au,v 1.4 1999/11/23 16:12:40 dmcmahill Exp $
-
---- ./configure.orig	Thu Sep 17 09:06:23 1998
-+++ ./configure	Mon Nov 22 19:55:23 1999
-@@ -44,5 +44,5 @@
- 
- # Guess values for system-dependent variables and create Makefiles.
--# Generated automatically using autoconf version 2.12 
-+# Generated automatically using autoconf version 2.13 
- # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
- #
-@@ -104,4 +104,5 @@
- subdirs=
- MFLAGS= MAKEFLAGS=
-+SHELL=${CONFIG_SHELL-/bin/sh}
- # Maximum number of lines to put in a shell here document.
- ac_max_here_lines=12
-@@ -387,5 +388,5 @@
- 
-   -version | --version | --versio | --versi | --vers)
--    echo "configure generated by autoconf version 2.12"
-+    echo "configure generated by autoconf version 2.13"
-     exit 0 ;;
- 
-@@ -557,7 +558,9 @@
- ac_cpp='$CPP $CPPFLAGS'
- ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5'
--ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
-+ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
- cross_compiling=$ac_cv_prog_cc_cross
- 
-+ac_exeext=
-+ac_objext=o
- if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
-   # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu.
-@@ -597,10 +600,10 @@
- 
- # Make sure we can run config.sub.
--if $ac_config_sub sun4 >/dev/null 2>&1; then :
-+if ${CONFIG_SHELL-/bin/sh} $ac_config_sub sun4 >/dev/null 2>&1; then :
- else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
- fi
- 
- echo $ac_n "checking host system type""... $ac_c" 1>&6
--echo "configure:605: checking host system type" >&5
-+echo "configure:608: checking host system type" >&5
- 
- host_alias=$host
-@@ -609,5 +612,5 @@
-   case $nonopt in
-   NONE)
--    if host_alias=`$ac_config_guess`; then :
-+    if host_alias=`${CONFIG_SHELL-/bin/sh} $ac_config_guess`; then :
-     else { echo "configure: error: can not guess host type; you must specify one" 1>&2; exit 1; }
-     fi ;;
-@@ -616,5 +619,5 @@
- esac
- 
--host=`$ac_config_sub $host_alias`
-+host=`${CONFIG_SHELL-/bin/sh} $ac_config_sub $host_alias`
- host_cpu=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
- host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
-@@ -668,5 +671,5 @@
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:671: checking for $ac_word" >&5
-+echo "configure:674: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_GCC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -675,6 +678,7 @@
-   ac_cv_prog_GCC="$GCC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -700,5 +704,5 @@
- set dummy g77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:703: checking for $ac_word" >&5
-+echo "configure:707: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -707,6 +711,7 @@
-   ac_cv_prog_G77="$G77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -734,5 +739,5 @@
- set dummy gcc; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:737: checking for $ac_word" >&5
-+echo "configure:742: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_GCC'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -741,6 +746,7 @@
-   ac_cv_prog_GCC="$GCC" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -768,5 +774,5 @@
- set dummy g77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:771: checking for $ac_word" >&5
-+echo "configure:777: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -775,6 +781,7 @@
-   ac_cv_prog_G77="$G77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -853,5 +860,5 @@
- set dummy f77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:856: checking for $ac_word" >&5
-+echo "configure:863: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -860,6 +867,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -918,5 +926,5 @@
- set dummy f77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:921: checking for $ac_word" >&5
-+echo "configure:929: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -925,6 +933,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -983,5 +992,5 @@
- set dummy f77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:986: checking for $ac_word" >&5
-+echo "configure:995: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -990,6 +999,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1049,5 +1059,5 @@
- set dummy f77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1052: checking for $ac_word" >&5
-+echo "configure:1062: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1056,6 +1066,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1118,5 +1129,5 @@
- set dummy f77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1121: checking for $ac_word" >&5
-+echo "configure:1132: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1125,6 +1136,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1179,5 +1191,5 @@
-     LIEEELIB=
-     echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
--echo "configure:1182: checking for main in -lieee" >&5
-+echo "configure:1194: checking for main in -lieee" >&5
- ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -1187,5 +1199,5 @@
- LIBS="-lieee  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1190 "configure"
-+#line 1202 "configure"
- #include "confdefs.h"
- 
-@@ -1194,5 +1206,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:1197: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1209: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -1226,5 +1238,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1229: checking for $ac_word" >&5
-+echo "configure:1241: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1233,6 +1245,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1262,5 +1275,5 @@
- set dummy g77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1265: checking for $ac_word" >&5
-+echo "configure:1278: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1269,6 +1282,7 @@
-   ac_cv_prog_G77="$G77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1295,5 +1309,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1298: checking for $ac_word" >&5
-+echo "configure:1312: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1302,6 +1316,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1345,5 +1360,5 @@
-     LIEEELIB=
-     echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
--echo "configure:1348: checking for main in -lieee" >&5
-+echo "configure:1363: checking for main in -lieee" >&5
- ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -1353,5 +1368,5 @@
- LIBS="-lieee  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1356 "configure"
-+#line 1371 "configure"
- #include "confdefs.h"
- 
-@@ -1360,5 +1375,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:1363: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -1392,5 +1407,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1395: checking for $ac_word" >&5
-+echo "configure:1410: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1399,6 +1414,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1428,5 +1444,5 @@
- set dummy g77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1431: checking for $ac_word" >&5
-+echo "configure:1447: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1435,6 +1451,7 @@
-   ac_cv_prog_G77="$G77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1461,5 +1478,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1464: checking for $ac_word" >&5
-+echo "configure:1481: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1468,6 +1485,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1521,5 +1539,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1524: checking for $ac_word" >&5
-+echo "configure:1542: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1528,6 +1546,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1557,5 +1576,5 @@
- set dummy g77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1560: checking for $ac_word" >&5
-+echo "configure:1579: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1564,6 +1583,7 @@
-   ac_cv_prog_G77="$G77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1590,5 +1610,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1593: checking for $ac_word" >&5
-+echo "configure:1613: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1597,6 +1617,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1638,5 +1659,5 @@
-     LIEEELIB=
-     echo $ac_n "checking for main in -lieee""... $ac_c" 1>&6
--echo "configure:1641: checking for main in -lieee" >&5
-+echo "configure:1662: checking for main in -lieee" >&5
- ac_lib_var=`echo ieee'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -1646,5 +1667,5 @@
- LIBS="-lieee  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 1649 "configure"
-+#line 1670 "configure"
- #include "confdefs.h"
- 
-@@ -1653,5 +1674,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:1656: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:1677: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -1686,5 +1707,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1689: checking for $ac_word" >&5
-+echo "configure:1710: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1693,6 +1714,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1722,5 +1744,5 @@
- set dummy g77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1725: checking for $ac_word" >&5
-+echo "configure:1747: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_G77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1729,6 +1751,7 @@
-   ac_cv_prog_G77="$G77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1755,5 +1778,5 @@
- set dummy f2c; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1758: checking for $ac_word" >&5
-+echo "configure:1781: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F2C'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1762,6 +1785,7 @@
-   ac_cv_prog_F2C="$F2C" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1810,5 +1834,5 @@
- set dummy f77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1813: checking for $ac_word" >&5
-+echo "configure:1837: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1817,6 +1841,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1876,5 +1901,5 @@
- set dummy f77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1879: checking for $ac_word" >&5
-+echo "configure:1904: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1883,6 +1908,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -1943,5 +1969,5 @@
- set dummy fort77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:1946: checking for $ac_word" >&5
-+echo "configure:1972: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -1950,6 +1976,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -2009,5 +2036,5 @@
- set dummy fort77; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2012: checking for $ac_word" >&5
-+echo "configure:2039: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2016,6 +2043,7 @@
-   ac_cv_prog_F77="$F77" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -2097,4 +2125,224 @@
-     MAKEFILE_TARGET=Makefile.gcwin32
-     ;;
-+  *-*-freebsd*)
-+     CC=gcc
-+     CC_OPTIONS='-O2 -Dfreebsd'
-+     CC_LDFLAGS=-lm
-+     CC_PICFLAGS='-fPIC'
-+     # script shell f77 have bugs, get ours
-+     FC=f77
-+     FC_OPTIONS='-O2 -Dfreebsd'
-+     FC_LDFLAGS=-lm
-+     FC_PICFLAGS='-fPIC'
-+     LD=ld
-+     LD_LDFLAGS=-lm
-+     if test "$enable_debug" = yes; then 
-+       CC_OPTIONS='-g -Dfreebsd'
-+       FC_OPTIONS=-g
-+     fi
-+     if test "$G77" = yes; then
-+       FC=g77
-+     fi
-+    DLDLIB='${SCIDIR}/libs/libdld.a'
-+    DLD_SUBDIR=dld
-+    MAKEFILE_TARGET=Makefile.freebsd
-+    ;;
-+
-+# NetBSD  systems (tested on NetBSD-1.3)
-+  *-*-netbsd*)
-+
-+    #
-+    # C Compiler
-+    #
-+    CC=cc
-+    CC_OPTIONS='-O2 -Dnetbsd'
-+    CC_LDFLAGS="-Wl,-R${X11BASE}/lib"
-+    CC_PICFLAGS='-fPIC'
-+ 
-+    # check for --export-dynamic
-+    ac_save_LDFLAGS="$LDFLAGS"
-+    LDFLAGS='-Wl,--export-dynamic'
-+    echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6
-+echo "configure:2167: checking if the linker accepts --export-dynamic" >&5
-+    cat > conftest.$ac_ext <<EOF
-+#line 2169 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2176: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  echo "$ac_t""yes" 1>&6
-+      CC_LDFLAGS="$CC_LDFLAGS  -Wl,--export-dynamic"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  echo "$ac_t""no" 1>&6
-+fi
-+rm -f conftest*
-+    LDFLAGS="$ac_save_LDFLAGS"
-+
-+   #
-+   # Fortran Compiler
-+   #
-+   if test "$with_f2c" = yes; then
-+     for ac_prog in f2c-f77
-+do
-+# Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2198: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$F77"; then
-+  ac_cv_prog_F77="$F77" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_F77="$ac_prog"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+F77="$ac_cv_prog_F77"
-+if test -n "$F77"; then
-+  echo "$ac_t""$F77" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+test -n "$F77" && break
-+done
-+test -n "$F77" || F77="no"
-+
-+     if test "$F77" = no; then
-+       { echo "configure: error: Unable to configure: Fortran compiler f2c-f77 not found" 1>&2; exit 1; }
-+     fi
-+   else         
-+     for ac_prog in "${FC}" f77 f2c-f77
-+do
-+# Extract the first word of "$ac_prog", so it can be a program name with args.
-+set dummy $ac_prog; ac_word=$2
-+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-+echo "configure:2237: checking for $ac_word" >&5
-+if eval "test \"`echo '$''{'ac_cv_prog_F77'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  if test -n "$F77"; then
-+  ac_cv_prog_F77="$F77" # Let the user override the test.
-+else
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-+    test -z "$ac_dir" && ac_dir=.
-+    if test -f $ac_dir/$ac_word; then
-+      ac_cv_prog_F77="$ac_prog"
-+      break
-+    fi
-+  done
-+  IFS="$ac_save_ifs"
-+fi
-+fi
-+F77="$ac_cv_prog_F77"
-+if test -n "$F77"; then
-+  echo "$ac_t""$F77" 1>&6
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+
-+test -n "$F77" && break
-+done
-+test -n "$F77" || F77="no"
-+
-+     if test "$F77" = no; then
-+       { echo "configure: error: Unable to configure: Fortran, f77 or f2c-f77, compiler not found" 1>&2; exit 1; }
-+     fi
-+   fi
-+ 
-+   FC="$F77"
-+   FC_OPTIONS='-O2'
-+   FC_LDFLAGS="-Wl,-R${X11BASE}/lib"
-+   FC_PICFLAGS='-fPIC'
-+
-+
-+   # check for --export-dynamic
-+   ac_save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS='-Wl,--export-dynamic'
-+   echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6
-+echo "configure:2282: checking if the linker accepts --export-dynamic" >&5
-+   cat > conftest.$ac_ext <<EOF
-+#line 2284 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2291: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  echo "$ac_t""yes" 1>&6
-+     FC_LDFLAGS="$FC_LDFLAGS  -Wl,--export-dynamic"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  echo "$ac_t""no" 1>&6
-+fi
-+rm -f conftest*
-+   LDFLAGS="$ac_save_LDFLAGS"
-+
-+
-+   #
-+   # Linker
-+   #
-+   LD=ld
-+   LD_LDFLAGS="-R${X11BASE}/lib"
-+   # check for --export-dynamic
-+   ac_save_LDFLAGS="$LDFLAGS"
-+   LDFLAGS='-Wl,--export-dynamic'
-+   echo $ac_n "checking if the linker accepts --export-dynamic""... $ac_c" 1>&6
-+echo "configure:2314: checking if the linker accepts --export-dynamic" >&5
-+   cat > conftest.$ac_ext <<EOF
-+#line 2316 "configure"
-+#include "confdefs.h"
-+
-+int main() {
-+
-+; return 0; }
-+EOF
-+if { (eval echo configure:2323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-+  rm -rf conftest*
-+  echo "$ac_t""yes" 1>&6
-+     LD_LDFLAGS="$LD_LDFLAGS  --export-dynamic"
-+else
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  echo "$ac_t""no" 1>&6
-+fi
-+rm -f conftest*
-+   LDFLAGS="$ac_save_LDFLAGS"
-+
-+    
-+   #
-+   # Compiler Debug Flags
-+   #
-+   if test "$enable_debug" = yes; then 
-+      CC_OPTIONS='-g -Dnetbsd -Wall'
-+      FC_OPTIONS='-g -Wall'
-+   fi
-+
-+   MAKEFILE_TARGET=Makefile.netbsd
-+   ;;
-+
-   *)
-     { echo "configure: error: "Unable to configure for host $host"" 1>&2; exit 1; }
-@@ -2112,5 +2360,5 @@
- set dummy ranlib; ac_word=$2
- echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
--echo "configure:2115: checking for $ac_word" >&5
-+echo "configure:2363: checking for $ac_word" >&5
- if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -2119,6 +2367,7 @@
-   ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test.
- else
--  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS="${IFS}:"
--  for ac_dir in $PATH; do
-+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-+  ac_dummy="$PATH"
-+  for ac_dir in $ac_dummy; do
-     test -z "$ac_dir" && ac_dir=.
-     if test -f $ac_dir/$ac_word; then
-@@ -2144,5 +2393,5 @@
- if test "$PERIFILE" = periX11.o; then 
- echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
--echo "configure:2147: checking how to run the C preprocessor" >&5
-+echo "configure:2396: checking how to run the C preprocessor" >&5
- # On Suns, sometimes $CPP names a directory.
- if test -n "$CPP" && test -d "$CPP"; then
-@@ -2159,5 +2408,5 @@
-   # not just through cpp.
-   cat > conftest.$ac_ext <<EOF
--#line 2162 "configure"
-+#line 2411 "configure"
- #include "confdefs.h"
- #include <assert.h>
-@@ -2165,6 +2414,6 @@
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2168: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2417: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -2176,5 +2425,22 @@
-   CPP="${CC-cc} -E -traditional-cpp"
-   cat > conftest.$ac_ext <<EOF
--#line 2179 "configure"
-+#line 2428 "configure"
-+#include "confdefs.h"
-+#include <assert.h>
-+Syntax Error
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:2434: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  :
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  CPP="${CC-cc} -nologo -E"
-+  cat > conftest.$ac_ext <<EOF
-+#line 2445 "configure"
- #include "confdefs.h"
- #include <assert.h>
-@@ -2182,6 +2448,6 @@
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2185: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2451: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   :
-@@ -2196,4 +2462,6 @@
- fi
- rm -f conftest*
-+fi
-+rm -f conftest*
-   ac_cv_prog_CPP="$CPP"
- fi
-@@ -2209,5 +2477,5 @@
- # --without-x overrides everything else, but does not touch the cache.
- echo $ac_n "checking for X""... $ac_c" 1>&6
--echo "configure:2212: checking for X" >&5
-+echo "configure:2480: checking for X" >&5
- 
- # Check whether --with-x or --without-x was given.
-@@ -2271,11 +2539,11 @@
-   # First, try using that file with no special directory specified.
- cat > conftest.$ac_ext <<EOF
--#line 2274 "configure"
-+#line 2542 "configure"
- #include "confdefs.h"
- #include <$x_direct_test_include>
- EOF
- ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
--{ (eval echo configure:2279: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
--ac_err=`grep -v '^ *+' conftest.out`
-+{ (eval echo configure:2547: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
- if test -z "$ac_err"; then
-   rm -rf conftest*
-@@ -2345,5 +2613,5 @@
-   LIBS="-l$x_direct_test_library $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2348 "configure"
-+#line 2616 "configure"
- #include "confdefs.h"
- 
-@@ -2352,5 +2620,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2355: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2623: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   LIBS="$ac_save_LIBS"
-@@ -2458,8 +2726,8 @@
-     "SunOS 5"*)
-       echo $ac_n "checking whether -R must be followed by a space""... $ac_c" 1>&6
--echo "configure:2461: checking whether -R must be followed by a space" >&5
-+echo "configure:2729: checking whether -R must be followed by a space" >&5
-       ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
-       cat > conftest.$ac_ext <<EOF
--#line 2464 "configure"
-+#line 2732 "configure"
- #include "confdefs.h"
- 
-@@ -2468,5 +2736,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2471: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2739: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_nospace=yes
-@@ -2484,5 +2752,5 @@
- 	LIBS="$ac_xsave_LIBS -R $x_libraries"
- 	cat > conftest.$ac_ext <<EOF
--#line 2487 "configure"
-+#line 2755 "configure"
- #include "confdefs.h"
- 
-@@ -2491,5 +2759,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2494: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2762: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   ac_R_space=yes
-@@ -2523,5 +2791,5 @@
-     # the Alpha needs dnet_stub (dnet does not exist).
-     echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
--echo "configure:2526: checking for dnet_ntoa in -ldnet" >&5
-+echo "configure:2794: checking for dnet_ntoa in -ldnet" >&5
- ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -2531,5 +2799,5 @@
- LIBS="-ldnet  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2534 "configure"
-+#line 2802 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -2542,5 +2810,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2545: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2813: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -2564,5 +2832,5 @@
-     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-       echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
--echo "configure:2567: checking for dnet_ntoa in -ldnet_stub" >&5
-+echo "configure:2835: checking for dnet_ntoa in -ldnet_stub" >&5
- ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -2572,5 +2840,5 @@
- LIBS="-ldnet_stub  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2575 "configure"
-+#line 2843 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -2583,5 +2851,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2586: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2854: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -2612,10 +2880,10 @@
-     # on Irix 5.2, according to dickey@clark.net.
-     echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
--echo "configure:2615: checking for gethostbyname" >&5
-+echo "configure:2883: checking for gethostbyname" >&5
- if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2620 "configure"
-+#line 2888 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -2640,5 +2908,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2643: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2911: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_gethostbyname=yes"
-@@ -2661,5 +2929,5 @@
-     if test $ac_cv_func_gethostbyname = no; then
-       echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
--echo "configure:2664: checking for gethostbyname in -lnsl" >&5
-+echo "configure:2932: checking for gethostbyname in -lnsl" >&5
- ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -2669,5 +2937,5 @@
- LIBS="-lnsl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2672 "configure"
-+#line 2940 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -2680,5 +2948,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2683: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:2951: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -2710,10 +2978,10 @@
-     # We assume that if connect needs -lnsl, so does gethostbyname.
-     echo $ac_n "checking for connect""... $ac_c" 1>&6
--echo "configure:2713: checking for connect" >&5
-+echo "configure:2981: checking for connect" >&5
- if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2718 "configure"
-+#line 2986 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -2738,5 +3006,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2741: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_connect=yes"
-@@ -2759,5 +3027,5 @@
-     if test $ac_cv_func_connect = no; then
-       echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
--echo "configure:2762: checking for connect in -lsocket" >&5
-+echo "configure:3030: checking for connect in -lsocket" >&5
- ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -2767,5 +3035,5 @@
- LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2770 "configure"
-+#line 3038 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -2778,5 +3046,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2781: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3049: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -2802,10 +3070,10 @@
-     # gomez@mi.uni-erlangen.de says -lposix is necessary on A/UX.
-     echo $ac_n "checking for remove""... $ac_c" 1>&6
--echo "configure:2805: checking for remove" >&5
-+echo "configure:3073: checking for remove" >&5
- if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2810 "configure"
-+#line 3078 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -2830,5 +3098,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2833: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3101: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_remove=yes"
-@@ -2851,5 +3119,5 @@
-     if test $ac_cv_func_remove = no; then
-       echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
--echo "configure:2854: checking for remove in -lposix" >&5
-+echo "configure:3122: checking for remove in -lposix" >&5
- ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -2859,5 +3127,5 @@
- LIBS="-lposix  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2862 "configure"
-+#line 3130 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -2870,5 +3138,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2873: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3141: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -2894,10 +3162,10 @@
-     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-     echo $ac_n "checking for shmat""... $ac_c" 1>&6
--echo "configure:2897: checking for shmat" >&5
-+echo "configure:3165: checking for shmat" >&5
- if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 2902 "configure"
-+#line 3170 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -2922,5 +3190,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2925: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3193: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_shmat=yes"
-@@ -2943,5 +3211,5 @@
-     if test $ac_cv_func_shmat = no; then
-       echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
--echo "configure:2946: checking for shmat in -lipc" >&5
-+echo "configure:3214: checking for shmat in -lipc" >&5
- ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -2951,5 +3219,5 @@
- LIBS="-lipc  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 2954 "configure"
-+#line 3222 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -2962,5 +3230,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:2965: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3233: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -2995,5 +3263,5 @@
-   #  --interran@uluru.Stanford.EDU, kb@cs.umb.edu.
-   echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
--echo "configure:2998: checking for IceConnectionNumber in -lICE" >&5
-+echo "configure:3266: checking for IceConnectionNumber in -lICE" >&5
- ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3001,7 +3269,7 @@
- else
-   ac_save_LIBS="$LIBS"
--LIBS="-lICE  $LIBS"
-+LIBS="-lICE $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3006 "configure"
-+#line 3274 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -3014,5 +3282,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3017: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3285: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3055,5 +3323,5 @@
- if test "$PERIFILE" = periX11.o; then 
- echo $ac_n "checking "for X11 release"""... $ac_c" 1>&6
--echo "configure:3058: checking "for X11 release"" >&5
-+echo "configure:3326: checking "for X11 release"" >&5
- if eval "test \"`echo '$''{'ac_cv_X11_release'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
-@@ -3104,5 +3372,5 @@
-   fi
-   echo $ac_n "checking for main in -lXmu""... $ac_c" 1>&6
--echo "configure:3107: checking for main in -lXmu" >&5
-+echo "configure:3375: checking for main in -lXmu" >&5
- ac_lib_var=`echo Xmu'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3112,5 +3380,5 @@
- LIBS="-lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3115 "configure"
-+#line 3383 "configure"
- #include "confdefs.h"
- 
-@@ -3119,5 +3387,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3122: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3390: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3141,5 +3409,5 @@
- 
-   echo $ac_n "checking for main in -lXaw""... $ac_c" 1>&6
--echo "configure:3144: checking for main in -lXaw" >&5
-+echo "configure:3412: checking for main in -lXaw" >&5
- ac_lib_var=`echo Xaw'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3149,5 +3417,5 @@
- LIBS="-lXaw -lXmu -lXt -lXext $X_PRE_LIBS -lX11 $X_EXTRA_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3152 "configure"
-+#line 3420 "configure"
- #include "confdefs.h"
- 
-@@ -3156,5 +3424,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3159: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3427: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3201,5 +3469,5 @@
- 
- echo $ac_n "checking "for leading and/or trailing underscores"""... $ac_c" 1>&6
--echo "configure:3204: checking "for leading and/or trailing underscores"" >&5
-+echo "configure:3472: checking "for leading and/or trailing underscores"" >&5
- cat << EOF > pipof.f
-        subroutine pipof
-@@ -3253,7 +3521,7 @@
- 
- echo $ac_n "checking "for use of sharpsign in CPP"""... $ac_c" 1>&6
--echo "configure:3256: checking "for use of sharpsign in CPP"" >&5
-+echo "configure:3524: checking "for use of sharpsign in CPP"" >&5
- cat > conftest.$ac_ext <<EOF
--#line 3258 "configure"
-+#line 3526 "configure"
- #include "confdefs.h"
- #define C2F(name) name##_
-@@ -3262,5 +3530,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3265: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-+if { (eval echo configure:3533: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
-   rm -rf conftest*
-   echo "$ac_t""yes" 1>&6
-@@ -3281,5 +3549,5 @@
- ##############################################################
- echo $ac_n "checking for main in -lm""... $ac_c" 1>&6
--echo "configure:3284: checking for main in -lm" >&5
-+echo "configure:3552: checking for main in -lm" >&5
- ac_lib_var=`echo m'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3289,5 +3557,5 @@
- LIBS="-lm  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3292 "configure"
-+#line 3560 "configure"
- #include "confdefs.h"
- 
-@@ -3296,5 +3564,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3299: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3567: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3326,10 +3594,10 @@
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3329: checking for $ac_func" >&5
-+echo "configure:3597: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3334 "configure"
-+#line 3602 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -3354,5 +3622,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3357: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3625: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
-@@ -3381,10 +3649,10 @@
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3384: checking for $ac_func" >&5
-+echo "configure:3652: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3389 "configure"
-+#line 3657 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -3409,5 +3677,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3680: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
-@@ -3436,10 +3704,10 @@
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3439: checking for $ac_func" >&5
-+echo "configure:3707: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3444 "configure"
-+#line 3712 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -3464,5 +3732,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3467: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3735: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
-@@ -3491,10 +3759,10 @@
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3494: checking for $ac_func" >&5
-+echo "configure:3762: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3499 "configure"
-+#line 3767 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -3519,5 +3787,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3522: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3790: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
-@@ -3546,10 +3814,10 @@
- do
- echo $ac_n "checking for $ac_func""... $ac_c" 1>&6
--echo "configure:3549: checking for $ac_func" >&5
-+echo "configure:3817: checking for $ac_func" >&5
- if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   cat > conftest.$ac_ext <<EOF
--#line 3554 "configure"
-+#line 3822 "configure"
- #include "confdefs.h"
- /* System header to define __stub macros and hopefully few prototypes,
-@@ -3574,5 +3842,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3577: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3845: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_func_$ac_func=yes"
-@@ -3599,4 +3867,48 @@
- 
- 
-+########################
-+## test for header files
-+########################
-+for ac_hdr in values.h
-+do
-+ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
-+echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-+echo "configure:3877: checking for $ac_hdr" >&5
-+if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
-+  echo $ac_n "(cached) $ac_c" 1>&6
-+else
-+  cat > conftest.$ac_ext <<EOF
-+#line 3882 "configure"
-+#include "confdefs.h"
-+#include <$ac_hdr>
-+EOF
-+ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-+{ (eval echo configure:3887: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
-+ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
-+if test -z "$ac_err"; then
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=yes"
-+else
-+  echo "$ac_err" >&5
-+  echo "configure: failed program was:" >&5
-+  cat conftest.$ac_ext >&5
-+  rm -rf conftest*
-+  eval "ac_cv_header_$ac_safe=no"
-+fi
-+rm -f conftest*
-+fi
-+if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
-+  echo "$ac_t""yes" 1>&6
-+    ac_tr_hdr=HAVE_`echo $ac_hdr | sed 'y%abcdefghijklmnopqrstuvwxyz./-%ABCDEFGHIJKLMNOPQRSTUVWXYZ___%'`
-+  cat >> confdefs.h <<EOF
-+#define $ac_tr_hdr 1
-+EOF
-+ 
-+else
-+  echo "$ac_t""no" 1>&6
-+fi
-+done
-+ 
-+
- ##################
- ## termcap library
-@@ -3604,5 +3916,5 @@
- TERMCAPLIB=no
- echo $ac_n "checking for main in -ltermcap""... $ac_c" 1>&6
--echo "configure:3607: checking for main in -ltermcap" >&5
-+echo "configure:3919: checking for main in -ltermcap" >&5
- ac_lib_var=`echo termcap'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3612,5 +3924,5 @@
- LIBS="-ltermcap  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3615 "configure"
-+#line 3927 "configure"
- #include "confdefs.h"
- 
-@@ -3619,5 +3931,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3622: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3934: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3641,5 +3953,5 @@
- if test "$TERMCAPLIB" = no; then
-   echo $ac_n "checking for main in -ltermlib""... $ac_c" 1>&6
--echo "configure:3644: checking for main in -ltermlib" >&5
-+echo "configure:3956: checking for main in -ltermlib" >&5
- ac_lib_var=`echo termlib'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3649,5 +3961,5 @@
- LIBS="-ltermlib  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3652 "configure"
-+#line 3964 "configure"
- #include "confdefs.h"
- 
-@@ -3656,5 +3968,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:3971: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3679,5 +3991,5 @@
- if test "$TERMCAPLIB" = no; then
-   echo $ac_n "checking for main in -lcurses""... $ac_c" 1>&6
--echo "configure:3682: checking for main in -lcurses" >&5
-+echo "configure:3994: checking for main in -lcurses" >&5
- ac_lib_var=`echo curses'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3687,5 +3999,5 @@
- LIBS="-lcurses  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3690 "configure"
-+#line 4002 "configure"
- #include "confdefs.h"
- 
-@@ -3694,5 +4006,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3697: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4009: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3738,29 +4050,29 @@
- if test "$with_pvm" != no; then
- 
--echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6
--echo "configure:3742: checking "for PVM architecture"" >&5
-+  echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6
-+echo "configure:4054: checking "for PVM architecture"" >&5
- if eval "test \"`echo '$''{'ac_cv_PVM_arch'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
- else
-   
--ac_cv_PVM_arch=`./pvm3/lib/pvmgetarch`
--
-+  ac_cv_PVM_arch=`${LOCALBASE}/pvm3/lib/pvmgetarch`
-+  
- fi
- 
- echo "$ac_t""$ac_cv_PVM_arch" 1>&6
--if test "$ac_cv_PVM_arch" = UNKNOWN; then
--  echo "configure: warning: "PVM unable to find architecture: I will not use PVM"" 1>&2
--else
--  cat >> confdefs.h <<\EOF
-+  if test "$ac_cv_PVM_arch" = UNKNOWN; then
-+    echo "configure: warning: "PVM unable to find architecture: I will not use PVM"" 1>&2
-+  else
-+    cat >> confdefs.h <<\EOF
- #define WITH_PVM 1
- EOF
- 
--  PVMARCH="$ac_cv_PVM_arch"
--  PVMGLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
--  PVMLIB="\$(SCIDIR)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
--  PVMSCIDIR=pvm
--  PVMSCILIB=libs/pvm.a
--  PVMTARGET=scilex-lib
--fi
-+    PVMARCH="$ac_cv_PVM_arch"
-+    PVMGLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libgpvm3.a"
-+    PVMLIB="\$(LOCALBASE)/pvm3/lib/$ac_cv_PVM_arch/libpvm3.a"
-+    PVMSCIDIR=pvm
-+    PVMSCILIB=libs/pvm.a
-+    PVMTARGET=pvm-no-build
-+  fi
- 
- fi
-@@ -3822,5 +4134,5 @@
- 
- echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6
--echo "configure:3825: checking for main in -ldl" >&5
-+echo "configure:4137: checking for main in -ldl" >&5
- ac_lib_var=`echo dl'_'main | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3830,5 +4142,5 @@
- LIBS="-ldl  $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3833 "configure"
-+#line 4145 "configure"
- #include "confdefs.h"
- 
-@@ -3837,5 +4149,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3840: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4152: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -3878,5 +4190,5 @@
- echo $ac_n "  Testing version (need $CHK_TCL_MAJOR.$CHK_TCL_MINOR or later)... " $ac_c
- cat > conftest.$ac_ext <<EOF
--#line 3881 "configure"
-+#line 4193 "configure"
- #include "confdefs.h"
- 
-@@ -3963,5 +4275,5 @@
- echo $ac_n "  ""$ac_c"
- echo $ac_n "checking for Tcl_DoOneEvent in -lm""... $ac_c" 1>&6
--echo "configure:3966: checking for Tcl_DoOneEvent in -lm" >&5
-+echo "configure:4278: checking for Tcl_DoOneEvent in -lm" >&5
- ac_lib_var=`echo m'_'Tcl_DoOneEvent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -3971,5 +4283,5 @@
- LIBS="-lm $m $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 3974 "configure"
-+#line 4286 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -3982,5 +4294,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:3985: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4297: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -4045,5 +4357,5 @@
- echo $ac_n "  Testing version (need $CHK_TK_MAJOR.$CHK_TK_MINOR or later)... " $ac_c
- cat > conftest.$ac_ext <<EOF
--#line 4048 "configure"
-+#line 4360 "configure"
- #include "confdefs.h"
- 
-@@ -4126,5 +4438,5 @@
- echo $ac_n "  ""$ac_c"
- echo $ac_n "checking for Tk_BindEvent in -lm""... $ac_c" 1>&6
--echo "configure:4129: checking for Tk_BindEvent in -lm" >&5
-+echo "configure:4441: checking for Tk_BindEvent in -lm" >&5
- ac_lib_var=`echo m'_'Tk_BindEvent | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-@@ -4134,5 +4446,5 @@
- LIBS="-lm $m -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS"
- cat > conftest.$ac_ext <<EOF
--#line 4137 "configure"
-+#line 4449 "configure"
- #include "confdefs.h"
- /* Override any gcc2 internal prototype to avoid an error.  */
-@@ -4145,5 +4457,5 @@
- ; return 0; }
- EOF
--if { (eval echo configure:4148: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then
-+if { (eval echo configure:4460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-@@ -4286,5 +4598,5 @@
- # and sets the high bit in the cache file unless we assign to the vars.
- (set) 2>&1 |
--  case `(ac_space=' '; set) 2>&1` in
-+  case `(ac_space=' '; set | grep ac_space) 2>&1` in
-   *ac_space=\ *)
-     # `set' does not quote correctly, so add quotes (double-quote substitution
-@@ -4353,5 +4665,5 @@
-     exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;;
-   -version | --version | --versio | --versi | --vers | --ver | --ve | --v)
--    echo "$CONFIG_STATUS generated by autoconf version 2.12"
-+    echo "$CONFIG_STATUS generated by autoconf version 2.13"
-     exit 0 ;;
-   -help | --help | --hel | --he | --h)
-@@ -4372,7 +4684,9 @@
- $ac_vpsub
- $extrasub
-+s%@SHELL@%$SHELL%g
- s%@CFLAGS@%$CFLAGS%g
- s%@CPPFLAGS@%$CPPFLAGS%g
- s%@CXXFLAGS@%$CXXFLAGS%g
-+s%@FFLAGS@%$FFLAGS%g
- s%@DEFS@%$DEFS%g
- s%@LDFLAGS@%$LDFLAGS%g
diff --git a/math/scilab/patches/patch-av b/math/scilab/patches/patch-av
deleted file mode 100644
index 08374842048..00000000000
--- a/math/scilab/patches/patch-av
+++ /dev/null
@@ -1,70 +0,0 @@
-$NetBSD: patch-av,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- Makefile.in.orig	Fri Sep 11 07:12:14 1998
-+++ Makefile.in	Sun Jan 17 12:51:05 1999
-@@ -60,5 +60,7 @@
- 	$(RM) bin/scilex
- 
--SUBDIRS = scripts maple macros imp intersci @MANVIEWER@ @XMETANET@ \
-+# don't install @MANVIEWER@  (xless) because NetBSD already has it
-+#SUBDIRS = scripts maple macros imp intersci @MANVIEWER@ @XMETANET@ \
-+SUBDIRS = scripts maple macros imp intersci @XMETANET@ \
- 	tests demos @COMM@ examples
- 
-@@ -78,6 +80,6 @@
- 		$(MAKE) $(MFLAGS) world;
- 
--scilex-lib-world::
--	@cd pvm3; echo "making all in pvm3..."; $(MAKE) $(MFLAGS);
-+#scilex-lib-world::
-+#	@cd pvm3; echo "making all in pvm3..."; $(MAKE) $(MFLAGS);
- 
- all::
-@@ -106,8 +108,8 @@
- 	done
- 
--distclean::
--	@cd pvm3; echo "making distclean in pvm3..."; \
--	$(MAKE) $(MFLAGS) clean;
--	$(RM) -r pvm3/lib/@PVMARCH@ pvm3/bin/@PVMARCH@
-+#distclean::
-+#	@cd pvm3; echo "making distclean in pvm3..."; \
-+#	$(MAKE) $(MFLAGS) clean;
-+#	$(RM) -r pvm3/lib/@PVMARCH@ pvm3/bin/@PVMARCH@
- 
- clean::
-@@ -119,7 +121,7 @@
- 	done
- 
--clean::
--	@cd pvm3; echo "making clean in pvm3..."; \
--	$(MAKE) $(MFLAGS)  clean;
-+#clean::
-+#	@cd pvm3; echo "making clean in pvm3..."; \
-+#	$(MAKE) $(MFLAGS)  clean;
- 
- tests:
-@@ -150,8 +152,4 @@
- 	$(SCIBASE)/routines/graphics/Graphics.h \
- 	$(SCIBASE)/routines/sun/link.h $(SCIBASE)/routines/intersci/sparse.h \
--	$(SCIBASE)/pvm3/lib/pvm $(SCIBASE)/pvm3/lib/pvmd \
--	$(SCIBASE)/pvm3/lib/pvmtmparch \
--	$(SCIBASE)/pvm3/lib/@PVMARCH@/pvmd3 \
--	$(SCIBASE)/pvm3/lib/@PVMARCH@/pvmgs \
- 	$(SCIBASE)/tcl \
- 	$(SCIBASE)/.binary
-@@ -162,2 +160,14 @@
- 	cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)
- 	$(RM) .binary
-+
-+install:
-+	touch .binary
-+	strip $(SCIDIR)/bin/scilex
-+	cd .. ; tar cvf - $(BINDISTFILES) | (cd ${PREFIX}/share; tar xf -)
-+	cd ${PREFIX}/share/scilab-2.4.1; make
-+	rm -f ${PREFIX}/bin/scilab
-+	ln -fs ${PREFIX}/share/scilab-2.4.1/bin/scilab ${PREFIX}/bin/scilab
-+	ln -fs ${PREFIX}/bin/xless ${PREFIX}/share/scilab-2.4.1/bin/xless
-+	${BSD_INSTALL_DATA} ${PREFIX}/share/scilab-2.4.1/X11_defaults/Xscilab ${X11BASE}/lib/X11/app-defaults
-+	${BSD_INSTALL_DATA} ${PREFIX}/share/scilab-2.4.1/X11_defaults/Metanet-color ${X11BASE}/lib/X11/app-defaults
-+
diff --git a/math/scilab/patches/patch-aw b/math/scilab/patches/patch-aw
deleted file mode 100644
index dddd2b85648..00000000000
--- a/math/scilab/patches/patch-aw
+++ /dev/null
@@ -1,20 +0,0 @@
-$NetBSD: patch-aw,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/xsci/wf_f_util.c.orig	Fri Dec 18 23:37:39 1998
-+++ routines/xsci/wf_f_util.c	Fri Dec 18 23:38:57 1998
-@@ -11,4 +11,8 @@
-  */
- 
-+#if defined(netbsd) || defined(freebsd)
-+#include <unistd.h>
-+#endif
-+
- #include "wf_fig.h"
- #include "wf_resources.h"
-@@ -66,5 +70,5 @@
- get_directory()
- {
--#if defined(SYSV) || defined(SVR4)
-+#if defined(SYSV) || defined(SVR4) || defined(netbsd) || defined(freebsd)
-     extern char	   *getcwd();
- 
diff --git a/math/scilab/patches/patch-ax b/math/scilab/patches/patch-ax
deleted file mode 100644
index 1f00612637a..00000000000
--- a/math/scilab/patches/patch-ax
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ax,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- examples/misc-examples/dassl1.sce.orig	Mon Aug 24 12:06:31 1998
-+++ examples/misc-examples/dassl1.sce	Mon Aug 24 12:07:19 1998
-@@ -21,5 +21,5 @@
- // fortran routine dres1 in dir. routines/default, without jocabian
- yy2=dassl([y0,y0d],t0,t,'dres1',info);   //=yy0
--if norm(dres1(yy2(1,:),yy2(2:3,:),yy2(4:5,:)),1)>1.d-6 then pause,end
-+if norm(dres1(yy2(1,:),yy2(2:3,:),yy2(4:5,:)),1)>1.4d-6 then pause,end
- // fortran routines dres1 and djac1 in dir. routines/default, with jacobian
- yy3=dassl([y0,y0d],t0,t,'dres1','djac1',info);  //=yy1
diff --git a/math/scilab/patches/patch-ay b/math/scilab/patches/patch-ay
deleted file mode 100644
index 453b21a4563..00000000000
--- a/math/scilab/patches/patch-ay
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-ay,v 1.3 1999/10/20 13:17:00 dmcmahill Exp $
-
---- examples/misc-examples/zlink.dia.ref.orig	Tue Sep 15 07:28:05 1998
-+++ examples/misc-examples/zlink.dia.ref	Fri Oct  8 19:36:36 1999
-@@ -231,5 +231,5 @@
- yy2=dassl([y0,y0d],t0,t,'dres1',info);   //=yy0
-  
--if norm(dres1(yy2(1,:),yy2(2:3,:),yy2(4:5,:)),1)>1.d-6 then bugmes();quit;end
-+if norm(dres1(yy2(1,:),yy2(2:3,:),yy2(4:5,:)),1)>1.4d-6 then bugmes();quit;end
-  
- // fortran routines dres1 and djac1 in dir. routines/default, with jacobian
-@@ -346,5 +346,5 @@
- xn=dassl([x0,x0d],t0,t,g,j,info);
-  
--if norm(x-xn,1)  > Eps then bugmes();quit;end
-+if norm(x-xn,1)  > 2.0*Eps then bugmes();quit;end
-  
-  
diff --git a/math/scilab/patches/patch-az b/math/scilab/patches/patch-az
deleted file mode 100644
index ec109307b32..00000000000
--- a/math/scilab/patches/patch-az
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-az,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/xsci/wf_w_dir.c.orig	Sat Dec 19 22:43:24 1998
-+++ routines/xsci/wf_w_dir.c	Sat Dec 19 22:45:42 1998
-@@ -56,5 +56,7 @@
- #endif
- 
-+#if !defined(freebsd)
- #include <malloc.h>
-+#endif
- 
- #include "../machine.h"
diff --git a/math/scilab/patches/patch-ba b/math/scilab/patches/patch-ba
deleted file mode 100644
index d8adf648831..00000000000
--- a/math/scilab/patches/patch-ba
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ba,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/xsci/wf_fig.h.orig	Sat Dec 19 22:46:40 1998
-+++ routines/xsci/wf_fig.h	Sat Dec 19 22:51:34 1998
-@@ -52,5 +52,5 @@
- extern int	errno;
- extern int	sys_nerr;
--#if (! (defined(BSD) && (BSD >= 199306)))
-+#if (! (defined(BSD) && (BSD >= 199306))) && !defined(freebsd)
- extern char    *sys_errlist[];
- #endif
diff --git a/math/scilab/patches/patch-bb b/math/scilab/patches/patch-bb
deleted file mode 100644
index af80977c0d4..00000000000
--- a/math/scilab/patches/patch-bb
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-bb,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/sun/zzledt.c.orig	Sun Dec 20 00:20:23 1998
-+++ routines/sun/zzledt.c	Tue Jan 12 13:04:10 1999
-@@ -54,5 +54,5 @@
- #define TERMCAP
- #endif
--#ifndef linux
-+#if !defined(linux) && !defined(netbsd) && !defined(freebsd)
- #ifdef  __alpha
- #define B42UNIX
-@@ -61,4 +61,7 @@
- #ifdef linux
- #define ATTUNIX
-+#define TERMCAP
-+#endif
-+#if defined(netbsd) || defined(freebsd)
- #define TERMCAP
- #endif
diff --git a/math/scilab/patches/patch-bc b/math/scilab/patches/patch-bc
deleted file mode 100644
index c3ec2650b87..00000000000
--- a/math/scilab/patches/patch-bc
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bc,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/sun/getenvc.c.orig	Sun Dec 20 11:27:21 1998
-+++ routines/sun/getenvc.c	Sun Dec 20 11:56:20 1998
-@@ -2,4 +2,5 @@
- /* returns setenv defined variable when getenv fails */
- #include <stdio.h>
-+#include <string.h>
- 
- #include "../graphics/Math.h"
diff --git a/math/scilab/patches/patch-bd b/math/scilab/patches/patch-bd
deleted file mode 100644
index 1c334db191d..00000000000
--- a/math/scilab/patches/patch-bd
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bd,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/sound/sox.c.orig	Fri Jul 17 08:24:52 1998
-+++ routines/sound/sox.c	Tue Jan 12 13:37:48 1999
-@@ -248,5 +248,5 @@
-  */
- 
--#if	defined(unix) || defined(AMIGA) || defined(ARM) || defined(aix)
-+#if defined(netbsd) || defined(freebsd) || defined(unix) || defined(AMIGA) || defined(ARM) || defined(aix)
- filetype(fd)
- int fd;
diff --git a/math/scilab/patches/patch-be b/math/scilab/patches/patch-be
deleted file mode 100644
index 91e3f3d1072..00000000000
--- a/math/scilab/patches/patch-be
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-be,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/sound/st.h.orig    Mon Dec 21 21:14:29 1998
-+++ routines/sound/st.h Mon Dec 21 21:18:03 1998
-@@ -8,4 +8,8 @@
-  */
- 
-+#if (defined(netbsd) || defined(freebsd)) && !defined(unix) 
-+#define unix
-+#endif
-+
- #define IMPORT  extern
- #define EXPORT 
diff --git a/math/scilab/patches/patch-bf b/math/scilab/patches/patch-bf
deleted file mode 100644
index 666ed71a97a..00000000000
--- a/math/scilab/patches/patch-bf
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bf,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/comm/messages.c.orig       Mon Dec 21 21:41:31 1998
-+++ routines/comm/messages.c    Mon Dec 21 21:41:49 1998
-@@ -7,4 +7,5 @@
- #endif
- #include <stdio.h>
-+#include <string.h>
- 
- #include "../machine.h"
diff --git a/math/scilab/patches/patch-bg b/math/scilab/patches/patch-bg
deleted file mode 100644
index 4bccb760782..00000000000
--- a/math/scilab/patches/patch-bg
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bg,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/interf/ctest.c.orig        Mon Dec 21 21:43:23 1998
-+++ routines/interf/ctest.c     Mon Dec 21 21:43:39 1998
-@@ -2,4 +2,5 @@
- 
- #include <stdio.h>
-+#include <string.h>
- #include "../machine.h"
- 
diff --git a/math/scilab/patches/patch-bh b/math/scilab/patches/patch-bh
deleted file mode 100644
index 48a3f91d553..00000000000
--- a/math/scilab/patches/patch-bh
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-bh,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/intersci/cerro.c.orig      Mon Dec 21 21:50:41 1998
-+++ routines/intersci/cerro.c   Mon Dec 21 21:51:09 1998
-@@ -1,3 +1,4 @@
- /* Copyright INRIA */
-+#include <string.h>
- #include "../machine.h"
- #include "cerro.h"
diff --git a/math/scilab/patches/patch-bi b/math/scilab/patches/patch-bi
deleted file mode 100644
index 77243a1f66e..00000000000
--- a/math/scilab/patches/patch-bi
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-bi,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/intersci/cout.c.orig       Mon Dec 21 21:51:37 1998
-+++ routines/intersci/cout.c    Mon Dec 21 21:51:57 1998
-@@ -1,3 +1,4 @@
- /* Copyright INRIA */
-+#include <string.h>
- #include "../machine.h"
- 
diff --git a/math/scilab/patches/patch-bj b/math/scilab/patches/patch-bj
deleted file mode 100644
index 138e14f8fa9..00000000000
--- a/math/scilab/patches/patch-bj
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-bj,v 1.2 1999/03/05 11:22:35 frueauf Exp $
-
---- routines/intersci/cstringf.c.orig   Mon Dec 21 21:51:45 1998
-+++ routines/intersci/cstringf.c        Mon Dec 21 21:52:12 1998
-@@ -1,3 +1,4 @@
- /* Copyright INRIA */
-+#include <string.h>
- #include "../machine.h"
- 
diff --git a/math/scilab/patches/patch-bk b/math/scilab/patches/patch-bk
deleted file mode 100644
index e9c87ade80f..00000000000
--- a/math/scilab/patches/patch-bk
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bk,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- routines/sun/inffic.c.orig  Mon Dec 21 21:57:15 1998
-+++ routines/sun/inffic.c       Mon Dec 21 21:57:39 1998
-@@ -1,3 +1,5 @@
- /* Copyright INRIA */
-+#include <string.h>
-+
- #if defined(THINK_C)||defined(__MWERKS__)
- #include "::graphics:Math.h"
diff --git a/math/scilab/patches/patch-bl b/math/scilab/patches/patch-bl
deleted file mode 100644
index 965a8a38c9c..00000000000
--- a/math/scilab/patches/patch-bl
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-bl,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- routines/system/scicurdir.c.orig    Mon Dec 21 21:58:38 1998
-+++ routines/system/scicurdir.c Mon Dec 21 21:59:00 1998
-@@ -1,3 +1,4 @@
- /* Copyright INRIA */
-+#include <string.h>
- #include "../machine.h"
- #ifdef WIN32 
diff --git a/math/scilab/patches/patch-bm b/math/scilab/patches/patch-bm
deleted file mode 100644
index e58d9653b08..00000000000
--- a/math/scilab/patches/patch-bm
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bm,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- geci/scr_applications.c.orig	Wed Jan 13 19:53:58 1999
-+++ geci/scr_applications.c	Wed Jan 13 19:54:17 1999
-@@ -6,4 +6,5 @@
- #include <sys/time.h>
- #include <stdio.h>
-+#include <string.h>
- #include <fcntl.h>
- #include <netdb.h>
diff --git a/math/scilab/patches/patch-bn b/math/scilab/patches/patch-bn
deleted file mode 100644
index b6e5cfdcd1c..00000000000
--- a/math/scilab/patches/patch-bn
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bn,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- routines/fraclab/gif.c.orig	Wed Jan 13 20:27:04 1999
-+++ routines/fraclab/gif.c	Wed Jan 13 20:27:32 1999
-@@ -45,4 +45,5 @@
- 
- #include <stdio.h>
-+#include <string.h>
- #include "gif.h"
- #include "imgif_const.h"
diff --git a/math/scilab/patches/patch-bo b/math/scilab/patches/patch-bo
deleted file mode 100644
index 544d42de2bf..00000000000
--- a/math/scilab/patches/patch-bo
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bo,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- routines/fraclab/gifrd.c.orig	Wed Jan 13 20:28:16 1999
-+++ routines/fraclab/gifrd.c	Wed Jan 13 20:28:45 1999
-@@ -45,4 +45,5 @@
- 
- #include <stdio.h>
-+#include <string.h>
- #include "gif.h"
- #include "imgif_const.h"
diff --git a/math/scilab/patches/patch-bp b/math/scilab/patches/patch-bp
deleted file mode 100644
index c5be7c27d47..00000000000
--- a/math/scilab/patches/patch-bp
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bp,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- routines/fraclab/gifwr.c.orig	Wed Jan 13 20:28:25 1999
-+++ routines/fraclab/gifwr.c	Wed Jan 13 20:29:03 1999
-@@ -45,4 +45,5 @@
- 
- #include <stdio.h>
-+#include <string.h>
- #include "gif.h"
- #include "imgif_const.h"
diff --git a/math/scilab/patches/patch-bq b/math/scilab/patches/patch-bq
deleted file mode 100644
index 57f7e92d81e..00000000000
--- a/math/scilab/patches/patch-bq
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bq,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- routines/fraclab/quantize.c.orig	Wed Jan 13 20:30:10 1999
-+++ routines/fraclab/quantize.c	Wed Jan 13 20:30:41 1999
-@@ -46,4 +46,5 @@
- 
- #include <stdio.h>
-+#include <string.h>
- #include "imgif_const.h"
- /*
diff --git a/math/scilab/patches/patch-br b/math/scilab/patches/patch-br
deleted file mode 100644
index ec54c8a76f7..00000000000
--- a/math/scilab/patches/patch-br
+++ /dev/null
@@ -1,19 +0,0 @@
-$NetBSD: patch-br,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- scripts/scilab.g.orig	Fri Sep 11 08:57:02 1998
-+++ scripts/scilab.g	Thu Jan 14 14:01:58 1999
-@@ -38,6 +38,12 @@
- fi
- 
--PVM_ROOT=$SCI/pvm3
--PVM_DPATH=$PVM_ROOT/lib/pvmd
-+if test "$PVM_ROOT" = ""; then
-+  PVM_ROOT=$SCI/pvm3
-+fi
-+if test -x $PVM_ROOT/bin/pvmd; then
-+  PVM_DPATH=$PVM_ROOT/bin/pvmd
-+else
-+  PVM_DPATH=$PVM_ROOT/lib/pvmd
-+fi
- export PVM_ROOT PVM_DPATH
- 
diff --git a/math/scilab/patches/patch-bs b/math/scilab/patches/patch-bs
deleted file mode 100644
index 1059c92f5fa..00000000000
--- a/math/scilab/patches/patch-bs
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bs,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- routines/xsci/x_main.c.orig	Sat Jan 16 12:34:24 1999
-+++ routines/xsci/x_main.c	Sat Jan 16 12:35:25 1999
-@@ -530,5 +530,5 @@
- 
- /* following include needed for solaris */
--#if defined(sparc) && defined(__STDC__)
-+#if (defined(sparc) && defined(__STDC__)) && !defined(netbsd)
- #include <stropts.h>
- #include <poll.h>
diff --git a/math/scilab/patches/patch-bt b/math/scilab/patches/patch-bt
deleted file mode 100644
index bca0969fc67..00000000000
--- a/math/scilab/patches/patch-bt
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bt,v 1.2 1999/03/05 11:22:36 frueauf Exp $
-
---- scilab.star.orig	Sun Jan 17 10:41:16 1999
-+++ scilab.star	Sun Jan 17 10:41:32 1999
-@@ -21,5 +21,5 @@
- 
- // Special variables definition
--%inf=10000.3^10000.3;%nan=%inf-%inf;
-+//%inf=10000.3^10000.3;%nan=%inf-%inf;
- %s=poly(0,'s');%z=poly(0,'z');
- $=poly(0,'$')
diff --git a/math/scilab/patches/patch-bu b/math/scilab/patches/patch-bu
deleted file mode 100644
index 8c76db82646..00000000000
--- a/math/scilab/patches/patch-bu
+++ /dev/null
@@ -1,10 +0,0 @@
-$NetBSD: patch-bu,v 1.3 1999/10/20 13:17:00 dmcmahill Exp $
-
---- examples/misc-examples/dassl2.sce.orig	Wed Jun  3 03:35:36 1998
-+++ examples/misc-examples/dassl2.sce	Fri Oct  8 17:47:12 1999
-@@ -29,4 +29,4 @@
- x=dassl([x0,x0d],t0,t,g,info);
- xn=dassl([x0,x0d],t0,t,g,j,info);
--if norm(x-xn,1)  > Eps then pause,end
-+if norm(x-xn,1)  > 2.0*Eps then pause,end
- 
diff --git a/math/scilab/patches/patch-bv b/math/scilab/patches/patch-bv
deleted file mode 100644
index 0a8cbc6532c..00000000000
--- a/math/scilab/patches/patch-bv
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bv,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
-
---- ./routines/pvm/Makefile.orig	Mon May 18 03:29:00 1998
-+++ ./routines/pvm/Makefile	Mon Nov 22 21:41:31 1999
-@@ -11,5 +11,5 @@
- include ../../Makefile.incl
- 
--CFLAGS = $(CC_OPTIONS) 
-+CFLAGS = $(CC_OPTIONS)  -I${LOCALBASE}/pvm3/include
- 
- include ../Make.lib
diff --git a/math/scilab/patches/patch-bw b/math/scilab/patches/patch-bw
deleted file mode 100644
index 390c8d35781..00000000000
--- a/math/scilab/patches/patch-bw
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bw,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
-
---- ./routines/pvm/pvm_grp.c.orig	Thu Apr 23 10:54:47 1998
-+++ ./routines/pvm/pvm_grp.c	Mon Nov 22 21:40:11 1999
-@@ -14,5 +14,5 @@
- #include <stdio.h>
- #include <string.h>
--#include "../../pvm3/include/pvm3.h"
-+#include "pvm3.h"
- #include "../machine.h"
- 
diff --git a/math/scilab/patches/patch-bx b/math/scilab/patches/patch-bx
deleted file mode 100644
index 8813d305e6b..00000000000
--- a/math/scilab/patches/patch-bx
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bx,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
-
---- ./routines/pvm/pvm_info.c.orig	Thu Apr 23 10:56:21 1998
-+++ ./routines/pvm/pvm_info.c	Mon Nov 22 21:40:22 1999
-@@ -16,5 +16,5 @@
- #include <stdlib.h>
- #include <string.h>
--#include "../../pvm3/include/pvm3.h"
-+#include "pvm3.h"
- #include "../machine.h"
- 
diff --git a/math/scilab/patches/patch-by b/math/scilab/patches/patch-by
deleted file mode 100644
index 09956210fff..00000000000
--- a/math/scilab/patches/patch-by
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-by,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
-
---- ./routines/pvm/pvm_proc_ctrl.c.orig	Mon Jun 22 03:20:48 1998
-+++ ./routines/pvm/pvm_proc_ctrl.c	Mon Nov 22 21:40:32 1999
-@@ -65,5 +65,5 @@
- #include <stdlib.h>
- #include <string.h>
--#include "../../pvm3/include/pvm3.h"
-+#include "pvm3.h"
- #include "../machine.h"
- #ifndef WIN32 
diff --git a/math/scilab/patches/patch-bz b/math/scilab/patches/patch-bz
deleted file mode 100644
index 6ad953b1b94..00000000000
--- a/math/scilab/patches/patch-bz
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-bz,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
-
---- ./routines/pvm/pvm_recv.c.orig	Thu Apr 23 11:00:24 1998
-+++ ./routines/pvm/pvm_recv.c	Mon Nov 22 21:40:38 1999
-@@ -15,5 +15,5 @@
- #include <stdlib.h>
- #include <string.h>
--#include "../../pvm3/include/pvm3.h"
-+#include "pvm3.h"
- #include "../machine.h"
- #include "../stack-c.h"
diff --git a/math/scilab/patches/patch-ca b/math/scilab/patches/patch-ca
deleted file mode 100644
index 55633095aba..00000000000
--- a/math/scilab/patches/patch-ca
+++ /dev/null
@@ -1,11 +0,0 @@
-$NetBSD: patch-ca,v 1.3 1999/11/23 16:12:40 dmcmahill Exp $
-
---- ./routines/pvm/pvm_send.c.orig	Tue May 26 03:41:52 1998
-+++ ./routines/pvm/pvm_send.c	Mon Nov 22 21:40:45 1999
-@@ -18,5 +18,5 @@
- #include <stdlib.h>
- #include <string.h>
--#include "../../pvm3/include/pvm3.h"
-+#include "pvm3.h"
- #include "../machine.h"
- #include "../stack-c.h"
diff --git a/math/scilab/pkg/MESSAGE b/math/scilab/pkg/MESSAGE
index e2fdfde3b72..b6777ebecf6 100644
--- a/math/scilab/pkg/MESSAGE
+++ b/math/scilab/pkg/MESSAGE
@@ -3,5 +3,5 @@
 
 To use Scilab, you need to fill and return the end of the file notice.tex
 or notice.ps (postscript file). You may email to Scilab@inria.fr.
-These files are in ${PREFIX}/share/scilab-2.4.1/
+These files are in ${PREFIX}/share/scilab-2.5/
 ******************************************************************************
diff --git a/math/scilab/pkg/PLIST b/math/scilab/pkg/PLIST
index e721d6e13da..10b279b6479 100644
--- a/math/scilab/pkg/PLIST
+++ b/math/scilab/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 1999/10/20 13:17:01 dmcmahill Exp $
+@comment $NetBSD: PLIST,v 1.5 1999/12/22 13:25:58 dmcmahill Exp $
 bin/scilab
 lib/X11/app-defaults/Metanet-color
 lib/X11/app-defaults/Xscilab
@@ -6,51 +6,28 @@ share/${PKGNAME}/.binary
 share/${PKGNAME}/ACKNOWLEDGEMENTS
 share/${PKGNAME}/CHANGES
 share/${PKGNAME}/Makefile
-share/${PKGNAME}/Makefile.in
-share/${PKGNAME}/Makefile.in.orig
 share/${PKGNAME}/Makefile.incl
-share/${PKGNAME}/Makefile.incl.in
-share/${PKGNAME}/Makefile.incl.mak
-share/${PKGNAME}/Makefile.mak
+share/${PKGNAME}/Makefile.OBJ
+share/${PKGNAME}/Makemex
 share/${PKGNAME}/Path.incl
 share/${PKGNAME}/README
-share/${PKGNAME}/README_Windows.txt
 share/${PKGNAME}/Version.incl
-share/${PKGNAME}/Win95-util/DllDemo/Makefile
-share/${PKGNAME}/Win95-util/DllDemo/Makefile.DLLs
-share/${PKGNAME}/Win95-util/DllDemo/Makefile.mak
-share/${PKGNAME}/Win95-util/DllDemo/Readme.txt
-share/${PKGNAME}/Win95-util/DllDemo/dll_fixup.s
-share/${PKGNAME}/Win95-util/DllDemo/how-to-build-dlls.txt
-share/${PKGNAME}/Win95-util/DllDemo/tdll.c
-share/${PKGNAME}/Win95-util/DllDemo/tdll.def
-share/${PKGNAME}/Win95-util/DllDemo/test1.c
-share/${PKGNAME}/Win95-util/DllDemo/test2.c
-share/${PKGNAME}/Win95-util/DllSci/Makefile
-share/${PKGNAME}/Win95-util/DllSci/Makefile.DLLs
-share/${PKGNAME}/Win95-util/DllSci/Makefile.DLLs.kp
-share/${PKGNAME}/Win95-util/DllSci/Makefile.mak
-share/${PKGNAME}/Win95-util/DllSci/Readme.txt
-share/${PKGNAME}/Win95-util/DllSci/dll_fixup.s
-share/${PKGNAME}/Win95-util/DllSci/libs_path
-share/${PKGNAME}/Win95-util/DllSci/tdll-vc.sci
-share/${PKGNAME}/Win95-util/DllSci/tdll.c
-share/${PKGNAME}/Win95-util/DllSci/tdll.def
-share/${PKGNAME}/Win95-util/DllSci/tdll.sci
-share/${PKGNAME}/Win95-util/Makefile
-share/${PKGNAME}/Win95-util/Nm/Makefile.mak
-share/${PKGNAME}/Win95-util/Nm/winDumpExts.c
+share/${PKGNAME}/libtool
 share/${PKGNAME}/X11_defaults/Metanet-color
 share/${PKGNAME}/X11_defaults/MetanetBegin.help
 share/${PKGNAME}/X11_defaults/MetanetModify.help
 share/${PKGNAME}/X11_defaults/MetanetStudy.help
 share/${PKGNAME}/X11_defaults/README
 share/${PKGNAME}/X11_defaults/Xscilab
+share/${PKGNAME}/X11_defaults/Xscilab.back
 share/${PKGNAME}/X11_defaults/metanet.xbm
 share/${PKGNAME}/X11_defaults/metanet.xpm
 share/${PKGNAME}/X11_defaults/scilab.xbm
 share/${PKGNAME}/X11_defaults/scilab.xpm
+share/${PKGNAME}/bin/.scicos_pal
 share/${PKGNAME}/bin/BEpsf
+share/${PKGNAME}/bin/Blatdoc
+share/${PKGNAME}/bin/Blatdocs
 share/${PKGNAME}/bin/Blatexpr
 share/${PKGNAME}/bin/Blatexpr2
 share/${PKGNAME}/bin/Blatexprs
@@ -74,15 +51,14 @@ share/${PKGNAME}/bin/xless
 share/${PKGNAME}/bin/xmetanet
 share/${PKGNAME}/config/Makefile.aix
 share/${PKGNAME}/config/Makefile.alpha
+share/${PKGNAME}/config/Makefile.amk
 share/${PKGNAME}/config/Makefile.freebsd
-share/${PKGNAME}/config/Makefile.freebsd.orig
 share/${PKGNAME}/config/Makefile.gcwin32
 share/${PKGNAME}/config/Makefile.hpux
 share/${PKGNAME}/config/Makefile.hpux9
 share/${PKGNAME}/config/Makefile.linux
 share/${PKGNAME}/config/Makefile.mak
 share/${PKGNAME}/config/Makefile.netbsd
-share/${PKGNAME}/config/Makefile.netbsd.orig
 share/${PKGNAME}/config/Makefile.sgi
 share/${PKGNAME}/config/Makefile.solaris
 share/${PKGNAME}/config/Makefile.sunos
@@ -91,7 +67,10 @@ share/${PKGNAME}/config/config.guess
 share/${PKGNAME}/config/config.sub
 share/${PKGNAME}/config/findpath
 share/${PKGNAME}/config/install-sh
+share/${PKGNAME}/config/ltconfig
+share/${PKGNAME}/config/ltmain.sh
 share/${PKGNAME}/configure
+share/${PKGNAME}/contrib/README
 share/${PKGNAME}/demos/Makefile
 share/${PKGNAME}/demos/alldems.dem
 share/${PKGNAME}/demos/anim/anim.dem
@@ -206,6 +185,7 @@ share/${PKGNAME}/demos/lmitool/testnormopt
 share/${PKGNAME}/demos/lmitool/tset.sci
 share/${PKGNAME}/demos/lqg/lqg2.dem
 share/${PKGNAME}/demos/metanet/colored.graph
+share/${PKGNAME}/demos/metanet/cross.graph
 share/${PKGNAME}/demos/metanet/foret.graph
 share/${PKGNAME}/demos/metanet/icon.graph
 share/${PKGNAME}/demos/metanet/mesh10.graph
@@ -277,26 +257,22 @@ share/${PKGNAME}/demos/sci2for/demotrad.dem
 share/${PKGNAME}/demos/sci2for/printspecs.sci
 share/${PKGNAME}/demos/scicos/Cont.Disc-Observer.cosf
 share/${PKGNAME}/demos/scicos/Controller.cosf
-share/${PKGNAME}/demos/scicos/System-Observer.cos
 share/${PKGNAME}/demos/scicos/System-Observer.cosf
 share/${PKGNAME}/demos/scicos/Temp.cosf
-share/${PKGNAME}/demos/scicos/demo1.cos
 share/${PKGNAME}/demos/scicos/demo1.cosf
-share/${PKGNAME}/demos/scicos/demo2.cos
 share/${PKGNAME}/demos/scicos/demo2.cosf
 share/${PKGNAME}/demos/scicos/demo3.cosf
-share/${PKGNAME}/demos/scicos/demo4.cos
 share/${PKGNAME}/demos/scicos/demo4.cosf
 share/${PKGNAME}/demos/scicos/demo5.cosf
 share/${PKGNAME}/demos/scicos/demo6.cosf
 share/${PKGNAME}/demos/scicos/demo7.cosf
 share/${PKGNAME}/demos/scicos/dialogs.sci
-share/${PKGNAME}/demos/scicos/fibo.cos
 share/${PKGNAME}/demos/scicos/fibo.cosf
 share/${PKGNAME}/demos/scicos/live.dat
 share/${PKGNAME}/demos/scicos/scicos.dem
 share/${PKGNAME}/demos/scicos/scicos_learn.sci
 share/${PKGNAME}/demos/scicos/scicos_play.sci
+share/${PKGNAME}/demos/scicos/sound.cosf
 share/${PKGNAME}/demos/signal/bode.dem
 share/${PKGNAME}/demos/signal/iir.dem
 share/${PKGNAME}/demos/signal/iirfilt.dem
@@ -305,7 +281,6 @@ share/${PKGNAME}/demos/signal/signal.dem
 share/${PKGNAME}/demos/signal/spect.dem
 share/${PKGNAME}/demos/signal/wiener.dem
 share/${PKGNAME}/demos/signal/winfilt.dem
-share/${PKGNAME}/demos/so_locations
 share/${PKGNAME}/demos/sound/sound.dem
 share/${PKGNAME}/demos/surface/Macros.sci
 share/${PKGNAME}/demos/surface/bezier.dem
@@ -320,7 +295,6 @@ share/${PKGNAME}/demos/velpic/id_rgn.desc
 share/${PKGNAME}/demos/velpic/id_rgn.f
 share/${PKGNAME}/demos/velpic/plotdb.sci
 share/${PKGNAME}/demos/velpic/snapshot.sci
-share/${PKGNAME}/demos/velpic/so_locations
 share/${PKGNAME}/demos/velpic/testpt.f
 share/${PKGNAME}/demos/velpic/velpic.1
 share/${PKGNAME}/demos/velpic/velpic.dem
@@ -346,53 +320,105 @@ share/${PKGNAME}/demos/wheel2/x.wrt
 share/${PKGNAME}/examples/Makefile
 share/${PKGNAME}/examples/README
 share/${PKGNAME}/examples/addinter-examples/Makefile
+share/${PKGNAME}/examples/addinter-examples/Makefile.amk
 share/${PKGNAME}/examples/addinter-examples/Makefile.mak
+share/${PKGNAME}/examples/addinter-examples/Makefile.mak.old
 share/${PKGNAME}/examples/addinter-examples/README
-share/${PKGNAME}/examples/addinter-examples/ex1c.c
+share/${PKGNAME}/examples/addinter-examples/as2osc.c
+share/${PKGNAME}/examples/addinter-examples/as2osf.f
+share/${PKGNAME}/examples/addinter-examples/ex10c.sce
+share/${PKGNAME}/examples/addinter-examples/ex10f.sce
+share/${PKGNAME}/examples/addinter-examples/ex11c.sce
+share/${PKGNAME}/examples/addinter-examples/ex11f.sce
+share/${PKGNAME}/examples/addinter-examples/ex12c.sce
+share/${PKGNAME}/examples/addinter-examples/ex12f.sce
+share/${PKGNAME}/examples/addinter-examples/ex13c.sce
+share/${PKGNAME}/examples/addinter-examples/ex13f.sce
+share/${PKGNAME}/examples/addinter-examples/ex14c.sce
+share/${PKGNAME}/examples/addinter-examples/ex14f.sce
+share/${PKGNAME}/examples/addinter-examples/ex15c.sce
+share/${PKGNAME}/examples/addinter-examples/ex15f.sce
+share/${PKGNAME}/examples/addinter-examples/ex16c.sce
+share/${PKGNAME}/examples/addinter-examples/ex16f.sce
+share/${PKGNAME}/examples/addinter-examples/ex17c.c
+share/${PKGNAME}/examples/addinter-examples/ex17c.sce
+share/${PKGNAME}/examples/addinter-examples/ex17f.f
+share/${PKGNAME}/examples/addinter-examples/ex17f.sce
 share/${PKGNAME}/examples/addinter-examples/ex1c.sce
-share/${PKGNAME}/examples/addinter-examples/ex1cI.c
-share/${PKGNAME}/examples/addinter-examples/ex1f.f
 share/${PKGNAME}/examples/addinter-examples/ex1f.sce
-share/${PKGNAME}/examples/addinter-examples/ex1fi.f
-share/${PKGNAME}/examples/addinter-examples/ex2c.c
 share/${PKGNAME}/examples/addinter-examples/ex2c.sce
-share/${PKGNAME}/examples/addinter-examples/ex2cI.c
-share/${PKGNAME}/examples/addinter-examples/ex2f.f
 share/${PKGNAME}/examples/addinter-examples/ex2f.sce
-share/${PKGNAME}/examples/addinter-examples/ex2fi.f
-share/${PKGNAME}/examples/addinter-examples/ex3c.c
-share/${PKGNAME}/examples/addinter-examples/ex3c.sce
-share/${PKGNAME}/examples/addinter-examples/ex3cI.c
-share/${PKGNAME}/examples/addinter-examples/ex3f.c
-share/${PKGNAME}/examples/addinter-examples/ex3f.sce
-share/${PKGNAME}/examples/addinter-examples/ex3fi.f
-share/${PKGNAME}/examples/addinter-examples/ex4c.sce
-share/${PKGNAME}/examples/addinter-examples/ex4cI.c
-share/${PKGNAME}/examples/addinter-examples/ex4f.sce
-share/${PKGNAME}/examples/addinter-examples/ex4fi.f
-share/${PKGNAME}/examples/addinter-examples/ex5.h
-share/${PKGNAME}/examples/addinter-examples/ex5c.c
-share/${PKGNAME}/examples/addinter-examples/ex5c.sce
-share/${PKGNAME}/examples/addinter-examples/ex5cI.c
-share/${PKGNAME}/examples/addinter-examples/ex5cm.c
-share/${PKGNAME}/examples/addinter-examples/ex5f.f
-share/${PKGNAME}/examples/addinter-examples/ex5f.h
-share/${PKGNAME}/examples/addinter-examples/ex5f.sce
-share/${PKGNAME}/examples/addinter-examples/ex5fI.c
-share/${PKGNAME}/examples/addinter-examples/ex5fm.f
-share/${PKGNAME}/examples/addinter-examples/ex6c.c
-share/${PKGNAME}/examples/addinter-examples/ex6c.sce
-share/${PKGNAME}/examples/addinter-examples/ex6cI.c
-share/${PKGNAME}/examples/addinter-examples/ex6f.f
-share/${PKGNAME}/examples/addinter-examples/ex6f.sce
-share/${PKGNAME}/examples/addinter-examples/ex6fi.f
+share/${PKGNAME}/examples/addinter-examples/ex3456c.sce
+share/${PKGNAME}/examples/addinter-examples/ex3456f.sce
+share/${PKGNAME}/examples/addinter-examples/ex7c.sce
 share/${PKGNAME}/examples/addinter-examples/ex7f.sce
-share/${PKGNAME}/examples/addinter-examples/ex7fi.f
+share/${PKGNAME}/examples/addinter-examples/ex8c.sce
 share/${PKGNAME}/examples/addinter-examples/ex8f.sce
-share/${PKGNAME}/examples/addinter-examples/ex8fi.f
-share/${PKGNAME}/examples/addinter-examples/template.c
-share/${PKGNAME}/examples/addinter-examples/template.f
-share/${PKGNAME}/examples/addinter-examples/zlink.dia.ref
+share/${PKGNAME}/examples/addinter-examples/ex9c.sce
+share/${PKGNAME}/examples/addinter-examples/ex9f.sce
+share/${PKGNAME}/examples/addinter-examples/examples.dia.ref
+share/${PKGNAME}/examples/addinter-examples/examples.sce.ref
+share/${PKGNAME}/examples/addinter-examples/examples_gateway.c.ref
+share/${PKGNAME}/examples/addinter-examples/f3c.c
+share/${PKGNAME}/examples/addinter-examples/f3f.f
+share/${PKGNAME}/examples/addinter-examples/intex10c.c
+share/${PKGNAME}/examples/addinter-examples/intex10f.f
+share/${PKGNAME}/examples/addinter-examples/intex11c.c
+share/${PKGNAME}/examples/addinter-examples/intex11f.f
+share/${PKGNAME}/examples/addinter-examples/intex12c.c
+share/${PKGNAME}/examples/addinter-examples/intex12f.f
+share/${PKGNAME}/examples/addinter-examples/intex13c.c
+share/${PKGNAME}/examples/addinter-examples/intex13f.f
+share/${PKGNAME}/examples/addinter-examples/intex14c.c
+share/${PKGNAME}/examples/addinter-examples/intex14f.f
+share/${PKGNAME}/examples/addinter-examples/intex15c.c
+share/${PKGNAME}/examples/addinter-examples/intex15f.f
+share/${PKGNAME}/examples/addinter-examples/intex16c.c
+share/${PKGNAME}/examples/addinter-examples/intex16f.f
+share/${PKGNAME}/examples/addinter-examples/intex17c.c
+share/${PKGNAME}/examples/addinter-examples/intex17f.c
+share/${PKGNAME}/examples/addinter-examples/intex1c.c
+share/${PKGNAME}/examples/addinter-examples/intex1f.f
+share/${PKGNAME}/examples/addinter-examples/intex2c.c
+share/${PKGNAME}/examples/addinter-examples/intex2f.f
+share/${PKGNAME}/examples/addinter-examples/intex3c.c
+share/${PKGNAME}/examples/addinter-examples/intex3f.f
+share/${PKGNAME}/examples/addinter-examples/intex4c.c
+share/${PKGNAME}/examples/addinter-examples/intex4f.f
+share/${PKGNAME}/examples/addinter-examples/intex5c.c
+share/${PKGNAME}/examples/addinter-examples/intex5f.f
+share/${PKGNAME}/examples/addinter-examples/intex6c.c
+share/${PKGNAME}/examples/addinter-examples/intex6f.f
+share/${PKGNAME}/examples/addinter-examples/intex7c.c
+share/${PKGNAME}/examples/addinter-examples/intex7f.f
+share/${PKGNAME}/examples/addinter-examples/intex8c.c
+share/${PKGNAME}/examples/addinter-examples/intex8f.f
+share/${PKGNAME}/examples/addinter-examples/intex9c.c
+share/${PKGNAME}/examples/addinter-examples/intex9f.f
+share/${PKGNAME}/examples/addinter-examples/pgmsc.c
+share/${PKGNAME}/examples/addinter-examples/pgmsf.c
+share/${PKGNAME}/examples/addinter-lapack/Makefile
+share/${PKGNAME}/examples/addinter-lapack/Makefile.mak
+share/${PKGNAME}/examples/addinter-lapack/README
+share/${PKGNAME}/examples/addinter-lapack/args
+share/${PKGNAME}/examples/addinter-lapack/file
+share/${PKGNAME}/examples/addinter-lapack/format
+share/${PKGNAME}/examples/addinter-lapack/intcdgemm.c
+share/${PKGNAME}/examples/addinter-lapack/intdgebak.f
+share/${PKGNAME}/examples/addinter-lapack/intdgebal.f
+share/${PKGNAME}/examples/addinter-lapack/intdgels.f
+share/${PKGNAME}/examples/addinter-lapack/intdgemm.f
+share/${PKGNAME}/examples/addinter-lapack/intdgeqrf.f
+share/${PKGNAME}/examples/addinter-lapack/lapackscilab.dia.ref
+share/${PKGNAME}/examples/addinter-lapack/lapackscilab.tst
+share/${PKGNAME}/examples/addinter-tutorial/Makefile
+share/${PKGNAME}/examples/addinter-tutorial/Makefile.mak
+share/${PKGNAME}/examples/addinter-tutorial/README
+share/${PKGNAME}/examples/addinter-tutorial/intmatmul.c
+share/${PKGNAME}/examples/addinter-tutorial/intview.c
+share/${PKGNAME}/examples/addinter-tutorial/tutorial.dia.ref
+share/${PKGNAME}/examples/addinter-tutorial/tutorial.tst
+share/${PKGNAME}/examples/callsci/.scicos_pal
 share/${PKGNAME}/examples/callsci/Init
 share/${PKGNAME}/examples/callsci/Makefile
 share/${PKGNAME}/examples/callsci/Makefile.more
@@ -401,6 +427,7 @@ share/${PKGNAME}/examples/callsci/callsci.f
 share/${PKGNAME}/examples/callsci/callsci.sh
 share/${PKGNAME}/examples/callsci/callsci.sh.in
 share/${PKGNAME}/examples/intersci-examples/Makefile
+share/${PKGNAME}/examples/intersci-examples/Makefile.amk
 share/${PKGNAME}/examples/intersci-examples/Makefile.mak
 share/${PKGNAME}/examples/intersci-examples/README.txt
 share/${PKGNAME}/examples/intersci-examples/ex1.sce
@@ -462,6 +489,7 @@ share/${PKGNAME}/examples/intersci-examples/sedprov
 share/${PKGNAME}/examples/intersci-examples/zall.sce
 share/${PKGNAME}/examples/intersci-examples/zallfi.dia.ref
 share/${PKGNAME}/examples/link-examples/Makefile
+share/${PKGNAME}/examples/link-examples/Makefile.amk
 share/${PKGNAME}/examples/link-examples/Makefile.mak
 share/${PKGNAME}/examples/link-examples/README
 share/${PKGNAME}/examples/link-examples/ext10c.c
@@ -521,17 +549,74 @@ share/${PKGNAME}/examples/link-examples/ext9c.sce
 share/${PKGNAME}/examples/link-examples/ext9f.f
 share/${PKGNAME}/examples/link-examples/ext9f.sce
 share/${PKGNAME}/examples/link-examples/zlink.dia.ref
-share/${PKGNAME}/examples/link-examples/zlink2.dia
 share/${PKGNAME}/examples/link-examples/zlink2.dia.ref
-share/${PKGNAME}/examples/link-examples/zlink2.tst
 share/${PKGNAME}/examples/macros-examples/Makefile
 share/${PKGNAME}/examples/macros-examples/Makefile.mak
+share/${PKGNAME}/examples/macros-examples/README
 share/${PKGNAME}/examples/macros-examples/f.sci
 share/${PKGNAME}/examples/macros-examples/g.sci
-share/${PKGNAME}/examples/man-examples/Chapters.add
 share/${PKGNAME}/examples/man-examples/Makefile
-share/${PKGNAME}/examples/man-examples/test1/example1.man
-share/${PKGNAME}/examples/man-examples/test2/example2.man
+share/${PKGNAME}/examples/man-examples/Makefile.orig
+share/${PKGNAME}/examples/man-examples/README
+share/${PKGNAME}/examples/man-examples/help.sce
+share/${PKGNAME}/examples/man-examples/helpdir1/README.man
+share/${PKGNAME}/examples/man-examples/helpdir1/example1.man
+share/${PKGNAME}/examples/man-examples/helpdir1/example2.man
+share/${PKGNAME}/examples/man-examples/helpdir2/example3.man
+share/${PKGNAME}/examples/mex-examples/Makefile
+share/${PKGNAME}/examples/mex-examples/cpp/Makefile
+share/${PKGNAME}/examples/mex-examples/cpp/Makemexcpp
+share/${PKGNAME}/examples/mex-examples/cpp/README
+share/${PKGNAME}/examples/mex-examples/cpp/compilemex.sh
+share/${PKGNAME}/examples/mex-examples/cpp/temptst.cpp
+share/${PKGNAME}/examples/mex-examples/cpp/temptst.h
+share/${PKGNAME}/examples/mex-examples/cpp/temptst2.cpp
+share/${PKGNAME}/examples/mex-examples/fortran/Makefile
+share/${PKGNAME}/examples/mex-examples/fortran/Makefile.mak
+share/${PKGNAME}/examples/mex-examples/fortran/README
+share/${PKGNAME}/examples/mex-examples/fortran/fmexfunction1.f
+share/${PKGNAME}/examples/mex-examples/fortran/fmexfunction2.f
+share/${PKGNAME}/examples/mex-examples/fortran/generic_gateway.c.ref
+share/${PKGNAME}/examples/mex-examples/fortran/mexfort.dia.ref
+share/${PKGNAME}/examples/mex-examples/fortran/mexfort.tst
+share/${PKGNAME}/examples/mex-examples/fortran/startup.sce.ref
+share/${PKGNAME}/examples/mex-examples/fortran/test.sce
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/Makefile
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/Makefile.mak
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/README
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/generic_gateway.c.ref
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction1.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction10.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction11.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction12.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction13.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction2.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction3.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction4.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction5.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction6.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction7.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction8.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexfunction9.c
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexobjs.dia.ref
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/mexobjs.tst
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/startup.sce.ref
+share/${PKGNAME}/examples/mex-examples/mex-with-objects/test.sce
+share/${PKGNAME}/examples/mex-examples/mex-with-so/Makefile
+share/${PKGNAME}/examples/mex-examples/mex-with-so/Makefile.mak
+share/${PKGNAME}/examples/mex-examples/mex-with-so/README
+share/${PKGNAME}/examples/mex-examples/mex-with-so/foof.F
+share/${PKGNAME}/examples/mex-examples/mex-with-so/libmylib_gateway.c.ref
+share/${PKGNAME}/examples/mex-examples/mex-with-so/make.bat
+share/${PKGNAME}/examples/mex-examples/mex-with-so/makeall
+share/${PKGNAME}/examples/mex-examples/mex-with-so/mexso.dia.ref
+share/${PKGNAME}/examples/mex-examples/mex-with-so/mexso.dia.ref.orig
+share/${PKGNAME}/examples/mex-examples/mex-with-so/mexso.tst
+share/${PKGNAME}/examples/mex-examples/mex-with-so/mexso.tst.orig
+share/${PKGNAME}/examples/mex-examples/mex-with-so/mylib.sce.ref
+share/${PKGNAME}/examples/mex-examples/mex-with-so/objects
+share/${PKGNAME}/examples/mex-examples/mex-with-so/pipo.c
+share/${PKGNAME}/examples/mex-examples/mex-with-so/popi.c
 share/${PKGNAME}/examples/misc-examples/Makefile
 share/${PKGNAME}/examples/misc-examples/Makefile.mak
 share/${PKGNAME}/examples/misc-examples/README
@@ -539,9 +624,7 @@ share/${PKGNAME}/examples/misc-examples/dasrt1.sce
 share/${PKGNAME}/examples/misc-examples/dasrt2.sce
 share/${PKGNAME}/examples/misc-examples/dasrt3.sce
 share/${PKGNAME}/examples/misc-examples/dassl1.sce
-share/${PKGNAME}/examples/misc-examples/dassl1.sce.orig
 share/${PKGNAME}/examples/misc-examples/dassl2.sce
-share/${PKGNAME}/examples/misc-examples/dassl2.sce.orig
 share/${PKGNAME}/examples/misc-examples/gr22.f
 share/${PKGNAME}/examples/misc-examples/jac22.f
 share/${PKGNAME}/examples/misc-examples/ode1.sce
@@ -554,19 +637,106 @@ share/${PKGNAME}/examples/misc-examples/wfex.f
 share/${PKGNAME}/examples/misc-examples/wfexab.f
 share/${PKGNAME}/examples/misc-examples/wjex.f
 share/${PKGNAME}/examples/misc-examples/zlink.dia.ref
-share/${PKGNAME}/examples/misc-examples/zlink.dia.ref.orig
 share/${PKGNAME}/imp/NperiPos.ps
+share/${PKGNAME}/imp/giffonts/100dpi/courR08.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/courR10.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/courR12.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/courR14.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/courR18.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/courR24.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/symb08.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/symb10.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/symb12.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/symb14.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/symb18.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/symb24.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timB08.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timB10.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timB12.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timB14.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timB18.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timB24.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timBI08.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timBI10.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timBI12.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timBI14.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timBI18.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timBI24.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timI08.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timI10.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timI12.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timI14.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timI18.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timI24.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timR08.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timR10.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timR12.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timR14.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timR18.bdf
+share/${PKGNAME}/imp/giffonts/100dpi/timR24.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/courR08.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/courR10.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/courR12.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/courR14.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/courR18.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/courR24.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/gdtimB10.c
+share/${PKGNAME}/imp/giffonts/75dpi/gdtimB10.h
+share/${PKGNAME}/imp/giffonts/75dpi/gdtimBI24.c
+share/${PKGNAME}/imp/giffonts/75dpi/gdtimBI24.h
+share/${PKGNAME}/imp/giffonts/75dpi/symb08.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/symb10.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/symb12.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/symb14.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/symb18.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/symb24.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timB08.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timB10.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timB12.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timB14.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timB18.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timB24.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timBI08.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timBI10.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timBI12.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timBI14.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timBI18.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timBI24.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timI08.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timI10.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timI12.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timI14.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timI18.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timI24.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timR08.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timR10.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timR12.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timR14.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timR18.bdf
+share/${PKGNAME}/imp/giffonts/75dpi/timR24.bdf
+share/${PKGNAME}/macros/Forwin
+share/${PKGNAME}/macros/Forwin.c
+share/${PKGNAME}/macros/Gengatsce
+share/${PKGNAME}/macros/Gengatsce.c
+share/${PKGNAME}/macros/Gensomex
+share/${PKGNAME}/macros/Gensomex.c
+share/${PKGNAME}/macros/Gensosce
+share/${PKGNAME}/macros/Gensosce.c
 share/${PKGNAME}/macros/Lib
 share/${PKGNAME}/macros/Lib.c
 share/${PKGNAME}/macros/Make.lib
+share/${PKGNAME}/macros/Make.lib.amk
 share/${PKGNAME}/macros/Make.lib.mak
-share/${PKGNAME}/macros/Make.res
 share/${PKGNAME}/macros/Makefile
+share/${PKGNAME}/macros/Makefile.amk
 share/${PKGNAME}/macros/Makefile.mak
 share/${PKGNAME}/macros/Makesubdirs.bat
 share/${PKGNAME}/macros/Name
 share/${PKGNAME}/macros/Name.c
+share/${PKGNAME}/macros/Tomake
+share/${PKGNAME}/macros/Tomake.c
 share/${PKGNAME}/macros/algebre/Makefile
+share/${PKGNAME}/macros/algebre/Makefile.amk
 share/${PKGNAME}/macros/algebre/Makefile.mak
 share/${PKGNAME}/macros/algebre/aff2ab.bin
 share/${PKGNAME}/macros/algebre/aff2ab.sci
@@ -642,9 +812,12 @@ share/${PKGNAME}/macros/algebre/sqroot.sci
 share/${PKGNAME}/macros/algebre/trace.bin
 share/${PKGNAME}/macros/algebre/trace.sci
 share/${PKGNAME}/macros/arma/Makefile
+share/${PKGNAME}/macros/arma/Makefile.amk
 share/${PKGNAME}/macros/arma/Makefile.mak
 share/${PKGNAME}/macros/arma/acf.bin
 share/${PKGNAME}/macros/arma/acf.sci
+share/${PKGNAME}/macros/arma/arma2p.bin
+share/${PKGNAME}/macros/arma/arma2p.sci
 share/${PKGNAME}/macros/arma/armac.bin
 share/${PKGNAME}/macros/arma/armac.sci
 share/${PKGNAME}/macros/arma/armax.bin
@@ -669,6 +842,7 @@ share/${PKGNAME}/macros/arma/reglin.sci
 share/${PKGNAME}/macros/arma/sdiff.bin
 share/${PKGNAME}/macros/arma/sdiff.sci
 share/${PKGNAME}/macros/auto/Makefile
+share/${PKGNAME}/macros/auto/Makefile.amk
 share/${PKGNAME}/macros/auto/Makefile.mak
 share/${PKGNAME}/macros/auto/abcd.bin
 share/${PKGNAME}/macros/auto/abcd.sci
@@ -704,6 +878,8 @@ share/${PKGNAME}/macros/auto/ctr_gram.bin
 share/${PKGNAME}/macros/auto/ctr_gram.sci
 share/${PKGNAME}/macros/auto/dbphi.bin
 share/${PKGNAME}/macros/auto/dbphi.sci
+share/${PKGNAME}/macros/auto/ddp.bin
+share/${PKGNAME}/macros/auto/ddp.sci
 share/${PKGNAME}/macros/auto/des2tf.bin
 share/${PKGNAME}/macros/auto/des2tf.sci
 share/${PKGNAME}/macros/auto/dscr.bin
@@ -804,11 +980,14 @@ share/${PKGNAME}/macros/auto/time_id.bin
 share/${PKGNAME}/macros/auto/time_id.sci
 share/${PKGNAME}/macros/auto/trzeros.bin
 share/${PKGNAME}/macros/auto/trzeros.sci
+share/${PKGNAME}/macros/auto/ui_observer.bin
+share/${PKGNAME}/macros/auto/ui_observer.sci
 share/${PKGNAME}/macros/auto/unobs.bin
 share/${PKGNAME}/macros/auto/unobs.sci
 share/${PKGNAME}/macros/auto/zeropen.bin
 share/${PKGNAME}/macros/auto/zeropen.sci
 share/${PKGNAME}/macros/calpol/Makefile
+share/${PKGNAME}/macros/calpol/Makefile.amk
 share/${PKGNAME}/macros/calpol/Makefile.mak
 share/${PKGNAME}/macros/calpol/cmndred.bin
 share/${PKGNAME}/macros/calpol/cmndred.sci
@@ -839,6 +1018,8 @@ share/${PKGNAME}/macros/calpol/hrmt.bin
 share/${PKGNAME}/macros/calpol/hrmt.sci
 share/${PKGNAME}/macros/calpol/htrianr.bin
 share/${PKGNAME}/macros/calpol/htrianr.sci
+share/${PKGNAME}/macros/calpol/inv_coeff.bin
+share/${PKGNAME}/macros/calpol/inv_coeff.sci
 share/${PKGNAME}/macros/calpol/invr.bin
 share/${PKGNAME}/macros/calpol/invr.sci
 share/${PKGNAME}/macros/calpol/l2r.sci
@@ -875,6 +1056,7 @@ share/${PKGNAME}/macros/comm/ExecScilab.sci
 share/${PKGNAME}/macros/comm/ExeclScilab.bin
 share/${PKGNAME}/macros/comm/ExeclScilab.sci
 share/${PKGNAME}/macros/comm/Makefile
+share/${PKGNAME}/macros/comm/Makefile.amk
 share/${PKGNAME}/macros/comm/Makefile.mak
 share/${PKGNAME}/macros/comm/genlib
 share/${PKGNAME}/macros/comm/lib
@@ -883,6 +1065,7 @@ share/${PKGNAME}/macros/elem/GLoad.bin
 share/${PKGNAME}/macros/elem/GLoad.sci
 share/${PKGNAME}/macros/elem/Makefile
 share/${PKGNAME}/macros/elem/Makefile.mak
+share/${PKGNAME}/macros/elem/Makefile.amk
 share/${PKGNAME}/macros/elem/acos.bin
 share/${PKGNAME}/macros/elem/acos.sci
 share/${PKGNAME}/macros/elem/acosh.bin
@@ -907,7 +1090,6 @@ share/${PKGNAME}/macros/elem/atanhm.bin
 share/${PKGNAME}/macros/elem/atanhm.sci
 share/${PKGNAME}/macros/elem/atanm.bin
 share/${PKGNAME}/macros/elem/atanm.sci
-share/${PKGNAME}/macros/elem/calerf.sci
 share/${PKGNAME}/macros/elem/cosh.bin
 share/${PKGNAME}/macros/elem/cosh.sci
 share/${PKGNAME}/macros/elem/coshm.bin
@@ -935,6 +1117,8 @@ share/${PKGNAME}/macros/elem/integrate.bin
 share/${PKGNAME}/macros/elem/integrate.sci
 share/${PKGNAME}/macros/elem/interpln.bin
 share/${PKGNAME}/macros/elem/interpln.sci
+share/${PKGNAME}/macros/elem/intersect.bin
+share/${PKGNAME}/macros/elem/intersect.sci
 share/${PKGNAME}/macros/elem/intl.bin
 share/${PKGNAME}/macros/elem/intl.sci
 share/${PKGNAME}/macros/elem/intsplin.bin
@@ -945,6 +1129,8 @@ share/${PKGNAME}/macros/elem/isinf.bin
 share/${PKGNAME}/macros/elem/isinf.sci
 share/${PKGNAME}/macros/elem/isnan.bin
 share/${PKGNAME}/macros/elem/isnan.sci
+share/${PKGNAME}/macros/elem/lex_sort.bin
+share/${PKGNAME}/macros/elem/lex_sort.sci
 share/${PKGNAME}/macros/elem/lib
 share/${PKGNAME}/macros/elem/log10.bin
 share/${PKGNAME}/macros/elem/log10.sci
@@ -963,6 +1149,8 @@ share/${PKGNAME}/macros/elem/or.bin
 share/${PKGNAME}/macros/elem/or.sci
 share/${PKGNAME}/macros/elem/pertrans.bin
 share/${PKGNAME}/macros/elem/pertrans.sci
+share/${PKGNAME}/macros/elem/setdiff.bin
+share/${PKGNAME}/macros/elem/setdiff.sci
 share/${PKGNAME}/macros/elem/signm.bin
 share/${PKGNAME}/macros/elem/signm.sci
 share/${PKGNAME}/macros/elem/sinh.bin
@@ -983,6 +1171,8 @@ share/${PKGNAME}/macros/elem/spzeros.bin
 share/${PKGNAME}/macros/elem/spzeros.sci
 share/${PKGNAME}/macros/elem/sqrtm.bin
 share/${PKGNAME}/macros/elem/sqrtm.sci
+share/${PKGNAME}/macros/elem/squarewave.bin
+share/${PKGNAME}/macros/elem/squarewave.sci
 share/${PKGNAME}/macros/elem/st_deviation.bin
 share/${PKGNAME}/macros/elem/st_deviation.sci
 share/${PKGNAME}/macros/elem/tan.bin
@@ -995,6 +1185,10 @@ share/${PKGNAME}/macros/elem/tanm.bin
 share/${PKGNAME}/macros/elem/tanm.sci
 share/${PKGNAME}/macros/elem/toeplitz.bin
 share/${PKGNAME}/macros/elem/toeplitz.sci
+share/${PKGNAME}/macros/elem/union.bin
+share/${PKGNAME}/macros/elem/union.sci
+share/${PKGNAME}/macros/elem/unique.bin
+share/${PKGNAME}/macros/elem/unique.sci
 share/${PKGNAME}/macros/fraclab/AtanH.bin
 share/${PKGNAME}/macros/fraclab/AtanH.sci
 share/${PKGNAME}/macros/fraclab/GeneWei.bin
@@ -1014,6 +1208,7 @@ share/${PKGNAME}/macros/fraclab/MakeCQF.sci
 share/${PKGNAME}/macros/fraclab/MakeQMF.bin
 share/${PKGNAME}/macros/fraclab/MakeQMF.sci
 share/${PKGNAME}/macros/fraclab/Makefile
+share/${PKGNAME}/macros/fraclab/Makefile.amk
 share/${PKGNAME}/macros/fraclab/Makefile.mak
 share/${PKGNAME}/macros/fraclab/WT2DNbScales.bin
 share/${PKGNAME}/macros/fraclab/WT2DNbScales.sci
@@ -1089,17 +1284,13 @@ share/${PKGNAME}/macros/fraclab/mexhat.bin
 share/${PKGNAME}/macros/fraclab/mexhat.sci
 share/${PKGNAME}/macros/fraclab/morlet.bin
 share/${PKGNAME}/macros/fraclab/morlet.sci
-share/${PKGNAME}/macros/fraclab/mtlb_diff.bin
 share/${PKGNAME}/macros/fraclab/mtlb_diff.sci
 share/${PKGNAME}/macros/fraclab/mtlb_fftshift.bin
 share/${PKGNAME}/macros/fraclab/mtlb_fftshift.sci
-share/${PKGNAME}/macros/fraclab/mtlb_fliplr.bin
 share/${PKGNAME}/macros/fraclab/mtlb_fliplr.sci
-share/${PKGNAME}/macros/fraclab/mtlb_flipud.bin
 share/${PKGNAME}/macros/fraclab/mtlb_flipud.sci
 share/${PKGNAME}/macros/fraclab/mtlb_hilbert.bin
 share/${PKGNAME}/macros/fraclab/mtlb_hilbert.sci
-share/${PKGNAME}/macros/fraclab/mtlb_isreal.bin
 share/${PKGNAME}/macros/fraclab/mtlb_isreal.sci
 share/${PKGNAME}/macros/fraclab/mtlb_log2.bin
 share/${PKGNAME}/macros/fraclab/mtlb_log2.sci
@@ -1118,6 +1309,84 @@ share/${PKGNAME}/macros/fraclab/sortup.bin
 share/${PKGNAME}/macros/fraclab/sortup.sci
 share/${PKGNAME}/macros/fraclab/viewmat.bin
 share/${PKGNAME}/macros/fraclab/viewmat.sci
+share/${PKGNAME}/macros/int/%i_1_s.bin
+share/${PKGNAME}/macros/int/%i_1_s.sci
+share/${PKGNAME}/macros/int/%i_2_s.bin
+share/${PKGNAME}/macros/int/%i_2_s.sci
+share/${PKGNAME}/macros/int/%i_3_s.bin
+share/${PKGNAME}/macros/int/%i_3_s.sci
+share/${PKGNAME}/macros/int/%i_4_s.bin
+share/${PKGNAME}/macros/int/%i_4_s.sci
+share/${PKGNAME}/macros/int/%i_Matplot.bin
+share/${PKGNAME}/macros/int/%i_Matplot.sci
+share/${PKGNAME}/macros/int/%i_a_s.bin
+share/${PKGNAME}/macros/int/%i_a_s.sci
+share/${PKGNAME}/macros/int/%i_champ.bin
+share/${PKGNAME}/macros/int/%i_champ.sci
+share/${PKGNAME}/macros/int/%i_champ1.bin
+share/${PKGNAME}/macros/int/%i_champ1.sci
+share/${PKGNAME}/macros/int/%i_contour.bin
+share/${PKGNAME}/macros/int/%i_contour.sci
+share/${PKGNAME}/macros/int/%i_contour2d.bin
+share/${PKGNAME}/macros/int/%i_contour2d.sci
+share/${PKGNAME}/macros/int/%i_fft.bin
+share/${PKGNAME}/macros/int/%i_fft.sci
+share/${PKGNAME}/macros/int/%i_j_i.bin
+share/${PKGNAME}/macros/int/%i_j_i.sci
+share/${PKGNAME}/macros/int/%i_j_s.bin
+share/${PKGNAME}/macros/int/%i_j_s.sci
+share/${PKGNAME}/macros/int/%i_m_s.bin
+share/${PKGNAME}/macros/int/%i_m_s.sci
+share/${PKGNAME}/macros/int/%i_n_s.bin
+share/${PKGNAME}/macros/int/%i_n_s.sci
+share/${PKGNAME}/macros/int/%i_o_s.bin
+share/${PKGNAME}/macros/int/%i_o_s.sci
+share/${PKGNAME}/macros/int/%i_p_i.bin
+share/${PKGNAME}/macros/int/%i_p_i.sci
+share/${PKGNAME}/macros/int/%i_p_s.bin
+share/${PKGNAME}/macros/int/%i_p_s.sci
+share/${PKGNAME}/macros/int/%i_plot2d.bin
+share/${PKGNAME}/macros/int/%i_plot2d.sci
+share/${PKGNAME}/macros/int/%i_plot2d1.bin
+share/${PKGNAME}/macros/int/%i_plot2d1.sci
+share/${PKGNAME}/macros/int/%i_plot2d2.bin
+share/${PKGNAME}/macros/int/%i_plot2d2.sci
+share/${PKGNAME}/macros/int/%i_s_s.bin
+share/${PKGNAME}/macros/int/%i_s_s.sci
+share/${PKGNAME}/macros/int/%i_sign.bin
+share/${PKGNAME}/macros/int/%i_sign.sci
+share/${PKGNAME}/macros/int/%i_string.bin
+share/${PKGNAME}/macros/int/%i_string.sci
+share/${PKGNAME}/macros/int/%s_1_i.bin
+share/${PKGNAME}/macros/int/%s_1_i.sci
+share/${PKGNAME}/macros/int/%s_2_i.bin
+share/${PKGNAME}/macros/int/%s_2_i.sci
+share/${PKGNAME}/macros/int/%s_3_i.bin
+share/${PKGNAME}/macros/int/%s_3_i.sci
+share/${PKGNAME}/macros/int/%s_4_i.bin
+share/${PKGNAME}/macros/int/%s_4_i.sci
+share/${PKGNAME}/macros/int/%s_a_i.bin
+share/${PKGNAME}/macros/int/%s_a_i.sci
+share/${PKGNAME}/macros/int/%s_i_i.bin
+share/${PKGNAME}/macros/int/%s_i_i.sci
+share/${PKGNAME}/macros/int/%s_j_i.bin
+share/${PKGNAME}/macros/int/%s_j_i.sci
+share/${PKGNAME}/macros/int/%s_m_i.bin
+share/${PKGNAME}/macros/int/%s_m_i.sci
+share/${PKGNAME}/macros/int/%s_n_i.bin
+share/${PKGNAME}/macros/int/%s_n_i.sci
+share/${PKGNAME}/macros/int/%s_o_i.bin
+share/${PKGNAME}/macros/int/%s_o_i.sci
+share/${PKGNAME}/macros/int/%s_p_i.bin
+share/${PKGNAME}/macros/int/%s_p_i.sci
+share/${PKGNAME}/macros/int/%s_s_i.bin
+share/${PKGNAME}/macros/int/%s_s_i.sci
+share/${PKGNAME}/macros/int/Makefile
+share/${PKGNAME}/macros/int/Makefile.amk
+share/${PKGNAME}/macros/int/Makefile.mak
+share/${PKGNAME}/macros/int/genlib
+share/${PKGNAME}/macros/int/lib
+share/${PKGNAME}/macros/int/names
 share/${PKGNAME}/macros/m2sci/%02sci.bin
 share/${PKGNAME}/macros/m2sci/%02sci.sci
 share/${PKGNAME}/macros/m2sci/%52sci.bin
@@ -1159,10 +1428,13 @@ share/${PKGNAME}/macros/m2sci/%t2sci.sci
 share/${PKGNAME}/macros/m2sci/%x2sci.bin
 share/${PKGNAME}/macros/m2sci/%x2sci.sci
 share/${PKGNAME}/macros/m2sci/Makefile
+share/${PKGNAME}/macros/m2sci/Makefile.amk
 share/${PKGNAME}/macros/m2sci/Makefile.mak
 share/${PKGNAME}/macros/m2sci/README
 share/${PKGNAME}/macros/m2sci/askfortype.bin
 share/${PKGNAME}/macros/m2sci/askfortype.sci
+share/${PKGNAME}/macros/m2sci/checkdims.bin
+share/${PKGNAME}/macros/m2sci/checkdims.sci
 share/${PKGNAME}/macros/m2sci/cla2sci.bin
 share/${PKGNAME}/macros/m2sci/cla2sci.sci
 share/${PKGNAME}/macros/m2sci/cod2sci.bin
@@ -1174,6 +1446,8 @@ share/${PKGNAME}/macros/m2sci/func2sci.sci
 share/${PKGNAME}/macros/m2sci/genlib
 share/${PKGNAME}/macros/m2sci/get2sci.bin
 share/${PKGNAME}/macros/m2sci/get2sci.sci
+share/${PKGNAME}/macros/m2sci/get_unknown.bin
+share/${PKGNAME}/macros/m2sci/get_unknown.sci
 share/${PKGNAME}/macros/m2sci/getlocal.bin
 share/${PKGNAME}/macros/m2sci/getlocal.sci
 share/${PKGNAME}/macros/m2sci/gettempvar.bin
@@ -1203,6 +1477,8 @@ share/${PKGNAME}/macros/m2sci/linetype.bin
 share/${PKGNAME}/macros/m2sci/linetype.sci
 share/${PKGNAME}/macros/m2sci/m2sci.bin
 share/${PKGNAME}/macros/m2sci/m2sci.sci
+share/${PKGNAME}/macros/m2sci/m2sci_syntax.bin
+share/${PKGNAME}/macros/m2sci/m2sci_syntax.sci
 share/${PKGNAME}/macros/m2sci/mfile_path.bin
 share/${PKGNAME}/macros/m2sci/mfile_path.sci
 share/${PKGNAME}/macros/m2sci/mmodlst.bin
@@ -1266,8 +1542,12 @@ share/${PKGNAME}/macros/m2sci/sci_clear.bin
 share/${PKGNAME}/macros/m2sci/sci_clear.sci
 share/${PKGNAME}/macros/m2sci/sci_clf.bin
 share/${PKGNAME}/macros/m2sci/sci_clf.sci
+share/${PKGNAME}/macros/m2sci/sci_clg.bin
+share/${PKGNAME}/macros/m2sci/sci_clg.sci
 share/${PKGNAME}/macros/m2sci/sci_clock.bin
 share/${PKGNAME}/macros/m2sci/sci_clock.sci
+share/${PKGNAME}/macros/m2sci/sci_close.bin
+share/${PKGNAME}/macros/m2sci/sci_close.sci
 share/${PKGNAME}/macros/m2sci/sci_colormap.bin
 share/${PKGNAME}/macros/m2sci/sci_colormap.sci
 share/${PKGNAME}/macros/m2sci/sci_comment.bin
@@ -1292,6 +1572,8 @@ share/${PKGNAME}/macros/m2sci/sci_cumprod.bin
 share/${PKGNAME}/macros/m2sci/sci_cumprod.sci
 share/${PKGNAME}/macros/m2sci/sci_cumsum.bin
 share/${PKGNAME}/macros/m2sci/sci_cumsum.sci
+share/${PKGNAME}/macros/m2sci/sci_date.bin
+share/${PKGNAME}/macros/m2sci/sci_date.sci
 share/${PKGNAME}/macros/m2sci/sci_delete.bin
 share/${PKGNAME}/macros/m2sci/sci_delete.sci
 share/${PKGNAME}/macros/m2sci/sci_det.bin
@@ -1300,10 +1582,14 @@ share/${PKGNAME}/macros/m2sci/sci_diag.bin
 share/${PKGNAME}/macros/m2sci/sci_diag.sci
 share/${PKGNAME}/macros/m2sci/sci_diary.bin
 share/${PKGNAME}/macros/m2sci/sci_diary.sci
+share/${PKGNAME}/macros/m2sci/sci_diff.bin
+share/${PKGNAME}/macros/m2sci/sci_diff.sci
 share/${PKGNAME}/macros/m2sci/sci_dir.bin
 share/${PKGNAME}/macros/m2sci/sci_dir.sci
 share/${PKGNAME}/macros/m2sci/sci_disp.bin
 share/${PKGNAME}/macros/m2sci/sci_disp.sci
+share/${PKGNAME}/macros/m2sci/sci_drawnow.bin
+share/${PKGNAME}/macros/m2sci/sci_drawnow.sci
 share/${PKGNAME}/macros/m2sci/sci_echo.bin
 share/${PKGNAME}/macros/m2sci/sci_echo.sci
 share/${PKGNAME}/macros/m2sci/sci_eig.bin
@@ -1344,6 +1630,8 @@ share/${PKGNAME}/macros/m2sci/sci_filter.bin
 share/${PKGNAME}/macros/m2sci/sci_filter.sci
 share/${PKGNAME}/macros/m2sci/sci_find.bin
 share/${PKGNAME}/macros/m2sci/sci_find.sci
+share/${PKGNAME}/macros/m2sci/sci_findstr.bin
+share/${PKGNAME}/macros/m2sci/sci_findstr.sci
 share/${PKGNAME}/macros/m2sci/sci_finite.bin
 share/${PKGNAME}/macros/m2sci/sci_finite.sci
 share/${PKGNAME}/macros/m2sci/sci_fix.bin
@@ -1360,16 +1648,21 @@ share/${PKGNAME}/macros/m2sci/sci_fopen.bin
 share/${PKGNAME}/macros/m2sci/sci_fopen.sci
 share/${PKGNAME}/macros/m2sci/sci_format.bin
 share/${PKGNAME}/macros/m2sci/sci_format.sci
+share/${PKGNAME}/macros/m2sci/sci_fprintf.bin
+share/${PKGNAME}/macros/m2sci/sci_fprintf.sci
 share/${PKGNAME}/macros/m2sci/sci_fread.bin
 share/${PKGNAME}/macros/m2sci/sci_fread.sci
 share/${PKGNAME}/macros/m2sci/sci_frewind.bin
 share/${PKGNAME}/macros/m2sci/sci_frewind.sci
+share/${PKGNAME}/macros/m2sci/sci_fscanf.bin
+share/${PKGNAME}/macros/m2sci/sci_fscanf.sci
 share/${PKGNAME}/macros/m2sci/sci_fseek.bin
 share/${PKGNAME}/macros/m2sci/sci_fseek.sci
 share/${PKGNAME}/macros/m2sci/sci_ftell.bin
 share/${PKGNAME}/macros/m2sci/sci_ftell.sci
 share/${PKGNAME}/macros/m2sci/sci_full.bin
 share/${PKGNAME}/macros/m2sci/sci_full.sci
+share/${PKGNAME}/macros/m2sci/sci_fwrite.bin
 share/${PKGNAME}/macros/m2sci/sci_fwrite.sci
 share/${PKGNAME}/macros/m2sci/sci_fzero.bin
 share/${PKGNAME}/macros/m2sci/sci_fzero.sci
@@ -1377,10 +1670,14 @@ share/${PKGNAME}/macros/m2sci/sci_gamma.bin
 share/${PKGNAME}/macros/m2sci/sci_gamma.sci
 share/${PKGNAME}/macros/m2sci/sci_gammaln.bin
 share/${PKGNAME}/macros/m2sci/sci_gammaln.sci
+share/${PKGNAME}/macros/m2sci/sci_gca.bin
+share/${PKGNAME}/macros/m2sci/sci_gca.sci
 share/${PKGNAME}/macros/m2sci/sci_gcf.bin
 share/${PKGNAME}/macros/m2sci/sci_gcf.sci
 share/${PKGNAME}/macros/m2sci/sci_gener.bin
 share/${PKGNAME}/macros/m2sci/sci_gener.sci
+share/${PKGNAME}/macros/m2sci/sci_get.bin
+share/${PKGNAME}/macros/m2sci/sci_get.sci
 share/${PKGNAME}/macros/m2sci/sci_getenv.bin
 share/${PKGNAME}/macros/m2sci/sci_getenv.sci
 share/${PKGNAME}/macros/m2sci/sci_ginput.bin
@@ -1397,6 +1694,8 @@ share/${PKGNAME}/macros/m2sci/sci_hess.bin
 share/${PKGNAME}/macros/m2sci/sci_hess.sci
 share/${PKGNAME}/macros/m2sci/sci_hold.bin
 share/${PKGNAME}/macros/m2sci/sci_hold.sci
+share/${PKGNAME}/macros/m2sci/sci_home.bin
+share/${PKGNAME}/macros/m2sci/sci_home.sci
 share/${PKGNAME}/macros/m2sci/sci_hot.bin
 share/${PKGNAME}/macros/m2sci/sci_hot.sci
 share/${PKGNAME}/macros/m2sci/sci_ifft.bin
@@ -1411,14 +1710,22 @@ share/${PKGNAME}/macros/m2sci/sci_inv.bin
 share/${PKGNAME}/macros/m2sci/sci_inv.sci
 share/${PKGNAME}/macros/m2sci/sci_isempty.bin
 share/${PKGNAME}/macros/m2sci/sci_isempty.sci
+share/${PKGNAME}/macros/m2sci/sci_isglobal.bin
+share/${PKGNAME}/macros/m2sci/sci_isglobal.sci
 share/${PKGNAME}/macros/m2sci/sci_ishold.bin
 share/${PKGNAME}/macros/m2sci/sci_ishold.sci
 share/${PKGNAME}/macros/m2sci/sci_isinf.bin
 share/${PKGNAME}/macros/m2sci/sci_isinf.sci
+share/${PKGNAME}/macros/m2sci/sci_isletter.bin
+share/${PKGNAME}/macros/m2sci/sci_isletter.sci
+share/${PKGNAME}/macros/m2sci/sci_islogical.bin
+share/${PKGNAME}/macros/m2sci/sci_islogical.sci
 share/${PKGNAME}/macros/m2sci/sci_isnan.bin
 share/${PKGNAME}/macros/m2sci/sci_isnan.sci
 share/${PKGNAME}/macros/m2sci/sci_isreal.bin
 share/${PKGNAME}/macros/m2sci/sci_isreal.sci
+share/${PKGNAME}/macros/m2sci/sci_isspace.bin
+share/${PKGNAME}/macros/m2sci/sci_isspace.sci
 share/${PKGNAME}/macros/m2sci/sci_isstr.bin
 share/${PKGNAME}/macros/m2sci/sci_isstr.sci
 share/${PKGNAME}/macros/m2sci/sci_keyboard.bin
@@ -1439,6 +1746,8 @@ share/${PKGNAME}/macros/m2sci/sci_log10.bin
 share/${PKGNAME}/macros/m2sci/sci_log10.sci
 share/${PKGNAME}/macros/m2sci/sci_log2.bin
 share/${PKGNAME}/macros/m2sci/sci_log2.sci
+share/${PKGNAME}/macros/m2sci/sci_logical.bin
+share/${PKGNAME}/macros/m2sci/sci_logical.sci
 share/${PKGNAME}/macros/m2sci/sci_loglog.bin
 share/${PKGNAME}/macros/m2sci/sci_loglog.sci
 share/${PKGNAME}/macros/m2sci/sci_logm.bin
@@ -1463,7 +1772,10 @@ share/${PKGNAME}/macros/m2sci/sci_median.bin
 share/${PKGNAME}/macros/m2sci/sci_median.sci
 share/${PKGNAME}/macros/m2sci/sci_menu.bin
 share/${PKGNAME}/macros/m2sci/sci_menu.sci
+share/${PKGNAME}/macros/m2sci/sci_mesh.bin
 share/${PKGNAME}/macros/m2sci/sci_mesh.sci
+share/${PKGNAME}/macros/m2sci/sci_meshdom.bin
+share/${PKGNAME}/macros/m2sci/sci_meshdom.sci
 share/${PKGNAME}/macros/m2sci/sci_meshgrid.bin
 share/${PKGNAME}/macros/m2sci/sci_meshgrid.sci
 share/${PKGNAME}/macros/m2sci/sci_min.bin
@@ -1482,6 +1794,7 @@ share/${PKGNAME}/macros/m2sci/sci_num2str.bin
 share/${PKGNAME}/macros/m2sci/sci_num2str.sci
 share/${PKGNAME}/macros/m2sci/sci_ones.bin
 share/${PKGNAME}/macros/m2sci/sci_ones.sci
+share/${PKGNAME}/macros/m2sci/sci_pack.bin
 share/${PKGNAME}/macros/m2sci/sci_pack.sci
 share/${PKGNAME}/macros/m2sci/sci_pause.bin
 share/${PKGNAME}/macros/m2sci/sci_pause.sci
@@ -1531,6 +1844,12 @@ share/${PKGNAME}/macros/m2sci/sci_save.bin
 share/${PKGNAME}/macros/m2sci/sci_save.sci
 share/${PKGNAME}/macros/m2sci/sci_schur.bin
 share/${PKGNAME}/macros/m2sci/sci_schur.sci
+share/${PKGNAME}/macros/m2sci/sci_semilogx.bin
+share/${PKGNAME}/macros/m2sci/sci_semilogx.sci
+share/${PKGNAME}/macros/m2sci/sci_semilogy.bin
+share/${PKGNAME}/macros/m2sci/sci_semilogy.sci
+share/${PKGNAME}/macros/m2sci/sci_set.bin
+share/${PKGNAME}/macros/m2sci/sci_set.sci
 share/${PKGNAME}/macros/m2sci/sci_setstr.bin
 share/${PKGNAME}/macros/m2sci/sci_setstr.sci
 share/${PKGNAME}/macros/m2sci/sci_sign.bin
@@ -1547,16 +1866,24 @@ share/${PKGNAME}/macros/m2sci/sci_sparse.bin
 share/${PKGNAME}/macros/m2sci/sci_sparse.sci
 share/${PKGNAME}/macros/m2sci/sci_spline.bin
 share/${PKGNAME}/macros/m2sci/sci_spline.sci
+share/${PKGNAME}/macros/m2sci/sci_sprintf.bin
+share/${PKGNAME}/macros/m2sci/sci_sprintf.sci
 share/${PKGNAME}/macros/m2sci/sci_sqrt.bin
 share/${PKGNAME}/macros/m2sci/sci_sqrt.sci
 share/${PKGNAME}/macros/m2sci/sci_sqrtm.bin
 share/${PKGNAME}/macros/m2sci/sci_sqrtm.sci
 share/${PKGNAME}/macros/m2sci/sci_ss2tf.bin
 share/${PKGNAME}/macros/m2sci/sci_ss2tf.sci
+share/${PKGNAME}/macros/m2sci/sci_sscanf.bin
+share/${PKGNAME}/macros/m2sci/sci_sscanf.sci
 share/${PKGNAME}/macros/m2sci/sci_stairs.bin
 share/${PKGNAME}/macros/m2sci/sci_stairs.sci
+share/${PKGNAME}/macros/m2sci/sci_std.bin
+share/${PKGNAME}/macros/m2sci/sci_std.sci
 share/${PKGNAME}/macros/m2sci/sci_stem.bin
 share/${PKGNAME}/macros/m2sci/sci_stem.sci
+share/${PKGNAME}/macros/m2sci/sci_str2num.bin
+share/${PKGNAME}/macros/m2sci/sci_str2num.sci
 share/${PKGNAME}/macros/m2sci/sci_strcmp.bin
 share/${PKGNAME}/macros/m2sci/sci_strcmp.sci
 share/${PKGNAME}/macros/m2sci/sci_struct.bin
@@ -1585,12 +1912,17 @@ share/${PKGNAME}/macros/m2sci/sci_tril.bin
 share/${PKGNAME}/macros/m2sci/sci_tril.sci
 share/${PKGNAME}/macros/m2sci/sci_triu.bin
 share/${PKGNAME}/macros/m2sci/sci_triu.sci
+share/${PKGNAME}/macros/m2sci/sci_type.bin
+share/${PKGNAME}/macros/m2sci/sci_type.sci
+share/${PKGNAME}/macros/m2sci/sci_uicontrol.bin
+share/${PKGNAME}/macros/m2sci/sci_uicontrol.sci
 share/${PKGNAME}/macros/m2sci/sci_unix.bin
 share/${PKGNAME}/macros/m2sci/sci_unix.sci
 share/${PKGNAME}/macros/m2sci/sci_upper.bin
 share/${PKGNAME}/macros/m2sci/sci_upper.sci
 share/${PKGNAME}/macros/m2sci/sci_who.bin
 share/${PKGNAME}/macros/m2sci/sci_who.sci
+share/${PKGNAME}/macros/m2sci/sci_whos.bin
 share/${PKGNAME}/macros/m2sci/sci_whos.sci
 share/${PKGNAME}/macros/m2sci/sci_xlabel.bin
 share/${PKGNAME}/macros/m2sci/sci_xlabel.sci
@@ -1600,11 +1932,14 @@ share/${PKGNAME}/macros/m2sci/sci_zeros.bin
 share/${PKGNAME}/macros/m2sci/sci_zeros.sci
 share/${PKGNAME}/macros/m2sci/sciparam.bin
 share/${PKGNAME}/macros/m2sci/sciparam.sci
+share/${PKGNAME}/macros/m2sci/set_infos.bin
+share/${PKGNAME}/macros/m2sci/set_infos.sci
 share/${PKGNAME}/macros/m2sci/updatevtps.bin
 share/${PKGNAME}/macros/m2sci/updatevtps.sci
 share/${PKGNAME}/macros/m2sci/warning.bin
 share/${PKGNAME}/macros/m2sci/warning.sci
 share/${PKGNAME}/macros/metanet/Makefile
+share/${PKGNAME}/macros/metanet/Makefile.amk
 share/${PKGNAME}/macros/metanet/Makefile.mak
 share/${PKGNAME}/macros/metanet/add_edge.bin
 share/${PKGNAME}/macros/metanet/add_edge.sci
@@ -1788,24 +2123,34 @@ share/${PKGNAME}/macros/mtlb/%s_s_b.sci
 share/${PKGNAME}/macros/mtlb/%s_x_b.bin
 share/${PKGNAME}/macros/mtlb/%s_x_b.sci
 share/${PKGNAME}/macros/mtlb/Makefile
+share/${PKGNAME}/macros/mtlb/Makefile.amk
 share/${PKGNAME}/macros/mtlb/Makefile.mak
 share/${PKGNAME}/macros/mtlb/README
 share/${PKGNAME}/macros/mtlb/fseek_origin.bin
 share/${PKGNAME}/macros/mtlb/fseek_origin.sci
 share/${PKGNAME}/macros/mtlb/genlib
 share/${PKGNAME}/macros/mtlb/lib
+share/${PKGNAME}/macros/mtlb/mtlb.bin
+share/${PKGNAME}/macros/mtlb/mtlb.sci
 share/${PKGNAME}/macros/mtlb/mtlb_all.bin
 share/${PKGNAME}/macros/mtlb/mtlb_all.sci
 share/${PKGNAME}/macros/mtlb/mtlb_any.bin
 share/${PKGNAME}/macros/mtlb/mtlb_any.sci
+share/${PKGNAME}/macros/mtlb/mtlb_axes.sci
 share/${PKGNAME}/macros/mtlb/mtlb_cell.bin
 share/${PKGNAME}/macros/mtlb/mtlb_cell.sci
 share/${PKGNAME}/macros/mtlb/mtlb_choices.bin
 share/${PKGNAME}/macros/mtlb/mtlb_choices.sci
+share/${PKGNAME}/macros/mtlb/mtlb_clf.bin
+share/${PKGNAME}/macros/mtlb/mtlb_clf.sci
 share/${PKGNAME}/macros/mtlb/mtlb_cumsum.bin
 share/${PKGNAME}/macros/mtlb/mtlb_cumsum.sci
+share/${PKGNAME}/macros/mtlb/mtlb_diff.bin
+share/${PKGNAME}/macros/mtlb/mtlb_diff.sci
 share/${PKGNAME}/macros/mtlb/mtlb_e.bin
 share/${PKGNAME}/macros/mtlb/mtlb_e.sci
+share/${PKGNAME}/macros/mtlb/mtlb_eval.bin
+share/${PKGNAME}/macros/mtlb/mtlb_eval.sci
 share/${PKGNAME}/macros/mtlb/mtlb_exist.bin
 share/${PKGNAME}/macros/mtlb/mtlb_exist.sci
 share/${PKGNAME}/macros/mtlb/mtlb_eye.bin
@@ -1816,8 +2161,18 @@ share/${PKGNAME}/macros/mtlb/mtlb_filter.bin
 share/${PKGNAME}/macros/mtlb/mtlb_filter.sci
 share/${PKGNAME}/macros/mtlb/mtlb_find.bin
 share/${PKGNAME}/macros/mtlb/mtlb_find.sci
+share/${PKGNAME}/macros/mtlb/mtlb_findstr.bin
+share/${PKGNAME}/macros/mtlb/mtlb_findstr.sci
+share/${PKGNAME}/macros/mtlb/mtlb_fliplr.bin
+share/${PKGNAME}/macros/mtlb/mtlb_fliplr.sci
+share/${PKGNAME}/macros/mtlb/mtlb_flipud.bin
+share/${PKGNAME}/macros/mtlb/mtlb_flipud.sci
+share/${PKGNAME}/macros/mtlb/mtlb_fprintf.bin
+share/${PKGNAME}/macros/mtlb/mtlb_fprintf.sci
 share/${PKGNAME}/macros/mtlb/mtlb_fread.bin
 share/${PKGNAME}/macros/mtlb/mtlb_fread.sci
+share/${PKGNAME}/macros/mtlb/mtlb_fscanf.bin
+share/${PKGNAME}/macros/mtlb/mtlb_fscanf.sci
 share/${PKGNAME}/macros/mtlb/mtlb_fwrite.bin
 share/${PKGNAME}/macros/mtlb/mtlb_fwrite.sci
 share/${PKGNAME}/macros/mtlb/mtlb_get.bin
@@ -1828,8 +2183,12 @@ share/${PKGNAME}/macros/mtlb/mtlb_i.bin
 share/${PKGNAME}/macros/mtlb/mtlb_i.sci
 share/${PKGNAME}/macros/mtlb/mtlb_ifft.bin
 share/${PKGNAME}/macros/mtlb/mtlb_ifft.sci
+share/${PKGNAME}/macros/mtlb/mtlb_is.bin
+share/${PKGNAME}/macros/mtlb/mtlb_is.sci
 share/${PKGNAME}/macros/mtlb/mtlb_ishold.bin
 share/${PKGNAME}/macros/mtlb/mtlb_ishold.sci
+share/${PKGNAME}/macros/mtlb/mtlb_isreal.bin
+share/${PKGNAME}/macros/mtlb/mtlb_isreal.sci
 share/${PKGNAME}/macros/mtlb/mtlb_length.bin
 share/${PKGNAME}/macros/mtlb/mtlb_length.sci
 share/${PKGNAME}/macros/mtlb/mtlb_load.bin
@@ -1842,6 +2201,10 @@ share/${PKGNAME}/macros/mtlb/mtlb_mean.bin
 share/${PKGNAME}/macros/mtlb/mtlb_mean.sci
 share/${PKGNAME}/macros/mtlb/mtlb_median.bin
 share/${PKGNAME}/macros/mtlb/mtlb_median.sci
+share/${PKGNAME}/macros/mtlb/mtlb_mesh.bin
+share/${PKGNAME}/macros/mtlb/mtlb_mesh.sci
+share/${PKGNAME}/macros/mtlb/mtlb_meshdom.bin
+share/${PKGNAME}/macros/mtlb/mtlb_meshdom.sci
 share/${PKGNAME}/macros/mtlb/mtlb_min.bin
 share/${PKGNAME}/macros/mtlb/mtlb_min.sci
 share/${PKGNAME}/macros/mtlb/mtlb_ones.bin
@@ -1856,6 +2219,16 @@ share/${PKGNAME}/macros/mtlb/mtlb_rand.bin
 share/${PKGNAME}/macros/mtlb/mtlb_rand.sci
 share/${PKGNAME}/macros/mtlb/mtlb_save.bin
 share/${PKGNAME}/macros/mtlb/mtlb_save.sci
+share/${PKGNAME}/macros/mtlb/mtlb_semilogx.bin
+share/${PKGNAME}/macros/mtlb/mtlb_semilogx.sci
+share/${PKGNAME}/macros/mtlb/mtlb_semilogy.bin
+share/${PKGNAME}/macros/mtlb/mtlb_semilogy.sci
+share/${PKGNAME}/macros/mtlb/mtlb_sprintf.bin
+share/${PKGNAME}/macros/mtlb/mtlb_sprintf.sci
+share/${PKGNAME}/macros/mtlb/mtlb_sscanf.bin
+share/${PKGNAME}/macros/mtlb/mtlb_sscanf.sci
+share/${PKGNAME}/macros/mtlb/mtlb_std.bin
+share/${PKGNAME}/macros/mtlb/mtlb_std.sci
 share/${PKGNAME}/macros/mtlb/mtlb_subplot.bin
 share/${PKGNAME}/macros/mtlb/mtlb_subplot.sci
 share/${PKGNAME}/macros/mtlb/mtlb_sum.bin
@@ -1864,14 +2237,19 @@ share/${PKGNAME}/macros/mtlb/mtlb_zeros.bin
 share/${PKGNAME}/macros/mtlb/mtlb_zeros.sci
 share/${PKGNAME}/macros/mtlb/names
 share/${PKGNAME}/macros/optim/Makefile
+share/${PKGNAME}/macros/optim/Makefile.amk
 share/${PKGNAME}/macros/optim/Makefile.mak
 share/${PKGNAME}/macros/optim/aplat.bin
 share/${PKGNAME}/macros/optim/aplat.sci
+share/${PKGNAME}/macros/optim/datafit.bin
+share/${PKGNAME}/macros/optim/datafit.sci
 share/${PKGNAME}/macros/optim/fit_dat.bin
 share/${PKGNAME}/macros/optim/fit_dat.sci
 share/${PKGNAME}/macros/optim/genlib
 share/${PKGNAME}/macros/optim/karmarkar.bin
 share/${PKGNAME}/macros/optim/karmarkar.sci
+share/${PKGNAME}/macros/optim/leastsq.bin
+share/${PKGNAME}/macros/optim/leastsq.sci
 share/${PKGNAME}/macros/optim/lib
 share/${PKGNAME}/macros/optim/linpro.bin
 share/${PKGNAME}/macros/optim/linpro.sci
@@ -1882,6 +2260,8 @@ share/${PKGNAME}/macros/optim/lmisolver.sci
 share/${PKGNAME}/macros/optim/lmitool.bin
 share/${PKGNAME}/macros/optim/lmitool.sci
 share/${PKGNAME}/macros/optim/names
+share/${PKGNAME}/macros/optim/numdiff.bin
+share/${PKGNAME}/macros/optim/numdiff.sci
 share/${PKGNAME}/macros/optim/pack.bin
 share/${PKGNAME}/macros/optim/pack.sci
 share/${PKGNAME}/macros/optim/pencost.bin
@@ -2026,6 +2406,10 @@ share/${PKGNAME}/macros/percent/%ip_a_s.bin
 share/${PKGNAME}/macros/percent/%ip_a_s.sci
 share/${PKGNAME}/macros/percent/%ip_m_s.bin
 share/${PKGNAME}/macros/percent/%ip_m_s.sci
+share/${PKGNAME}/macros/percent/%ip_n_ip.bin
+share/${PKGNAME}/macros/percent/%ip_n_ip.sci
+share/${PKGNAME}/macros/percent/%ip_o_ip.bin
+share/${PKGNAME}/macros/percent/%ip_o_ip.sci
 share/${PKGNAME}/macros/percent/%ip_p.bin
 share/${PKGNAME}/macros/percent/%ip_p.sci
 share/${PKGNAME}/macros/percent/%ip_s_s.bin
@@ -2148,8 +2532,13 @@ share/${PKGNAME}/macros/percent/%m_n_l.bin
 share/${PKGNAME}/macros/percent/%m_n_l.sci
 share/${PKGNAME}/macros/percent/%m_o_l.bin
 share/${PKGNAME}/macros/percent/%m_o_l.sci
-share/${PKGNAME}/macros/percent/%nochoose.bin
-share/${PKGNAME}/macros/percent/%nochoose.sci
+share/${PKGNAME}/macros/percent/%msp_n_msp.bin
+share/${PKGNAME}/macros/percent/%msp_n_msp.sci
+share/${PKGNAME}/macros/percent/%msp_o_msp.bin
+share/${PKGNAME}/macros/percent/%msp_o_msp.sci
+share/${PKGNAME}/macros/percent/%msp_p.bin
+share/${PKGNAME}/macros/percent/%msp_p.sci
+share/${PKGNAME}/macros/percent/%no_choos.sci
 share/${PKGNAME}/macros/percent/%p_a_lss.bin
 share/${PKGNAME}/macros/percent/%p_a_lss.sci
 share/${PKGNAME}/macros/percent/%p_a_r.bin
@@ -2564,6 +2953,8 @@ share/${PKGNAME}/macros/percent/%sp_f_s.bin
 share/${PKGNAME}/macros/percent/%sp_f_s.sci
 share/${PKGNAME}/macros/percent/%sp_i_s.bin
 share/${PKGNAME}/macros/percent/%sp_i_s.sci
+share/${PKGNAME}/macros/percent/%sp_i_sp.bin
+share/${PKGNAME}/macros/percent/%sp_i_sp.sci
 share/${PKGNAME}/macros/percent/%sp_k_s.bin
 share/${PKGNAME}/macros/percent/%sp_k_s.sci
 share/${PKGNAME}/macros/percent/%sp_k_sp.bin
@@ -2610,12 +3001,14 @@ share/${PKGNAME}/macros/percent/%spb_i.sci
 share/${PKGNAME}/macros/percent/%spb_i_b.bin
 share/${PKGNAME}/macros/percent/%spb_i_b.sci
 share/${PKGNAME}/macros/percent/Makefile
+share/${PKGNAME}/macros/percent/Makefile.amk
 share/${PKGNAME}/macros/percent/Makefile.mak
 share/${PKGNAME}/macros/percent/README
 share/${PKGNAME}/macros/percent/genlib
 share/${PKGNAME}/macros/percent/lib
 share/${PKGNAME}/macros/percent/names
 share/${PKGNAME}/macros/robust/Makefile
+share/${PKGNAME}/macros/robust/Makefile.amk
 share/${PKGNAME}/macros/robust/Makefile.mak
 share/${PKGNAME}/macros/robust/augment.bin
 share/${PKGNAME}/macros/robust/augment.sci
@@ -2714,6 +3107,8 @@ share/${PKGNAME}/macros/sci2for/%cc2for.bin
 share/${PKGNAME}/macros/sci2for/%cc2for.sci
 share/${PKGNAME}/macros/sci2for/%e2for.bin
 share/${PKGNAME}/macros/sci2for/%e2for.sci
+share/${PKGNAME}/macros/sci2for/%h2for.bin
+share/${PKGNAME}/macros/sci2for/%h2for.sci
 share/${PKGNAME}/macros/sci2for/%i2for.bin
 share/${PKGNAME}/macros/sci2for/%i2for.sci
 share/${PKGNAME}/macros/sci2for/%imp2for.bin
@@ -2722,6 +3117,8 @@ share/${PKGNAME}/macros/sci2for/%log2for.bin
 share/${PKGNAME}/macros/sci2for/%log2for.sci
 share/${PKGNAME}/macros/sci2for/%m2for.bin
 share/${PKGNAME}/macros/sci2for/%m2for.sci
+share/${PKGNAME}/macros/sci2for/%p2for.bin
+share/${PKGNAME}/macros/sci2for/%p2for.sci
 share/${PKGNAME}/macros/sci2for/%r2for.bin
 share/${PKGNAME}/macros/sci2for/%r2for.sci
 share/${PKGNAME}/macros/sci2for/%rc2for.bin
@@ -2731,6 +3128,7 @@ share/${PKGNAME}/macros/sci2for/%s2for.sci
 share/${PKGNAME}/macros/sci2for/%t2for.bin
 share/${PKGNAME}/macros/sci2for/%t2for.sci
 share/${PKGNAME}/macros/sci2for/Makefile
+share/${PKGNAME}/macros/sci2for/Makefile.amk
 share/${PKGNAME}/macros/sci2for/Makefile.mak
 share/${PKGNAME}/macros/sci2for/README
 share/${PKGNAME}/macros/sci2for/adderr.bin
@@ -2851,25 +3249,19 @@ share/${PKGNAME}/macros/sci2for/typconv.sci
 share/${PKGNAME}/macros/sci2for/warning.bin
 share/${PKGNAME}/macros/sci2for/warning.sci
 share/${PKGNAME}/macros/scicos/Branching.cosf
-share/${PKGNAME}/macros/scicos/Branching.pal
 share/${PKGNAME}/macros/scicos/CFORTR.bin
 share/${PKGNAME}/macros/scicos/CFORTR.sci
 share/${PKGNAME}/macros/scicos/Events.cosf
-share/${PKGNAME}/macros/scicos/Events.pal
 share/${PKGNAME}/macros/scicos/FORTR.bin
 share/${PKGNAME}/macros/scicos/FORTR.sci
 share/${PKGNAME}/macros/scicos/Inputs_Outputs.cosf
-share/${PKGNAME}/macros/scicos/Inputs_Outputs.pal
 share/${PKGNAME}/macros/scicos/Linear.cosf
-share/${PKGNAME}/macros/scicos/Linear.pal
 share/${PKGNAME}/macros/scicos/Makefile
+share/${PKGNAME}/macros/scicos/Makefile.amk
 share/${PKGNAME}/macros/scicos/Makefile.mak
 share/${PKGNAME}/macros/scicos/Non_linear.cosf
-share/${PKGNAME}/macros/scicos/Non_linear.pal
 share/${PKGNAME}/macros/scicos/Others.cosf
-share/${PKGNAME}/macros/scicos/Others.pal
 share/${PKGNAME}/macros/scicos/Treshold.cosf
-share/${PKGNAME}/macros/scicos/Treshold.pal
 share/${PKGNAME}/macros/scicos/add_palette.bin
 share/${PKGNAME}/macros/scicos/add_palette.sci
 share/${PKGNAME}/macros/scicos/adjust.bin
@@ -2907,8 +3299,8 @@ share/${PKGNAME}/macros/scicos/connected_links.bin
 share/${PKGNAME}/macros/scicos/connected_links.sci
 share/${PKGNAME}/macros/scicos/cos2cosf.bin
 share/${PKGNAME}/macros/scicos/cos2cosf.sci
-share/${PKGNAME}/macros/scicos/cos2txt.bin
-share/${PKGNAME}/macros/scicos/cos2txt.sci
+share/${PKGNAME}/macros/scicos/cosclick.bin
+share/${PKGNAME}/macros/scicos/cosclick.sci
 share/${PKGNAME}/macros/scicos/countblocks.bin
 share/${PKGNAME}/macros/scicos/countblocks.sci
 share/${PKGNAME}/macros/scicos/ctree.bin
@@ -2921,6 +3313,8 @@ share/${PKGNAME}/macros/scicos/delete_unconnected.bin
 share/${PKGNAME}/macros/scicos/delete_unconnected.sci
 share/${PKGNAME}/macros/scicos/dialog.bin
 share/${PKGNAME}/macros/scicos/dialog.sci
+share/${PKGNAME}/macros/scicos/dig_bound.bin
+share/${PKGNAME}/macros/scicos/dig_bound.sci
 share/${PKGNAME}/macros/scicos/disablemenus.bin
 share/${PKGNAME}/macros/scicos/disablemenus.sci
 share/${PKGNAME}/macros/scicos/dist2polyline.bin
@@ -2953,7 +3347,10 @@ share/${PKGNAME}/macros/scicos/do_delete2.bin
 share/${PKGNAME}/macros/scicos/do_delete2.sci
 share/${PKGNAME}/macros/scicos/do_delete_region.bin
 share/${PKGNAME}/macros/scicos/do_delete_region.sci
+share/${PKGNAME}/macros/scicos/do_doc.bin
+share/${PKGNAME}/macros/scicos/do_doc.sci
 share/${PKGNAME}/macros/scicos/do_edit_pal.bin
+share/${PKGNAME}/macros/scicos/do_edit_pal.bug
 share/${PKGNAME}/macros/scicos/do_edit_pal.sci
 share/${PKGNAME}/macros/scicos/do_eval.bin
 share/${PKGNAME}/macros/scicos/do_eval.sci
@@ -3045,6 +3442,8 @@ share/${PKGNAME}/macros/scicos/empty_diagram.bin
 share/${PKGNAME}/macros/scicos/empty_diagram.sci
 share/${PKGNAME}/macros/scicos/enablemenus.bin
 share/${PKGNAME}/macros/scicos/enablemenus.sci
+share/${PKGNAME}/macros/scicos/f_xsetech.bin
+share/${PKGNAME}/macros/scicos/f_xsetech.sci
 share/${PKGNAME}/macros/scicos/fortran_block.bin
 share/${PKGNAME}/macros/scicos/fortran_block.sci
 share/${PKGNAME}/macros/scicos/generic_block.bin
@@ -3116,6 +3515,7 @@ share/${PKGNAME}/macros/scicos/mark_prt.bin
 share/${PKGNAME}/macros/scicos/mark_prt.sci
 share/${PKGNAME}/macros/scicos/message.bin
 share/${PKGNAME}/macros/scicos/message.sci
+share/${PKGNAME}/macros/scicos/mfpatch
 share/${PKGNAME}/macros/scicos/mkvect.bin
 share/${PKGNAME}/macros/scicos/mkvect.sci
 share/${PKGNAME}/macros/scicos/modipar.bin
@@ -3245,6 +3645,8 @@ share/${PKGNAME}/macros/scicos_blocks/EVTGEN_f.bin
 share/${PKGNAME}/macros/scicos_blocks/EVTGEN_f.sci
 share/${PKGNAME}/macros/scicos_blocks/EXPBLK_f.bin
 share/${PKGNAME}/macros/scicos_blocks/EXPBLK_f.sci
+share/${PKGNAME}/macros/scicos_blocks/FSCOPE_f.bin
+share/${PKGNAME}/macros/scicos_blocks/FSCOPE_f.sci
 share/${PKGNAME}/macros/scicos_blocks/FSV_f.bin
 share/${PKGNAME}/macros/scicos_blocks/FSV_f.sci
 share/${PKGNAME}/macros/scicos_blocks/GAINBLK_f.bin
@@ -3292,6 +3694,7 @@ share/${PKGNAME}/macros/scicos_blocks/MSCOPE_f.sci
 share/${PKGNAME}/macros/scicos_blocks/MUX_f.bin
 share/${PKGNAME}/macros/scicos_blocks/MUX_f.sci
 share/${PKGNAME}/macros/scicos_blocks/Makefile
+share/${PKGNAME}/macros/scicos_blocks/Makefile.amk
 share/${PKGNAME}/macros/scicos_blocks/Makefile.mak
 share/${PKGNAME}/macros/scicos_blocks/NEGTOPOS_f.bin
 share/${PKGNAME}/macros/scicos_blocks/NEGTOPOS_f.sci
@@ -3309,6 +3712,10 @@ share/${PKGNAME}/macros/scicos_blocks/QUANT_f.bin
 share/${PKGNAME}/macros/scicos_blocks/QUANT_f.sci
 share/${PKGNAME}/macros/scicos_blocks/RAND_f.bin
 share/${PKGNAME}/macros/scicos_blocks/RAND_f.sci
+share/${PKGNAME}/macros/scicos_blocks/READAU_f.bin
+share/${PKGNAME}/macros/scicos_blocks/READAU_f.sci
+share/${PKGNAME}/macros/scicos_blocks/READC_f.bin
+share/${PKGNAME}/macros/scicos_blocks/READC_f.sci
 share/${PKGNAME}/macros/scicos_blocks/REGISTER_f.bin
 share/${PKGNAME}/macros/scicos_blocks/REGISTER_f.sci
 share/${PKGNAME}/macros/scicos_blocks/RELAY_f.bin
@@ -3349,6 +3756,10 @@ share/${PKGNAME}/macros/scicos_blocks/TRASH_f.bin
 share/${PKGNAME}/macros/scicos_blocks/TRASH_f.sci
 share/${PKGNAME}/macros/scicos_blocks/WFILE_f.bin
 share/${PKGNAME}/macros/scicos_blocks/WFILE_f.sci
+share/${PKGNAME}/macros/scicos_blocks/WRITEAU_f.bin
+share/${PKGNAME}/macros/scicos_blocks/WRITEAU_f.sci
+share/${PKGNAME}/macros/scicos_blocks/WRITEC_f.bin
+share/${PKGNAME}/macros/scicos_blocks/WRITEC_f.sci
 share/${PKGNAME}/macros/scicos_blocks/ZCROSS_f.bin
 share/${PKGNAME}/macros/scicos_blocks/ZCROSS_f.sci
 share/${PKGNAME}/macros/scicos_blocks/func_block.bin
@@ -3367,6 +3778,7 @@ share/${PKGNAME}/macros/signal/%k.sci
 share/${PKGNAME}/macros/signal/%sn.bin
 share/${PKGNAME}/macros/signal/%sn.sci
 share/${PKGNAME}/macros/signal/Makefile
+share/${PKGNAME}/macros/signal/Makefile.amk
 share/${PKGNAME}/macros/signal/Makefile.mak
 share/${PKGNAME}/macros/signal/analpf.bin
 share/${PKGNAME}/macros/signal/analpf.sci
@@ -3492,21 +3904,21 @@ share/${PKGNAME}/macros/signal/zpch2.sci
 share/${PKGNAME}/macros/signal/zpell.bin
 share/${PKGNAME}/macros/signal/zpell.sci
 share/${PKGNAME}/macros/sound/Makefile
+share/${PKGNAME}/macros/sound/Makefile.amk
 share/${PKGNAME}/macros/sound/Makefile.mak
 share/${PKGNAME}/macros/sound/analyze.bin
 share/${PKGNAME}/macros/sound/analyze.sci
 share/${PKGNAME}/macros/sound/genlib
 share/${PKGNAME}/macros/sound/lib
-share/${PKGNAME}/macros/sound/loadwave.sci
 share/${PKGNAME}/macros/sound/mapsound.bin
 share/${PKGNAME}/macros/sound/mapsound.sci
 share/${PKGNAME}/macros/sound/names
-share/${PKGNAME}/macros/sound/savewave.sci
 share/${PKGNAME}/macros/sound/soundsec.bin
 share/${PKGNAME}/macros/sound/soundsec.sci
 share/${PKGNAME}/macros/tdcs/BInit.bin
 share/${PKGNAME}/macros/tdcs/BInit.sci
 share/${PKGNAME}/macros/tdcs/Makefile
+share/${PKGNAME}/macros/tdcs/Makefile.amk
 share/${PKGNAME}/macros/tdcs/Makefile.mak
 share/${PKGNAME}/macros/tdcs/artest.bin
 share/${PKGNAME}/macros/tdcs/artest.sci
@@ -3664,6 +4076,7 @@ share/${PKGNAME}/macros/util/%spb_triu.sci
 share/${PKGNAME}/macros/util/G_make.bin
 share/${PKGNAME}/macros/util/G_make.sci
 share/${PKGNAME}/macros/util/Makefile
+share/${PKGNAME}/macros/util/Makefile.amk
 share/${PKGNAME}/macros/util/Makefile.mak
 share/${PKGNAME}/macros/util/adj2sp.bin
 share/${PKGNAME}/macros/util/adj2sp.sci
@@ -3671,10 +4084,10 @@ share/${PKGNAME}/macros/util/bloc2exp.bin
 share/${PKGNAME}/macros/util/bloc2exp.sci
 share/${PKGNAME}/macros/util/bloc2ss.bin
 share/${PKGNAME}/macros/util/bloc2ss.sci
-share/${PKGNAME}/macros/util/bvode.sci
 share/${PKGNAME}/macros/util/cmb_lin.bin
 share/${PKGNAME}/macros/util/cmb_lin.sci
-share/${PKGNAME}/macros/util/colnew.sci
+share/${PKGNAME}/macros/util/date.bin
+share/${PKGNAME}/macros/util/date.sci
 share/${PKGNAME}/macros/util/dec2hex.bin
 share/${PKGNAME}/macros/util/dec2hex.sci
 share/${PKGNAME}/macros/util/define.bin
@@ -3694,7 +4107,6 @@ share/${PKGNAME}/macros/util/fprintf.sci
 share/${PKGNAME}/macros/util/fscanf.bin
 share/${PKGNAME}/macros/util/fscanf.sci
 share/${PKGNAME}/macros/util/g_ceil.sci
-share/${PKGNAME}/macros/util/g_clean.sci
 share/${PKGNAME}/macros/util/g_cos.sci
 share/${PKGNAME}/macros/util/g_det.sci
 share/${PKGNAME}/macros/util/g_diag.sci
@@ -3716,6 +4128,8 @@ share/${PKGNAME}/macros/util/g_sqrt.sci
 share/${PKGNAME}/macros/util/g_tril.sci
 share/${PKGNAME}/macros/util/g_triu.sci
 share/${PKGNAME}/macros/util/genlib
+share/${PKGNAME}/macros/util/genlib.bin
+share/${PKGNAME}/macros/util/genlib.sci
 share/${PKGNAME}/macros/util/getclick.bin
 share/${PKGNAME}/macros/util/getclick.sci
 share/${PKGNAME}/macros/util/getd.bin
@@ -3747,6 +4161,8 @@ share/${PKGNAME}/macros/util/menubar.bin
 share/${PKGNAME}/macros/util/menubar.sci
 share/${PKGNAME}/macros/util/mfile2sci.bin
 share/${PKGNAME}/macros/util/mfile2sci.sci
+share/${PKGNAME}/macros/util/mps2linpro.bin
+share/${PKGNAME}/macros/util/mps2linpro.sci
 share/${PKGNAME}/macros/util/names
 share/${PKGNAME}/macros/util/newest.bin
 share/${PKGNAME}/macros/util/newest.sci
@@ -3826,6 +4242,7 @@ share/${PKGNAME}/macros/util/xdialog.sci
 share/${PKGNAME}/macros/util/zeros.bin
 share/${PKGNAME}/macros/util/zeros.sci
 share/${PKGNAME}/macros/xdess/Makefile
+share/${PKGNAME}/macros/xdess/Makefile.amk
 share/${PKGNAME}/macros/xdess/Makefile.mak
 share/${PKGNAME}/macros/xdess/Sfgrayplot.bin
 share/${PKGNAME}/macros/xdess/Sfgrayplot.sci
@@ -3950,6 +4367,8 @@ share/${PKGNAME}/man/Makefile
 share/${PKGNAME}/man/README
 share/${PKGNAME}/man/arma/arma.cat
 share/${PKGNAME}/man/arma/arma.man
+share/${PKGNAME}/man/arma/arma2p.cat
+share/${PKGNAME}/man/arma/arma2p.man
 share/${PKGNAME}/man/arma/armac.cat
 share/${PKGNAME}/man/arma/armac.man
 share/${PKGNAME}/man/arma/armax.cat
@@ -4024,6 +4443,8 @@ share/${PKGNAME}/man/control/ctr_gram.cat
 share/${PKGNAME}/man/control/ctr_gram.man
 share/${PKGNAME}/man/control/dbphi.cat
 share/${PKGNAME}/man/control/dbphi.man
+share/${PKGNAME}/man/control/ddp.cat
+share/${PKGNAME}/man/control/ddp.man
 share/${PKGNAME}/man/control/des2tf.cat
 share/${PKGNAME}/man/control/des2tf.man
 share/${PKGNAME}/man/control/dscr.cat
@@ -4130,6 +4551,8 @@ share/${PKGNAME}/man/control/time_id.cat
 share/${PKGNAME}/man/control/time_id.man
 share/${PKGNAME}/man/control/trzeros.cat
 share/${PKGNAME}/man/control/trzeros.man
+share/${PKGNAME}/man/control/ui_observer.cat
+share/${PKGNAME}/man/control/ui_observer.man
 share/${PKGNAME}/man/control/unobs.cat
 share/${PKGNAME}/man/control/unobs.man
 share/${PKGNAME}/man/control/whatis
@@ -4264,8 +4687,6 @@ share/${PKGNAME}/man/elementary/erfcx.cat
 share/${PKGNAME}/man/elementary/erfcx.man
 share/${PKGNAME}/man/elementary/eval.cat
 share/${PKGNAME}/man/elementary/eval.man
-share/${PKGNAME}/man/elementary/execstr.cat
-share/${PKGNAME}/man/elementary/execstr.man
 share/${PKGNAME}/man/elementary/full.cat
 share/${PKGNAME}/man/elementary/full.man
 share/${PKGNAME}/man/elementary/gamma.cat
@@ -4290,6 +4711,8 @@ share/${PKGNAME}/man/elementary/interp.cat
 share/${PKGNAME}/man/elementary/interp.man
 share/${PKGNAME}/man/elementary/interpln.cat
 share/${PKGNAME}/man/elementary/interpln.man
+share/${PKGNAME}/man/elementary/intersect.cat
+share/${PKGNAME}/man/elementary/intersect.man
 share/${PKGNAME}/man/elementary/intsplin.cat
 share/${PKGNAME}/man/elementary/intsplin.man
 share/${PKGNAME}/man/elementary/inttrap.cat
@@ -4306,6 +4729,8 @@ share/${PKGNAME}/man/elementary/kron.cat
 share/${PKGNAME}/man/elementary/kron.man
 share/${PKGNAME}/man/elementary/ldivf.cat
 share/${PKGNAME}/man/elementary/ldivf.man
+share/${PKGNAME}/man/elementary/lex_sort.cat
+share/${PKGNAME}/man/elementary/lex_sort.man
 share/${PKGNAME}/man/elementary/linspace.cat
 share/${PKGNAME}/man/elementary/linspace.man
 share/${PKGNAME}/man/elementary/log.cat
@@ -4328,6 +4753,10 @@ share/${PKGNAME}/man/elementary/median.cat
 share/${PKGNAME}/man/elementary/median.man
 share/${PKGNAME}/man/elementary/modulo.cat
 share/${PKGNAME}/man/elementary/modulo.man
+share/${PKGNAME}/man/elementary/mps2linpro.cat
+share/${PKGNAME}/man/elementary/mps2linpro.man
+share/${PKGNAME}/man/elementary/mtlb_sparse.cat
+share/${PKGNAME}/man/elementary/mtlb_sparse.man
 share/${PKGNAME}/man/elementary/mulf.cat
 share/${PKGNAME}/man/elementary/mulf.man
 share/${PKGNAME}/man/elementary/nnz.cat
@@ -4388,6 +4817,8 @@ share/${PKGNAME}/man/elementary/sqrt.cat
 share/${PKGNAME}/man/elementary/sqrt.man
 share/${PKGNAME}/man/elementary/sqrtm.cat
 share/${PKGNAME}/man/elementary/sqrtm.man
+share/${PKGNAME}/man/elementary/squarewave.cat
+share/${PKGNAME}/man/elementary/squarewave.man
 share/${PKGNAME}/man/elementary/ssprint.cat
 share/${PKGNAME}/man/elementary/ssprint.man
 share/${PKGNAME}/man/elementary/ssrand.cat
@@ -4418,7 +4849,6 @@ share/${PKGNAME}/man/elementary/tanh.cat
 share/${PKGNAME}/man/elementary/tanh.man
 share/${PKGNAME}/man/elementary/tanhm.cat
 share/${PKGNAME}/man/elementary/tanhm.man
-share/${PKGNAME}/man/elementary/tanhm.sci
 share/${PKGNAME}/man/elementary/tanm.cat
 share/${PKGNAME}/man/elementary/tanm.man
 share/${PKGNAME}/man/elementary/timer.cat
@@ -4437,6 +4867,10 @@ share/${PKGNAME}/man/elementary/triu.cat
 share/${PKGNAME}/man/elementary/triu.man
 share/${PKGNAME}/man/elementary/typeof.cat
 share/${PKGNAME}/man/elementary/typeof.man
+share/${PKGNAME}/man/elementary/union.cat
+share/${PKGNAME}/man/elementary/union.man
+share/${PKGNAME}/man/elementary/unique.cat
+share/${PKGNAME}/man/elementary/unique.man
 share/${PKGNAME}/man/elementary/unsetmenu.cat
 share/${PKGNAME}/man/elementary/unsetmenu.man
 share/${PKGNAME}/man/elementary/whatis
@@ -4561,24 +4995,6 @@ share/${PKGNAME}/man/fraclab/monolr.cat
 share/${PKGNAME}/man/fraclab/monolr.man
 share/${PKGNAME}/man/fraclab/morlet.cat
 share/${PKGNAME}/man/fraclab/morlet.man
-share/${PKGNAME}/man/fraclab/mtlb_diff.cat
-share/${PKGNAME}/man/fraclab/mtlb_diff.man
-share/${PKGNAME}/man/fraclab/mtlb_fftshift.cat
-share/${PKGNAME}/man/fraclab/mtlb_fftshift.man
-share/${PKGNAME}/man/fraclab/mtlb_fliplr.cat
-share/${PKGNAME}/man/fraclab/mtlb_fliplr.man
-share/${PKGNAME}/man/fraclab/mtlb_flipud.cat
-share/${PKGNAME}/man/fraclab/mtlb_flipud.man
-share/${PKGNAME}/man/fraclab/mtlb_hilbert.cat
-share/${PKGNAME}/man/fraclab/mtlb_hilbert.man
-share/${PKGNAME}/man/fraclab/mtlb_isreal.cat
-share/${PKGNAME}/man/fraclab/mtlb_isreal.man
-share/${PKGNAME}/man/fraclab/mtlb_log2.cat
-share/${PKGNAME}/man/fraclab/mtlb_log2.man
-share/${PKGNAME}/man/fraclab/mtlb_mean.cat
-share/${PKGNAME}/man/fraclab/mtlb_mean.man
-share/${PKGNAME}/man/fraclab/mtlb_rem.cat
-share/${PKGNAME}/man/fraclab/mtlb_rem.man
 share/${PKGNAME}/man/fraclab/multim1d.cat
 share/${PKGNAME}/man/fraclab/multim1d.man
 share/${PKGNAME}/man/fraclab/multim2d.cat
@@ -4690,7 +5106,6 @@ share/${PKGNAME}/man/graphics/geom3d.cat
 share/${PKGNAME}/man/graphics/geom3d.man
 share/${PKGNAME}/man/graphics/getcolor.cat
 share/${PKGNAME}/man/graphics/getcolor.man
-share/${PKGNAME}/man/graphics/getcolor.sci
 share/${PKGNAME}/man/graphics/getsymbol.cat
 share/${PKGNAME}/man/graphics/getsymbol.man
 share/${PKGNAME}/man/graphics/gr_menu.cat
@@ -4699,7 +5114,6 @@ share/${PKGNAME}/man/graphics/graduate.cat
 share/${PKGNAME}/man/graphics/graduate.man
 share/${PKGNAME}/man/graphics/graycolormap.cat
 share/${PKGNAME}/man/graphics/graycolormap.man
-share/${PKGNAME}/man/graphics/graycolormap.sci
 share/${PKGNAME}/man/graphics/grayplot.cat
 share/${PKGNAME}/man/graphics/grayplot.man
 share/${PKGNAME}/man/graphics/hist3d.cat
@@ -4722,8 +5136,6 @@ share/${PKGNAME}/man/graphics/param3d.cat
 share/${PKGNAME}/man/graphics/param3d.man
 share/${PKGNAME}/man/graphics/param3d1.cat
 share/${PKGNAME}/man/graphics/param3d1.man
-share/${PKGNAME}/man/graphics/param3di.cat
-share/${PKGNAME}/man/graphics/param3di.man
 share/${PKGNAME}/man/graphics/plot.cat
 share/${PKGNAME}/man/graphics/plot.man
 share/${PKGNAME}/man/graphics/plot2d.cat
@@ -4746,6 +5158,9 @@ share/${PKGNAME}/man/graphics/plzr.cat
 share/${PKGNAME}/man/graphics/plzr.man
 share/${PKGNAME}/man/graphics/printing.cat
 share/${PKGNAME}/man/graphics/printing.man
+share/${PKGNAME}/man/graphics/readgif.cat
+share/${PKGNAME}/man/graphics/replot.cat
+share/${PKGNAME}/man/graphics/replot.man
 share/${PKGNAME}/man/graphics/rotate.cat
 share/${PKGNAME}/man/graphics/rotate.man
 share/${PKGNAME}/man/graphics/scaling.cat
@@ -4817,6 +5232,8 @@ share/${PKGNAME}/man/graphics/xlfont.cat
 share/${PKGNAME}/man/graphics/xlfont.man
 share/${PKGNAME}/man/graphics/xload.cat
 share/${PKGNAME}/man/graphics/xload.man
+share/${PKGNAME}/man/graphics/xname.cat
+share/${PKGNAME}/man/graphics/xname.man
 share/${PKGNAME}/man/graphics/xnumb.cat
 share/${PKGNAME}/man/graphics/xnumb.man
 share/${PKGNAME}/man/graphics/xpause.cat
@@ -5139,7 +5556,6 @@ share/${PKGNAME}/man/metanet/supernode.man
 share/${PKGNAME}/man/metanet/trans_closure.cat
 share/${PKGNAME}/man/metanet/trans_closure.man
 share/${PKGNAME}/man/metanet/whatis
-share/${PKGNAME}/man/mkwhatis
 share/${PKGNAME}/man/nonlinear/bvode.cat
 share/${PKGNAME}/man/nonlinear/bvode.man
 share/${PKGNAME}/man/nonlinear/colnew.cat
@@ -5148,6 +5564,8 @@ share/${PKGNAME}/man/nonlinear/dasrt.cat
 share/${PKGNAME}/man/nonlinear/dasrt.man
 share/${PKGNAME}/man/nonlinear/dassl.cat
 share/${PKGNAME}/man/nonlinear/dassl.man
+share/${PKGNAME}/man/nonlinear/datafit.cat
+share/${PKGNAME}/man/nonlinear/datafit.man
 share/${PKGNAME}/man/nonlinear/fit_dat.cat
 share/${PKGNAME}/man/nonlinear/fit_dat.man
 share/${PKGNAME}/man/nonlinear/fsolve.cat
@@ -5166,6 +5584,8 @@ share/${PKGNAME}/man/nonlinear/intl.cat
 share/${PKGNAME}/man/nonlinear/intl.man
 share/${PKGNAME}/man/nonlinear/karmarkar.cat
 share/${PKGNAME}/man/nonlinear/karmarkar.man
+share/${PKGNAME}/man/nonlinear/leastsq.cat
+share/${PKGNAME}/man/nonlinear/leastsq.man
 share/${PKGNAME}/man/nonlinear/linpro.cat
 share/${PKGNAME}/man/nonlinear/linpro.man
 share/${PKGNAME}/man/nonlinear/lmisolver.cat
@@ -5258,6 +5678,8 @@ share/${PKGNAME}/man/polynomials/sylm.man
 share/${PKGNAME}/man/polynomials/systmat.cat
 share/${PKGNAME}/man/polynomials/systmat.man
 share/${PKGNAME}/man/polynomials/whatis
+share/${PKGNAME}/man/programming/%helps.cat
+share/${PKGNAME}/man/programming/%helps.man
 share/${PKGNAME}/man/programming/abort.cat
 share/${PKGNAME}/man/programming/abort.man
 share/${PKGNAME}/man/programming/addinter.cat
@@ -5272,8 +5694,6 @@ share/${PKGNAME}/man/programming/argn.cat
 share/${PKGNAME}/man/programming/argn.man
 share/${PKGNAME}/man/programming/backslash.cat
 share/${PKGNAME}/man/programming/backslash.man
-share/${PKGNAME}/man/programming/binary.cat
-share/${PKGNAME}/man/programming/binary.man
 share/${PKGNAME}/man/programming/bool2s.cat
 share/${PKGNAME}/man/programming/bool2s.man
 share/${PKGNAME}/man/programming/boolean.cat
@@ -5294,6 +5714,8 @@ share/${PKGNAME}/man/programming/clear.cat
 share/${PKGNAME}/man/programming/clear.man
 share/${PKGNAME}/man/programming/clearfun.cat
 share/${PKGNAME}/man/programming/clearfun.man
+share/${PKGNAME}/man/programming/clearglobal.cat
+share/${PKGNAME}/man/programming/clearglobal.man
 share/${PKGNAME}/man/programming/code2str.cat
 share/${PKGNAME}/man/programming/code2str.man
 share/${PKGNAME}/man/programming/coeff.cat
@@ -5306,6 +5728,8 @@ share/${PKGNAME}/man/programming/comments.cat
 share/${PKGNAME}/man/programming/comments.man
 share/${PKGNAME}/man/programming/comp.cat
 share/${PKGNAME}/man/programming/comp.man
+share/${PKGNAME}/man/programming/date.cat
+share/${PKGNAME}/man/programming/date.man
 share/${PKGNAME}/man/programming/deff.cat
 share/${PKGNAME}/man/programming/deff.man
 share/${PKGNAME}/man/programming/degree.cat
@@ -5320,6 +5744,8 @@ share/${PKGNAME}/man/programming/dispbpt.cat
 share/${PKGNAME}/man/programming/dispbpt.man
 share/${PKGNAME}/man/programming/dot.cat
 share/${PKGNAME}/man/programming/dot.man
+share/${PKGNAME}/man/programming/double.cat
+share/${PKGNAME}/man/programming/double.man
 share/${PKGNAME}/man/programming/else.cat
 share/${PKGNAME}/man/programming/else.man
 share/${PKGNAME}/man/programming/elseif.cat
@@ -5340,6 +5766,8 @@ share/${PKGNAME}/man/programming/evstr.cat
 share/${PKGNAME}/man/programming/evstr.man
 share/${PKGNAME}/man/programming/exec.cat
 share/${PKGNAME}/man/programming/exec.man
+share/${PKGNAME}/man/programming/execstr.cat
+share/${PKGNAME}/man/programming/execstr.man
 share/${PKGNAME}/man/programming/exists.cat
 share/${PKGNAME}/man/programming/exists.man
 share/${PKGNAME}/man/programming/exit.cat
@@ -5368,34 +5796,51 @@ share/${PKGNAME}/man/programming/fort.cat
 share/${PKGNAME}/man/programming/fort.man
 share/${PKGNAME}/man/programming/fprintf.cat
 share/${PKGNAME}/man/programming/fprintf.man
+share/${PKGNAME}/man/programming/fprintfMat.cat
+share/${PKGNAME}/man/programming/fprintfMat.man
 share/${PKGNAME}/man/programming/fscanf.cat
 share/${PKGNAME}/man/programming/fscanf.man
+share/${PKGNAME}/man/programming/fscanfMat.cat
+share/${PKGNAME}/man/programming/fscanfMat.man
 share/${PKGNAME}/man/programming/funcprot.cat
 share/${PKGNAME}/man/programming/funcprot.man
 share/${PKGNAME}/man/programming/function.cat
 share/${PKGNAME}/man/programming/function.man
 share/${PKGNAME}/man/programming/funptr.cat
 share/${PKGNAME}/man/programming/funptr.man
+share/${PKGNAME}/man/programming/genlib.cat
+share/${PKGNAME}/man/programming/genlib.man
 share/${PKGNAME}/man/programming/getcwd.cat
 share/${PKGNAME}/man/programming/getcwd.man
 share/${PKGNAME}/man/programming/getd.cat
 share/${PKGNAME}/man/programming/getd.man
+share/${PKGNAME}/man/programming/getdate.cat
+share/${PKGNAME}/man/programming/getdate.man
 share/${PKGNAME}/man/programming/getenv.cat
 share/${PKGNAME}/man/programming/getenv.man
 share/${PKGNAME}/man/programming/getf.cat
 share/${PKGNAME}/man/programming/getf.man
+share/${PKGNAME}/man/programming/getfield.cat
+share/${PKGNAME}/man/programming/getfield.man
 share/${PKGNAME}/man/programming/getpid.cat
 share/${PKGNAME}/man/programming/getpid.man
+share/${PKGNAME}/man/programming/global.cat
+share/${PKGNAME}/man/programming/global.man
+share/${PKGNAME}/man/programming/gstacksize.cat
+share/${PKGNAME}/man/programming/gstacksize.man
 share/${PKGNAME}/man/programming/hat.cat
 share/${PKGNAME}/man/programming/hat.man
 share/${PKGNAME}/man/programming/help.cat
 share/${PKGNAME}/man/programming/help.man
+share/${PKGNAME}/man/programming/helps
 share/${PKGNAME}/man/programming/host.cat
 share/${PKGNAME}/man/programming/host.man
 share/${PKGNAME}/man/programming/hypermat.cat
 share/${PKGNAME}/man/programming/hypermat.man
 share/${PKGNAME}/man/programming/hypermatrices.cat
 share/${PKGNAME}/man/programming/hypermatrices.man
+share/${PKGNAME}/man/programming/iconvert.cat
+share/${PKGNAME}/man/programming/iconvert.man
 share/${PKGNAME}/man/programming/ieee.cat
 share/${PKGNAME}/man/programming/ieee.man
 share/${PKGNAME}/man/programming/if.cat
@@ -5406,10 +5851,20 @@ share/${PKGNAME}/man/programming/insertion.cat
 share/${PKGNAME}/man/programming/insertion.man
 share/${PKGNAME}/man/programming/int.cat
 share/${PKGNAME}/man/programming/int.man
+share/${PKGNAME}/man/programming/int8.cat
+share/${PKGNAME}/man/programming/int8.man
 share/${PKGNAME}/man/programming/intersci.cat
 share/${PKGNAME}/man/programming/intersci.man
+share/${PKGNAME}/man/programming/intppty.cat
+share/${PKGNAME}/man/programming/intppty.man
+share/${PKGNAME}/man/programming/inttype.cat
+share/${PKGNAME}/man/programming/inttype.man
+share/${PKGNAME}/man/programming/inv_coeff.cat
+share/${PKGNAME}/man/programming/inv_coeff.man
 share/${PKGNAME}/man/programming/iserror.cat
 share/${PKGNAME}/man/programming/iserror.man
+share/${PKGNAME}/man/programming/isglobal.cat
+share/${PKGNAME}/man/programming/isglobal.man
 share/${PKGNAME}/man/programming/keyboard.cat
 share/${PKGNAME}/man/programming/keyboard.man
 share/${PKGNAME}/man/programming/left.cat
@@ -5442,14 +5897,44 @@ share/${PKGNAME}/man/programming/max.cat
 share/${PKGNAME}/man/programming/max.man
 share/${PKGNAME}/man/programming/maxi.cat
 share/${PKGNAME}/man/programming/maxi.man
+share/${PKGNAME}/man/programming/mclearerr.cat
+share/${PKGNAME}/man/programming/mclearerr.man
+share/${PKGNAME}/man/programming/mclose.cat
+share/${PKGNAME}/man/programming/mclose.man
+share/${PKGNAME}/man/programming/meof.cat
+share/${PKGNAME}/man/programming/meof.man
+share/${PKGNAME}/man/programming/mfprintf.cat
+share/${PKGNAME}/man/programming/mfprintf.man
+share/${PKGNAME}/man/programming/mfscanf.cat
+share/${PKGNAME}/man/programming/mfscanf.man
+share/${PKGNAME}/man/programming/mget.cat
+share/${PKGNAME}/man/programming/mget.man
+share/${PKGNAME}/man/programming/mgetstr.cat
+share/${PKGNAME}/man/programming/mgetstr.man
 share/${PKGNAME}/man/programming/min.cat
 share/${PKGNAME}/man/programming/min.man
 share/${PKGNAME}/man/programming/mini.cat
 share/${PKGNAME}/man/programming/mini.man
 share/${PKGNAME}/man/programming/minus.cat
 share/${PKGNAME}/man/programming/minus.man
+share/${PKGNAME}/man/programming/mlist.cat
+share/${PKGNAME}/man/programming/mlist.man
 share/${PKGNAME}/man/programming/mode.cat
 share/${PKGNAME}/man/programming/mode.man
+share/${PKGNAME}/man/programming/mopen.cat
+share/${PKGNAME}/man/programming/mopen.man
+share/${PKGNAME}/man/programming/mprintf.cat
+share/${PKGNAME}/man/programming/mprintf.man
+share/${PKGNAME}/man/programming/mput.cat
+share/${PKGNAME}/man/programming/mput.man
+share/${PKGNAME}/man/programming/mputstr.cat
+share/${PKGNAME}/man/programming/mputstr.man
+share/${PKGNAME}/man/programming/mscanf.cat
+share/${PKGNAME}/man/programming/mscanf.man
+share/${PKGNAME}/man/programming/mseek.cat
+share/${PKGNAME}/man/programming/mseek.man
+share/${PKGNAME}/man/programming/mtell.cat
+share/${PKGNAME}/man/programming/mtell.man
 share/${PKGNAME}/man/programming/mtlb_mode.cat
 share/${PKGNAME}/man/programming/mtlb_mode.man
 share/${PKGNAME}/man/programming/names.cat
@@ -5460,6 +5945,10 @@ share/${PKGNAME}/man/programming/not.cat
 share/${PKGNAME}/man/programming/not.man
 share/${PKGNAME}/man/programming/null.cat
 share/${PKGNAME}/man/programming/null.man
+share/${PKGNAME}/man/programming/oldload.cat
+share/${PKGNAME}/man/programming/oldload.man
+share/${PKGNAME}/man/programming/oldsave.cat
+share/${PKGNAME}/man/programming/oldsave.man
 share/${PKGNAME}/man/programming/ones.cat
 share/${PKGNAME}/man/programming/ones.man
 share/${PKGNAME}/man/programming/or.cat
@@ -5530,10 +6019,14 @@ share/${PKGNAME}/man/programming/scilink.cat
 share/${PKGNAME}/man/programming/scilink.man
 share/${PKGNAME}/man/programming/select.cat
 share/${PKGNAME}/man/programming/select.man
+share/${PKGNAME}/man/programming/semi.cat
+share/${PKGNAME}/man/programming/semi.man
 share/${PKGNAME}/man/programming/semicolumn.cat
 share/${PKGNAME}/man/programming/semicolumn.man
 share/${PKGNAME}/man/programming/setbpt.cat
 share/${PKGNAME}/man/programming/setbpt.man
+share/${PKGNAME}/man/programming/setfield.cat
+share/${PKGNAME}/man/programming/setfield.man
 share/${PKGNAME}/man/programming/sign.cat
 share/${PKGNAME}/man/programming/sign.man
 share/${PKGNAME}/man/programming/signm.cat
@@ -5570,6 +6063,8 @@ share/${PKGNAME}/man/programming/tlist.cat
 share/${PKGNAME}/man/programming/tlist.man
 share/${PKGNAME}/man/programming/type.cat
 share/${PKGNAME}/man/programming/type.man
+share/${PKGNAME}/man/programming/typename.cat
+share/${PKGNAME}/man/programming/typename.man
 share/${PKGNAME}/man/programming/ulink.cat
 share/${PKGNAME}/man/programming/ulink.man
 share/${PKGNAME}/man/programming/unix.cat
@@ -5856,6 +6351,8 @@ share/${PKGNAME}/man/scicos/QUANT_f.cat
 share/${PKGNAME}/man/scicos/QUANT_f.man
 share/${PKGNAME}/man/scicos/RAND_f.cat
 share/${PKGNAME}/man/scicos/RAND_f.man
+share/${PKGNAME}/man/scicos/READC_f.cat
+share/${PKGNAME}/man/scicos/READC_f.man
 share/${PKGNAME}/man/scicos/REGISTER_f.cat
 share/${PKGNAME}/man/scicos/REGISTER_f.man
 share/${PKGNAME}/man/scicos/RELAY_f.cat
@@ -5896,6 +6393,8 @@ share/${PKGNAME}/man/scicos/TRASH_f.cat
 share/${PKGNAME}/man/scicos/TRASH_f.man
 share/${PKGNAME}/man/scicos/WFILE_f.cat
 share/${PKGNAME}/man/scicos/WFILE_f.man
+share/${PKGNAME}/man/scicos/WRITEC_f.cat
+share/${PKGNAME}/man/scicos/WRITEC_f.man
 share/${PKGNAME}/man/scicos/ZCROSS_f.cat
 share/${PKGNAME}/man/scicos/ZCROSS_f.man
 share/${PKGNAME}/man/scicos/check_io.cat
@@ -6001,7 +6500,6 @@ share/${PKGNAME}/man/signal/frmag.cat
 share/${PKGNAME}/man/signal/frmag.man
 share/${PKGNAME}/man/signal/fsfirlin.cat
 share/${PKGNAME}/man/signal/fsfirlin.man
-share/${PKGNAME}/man/signal/fwiir.man.save
 share/${PKGNAME}/man/signal/group.cat
 share/${PKGNAME}/man/signal/group.man
 share/${PKGNAME}/man/signal/hank.cat
@@ -6090,7 +6588,6 @@ share/${PKGNAME}/man/sound/mapsound.man
 share/${PKGNAME}/man/sound/savewave.cat
 share/${PKGNAME}/man/sound/savewave.man
 share/${PKGNAME}/man/sound/whatis
-share/${PKGNAME}/man/strip.sed
 share/${PKGNAME}/man/tdcs/artest.cat
 share/${PKGNAME}/man/tdcs/artest.man
 share/${PKGNAME}/man/tdcs/bifish.cat
@@ -6177,16 +6674,61 @@ share/${PKGNAME}/maple/maple2scilab.mpl
 share/${PKGNAME}/maple/maple2scilab.mpl.g
 share/${PKGNAME}/notice.ps
 share/${PKGNAME}/notice.tex
-share/${PKGNAME}/patchlevel.h
+share/${PKGNAME}/pvm3/lib/pvm
+share/${PKGNAME}/pvm3/lib/pvmd
+share/${PKGNAME}/pvm3/lib/pvmtmparch
+share/${PKGNAME}/routines/Make.lib
 share/${PKGNAME}/routines/callinter.h
+share/${PKGNAME}/routines/default/Ex-colnew.f
+share/${PKGNAME}/routines/default/Ex-corr.f
+share/${PKGNAME}/routines/default/Ex-dasrt.f
+share/${PKGNAME}/routines/default/Ex-dassl.f
+share/${PKGNAME}/routines/default/Ex-fbutn.f
+share/${PKGNAME}/routines/default/Ex-feval.f
+share/${PKGNAME}/routines/default/Ex-fort.f
+share/${PKGNAME}/routines/default/Ex-fsolve.f
+share/${PKGNAME}/routines/default/Ex-impl.f
+share/${PKGNAME}/routines/default/Ex-int2d.f
+share/${PKGNAME}/routines/default/Ex-int3d.f
+share/${PKGNAME}/routines/default/Ex-intg.f
+share/${PKGNAME}/routines/default/Ex-ode-more.f
+share/${PKGNAME}/routines/default/Ex-ode.f
+share/${PKGNAME}/routines/default/Ex-odedc.f
+share/${PKGNAME}/routines/default/Ex-optim.f
+share/${PKGNAME}/routines/default/Ex-schur.f
+share/${PKGNAME}/routines/default/FCreate
+share/${PKGNAME}/routines/default/FTables.c
+share/${PKGNAME}/routines/default/FTables.h
+share/${PKGNAME}/routines/default/FTables0.h
+share/${PKGNAME}/routines/default/Flist
+share/${PKGNAME}/routines/default/Funtab.c
+share/${PKGNAME}/routines/default/README
+share/${PKGNAME}/routines/default/callinterf.c
+share/${PKGNAME}/routines/default/callinterf.h
+share/${PKGNAME}/routines/default/fundef
+share/${PKGNAME}/routines/default/icsef.f
+share/${PKGNAME}/routines/default/icsenb.f
+share/${PKGNAME}/routines/default/icsest.f
+share/${PKGNAME}/routines/default/mainsci.f
+share/${PKGNAME}/routines/default/mainwin95.f
+share/${PKGNAME}/routines/default/matus2.f
+share/${PKGNAME}/routines/default/matusr.f
+share/${PKGNAME}/routines/default/mexlib.c
+share/${PKGNAME}/routines/default/msgstxt.f
+share/${PKGNAME}/routines/default/scimem.c
+share/${PKGNAME}/routines/default/userf2.f
 share/${PKGNAME}/routines/graphics/Graphics.h
 share/${PKGNAME}/routines/graphics/Math.h
 share/${PKGNAME}/routines/intersci/sparse.h
 share/${PKGNAME}/routines/machine.h
+share/${PKGNAME}/routines/machine-abs.h
+share/${PKGNAME}/routines/mex.h
 share/${PKGNAME}/routines/stack-c.h
 share/${PKGNAME}/routines/stack-def.h
 share/${PKGNAME}/routines/stack.h
 share/${PKGNAME}/routines/sun/link.h
+share/${PKGNAME}/routines/scicos/scicos.h
+share/${PKGNAME}/routines/stack-abs.h
 share/${PKGNAME}/scilab.quit
 share/${PKGNAME}/scilab.star
 share/${PKGNAME}/scripts/BEpsf.g
@@ -6198,9 +6740,9 @@ share/${PKGNAME}/scripts/Blatexprs.g
 share/${PKGNAME}/scripts/Blpr.g
 share/${PKGNAME}/scripts/Makefile
 share/${PKGNAME}/scripts/Makefile.in
+share/${PKGNAME}/scripts/sc_cpp
 share/${PKGNAME}/scripts/scilab-gcwin32.g
 share/${PKGNAME}/scripts/scilab.g
-share/${PKGNAME}/scripts/scilab.g.orig
 share/${PKGNAME}/tcl/.scilab
 share/${PKGNAME}/tcl/TK_Scilab.tcl
 share/${PKGNAME}/tcl/callbacks.tcl
@@ -6252,6 +6794,7 @@ share/${PKGNAME}/tcl/uimenu.tcl
 share/${PKGNAME}/util/Blatdoc
 share/${PKGNAME}/util/Blatdocs
 share/${PKGNAME}/util/Gload.sce
+share/${PKGNAME}/util/Mak2ABSMak
 share/${PKGNAME}/util/Mak2VCMak
 share/${PKGNAME}/util/README
 share/${PKGNAME}/util/Slatdoc
@@ -6263,13 +6806,10 @@ share/${PKGNAME}/util/scidem
 share/${PKGNAME}/util/scidem-gcwin32
 share/${PKGNAME}/util/scidoc
 share/${PKGNAME}/util/scilib
-@dirrm share/${PKGNAME}/Win95-util/DllDemo/
-@dirrm share/${PKGNAME}/Win95-util/DllSci/
-@dirrm share/${PKGNAME}/Win95-util/Nm/
-@dirrm share/${PKGNAME}/Win95-util/
 @dirrm share/${PKGNAME}/X11_defaults/
 @dirrm share/${PKGNAME}/bin/
 @dirrm share/${PKGNAME}/config/
+@dirrm share/${PKGNAME}/contrib/
 @dirrm share/${PKGNAME}/demos/anim/
 @dirrm share/${PKGNAME}/demos/arma/
 @dirrm share/${PKGNAME}/demos/bike/data/
@@ -6306,15 +6846,25 @@ share/${PKGNAME}/util/scilib
 @dirrm share/${PKGNAME}/demos/wheel2/
 @dirrm share/${PKGNAME}/demos/
 @dirrm share/${PKGNAME}/examples/addinter-examples/
+@dirrm share/${PKGNAME}/examples/addinter-lapack/
+@dirrm share/${PKGNAME}/examples/addinter-tutorial/
 @dirrm share/${PKGNAME}/examples/callsci/
 @dirrm share/${PKGNAME}/examples/intersci-examples/
 @dirrm share/${PKGNAME}/examples/link-examples/
 @dirrm share/${PKGNAME}/examples/macros-examples/
-@dirrm share/${PKGNAME}/examples/man-examples/test1/
-@dirrm share/${PKGNAME}/examples/man-examples/test2/
+@dirrm share/${PKGNAME}/examples/man-examples/helpdir1/
+@dirrm share/${PKGNAME}/examples/man-examples/helpdir2/
 @dirrm share/${PKGNAME}/examples/man-examples/
+@dirrm share/${PKGNAME}/examples/mex-examples/cpp/
+@dirrm share/${PKGNAME}/examples/mex-examples/fortran/
+@dirrm share/${PKGNAME}/examples/mex-examples/mex-with-objects/
+@dirrm share/${PKGNAME}/examples/mex-examples/mex-with-so/
+@dirrm share/${PKGNAME}/examples/mex-examples/
 @dirrm share/${PKGNAME}/examples/misc-examples/
 @dirrm share/${PKGNAME}/examples/
+@dirrm share/${PKGNAME}/imp/giffonts/100dpi/
+@dirrm share/${PKGNAME}/imp/giffonts/75dpi/
+@dirrm share/${PKGNAME}/imp/giffonts/
 @dirrm share/${PKGNAME}/imp/
 @dirrm share/${PKGNAME}/macros/algebre/
 @dirrm share/${PKGNAME}/macros/arma/
@@ -6323,6 +6873,7 @@ share/${PKGNAME}/util/scilib
 @dirrm share/${PKGNAME}/macros/comm/
 @dirrm share/${PKGNAME}/macros/elem/
 @dirrm share/${PKGNAME}/macros/fraclab/
+@dirrm share/${PKGNAME}/macros/int/
 @dirrm share/${PKGNAME}/macros/m2sci/
 @dirrm share/${PKGNAME}/macros/metanet/
 @dirrm share/${PKGNAME}/macros/mtlb/
@@ -6360,8 +6911,12 @@ share/${PKGNAME}/util/scilib
 @dirrm share/${PKGNAME}/man/translation/
 @dirrm share/${PKGNAME}/man/
 @dirrm share/${PKGNAME}/maple/
+@dirrm share/${PKGNAME}/pvm3/lib/
+@dirrm share/${PKGNAME}/pvm3/
+@dirrm share/${PKGNAME}/routines/default/
 @dirrm share/${PKGNAME}/routines/graphics/
 @dirrm share/${PKGNAME}/routines/intersci/
+@dirrm share/${PKGNAME}/routines/scicos/
 @dirrm share/${PKGNAME}/routines/sun/
 @dirrm share/${PKGNAME}/routines/
 @dirrm share/${PKGNAME}/scripts/