diff options
author | Thomas Gellekum <tg@FreeBSD.org> | 1997-06-18 12:14:52 +0000 |
---|---|---|
committer | Thomas Gellekum <tg@FreeBSD.org> | 1997-06-18 12:14:52 +0000 |
commit | cad64cdf202ccee70aa99a52da882a3cbdd1ae03 (patch) | |
tree | cbeb57a06a96d8a6687549bd78e3440f02ce096b /math/scilab/files | |
parent | 5c040456dbe638283e1ef8fe0fa5c9e3d698db23 (diff) |
Notes
Diffstat (limited to 'math/scilab/files')
-rw-r--r-- | math/scilab/files/patch-aa | 26 | ||||
-rw-r--r-- | math/scilab/files/patch-ab | 35 | ||||
-rw-r--r-- | math/scilab/files/patch-ac | 27 | ||||
-rw-r--r-- | math/scilab/files/patch-ad | 27 | ||||
-rw-r--r-- | math/scilab/files/patch-ae | 27 | ||||
-rw-r--r-- | math/scilab/files/patch-af | 13 | ||||
-rw-r--r-- | math/scilab/files/patch-ag | 26 | ||||
-rw-r--r-- | math/scilab/files/patch-ah | 15 | ||||
-rw-r--r-- | math/scilab/files/patch-ai | 22 | ||||
-rw-r--r-- | math/scilab/files/patch-aj | 37 | ||||
-rw-r--r-- | math/scilab/files/patch-ak | 60 | ||||
-rw-r--r-- | math/scilab/files/patch-al | 15 | ||||
-rw-r--r-- | math/scilab/files/patch-am | 15 | ||||
-rw-r--r-- | math/scilab/files/patch-an | 14 | ||||
-rw-r--r-- | math/scilab/files/patch-ao | 12 | ||||
-rw-r--r-- | math/scilab/files/patch-ap | 41 |
16 files changed, 412 insertions, 0 deletions
diff --git a/math/scilab/files/patch-aa b/math/scilab/files/patch-aa new file mode 100644 index 000000000000..52599cc09d4a --- /dev/null +++ b/math/scilab/files/patch-aa @@ -0,0 +1,26 @@ +--- 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 ++ ++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 diff --git a/math/scilab/files/patch-ab b/math/scilab/files/patch-ab new file mode 100644 index 000000000000..92b74576c228 --- /dev/null +++ b/math/scilab/files/patch-ab @@ -0,0 +1,35 @@ +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= diff --git a/math/scilab/files/patch-ac b/math/scilab/files/patch-ac new file mode 100644 index 000000000000..a7eb66c2c10c --- /dev/null +++ b/math/scilab/files/patch-ac @@ -0,0 +1,27 @@ +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); diff --git a/math/scilab/files/patch-ad b/math/scilab/files/patch-ad new file mode 100644 index 000000000000..9c3201b70b04 --- /dev/null +++ b/math/scilab/files/patch-ad @@ -0,0 +1,27 @@ +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) + { diff --git a/math/scilab/files/patch-ae b/math/scilab/files/patch-ae new file mode 100644 index 000000000000..71e90131460f --- /dev/null +++ b/math/scilab/files/patch-ae @@ -0,0 +1,27 @@ +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) + { diff --git a/math/scilab/files/patch-af b/math/scilab/files/patch-af new file mode 100644 index 000000000000..9583addced2e --- /dev/null +++ b/math/scilab/files/patch-af @@ -0,0 +1,13 @@ +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 diff --git a/math/scilab/files/patch-ag b/math/scilab/files/patch-ag new file mode 100644 index 000000000000..41a8dd946bae --- /dev/null +++ b/math/scilab/files/patch-ag @@ -0,0 +1,26 @@ +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; diff --git a/math/scilab/files/patch-ah b/math/scilab/files/patch-ah new file mode 100644 index 000000000000..a75a6bd99ea5 --- /dev/null +++ b/math/scilab/files/patch-ah @@ -0,0 +1,15 @@ +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 diff --git a/math/scilab/files/patch-ai b/math/scilab/files/patch-ai new file mode 100644 index 000000000000..d9c0e98d080b --- /dev/null +++ b/math/scilab/files/patch-ai @@ -0,0 +1,22 @@ +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> diff --git a/math/scilab/files/patch-aj b/math/scilab/files/patch-aj new file mode 100644 index 000000000000..3128080a1109 --- /dev/null +++ b/math/scilab/files/patch-aj @@ -0,0 +1,37 @@ +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 diff --git a/math/scilab/files/patch-ak b/math/scilab/files/patch-ak new file mode 100644 index 000000000000..6572a99dcfc0 --- /dev/null +++ b/math/scilab/files/patch-ak @@ -0,0 +1,60 @@ +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 diff --git a/math/scilab/files/patch-al b/math/scilab/files/patch-al new file mode 100644 index 000000000000..526c01eee4c9 --- /dev/null +++ b/math/scilab/files/patch-al @@ -0,0 +1,15 @@ +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 */ + diff --git a/math/scilab/files/patch-am b/math/scilab/files/patch-am new file mode 100644 index 000000000000..655b1c03b340 --- /dev/null +++ b/math/scilab/files/patch-am @@ -0,0 +1,15 @@ +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"); diff --git a/math/scilab/files/patch-an b/math/scilab/files/patch-an new file mode 100644 index 000000000000..2f1046ff28ae --- /dev/null +++ b/math/scilab/files/patch-an @@ -0,0 +1,14 @@ +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> + diff --git a/math/scilab/files/patch-ao b/math/scilab/files/patch-ao new file mode 100644 index 000000000000..b28d529f8fe0 --- /dev/null +++ b/math/scilab/files/patch-ao @@ -0,0 +1,12 @@ +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> diff --git a/math/scilab/files/patch-ap b/math/scilab/files/patch-ap new file mode 100644 index 000000000000..f4e35713f4ae --- /dev/null +++ b/math/scilab/files/patch-ap @@ -0,0 +1,41 @@ +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); |