diff options
Diffstat (limited to 'math/scilab/files')
34 files changed, 191 insertions, 2393 deletions
diff --git a/math/scilab/files/patch-aa b/math/scilab/files/patch-aa index 35588c90042d..710f01fcfd55 100644 --- a/math/scilab/files/patch-aa +++ b/math/scilab/files/patch-aa @@ -1,172 +1,11 @@ ---- configure.in.orig Thu Sep 17 07:44:35 1998 -+++ configure.in Mon Oct 4 21:52:54 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,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 Mon Apr 30 21:48:16 2001 ++++ routines/pvm/Makefile Mon Apr 30 21:52:03 2001 +@@ -10,7 +10,7 @@ -+######################## -+## test for header files -+######################## -+AC_CHECK_HEADERS(values.h) -+ - ################## - ## termcap library -@@ -883,20 +992,38 @@ - if test "$with_pvm" != no; then + include ../../Makefile.incl --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 -+case "$host" in -+ *-*-netbsd*) -+ ## with NetBSD, use the version of pvm3 which is part of the package collection -+ AC_MSG_CHECKING("for PVM architecture") -+ AC_MSG_RESULT("NETBSD") - 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" -+ PVMARCH=NETBSD -+ PVMLIB=${LOCALBASE}/lib/libpvm3.a -+ PVMGLIB=${LOCALBASE}/lib/libgpvm3.a - PVMSCIDIR=pvm - PVMSCILIB=libs/pvm.a -- PVMTARGET=scilex-lib --fi -+ PVMTARGET=pvm-no-build -+ ;; -+ -+ *) +-CFLAGS = $(CC_OPTIONS) -I${PVMROOT}/include ++CFLAGS = $(CC_OPTIONS) -I${PVM_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 -+ ;; -+ -+esac - fi + FFLAGS = $(FC_OPTIONS) diff --git a/math/scilab/files/patch-ab b/math/scilab/files/patch-ab index 3b0d8da34bfd..4d02f340b747 100644 --- a/math/scilab/files/patch-ab +++ b/math/scilab/files/patch-ab @@ -1,14 +1,39 @@ ---- 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 +--- Makefile.in Mon Apr 30 21:12:52 2001 ++++ Makefile.in Mon Apr 30 22:19:49 2001 +@@ -115,8 +115,6 @@ + $(SCIBASE)/pvm3/lib/pvmd \ + $(SCIBASE)/pvm3/lib/pvmtmparch \ + $(SCIBASE)/pvm3/lib/pvmgetarch \ +- $(SCIBASE)/pvm3/lib/@PVMARCH@/pvmd3 \ +- $(SCIBASE)/pvm3/lib/@PVMARCH@/pvmgs \ + $(SCIBASE)/routines/*.h \ + $(SCIBASE)/routines/Make.lib \ + $(SCIBASE)/routines/default/FCreate \ +@@ -147,7 +145,7 @@ + cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES) + $(RM) .binary +-LIBPREFIX = @prefix@/lib ++LIBPREFIX = @prefix@ + + install: + @if test `pwd` != ${LIBPREFIX}/$(SCIBASE); then \ +@@ -159,12 +157,12 @@ + (cd ${LIBPREFIX}/$(SCIBASE); make); \ + $(RM) .binary; \ + fi +- $(RM) /usr/bin/scilab +- ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/scilab /usr/bin/scilab +- $(RM) /usr/bin/intersci +- ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci /usr/bin/intersci +- $(RM) /usr/bin/intersci-n +- ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci-n /usr/bin/intersci-n ++ $(RM) @prefix@/bin/scilab ++ ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/scilab @prefix@/bin/scilab ++ $(RM) @prefix@/bin/intersci ++ ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci @prefix@/bin/intersci ++ $(RM) @prefix@/bin/intersci-n ++ ln -fs ${LIBPREFIX}/$(SCIBASE)/bin/intersci-n @prefix@/bin/intersci-n + + uninstall: + $(RM) -r ${LIBPREFIX}/$(SCIBASE) diff --git a/math/scilab/files/patch-ac b/math/scilab/files/patch-ac index 40730ee2d43d..d69dbaf8ecaa 100644 --- a/math/scilab/files/patch-ac +++ b/math/scilab/files/patch-ac @@ -1,14 +1,33 @@ ---- ./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 +--- configure Mon Apr 30 22:08:50 2001 ++++ configure Mon Apr 30 22:10:33 2001 +@@ -2528,15 +2528,15 @@ + # FreeBSD systems (not supported by INRIA) + *-*-freebsd*) + GCC=yes +- CC=gcc +- CC_OPTIONS='-O2 -Dfreebsd' ++ CC=cc ++ CC_OPTIONS="${CFLAGS} -Dfreebsd" + CC_LDFLAGS=-lm + CC_PICFLAGS='-fPIC' + # script shell f77 have bugs, get ours + FC=f77 +- FC_OPTIONS='-O2 -Dfreebsd' ++ FC_OPTIONS="${CFLAGS} -Dfreebsd" + FC_OPTIONS_O0='-Dfreebsd' +- FC_LDFLAGS=-lm ++ FC_LDFLAGS='-lm -Wl,--export-dynamic' + FC_PICFLAGS='-fPIC' + LD=ld + LD_LDFLAGS=-lm +@@ -4635,8 +4635,8 @@ + EOF + PVMARCH="$ac_cv_PVM_arch" +- PVMGLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libgpvm3.a" +- PVMLIB="$PVMROOT/lib/$ac_cv_PVM_arch/libpvm3.a" ++ PVMGLIB="${PVM_LIB}/libgpvm3.a" ++ PVMLIB="${PVM_LIB}/libpvm3.a" + PVMSCIDIR=pvm + PVMSCILIB="\$(SCIDIR)/libs/pvm.a" + fi diff --git a/math/scilab/files/patch-ad b/math/scilab/files/patch-ad index 38b18d663324..e58316878683 100644 --- a/math/scilab/files/patch-ad +++ b/math/scilab/files/patch-ad @@ -1,44 +1,11 @@ ---- ./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> +--- examples/callsci/callsciC/config/callsci.sh Fri Jul 6 10:53:00 2001 ++++ examples/callsci/callsciC/config/callsci.sh Fri Jul 6 11:01:20 2001 +@@ -36,8 +36,6 @@ + export PATH + XAPPLRESDIR=$SCI/X11_defaults + export XAPPLRESDIR +- XLESSHELPFILE=$SCI/X11_defaults/xless.help +- export XLESSHELPFILE + NETHELPDIR=$SCI/X11_defaults + export NETHELPDIR + tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z' diff --git a/math/scilab/files/patch-ae b/math/scilab/files/patch-ae index c2fcea7360d5..ac93a7a273a5 100644 --- a/math/scilab/files/patch-ae +++ b/math/scilab/files/patch-ae @@ -1,21 +1,11 @@ ---- /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 +--- examples/callsci/callsciC/myprog.sh Fri Jul 6 10:53:00 2001 ++++ examples/callsci/callsciC/myprog.sh Fri Jul 6 11:01:47 2001 +@@ -36,8 +36,6 @@ + export PATH + XAPPLRESDIR=$SCI/X11_defaults + export XAPPLRESDIR +- XLESSHELPFILE=$SCI/X11_defaults/xless.help +- export XLESSHELPFILE + NETHELPDIR=$SCI/X11_defaults + export NETHELPDIR + tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z' diff --git a/math/scilab/files/patch-af b/math/scilab/files/patch-af index 657de1b20663..1f3480014653 100644 --- a/math/scilab/files/patch-af +++ b/math/scilab/files/patch-af @@ -1,23 +1,11 @@ ---- 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) +--- examples/callsci/callsciFortran/config/callsci.sh Fri Jul 6 10:53:00 2001 ++++ examples/callsci/callsciFortran/config/callsci.sh Fri Jul 6 11:02:03 2001 +@@ -36,8 +36,6 @@ + export PATH + XAPPLRESDIR=$SCI/X11_defaults + export XAPPLRESDIR +- XLESSHELPFILE=$SCI/X11_defaults/xless.help +- export XLESSHELPFILE + NETHELPDIR=$SCI/X11_defaults + export NETHELPDIR + tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z' diff --git a/math/scilab/files/patch-ag b/math/scilab/files/patch-ag index 4cfdec2b65c2..52af70c55253 100644 --- a/math/scilab/files/patch-ag +++ b/math/scilab/files/patch-ag @@ -1,47 +1,11 @@ ---- 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 - --#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 - --#ifndef linux -+#if !defined(linux) && !defined(netbsd) - #ifdef __alpha - #include <c_asm.h> -@@ -59,7 +61,9 @@ - #endif - -+#if !defined(netbsd) - #if defined __alpha || defined sgi - #include <a.out.h> - #endif -+#endif - - #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 +--- macros/scicos/do_block_info.sci Fri Jul 6 10:51:58 2001 ++++ macros/scicos/do_block_info.sci Fri Jul 6 11:09:23 2001 +@@ -43,7 +43,7 @@ + out_f = strsubsTMPDIR,'/','\')+'\scs_info'; + hos''"'+strsubsSCI,'/','\')+'\bin\xless.exe'" '+ out_f); + else +- unix_s(SCI+'/bin/xless '+TMPDIR+'/scs_info&') ++ unix_s('xless '+TMPDIR+'/scs_info&') + end + end + else diff --git a/math/scilab/files/patch-ah b/math/scilab/files/patch-ah index 28237c526660..5c87dd93ecde 100644 --- a/math/scilab/files/patch-ah +++ b/math/scilab/files/patch-ah @@ -1,8 +1,11 @@ ---- ./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 +--- macros/util/unix_x.sci Fri Jul 6 10:51:58 2001 ++++ macros/util/unix_x.sci Fri Jul 6 11:07:57 2001 +@@ -28,7 +28,7 @@ + if MSDOS then + hos""""+strsubsSCI,'/','\')+'\bin\xless.exe"" '+ tmp); + else +- host('$SCI/bin/xless '+tmp+' & 2>/dev/null;') ++ host('xless '+tmp+' & 2>/dev/null;') + end + case -1 then // host failed + erro85) diff --git a/math/scilab/files/patch-ai b/math/scilab/files/patch-ai index e166faf57a46..830da26f00fb 100644 --- a/math/scilab/files/patch-ai +++ b/math/scilab/files/patch-ai @@ -1,29 +1,11 @@ ---- ./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(freebsd))&& !defined(__alpha__) -+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; +--- routines/sun/h_help_data.c Fri Jul 6 10:52:43 2001 ++++ routines/sun/h_help_data.c Fri Jul 6 11:11:08 2001 +@@ -163,7 +163,7 @@ + } + #else + int i; +- static char format1[]= "$SCI/bin/xless %s/%s.cat 2> /dev/null &"; ++ static char format1[]= "xless %s/%s.cat 2> /dev/null &"; + static char format2[]= "cat %s/%s.cat | more "; + C2xscion&i); + if i != 0 ) diff --git a/math/scilab/files/patch-aj b/math/scilab/files/patch-aj index 289868b66e04..67fec060643d 100644 --- a/math/scilab/files/patch-aj +++ b/math/scilab/files/patch-aj @@ -1,16 +1,38 @@ ---- ./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 -- +--- scripts/scilab.g Fri Jul 6 10:52:53 2001 ++++ scripts/scilab.g Fri Jul 6 11:12:00 2001 +@@ -46,8 +46,6 @@ + export PATH + XAPPLRESDIR=$SCI/X11_defaults + export XAPPLRESDIR +- XLESSHELPFILE=$SCI/X11_defaults/xless.help +- export XLESSHELPFILE + NETHELPDIR=$SCI/X11_defaults + export NETHELPDIR + tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z' +@@ -60,8 +58,6 @@ + export PATH + XAPPLRESDIR=$SCI/X11_defaults + export XAPPLRESDIR +- XLESSHELPFILE=$SCI/X11_defaults/xless.help +- export XLESSHELPFILE + NETHELPDIR=$SCI/X11_defaults + export NETHELPDIR + tty -s && stty kill '^U' intr '^C' erase '^H' quit '^\' eof '^D' susp '^Z' +@@ -122,7 +118,7 @@ + then + exit 19 + else +- ( $SCI/bin/xless /tmp/Sci_mankx ;rm -f /tmp/Sci_mankx ) & ++ ( xless /tmp/Sci_mankx ;rm -f /tmp/Sci_mankx ) & + fi + } - #include "mysearch.h" +@@ -162,7 +158,7 @@ + f=`ls $mpath/$1.cat 2> /dev/null` + if test -n "$f" + then +- $SCI/bin/xless $mpath/$1.cat & ++ xless $mpath/$1.cat & + tst="found" + break + fi diff --git a/math/scilab/files/patch-ak b/math/scilab/files/patch-ak index 90053b125bf8..2305308e3565 100644 --- a/math/scilab/files/patch-ak +++ b/math/scilab/files/patch-ak @@ -1,19 +1,11 @@ ---- ./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 - +--- intersci/intersci.c.orig Wed Aug 15 16:21:17 2001 ++++ intersci/intersci.c Wed Aug 15 16:21:58 2001 +@@ -3326,7 +3326,7 @@ + white(f,7+indent); + count = 7+indent; + } +- if ( count == 72 && sbuf[i] != '\n' ) { fprintf(f,"\n $ ");count=7;} ++ if ( count == 72 && sbuf[i] != '\n' ) { fprintf(f,"\n /");count=6;} + if ( sbuf[i] == '\n') count = -1 ; + fprintf(f,"%c",sbuf[i]); + count++; diff --git a/math/scilab/files/patch-al b/math/scilab/files/patch-al deleted file mode 100644 index ffed38bb80e5..000000000000 --- a/math/scilab/files/patch-al +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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 diff --git a/math/scilab/files/patch-am b/math/scilab/files/patch-am deleted file mode 100644 index f734130a0080..000000000000 --- a/math/scilab/files/patch-am +++ /dev/null @@ -1,21 +0,0 @@ ---- ./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 diff --git a/math/scilab/files/patch-an b/math/scilab/files/patch-an deleted file mode 100644 index ad74285e3bbf..000000000000 --- a/math/scilab/files/patch-an +++ /dev/null @@ -1,30 +0,0 @@ ---- 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(freebsd)) && !defined(__alpha__) -+ fpsetmask(0); -+#endif -+ - signal(SIGTERM,signal_arret_scruteur); - signal(SIGQUIT,signal_arret_scruteur); diff --git a/math/scilab/files/patch-ao b/math/scilab/files/patch-ao deleted file mode 100644 index 022ca27a4005..000000000000 --- a/math/scilab/files/patch-ao +++ /dev/null @@ -1,23 +0,0 @@ ---- 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(freebsd)) && !defined(__alpha__) -+ fpsetmask(0); -+#endif - #ifdef WIN32 - SciEnv(); diff --git a/math/scilab/files/patch-ap b/math/scilab/files/patch-ap deleted file mode 100644 index 96dfc67ef43b..000000000000 --- a/math/scilab/files/patch-ap +++ /dev/null @@ -1,22 +0,0 @@ ---- ./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(freebsd)) && !defined(__alpha__) -+ fpsetmask(0); -+#endif - if (argc <= 2) { int i=0; - while (strcmp(UsageStr[i],"fin")!=0) diff --git a/math/scilab/files/patch-ar b/math/scilab/files/patch-ar deleted file mode 100644 index bbe5c2aa884c..000000000000 --- a/math/scilab/files/patch-ar +++ /dev/null @@ -1,10 +0,0 @@ ---- ./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 __STDC__ - #include <malloc.h> -+#endif - #include <string.h> - #include <stdio.h> diff --git a/math/scilab/files/patch-as b/math/scilab/files/patch-as deleted file mode 100644 index db85ef964f7b..000000000000 --- a/math/scilab/files/patch-as +++ /dev/null @@ -1,17 +0,0 @@ ---- ./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/files/patch-at b/math/scilab/files/patch-at deleted file mode 100644 index c1f97e90ff08..000000000000 --- a/math/scilab/files/patch-at +++ /dev/null @@ -1,13 +0,0 @@ ---- ./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 __STDC__ - #include <malloc.h> -+#endif - #include <stdio.h> - #include <string.h> diff --git a/math/scilab/files/patch-au b/math/scilab/files/patch-au deleted file mode 100644 index d217cb471f1d..000000000000 --- a/math/scilab/files/patch-au +++ /dev/null @@ -1,1626 +0,0 @@ ---- configure.orig Thu Sep 17 09:06:23 1998 -+++ configure Mon Oct 4 21:53:01 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 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,30 +4050,52 @@ - 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 -+case "$host" in -+ *-*-netbsd*) -+ ## with NetBSD, use the version of pvm3 which is part of the package collection -+ echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6 -+echo "configure:4057: checking "for PVM architecture"" >&5 -+ echo "$ac_t"""NETBSD"" 1>&6 -+ cat >> confdefs.h <<\EOF -+#define WITH_PVM 1 -+EOF -+ -+ PVMARCH=NETBSD -+ PVMLIB=${LOCALBASE}/lib/libpvm3.a -+ PVMGLIB=${LOCALBASE}/lib/libgpvm3.a -+ PVMSCIDIR=pvm -+ PVMSCILIB=libs/pvm.a -+ PVMTARGET=pvm-no-build -+ ;; -+ -+ *) -+ -+ echo $ac_n "checking "for PVM architecture"""... $ac_c" 1>&6 -+echo "configure:4074: 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=`./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="\$(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 -+ ;; - -+esac - fi - -@@ -3822,5 +4156,5 @@ - - echo $ac_n "checking for main in -ldl""... $ac_c" 1>&6 --echo "configure:3825: checking for main in -ldl" >&5 -+echo "configure:4159: 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 +4164,5 @@ - LIBS="-ldl $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3833 "configure" -+#line 4167 "configure" - #include "confdefs.h" - -@@ -3837,5 +4171,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:4174: \"$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 +4212,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 4215 "configure" - #include "confdefs.h" - -@@ -3963,5 +4297,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:4300: 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 +4305,5 @@ - LIBS="-lm $m $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 3974 "configure" -+#line 4308 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -3982,5 +4316,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:4319: \"$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 +4379,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 4382 "configure" - #include "confdefs.h" - -@@ -4126,5 +4460,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:4463: 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 +4468,5 @@ - LIBS="-lm $m -lX11 $X_LIBS $X_EXTRA_LIBS $TCLTK_LIBS $LIBS" - cat > conftest.$ac_ext <<EOF --#line 4137 "configure" -+#line 4471 "configure" - #include "confdefs.h" - /* Override any gcc2 internal prototype to avoid an error. */ -@@ -4145,5 +4479,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:4482: \"$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 +4620,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 +4687,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 +4706,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/files/patch-av b/math/scilab/files/patch-av deleted file mode 100644 index 1259f1d76841..000000000000 --- a/math/scilab/files/patch-av +++ /dev/null @@ -1,68 +0,0 @@ ---- 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 FreeBSD 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}/lib/X11; tar xf -) -+ cd ${SCIDIR}; $(MAKE) -+ ln -fs ${X11BASE}/bin/xless ${SCIDIR}/bin/xless -+ rm -f ${PREFIX}/bin/scilab -+ ln -fs ${SCIDIR}/bin/scilab ${PREFIX}/bin/scilab -+ ${BSD_INSTALL_DATA} ${SCIDIR}/X11_defaults/Xscilab ${X11BASE}/lib/X11/app-defaults -+ ${BSD_INSTALL_DATA} ${SCIDIR}/X11_defaults/Metanet-color ${X11BASE}/lib/X11/app-defaults -+ diff --git a/math/scilab/files/patch-aw b/math/scilab/files/patch-aw deleted file mode 100644 index 5c31b270c019..000000000000 --- a/math/scilab/files/patch-aw +++ /dev/null @@ -1,18 +0,0 @@ ---- 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/files/patch-ax b/math/scilab/files/patch-ax deleted file mode 100644 index 277e63164051..000000000000 --- a/math/scilab/files/patch-ax +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/files/patch-ay b/math/scilab/files/patch-ay deleted file mode 100644 index 3f7ab5559684..000000000000 --- a/math/scilab/files/patch-ay +++ /dev/null @@ -1,16 +0,0 @@ ---- 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/files/patch-az b/math/scilab/files/patch-az deleted file mode 100644 index fed7870a36d0..000000000000 --- a/math/scilab/files/patch-az +++ /dev/null @@ -1,10 +0,0 @@ ---- 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 - -+#ifndef __STDC__ - #include <malloc.h> -+#endif - - #include "../machine.h" diff --git a/math/scilab/files/patch-ba b/math/scilab/files/patch-ba deleted file mode 100644 index dc1af0ed8269..000000000000 --- a/math/scilab/files/patch-ba +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/files/patch-bb b/math/scilab/files/patch-bb deleted file mode 100644 index 677d66c88583..000000000000 --- a/math/scilab/files/patch-bb +++ /dev/null @@ -1,17 +0,0 @@ ---- 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/files/patch-bd b/math/scilab/files/patch-bd deleted file mode 100644 index ea9ee7857d43..000000000000 --- a/math/scilab/files/patch-bd +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/files/patch-be b/math/scilab/files/patch-be deleted file mode 100644 index 0ff6eb989158..000000000000 --- a/math/scilab/files/patch-be +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/files/patch-br b/math/scilab/files/patch-br deleted file mode 100644 index c4df9ac0d9e6..000000000000 --- a/math/scilab/files/patch-br +++ /dev/null @@ -1,17 +0,0 @@ ---- 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/files/patch-bs b/math/scilab/files/patch-bs deleted file mode 100644 index 4bd4c4ea39ef..000000000000 --- a/math/scilab/files/patch-bs +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/files/patch-bt b/math/scilab/files/patch-bt deleted file mode 100644 index eff2e247c36d..000000000000 --- a/math/scilab/files/patch-bt +++ /dev/null @@ -1,9 +0,0 @@ ---- 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/files/patch-bu b/math/scilab/files/patch-bu deleted file mode 100644 index 2fb6f3c1ae88..000000000000 --- a/math/scilab/files/patch-bu +++ /dev/null @@ -1,8 +0,0 @@ ---- 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/files/patch-bv b/math/scilab/files/patch-bv deleted file mode 100644 index 1a4b014459bf..000000000000 --- a/math/scilab/files/patch-bv +++ /dev/null @@ -1,11 +0,0 @@ ---- pvm3/src/host.c.orig Fri Nov 26 17:05:44 1999 -+++ pvm3/src/host.c Fri Nov 26 17:10:55 1999 -@@ -929,7 +929,7 @@ - perror("ioctl"); - goto bail; - } -- if (IFF_UP & req.ifr_ifru.ifru_flags) { -+ if (IFF_UP & req.ifr_flags) { - if (nip > 0 && !(nip % 10)) - iplist = TREALLOC(iplist, (nip + 10), struct in_addr); - iplist[nip++] = |