Update to version 2.4.1.

PR:		14877
Submitted by:	Pedro F. Giffuni <pfgiffun@bachue.usc.unal.edu.co>
This commit is contained in:
Steve Price 1999-11-27 01:38:31 +00:00
parent 35e6b5474e
commit dca1739cb8
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=23432
74 changed files with 17506 additions and 9672 deletions

View File

@ -1,29 +1,33 @@
# New ports collection makefile for: Scilab
# Version required: 2.3
# Version required: 2.4.1
# Date created: 13 June 1997
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
DISTNAME= scilab-2.3.1
PKGNAME= Scilab-2.3.1
DISTNAME= scilab-${SCILAB_VER}
PKGNAME= Scilab-${SCILAB_VER}
CATEGORIES= math cad
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= paulo@isr.uc.pt
RUN_DEPENDS= xless:${PORTSDIR}/misc/xless
RUN_DEPENDS= pvm:${PORTSDIR}/net/pvm \
xless:${PORTSDIR}/misc/xless
BROKEN= package
SCILAB_VER= 2.4.1
PLIST_SUB+= SCILAB_VER=${SCILAB_VER}
NO_CDROM= "Don't sell for profit."
WRKSRC= ${WRKDIR}/scilab-2.3
HAS_CONFIGURE= yes
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
SCIDIR= ${X11BASE}/lib/X11/scilab
MAKE_ENV= SCIDIR=${PREFIX}/lib/X11/$(DISTNAME)
pre-install:
@(cd $(WRKSRC); ${RM} -rf Win95-util *.orig)
post-install:
@${CAT} ${PKGMESSAGE}

View File

@ -1 +1 @@
MD5 (scilab-2.3.1-src.tar.gz) = 4189d0747f3b3b82d1dc4efda9ff2ca6
MD5 (scilab-2.4.1-src.tar.gz) = d035812dea97012d0353c83ee0eabab3

View File

@ -1,26 +1,172 @@
--- Makefile.in.orig Mon May 12 17:30:43 1997
+++ Makefile.in Wed Jun 18 13:44:05 1997
@@ -54,7 +54,8 @@
distclean::
$(RM) bin/scilex
-SUBDIRS = scripts macros imp intersci @MANVIEWER@ @XMETANET@ tests demos @COMM@
+# FreeBSD Has xless so we dont need it here
+SUBDIRS = scripts macros imp intersci @XMETANET@ tests demos @COMM@
SUBDIRS-DOC = man doc
@@ -135,3 +136,13 @@
touch .binary
cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)
$(RM) .binary
--- 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
+ ;;
+
+install:
+ touch .binary
+ cd .. ; tar cvf - $(BINDISTFILES) | (cd ${PREFIX}/lib/X11; tar xf -)
+ cd ${PREFIX}/lib/X11/scilab-2.3; make
+ rm -f ${PREFIX}/bin/scilab
+ ln -fs ${PREFIX}/lib/X11/scilab-2.3/bin/scilab ${PREFIX}/bin/scilab
+ ln -fs ${PREFIX}/bin/xless ${PREFIX}/lib/X11/scilab-2.3/bin/xless
+ cp ${PREFIX}/lib/X11/scilab-2.3/X11_defaults/Xscilab ${PREFIX}/lib/X11/app-defaults
+ cp ${PREFIX}/lib/X11/scilab-2.3/X11_defaults/Metanet-color ${PREFIX}/lib/X11/app-defaults
+# 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)
+########################
+## test for header files
+########################
+AC_CHECK_HEADERS(values.h)
+
##################
## termcap library
@@ -883,20 +992,38 @@
if test "$with_pvm" != no; then
-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
+ ;;
+
+ *)
+ 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

View File

@ -1,35 +1,14 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/configure ./configure
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/configure Tue May 13 14:08:49 1997
--- ./configure Sun May 25 21:16:16 1997
***************
*** 1050,1055 ****
--- 1050,1078 ----
fi
MAKEFILE_TARGET=Makefile.solaris
;;
+ # FreeBSD
+ *-*-freebsd*)
+ CC=gcc
+ CC_OPTIONS='-O2 -Dfreebsd'
+ CC_LDFLAGS=-lm
+ # script shell f77 have bugs, get ours
+ FC=f77
+ FC_OPTIONS='-O2 -Dfreebsd'
+ FC_LDFLAGS=-lm
+ 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.sunos
+ ;;
+
# Linux a.out
*-pc-linux-gnuaout)
LIEEELIB=
--- 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

View File

@ -1,27 +1,14 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/geci/scruteur.c ./geci/scruteur.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/geci/scruteur.c Mon May 12 16:34:55 1997
--- ./geci/scruteur.c Wed May 21 00:58:59 1997
***************
*** 12,17 ****
--- 12,20 ----
#include <stdio.h>
#include <signal.h>
#include <netdb.h>
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
+ #endif
#include "listes_chainees.h"
#include "utilitaires.h"
***************
*** 45,50 ****
--- 48,56 ----
#if defined (sun) && defined (SYSV)
sigset_t set,oset;
#endif
+ #ifdef __FreeBSD__
+ fpsetmask(0);
+ #endif
signal(SIGTERM,signal_arret_scruteur);
signal(SIGQUIT,signal_arret_scruteur);
--- ./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

View File

@ -1,27 +1,44 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slatexpr2.c ./imp/Slatexpr2.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slatexpr2.c Mon May 12 16:34:55 1997
--- ./imp/Slatexpr2.c Wed May 21 01:00:03 1997
***************
*** 5,10 ****
--- 5,13 ----
#include <malloc.h>
#endif
#include <stdio.h>
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
+ #endif
void readOneLine();
***************
*** 142,147 ****
--- 145,153 ----
int i ;
FILE *fd;
FILE *fdo;
+ #ifdef __FreeBSD__
+ fpsetmask(0);
+ #endif
if (argc !=4 ) { int i=0;
while (strcmp(UsageStr[i],"fin")!=0)
{
--- ./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>

View File

@ -1,27 +1,21 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slpr.c ./imp/Slpr.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slpr.c Mon May 12 16:34:55 1997
--- ./imp/Slpr.c Wed May 21 00:55:40 1997
***************
*** 5,10 ****
--- 5,13 ----
#include <malloc.h>
#endif
#include <stdio.h>
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
+ #endif
#ifdef __STDC__
***************
*** 52,57 ****
--- 55,63 ----
char buf[256];
int i ;
FILE *fd;
+ #ifdef __FreeBSD__
+ fpsetmask(0);
+ #endif
if (argc <= 2) { int i=0;
while (strcmp(UsageStr[i],"fin")!=0)
{
--- /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

View File

@ -1,13 +1,23 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/mainsci.f ./routines/default/mainsci.f
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/mainsci.f Mon May 12 16:33:46 1997
--- ./routines/default/mainsci.f Wed May 21 00:44:49 1997
***************
*** 11,16 ****
--- 11,17 ----
mem=0
nargs = iargc()
call fgetarg(0,pname)
+ call nofpex()
i = 0
10 continue
i=i+1
--- 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)

View File

@ -1,26 +1,47 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/scimem.c ./routines/default/scimem.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/scimem.c Mon May 12 16:33:46 1997
--- ./routines/default/scimem.c Wed May 21 00:47:34 1997
***************
*** 8,13 ****
--- 8,27 ----
#include "../machine.h"
+ #if defined (__FreeBSD__)
+ #include <floatingpoint.h> /* This should be elsewhere but I had to
+ put it somewhere :( */
+ void C2F(nofpex)()
+ {
+ fpsetmask(0); /* Don't dump core on FPE return Inf or NaN */
+ }
+ #else
+ void C2F(nofpex)()
+ {
+ return;
+ }
+ #endif /*freebsd*/
+
char *the_p=NULL;
char *the_ps=NULL;
--- 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

View File

@ -1,15 +1,8 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sound/misc.c ./routines/sound/misc.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sound/misc.c Mon May 12 16:34:27 1997
--- ./routines/sound/misc.c Fri May 16 20:25:33 1997
***************
*** 358,364 ****
--- 358,366 ----
{
static char nomesg[30];
extern int sys_nerr;
+ #ifndef __FreeBSD__
extern char *sys_errlist[];
+ #endif
if (errcode < sys_nerr)
return (sys_errlist[errcode]);
else
--- ./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

View File

@ -1,22 +1,29 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sparse/spConfig.h ./routines/sparse/spConfig.h
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sparse/spConfig.h Mon May 12 16:34:02 1997
--- ./routines/sparse/spConfig.h Fri May 16 20:08:24 1997
***************
*** 495,500 ****
--- 495,510 ----
# define LARGEST_SHORT_INTEGER SHRT_MAX
# define LARGEST_LONG_INTEGER LONG_MAX
#endif
+ #ifdef freebsd
+ # 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
+
#ifdef WIN32
# include <limits.h>
# include <float.h>
--- ./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;

View File

@ -1,37 +1,16 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link.c ./routines/sun/link.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link.c Mon May 12 16:34:04 1997
--- ./routines/sun/link.c Sun May 25 21:13:41 1997
***************
*** 118,124 ****
}
! #if (defined(sun) && defined(SYSV)) || defined(__alpha) || defined(sgi) || (!defined(hppa_old) && defined(hppa))
#include "link_SYSV.c"
#else
#if defined(sun) || defined(mips) || defined(_IBMR2) || defined(hppa_old)
--- 118,124 ----
}
! #if (defined(sun) && defined(SYSV)) || defined(__alpha) || defined(sgi) || (!defined(hppa_old) && defined(hppa)) || defined(__FreeBSD__)
#include "link_SYSV.c"
#else
#if defined(sun) || defined(mips) || defined(_IBMR2) || defined(hppa_old)
***************
*** 128,134 ****
#include "link_std.c"
#endif /* end of SUNOSDLD */
#else
! #if defined(linux)
#ifdef __ELF__
#include "link_SYSV.c"
#else
--- 128,134 ----
#include "link_std.c"
#endif /* end of SUNOSDLD */
#else
! #if defined(linux)
#ifdef __ELF__
#include "link_SYSV.c"
#else
--- ./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
-
#include "mysearch.h"

View File

@ -1,60 +1,19 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link_SYSV.c ./routines/sun/link_SYSV.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link_SYSV.c Mon May 12 16:34:04 1997
--- ./routines/sun/link_SYSV.c Wed May 21 00:12:20 1997
***************
*** 27,42 ****
#include <archives.h>
#endif
! #ifdef linux
#include <unistd.h>
#include <sys/wait.h>
#endif
#ifndef linux
#ifndef hppa
#include <sys/mode.h>
#endif
#endif
#ifdef __alpha
#include <c_asm.h>
--- 27,47 ----
#include <archives.h>
#endif
! #if defined(linux) || defined(__FreeBSD__)
#include <unistd.h>
#include <sys/wait.h>
#endif
+ #ifdef __FreeBSD__
+ #define RTLD_NOW 1
+ #endif
#ifndef linux
+ #ifndef __FreeBSD__
#ifndef hppa
#include <sys/mode.h>
#endif
#endif
+ #endif
#ifdef __alpha
#include <c_asm.h>
***************
*** 169,178 ****
--- 174,187 ----
#ifdef linux
"/usr/bin/ld", "-shared", "-o", 0, 0
#else
+ #ifdef __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
#endif
--- ./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

View File

@ -1,15 +1,10 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/wf_fig.h ./routines/xsci/wf_fig.h
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/wf_fig.h Mon May 12 16:34:24 1997
--- ./routines/xsci/wf_fig.h Fri May 16 20:27:49 1997
***************
*** 209,215 ****
--- 209,217 ----
extern int errno;
extern int sys_nerr;
+ #ifndef __FreeBSD__
extern char *sys_errlist[];
+ #endif
#include <math.h> /* for sin(), cos() etc */
--- ./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,15 +1,21 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/x_misc.c ./routines/xsci/x_misc.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/x_misc.c Mon May 12 16:34:23 1997
--- ./routines/xsci/x_misc.c Fri May 16 20:29:07 1997
***************
*** 507,513 ****
--- 507,515 ----
char *SysErrorMsg(n)
int n;
{
+ #ifndef __FreeBSD__
extern char *sys_errlist[];
+ #endif
extern int sys_nerr;
return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
--- ./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,14 +1,30 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/graphics.c ./xmetanet/graphics.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/graphics.c Mon May 12 16:34:40 1997
--- ./xmetanet/graphics.c Mon May 19 00:28:39 1997
***************
*** 1,6 ****
--- 1,8 ----
#include <X11/Intrinsic.h>
#include <math.h>
+ #ifndef __FreeBSD__
#include <malloc.h>
+ #endif
#include <string.h>
#include <stdio.h>
--- 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,12 +1,23 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/init.c ./xmetanet/init.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/init.c Mon May 12 16:34:40 1997
--- ./xmetanet/init.c Mon May 19 00:29:50 1997
***************
*** 1,3 ****
--- 1,6 ----
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
--- 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,41 +1,22 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/metanet.c ./xmetanet/metanet.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/metanet.c Mon May 12 16:34:41 1997
--- ./xmetanet/metanet.c Wed May 21 01:00:49 1997
***************
*** 6,12 ****
#include <X11/StringDefs.h>
#include <X11/Xaw/Form.h>
#include <X11/Xaw/Label.h>
!
#include "defs.h"
#include "color.h"
#include "list.h"
--- 6,14 ----
#include <X11/StringDefs.h>
#include <X11/Xaw/Form.h>
#include <X11/Xaw/Label.h>
! #ifdef __FreeBSD__
! #include <floatingpoint.h>
! #endif
#include "defs.h"
#include "color.h"
#include "list.h"
***************
*** 219,225 ****
XSizeHints sizehints;
iniG = NULL;
!
/* Is xmetanet called by Scilab? */
igeci = find("-pipes",argc,argv);
--- 221,229 ----
XSizeHints sizehints;
iniG = NULL;
! #ifdef __FreeBSD__
! fpsetmask(0);
! #endif
/* Is xmetanet called by Scilab? */
igeci = find("-pipes",argc,argv);
--- ./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,14 +1,10 @@
*** ./routines/metanet/loadg.c.old Sun Jun 22 16:54:55 1997
--- ./routines/metanet/loadg.c Sun Jun 22 16:55:26 1997
***************
*** 1,5 ****
--- 1,8 ----
#include <stdio.h>
#ifndef __MSC__
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#endif
#include <string.h>
--- ./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,13 +1,17 @@
*** ./routines/metanet/saveg.c.old Sun Jun 22 16:56:33 1997
--- ./routines/metanet/saveg.c Sun Jun 22 16:56:53 1997
***************
*** 1,5 ****
--- 1,8 ----
#include <stdio.h>
#ifndef __MSC__
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#endif
#include <string.h>
--- ./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 +1,13 @@
*** ./routines/metanet/files.c.old Sun Jun 22 16:57:23 1997
--- ./routines/metanet/files.c Sun Jun 22 16:58:16 1997
***************
*** 1,5 ****
--- 1,8 ----
#include <stdio.h>
#ifndef __MSC__
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#endif
#include <string.h>
--- ./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>

1626
math/Scilab/files/patch-au Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,68 @@
--- 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

@ -0,0 +1,18 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,16 @@
--- 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

@ -0,0 +1,10 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,17 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,11 @@
--- 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

@ -0,0 +1,17 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,8 @@
--- 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

@ -0,0 +1,11 @@
--- 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++] =

File diff suppressed because it is too large Load Diff

View File

@ -1,29 +1,33 @@
# New ports collection makefile for: Scilab
# Version required: 2.3
# Version required: 2.4.1
# Date created: 13 June 1997
# Whom: paulo@isr.uc.pt
#
# $FreeBSD$
#
DISTNAME= scilab-2.3.1
PKGNAME= Scilab-2.3.1
DISTNAME= scilab-${SCILAB_VER}
PKGNAME= Scilab-${SCILAB_VER}
CATEGORIES= math cad
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/
MASTER_SITES= ftp://ftp.inria.fr/INRIA/Projects/Meta2/Scilab/distributions/
EXTRACT_SUFX= -src.tar.gz
MAINTAINER= paulo@isr.uc.pt
RUN_DEPENDS= xless:${PORTSDIR}/misc/xless
RUN_DEPENDS= pvm:${PORTSDIR}/net/pvm \
xless:${PORTSDIR}/misc/xless
BROKEN= package
SCILAB_VER= 2.4.1
PLIST_SUB+= SCILAB_VER=${SCILAB_VER}
NO_CDROM= "Don't sell for profit."
WRKSRC= ${WRKDIR}/scilab-2.3
HAS_CONFIGURE= yes
GNU_CONFIGURE= yes
USE_X_PREFIX= yes
SCIDIR= ${X11BASE}/lib/X11/scilab
MAKE_ENV= SCIDIR=${PREFIX}/lib/X11/$(DISTNAME)
pre-install:
@(cd $(WRKSRC); ${RM} -rf Win95-util *.orig)
post-install:
@${CAT} ${PKGMESSAGE}

View File

@ -1 +1 @@
MD5 (scilab-2.3.1-src.tar.gz) = 4189d0747f3b3b82d1dc4efda9ff2ca6
MD5 (scilab-2.4.1-src.tar.gz) = d035812dea97012d0353c83ee0eabab3

View File

@ -1,26 +1,172 @@
--- Makefile.in.orig Mon May 12 17:30:43 1997
+++ Makefile.in Wed Jun 18 13:44:05 1997
@@ -54,7 +54,8 @@
distclean::
$(RM) bin/scilex
-SUBDIRS = scripts macros imp intersci @MANVIEWER@ @XMETANET@ tests demos @COMM@
+# FreeBSD Has xless so we dont need it here
+SUBDIRS = scripts macros imp intersci @XMETANET@ tests demos @COMM@
SUBDIRS-DOC = man doc
@@ -135,3 +136,13 @@
touch .binary
cd .. ; tar cvf $(SCIDIR)/$(SCIBASE)-bin.tar $(BINDISTFILES)
$(RM) .binary
--- 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
+ ;;
+
+install:
+ touch .binary
+ cd .. ; tar cvf - $(BINDISTFILES) | (cd ${PREFIX}/lib/X11; tar xf -)
+ cd ${PREFIX}/lib/X11/scilab-2.3; make
+ rm -f ${PREFIX}/bin/scilab
+ ln -fs ${PREFIX}/lib/X11/scilab-2.3/bin/scilab ${PREFIX}/bin/scilab
+ ln -fs ${PREFIX}/bin/xless ${PREFIX}/lib/X11/scilab-2.3/bin/xless
+ cp ${PREFIX}/lib/X11/scilab-2.3/X11_defaults/Xscilab ${PREFIX}/lib/X11/app-defaults
+ cp ${PREFIX}/lib/X11/scilab-2.3/X11_defaults/Metanet-color ${PREFIX}/lib/X11/app-defaults
+# 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)
+########################
+## test for header files
+########################
+AC_CHECK_HEADERS(values.h)
+
##################
## termcap library
@@ -883,20 +992,38 @@
if test "$with_pvm" != no; then
-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
+ ;;
+
+ *)
+ 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

View File

@ -1,35 +1,14 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/configure ./configure
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/configure Tue May 13 14:08:49 1997
--- ./configure Sun May 25 21:16:16 1997
***************
*** 1050,1055 ****
--- 1050,1078 ----
fi
MAKEFILE_TARGET=Makefile.solaris
;;
+ # FreeBSD
+ *-*-freebsd*)
+ CC=gcc
+ CC_OPTIONS='-O2 -Dfreebsd'
+ CC_LDFLAGS=-lm
+ # script shell f77 have bugs, get ours
+ FC=f77
+ FC_OPTIONS='-O2 -Dfreebsd'
+ FC_LDFLAGS=-lm
+ 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.sunos
+ ;;
+
# Linux a.out
*-pc-linux-gnuaout)
LIEEELIB=
--- 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

View File

@ -1,27 +1,14 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/geci/scruteur.c ./geci/scruteur.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/geci/scruteur.c Mon May 12 16:34:55 1997
--- ./geci/scruteur.c Wed May 21 00:58:59 1997
***************
*** 12,17 ****
--- 12,20 ----
#include <stdio.h>
#include <signal.h>
#include <netdb.h>
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
+ #endif
#include "listes_chainees.h"
#include "utilitaires.h"
***************
*** 45,50 ****
--- 48,56 ----
#if defined (sun) && defined (SYSV)
sigset_t set,oset;
#endif
+ #ifdef __FreeBSD__
+ fpsetmask(0);
+ #endif
signal(SIGTERM,signal_arret_scruteur);
signal(SIGQUIT,signal_arret_scruteur);
--- ./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

View File

@ -1,27 +1,44 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slatexpr2.c ./imp/Slatexpr2.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slatexpr2.c Mon May 12 16:34:55 1997
--- ./imp/Slatexpr2.c Wed May 21 01:00:03 1997
***************
*** 5,10 ****
--- 5,13 ----
#include <malloc.h>
#endif
#include <stdio.h>
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
+ #endif
void readOneLine();
***************
*** 142,147 ****
--- 145,153 ----
int i ;
FILE *fd;
FILE *fdo;
+ #ifdef __FreeBSD__
+ fpsetmask(0);
+ #endif
if (argc !=4 ) { int i=0;
while (strcmp(UsageStr[i],"fin")!=0)
{
--- ./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>

View File

@ -1,27 +1,21 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slpr.c ./imp/Slpr.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/imp/Slpr.c Mon May 12 16:34:55 1997
--- ./imp/Slpr.c Wed May 21 00:55:40 1997
***************
*** 5,10 ****
--- 5,13 ----
#include <malloc.h>
#endif
#include <stdio.h>
+ #ifdef __FreeBSD__
+ #include <floatingpoint.h>
+ #endif
#ifdef __STDC__
***************
*** 52,57 ****
--- 55,63 ----
char buf[256];
int i ;
FILE *fd;
+ #ifdef __FreeBSD__
+ fpsetmask(0);
+ #endif
if (argc <= 2) { int i=0;
while (strcmp(UsageStr[i],"fin")!=0)
{
--- /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

View File

@ -1,13 +1,23 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/mainsci.f ./routines/default/mainsci.f
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/mainsci.f Mon May 12 16:33:46 1997
--- ./routines/default/mainsci.f Wed May 21 00:44:49 1997
***************
*** 11,16 ****
--- 11,17 ----
mem=0
nargs = iargc()
call fgetarg(0,pname)
+ call nofpex()
i = 0
10 continue
i=i+1
--- 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)

View File

@ -1,26 +1,47 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/scimem.c ./routines/default/scimem.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/default/scimem.c Mon May 12 16:33:46 1997
--- ./routines/default/scimem.c Wed May 21 00:47:34 1997
***************
*** 8,13 ****
--- 8,27 ----
#include "../machine.h"
+ #if defined (__FreeBSD__)
+ #include <floatingpoint.h> /* This should be elsewhere but I had to
+ put it somewhere :( */
+ void C2F(nofpex)()
+ {
+ fpsetmask(0); /* Don't dump core on FPE return Inf or NaN */
+ }
+ #else
+ void C2F(nofpex)()
+ {
+ return;
+ }
+ #endif /*freebsd*/
+
char *the_p=NULL;
char *the_ps=NULL;
--- 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

View File

@ -1,15 +1,8 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sound/misc.c ./routines/sound/misc.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sound/misc.c Mon May 12 16:34:27 1997
--- ./routines/sound/misc.c Fri May 16 20:25:33 1997
***************
*** 358,364 ****
--- 358,366 ----
{
static char nomesg[30];
extern int sys_nerr;
+ #ifndef __FreeBSD__
extern char *sys_errlist[];
+ #endif
if (errcode < sys_nerr)
return (sys_errlist[errcode]);
else
--- ./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

View File

@ -1,22 +1,29 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sparse/spConfig.h ./routines/sparse/spConfig.h
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sparse/spConfig.h Mon May 12 16:34:02 1997
--- ./routines/sparse/spConfig.h Fri May 16 20:08:24 1997
***************
*** 495,500 ****
--- 495,510 ----
# define LARGEST_SHORT_INTEGER SHRT_MAX
# define LARGEST_LONG_INTEGER LONG_MAX
#endif
+ #ifdef freebsd
+ # 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
+
#ifdef WIN32
# include <limits.h>
# include <float.h>
--- ./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;

View File

@ -1,37 +1,16 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link.c ./routines/sun/link.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link.c Mon May 12 16:34:04 1997
--- ./routines/sun/link.c Sun May 25 21:13:41 1997
***************
*** 118,124 ****
}
! #if (defined(sun) && defined(SYSV)) || defined(__alpha) || defined(sgi) || (!defined(hppa_old) && defined(hppa))
#include "link_SYSV.c"
#else
#if defined(sun) || defined(mips) || defined(_IBMR2) || defined(hppa_old)
--- 118,124 ----
}
! #if (defined(sun) && defined(SYSV)) || defined(__alpha) || defined(sgi) || (!defined(hppa_old) && defined(hppa)) || defined(__FreeBSD__)
#include "link_SYSV.c"
#else
#if defined(sun) || defined(mips) || defined(_IBMR2) || defined(hppa_old)
***************
*** 128,134 ****
#include "link_std.c"
#endif /* end of SUNOSDLD */
#else
! #if defined(linux)
#ifdef __ELF__
#include "link_SYSV.c"
#else
--- 128,134 ----
#include "link_std.c"
#endif /* end of SUNOSDLD */
#else
! #if defined(linux)
#ifdef __ELF__
#include "link_SYSV.c"
#else
--- ./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
-
#include "mysearch.h"

View File

@ -1,60 +1,19 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link_SYSV.c ./routines/sun/link_SYSV.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/sun/link_SYSV.c Mon May 12 16:34:04 1997
--- ./routines/sun/link_SYSV.c Wed May 21 00:12:20 1997
***************
*** 27,42 ****
#include <archives.h>
#endif
! #ifdef linux
#include <unistd.h>
#include <sys/wait.h>
#endif
#ifndef linux
#ifndef hppa
#include <sys/mode.h>
#endif
#endif
#ifdef __alpha
#include <c_asm.h>
--- 27,47 ----
#include <archives.h>
#endif
! #if defined(linux) || defined(__FreeBSD__)
#include <unistd.h>
#include <sys/wait.h>
#endif
+ #ifdef __FreeBSD__
+ #define RTLD_NOW 1
+ #endif
#ifndef linux
+ #ifndef __FreeBSD__
#ifndef hppa
#include <sys/mode.h>
#endif
#endif
+ #endif
#ifdef __alpha
#include <c_asm.h>
***************
*** 169,178 ****
--- 174,187 ----
#ifdef linux
"/usr/bin/ld", "-shared", "-o", 0, 0
#else
+ #ifdef __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
#endif
--- ./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

View File

@ -1,15 +1,10 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/wf_fig.h ./routines/xsci/wf_fig.h
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/wf_fig.h Mon May 12 16:34:24 1997
--- ./routines/xsci/wf_fig.h Fri May 16 20:27:49 1997
***************
*** 209,215 ****
--- 209,217 ----
extern int errno;
extern int sys_nerr;
+ #ifndef __FreeBSD__
extern char *sys_errlist[];
+ #endif
#include <math.h> /* for sin(), cos() etc */
--- ./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,15 +1,21 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/x_misc.c ./routines/xsci/x_misc.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/routines/xsci/x_misc.c Mon May 12 16:34:23 1997
--- ./routines/xsci/x_misc.c Fri May 16 20:29:07 1997
***************
*** 507,513 ****
--- 507,515 ----
char *SysErrorMsg(n)
int n;
{
+ #ifndef __FreeBSD__
extern char *sys_errlist[];
+ #endif
extern int sys_nerr;
return ((n >= 0 && n < sys_nerr) ? sys_errlist[n] : "unknown error");
--- ./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,14 +1,30 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/graphics.c ./xmetanet/graphics.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/graphics.c Mon May 12 16:34:40 1997
--- ./xmetanet/graphics.c Mon May 19 00:28:39 1997
***************
*** 1,6 ****
--- 1,8 ----
#include <X11/Intrinsic.h>
#include <math.h>
+ #ifndef __FreeBSD__
#include <malloc.h>
+ #endif
#include <string.h>
#include <stdio.h>
--- 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,12 +1,23 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/init.c ./xmetanet/init.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/init.c Mon May 12 16:34:40 1997
--- ./xmetanet/init.c Mon May 19 00:29:50 1997
***************
*** 1,3 ****
--- 1,6 ----
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#include <stdlib.h>
#include <string.h>
--- 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,41 +1,22 @@
diff -c -r /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/metanet.c ./xmetanet/metanet.c
*** /usr/LOCAL/scilab2.3/work/scilab-2.3/xmetanet/metanet.c Mon May 12 16:34:41 1997
--- ./xmetanet/metanet.c Wed May 21 01:00:49 1997
***************
*** 6,12 ****
#include <X11/StringDefs.h>
#include <X11/Xaw/Form.h>
#include <X11/Xaw/Label.h>
!
#include "defs.h"
#include "color.h"
#include "list.h"
--- 6,14 ----
#include <X11/StringDefs.h>
#include <X11/Xaw/Form.h>
#include <X11/Xaw/Label.h>
! #ifdef __FreeBSD__
! #include <floatingpoint.h>
! #endif
#include "defs.h"
#include "color.h"
#include "list.h"
***************
*** 219,225 ****
XSizeHints sizehints;
iniG = NULL;
!
/* Is xmetanet called by Scilab? */
igeci = find("-pipes",argc,argv);
--- 221,229 ----
XSizeHints sizehints;
iniG = NULL;
! #ifdef __FreeBSD__
! fpsetmask(0);
! #endif
/* Is xmetanet called by Scilab? */
igeci = find("-pipes",argc,argv);
--- ./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,14 +1,10 @@
*** ./routines/metanet/loadg.c.old Sun Jun 22 16:54:55 1997
--- ./routines/metanet/loadg.c Sun Jun 22 16:55:26 1997
***************
*** 1,5 ****
--- 1,8 ----
#include <stdio.h>
#ifndef __MSC__
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#endif
#include <string.h>
--- ./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,13 +1,17 @@
*** ./routines/metanet/saveg.c.old Sun Jun 22 16:56:33 1997
--- ./routines/metanet/saveg.c Sun Jun 22 16:56:53 1997
***************
*** 1,5 ****
--- 1,8 ----
#include <stdio.h>
#ifndef __MSC__
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#endif
#include <string.h>
--- ./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 +1,13 @@
*** ./routines/metanet/files.c.old Sun Jun 22 16:57:23 1997
--- ./routines/metanet/files.c Sun Jun 22 16:58:16 1997
***************
*** 1,5 ****
--- 1,8 ----
#include <stdio.h>
#ifndef __MSC__
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
+ #endif
#include <dirent.h>
#endif
#include <string.h>
--- ./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>

1626
math/scilab/files/patch-au Normal file

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,68 @@
--- 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

@ -0,0 +1,18 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,16 @@
--- 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

@ -0,0 +1,10 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,17 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,11 @@
--- 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

@ -0,0 +1,17 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,9 @@
--- 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

@ -0,0 +1,8 @@
--- 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

@ -0,0 +1,11 @@
--- 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++] =

File diff suppressed because it is too large Load Diff