1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-25 04:43:33 +00:00

New ports for scilab 2.6 .

PR:		ports/26997
Submitted by:	Jean-Sebastien Roy <jean-sebastien.roy@wanadoo.fr>
This commit is contained in:
SADA Kenji 2001-10-03 14:44:01 +00:00
parent 45b5f0a3f9
commit daa4df5b0b
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=48395
40 changed files with 7812 additions and 8777 deletions

View File

@ -1,34 +1,46 @@
# New ports collection makefile for: Scilab
# Date created: 13 June 1997
# Whom: paulo@isr.uc.pt
# New ports collection makefile for: scilab
# Date created: 30 April 2001
# Whom: js@jeannot.org
#
# $FreeBSD$
#
PORTNAME= Scilab
PORTVERSION= 2.4.1
PORTNAME= scilab
PORTVERSION= 2.6
CATEGORIES= math cad
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
DISTNAME= scilab-${PORTVERSION}
EXTRACT_SUFX= -src.tar.gz
EXTRACT_SUFX= .src.tar.gz
MAINTAINER= paulo@isr.uc.pt
MAINTAINER= js@jeannot.org
RUN_DEPENDS= pvm:${PORTSDIR}/net/pvm \
xless:${PORTSDIR}/misc/xless
LIB_DEPENDS= Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
BUILD_DEPENDS= pvm:${PORTSDIR}/net/pvm \
wish8.3:${PORTSDIR}/x11-toolkits/tk83
RUN_DEPENDS= xless:${PORTSDIR}/misc/xless \
wish8.3:${PORTSDIR}/x11-toolkits/tk83 \
pvm:${PORTSDIR}/net/pvm
PLIST_SUB= SCILAB_VER=${PORTVERSION}
PVM_ROOT= ${PREFIX}/lib/pvm
NO_CDROM= "Don't sell for profit."
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
MAKE_ENV= SCIDIR=${PREFIX}/lib/X11/$(DISTNAME)
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-xless --with-tk \
--with-tk-library=${PREFIX}/lib --with-tk-include=${PREFIX}/include/tk8.3 \
--with-tcl-library=${PREFIX}/lib --with-tcl-include=${PREFIX}/include/tcl8.3 \
--with-xaw3d
CONFIGURE_ENV= PVM_ROOT=${PVM_ROOT} PVM_LIB=${PREFIX}/lib
MAKE_ENV= PVM_INCLUDE=${PREFIX}/include
post-extract:
${RM} ${WRKSRC}/examples/callsci/callsciJava/config/config
${RM} ${WRKSRC}/examples/callsci/callsciFortran/config/config
${RM} ${WRKSRC}/examples/callsci/callsciC/config/config
${RM} ${WRKSRC}/examples/callsci/callsciC++/config/config
pre-install:
@(cd $(WRKSRC); ${RM} -rf Win95-util *.orig)
post-install:
@${CAT} ${PKGMESSAGE}
find ${WRKSRC} -name \*.orig -delete
.include <bsd.port.mk>

View File

@ -1 +1 @@
MD5 (scilab-2.4.1-src.tar.gz) = d035812dea97012d0353c83ee0eabab3
MD5 (scilab-2.6.src.tar.gz) = 32719c686f154ca0ddb02157b00c897e

View File

@ -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)

View File

@ -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)

View File

@ -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

View File

@ -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'

View File

@ -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'

View File

@ -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'

View File

@ -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

View File

@ -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)

View File

@ -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 )

View File

@ -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

View File

@ -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++;

View File

@ -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

View File

@ -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

View File

@ -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);

View File

@ -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();

View File

@ -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)

View File

@ -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>

View File

@ -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"

View File

@ -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>

File diff suppressed because it is too large Load Diff

View File

@ -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
+

View File

@ -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();

View File

@ -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

View File

@ -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

View File

@ -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"

View File

@ -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

View File

@ -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

View File

@ -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;

View File

@ -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

View File

@ -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

View File

@ -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>

View File

@ -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,'$')

View File

@ -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

View File

@ -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++] =

View File

@ -1 +1 @@
A free CACSD Package by INRIA
A free Matlab clone by INRIA & ENPC

View File

@ -1,27 +1,24 @@
Scilab is a scientific software package for numerical computations in a
user-friendly environment. It features:
Elaborate data structures (polynomial, rational and string matrices,
lists, multivariable linear systems,...).
Elaborate data structures.
Sophisticated interpreter and programming language with Matlab-like syntax.
Hundreds of built-in math functions (new primitives can easily be added).
Stunning graphics (2d, 3d, animation).
Open structure (easy interfacing with Fortran and C via online
dynamic link).
Hundreds of built-in math functions.
Stunning graphics.
Open structure.
Many built-in libraries:
Linear Algebra (including sparse matrices, Kronecker form,
ordered Schur,...).
Control (Classical, LQG, H-infinity,...).
Package for LMI (Linear Matrix Inequalities) optimization.
Linear Algebra.
Control.
Package for linear matrix inequalities, optimization.
Signal processing.
Simulation (various ode's, dassl,...).
Optimization (differentiable and non-differentiable, LQ solver).
Metanet (network analysis and optimization).
Simulation.
Optimization.
Metanet.
Symbolic capabilities through Maple interface.
WWW: http://www-rocq.inria.fr/scilab/
Note: To configure your local printers, add their names to the PRINTERS
variable in the scilab script.
WWW: http://www-rocq.inria.fr/scilab/
-- P. Menezes (paulo@isr.uc.pt)

View File

@ -1,8 +0,0 @@
******************************************************************************
0 - COPYRIGHT NOTICE
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.
******************************************************************************

File diff suppressed because it is too large Load Diff