diff options
author | dmcmahill <dmcmahill> | 2003-02-24 03:35:29 +0000 |
---|---|---|
committer | dmcmahill <dmcmahill> | 2003-02-24 03:35:29 +0000 |
commit | 769d3274eab6c0313708012e160afc8d237ee84b (patch) | |
tree | 3443afc8dff3ea88acdea31acf9455263ce66a61 /math/scilab | |
parent | 23296b303bd625dba311cc254b4df5207ee100af (diff) | |
download | pkgsrc-769d3274eab6c0313708012e160afc8d237ee84b.tar.gz |
- fix the tk shared library path to allow the scipad editor to work
- make sure the path is correctly determined for pvm.
- add a --tag= argument to libtool when building fortran code.
This makes all selftests pass on my alpha.
Diffstat (limited to 'math/scilab')
-rw-r--r-- | math/scilab/Makefile | 3 | ||||
-rw-r--r-- | math/scilab/distinfo | 8 | ||||
-rw-r--r-- | math/scilab/patches/patch-ae | 13 | ||||
-rw-r--r-- | math/scilab/patches/patch-af | 13 | ||||
-rw-r--r-- | math/scilab/patches/patch-ag | 13 | ||||
-rw-r--r-- | math/scilab/patches/patch-ah | 19 | ||||
-rw-r--r-- | math/scilab/patches/patch-ai | 13 | ||||
-rw-r--r-- | math/scilab/patches/patch-aj | 13 |
8 files changed, 93 insertions, 2 deletions
diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 2403cd01ac2..63a246da85d 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,8 +1,9 @@ -# $NetBSD: Makefile,v 1.33 2003/02/22 04:31:03 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.34 2003/02/24 03:35:29 dmcmahill Exp $ # DISTNAME= ${SCIBASE}.src PKGNAME= ${SCIBASE} +PKGREVISION= 1 SCIBASE= scilab-2.7 WRKSRC= ${WRKDIR}/${DISTNAME:.src=} CATEGORIES= math diff --git a/math/scilab/distinfo b/math/scilab/distinfo index 60d8eec0770..cf8cd1684b0 100644 --- a/math/scilab/distinfo +++ b/math/scilab/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.8 2003/02/22 04:31:05 dmcmahill Exp $ +$NetBSD: distinfo,v 1.9 2003/02/24 03:35:29 dmcmahill Exp $ SHA1 (scilab-2.7.src.tar.gz) = ce1ab6cb06d938239590e31ac3701ced6f9b3505 Size (scilab-2.7.src.tar.gz) = 9510676 bytes @@ -6,3 +6,9 @@ SHA1 (patch-aa) = 93efb013a8651829dcef30b13fa6de085375d76c SHA1 (patch-ab) = 2a13fc2bf4bd6dc55dc12480acb4f44b8c5ef14f SHA1 (patch-ac) = 8d8e2352815b4c1ad61545ccb7e430169eae876e SHA1 (patch-ad) = 3554377aa2188f55355218408a9e12b5faef177b +SHA1 (patch-ae) = 3428eab766c3a87afdfe25161d8e9b9513f624c0 +SHA1 (patch-af) = 67f6fc74ef81377456884ccfa9c28fa0e6f7cf4d +SHA1 (patch-ag) = 0716d6b284d79f3220adf9af8363eb56ba59f1f8 +SHA1 (patch-ah) = c8b5b418c9dd6d809ccfe2ebbd72514c2243a898 +SHA1 (patch-ai) = a99bd6b3cd27a6328343ae9247e291eea635402c +SHA1 (patch-aj) = 231a10acd752c8dc8039cae8c011f78dbbfa56fa diff --git a/math/scilab/patches/patch-ae b/math/scilab/patches/patch-ae new file mode 100644 index 00000000000..301ca75c027 --- /dev/null +++ b/math/scilab/patches/patch-ae @@ -0,0 +1,13 @@ +$NetBSD: patch-ae,v 1.6 2003/02/24 03:35:30 dmcmahill Exp $ + +--- macros/util/scipad.sci.orig Fri Feb 7 07:22:29 2003 ++++ macros/util/scipad.sci +@@ -14,7 +14,7 @@ if with_tk() then + else + if TK_GetVar("isscipadinterp")=='0' then + TK_EvalStr("interp create scipad") +- TK_EvalStr("load {libtk8.3.so} Tk scipad") ++ TK_EvalStr("load {libtk83.so} Tk scipad") + TK_EvalStr("scipad eval {wm withdraw .}") + TK_EvalStr("scipad alias ScilabEval ScilabEval") + end diff --git a/math/scilab/patches/patch-af b/math/scilab/patches/patch-af new file mode 100644 index 00000000000..f09454c6f1c --- /dev/null +++ b/math/scilab/patches/patch-af @@ -0,0 +1,13 @@ +$NetBSD: patch-af,v 1.7 2003/02/24 03:35:30 dmcmahill Exp $ + +--- Makemex.in.orig Fri Feb 8 05:26:51 2002 ++++ Makemex.in +@@ -30,7 +30,7 @@ FCOMPILE = $(FC) $(FFLAGS) + QUIET=--quiet + + LTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +-FLTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(FC) $(FFLAGS) ++FLTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(QUIET) $(FC) $(FFLAGS) + + LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) -o $@ + diff --git a/math/scilab/patches/patch-ag b/math/scilab/patches/patch-ag new file mode 100644 index 00000000000..33c1890edff --- /dev/null +++ b/math/scilab/patches/patch-ag @@ -0,0 +1,13 @@ +$NetBSD: patch-ag,v 1.7 2003/02/24 03:35:30 dmcmahill Exp $ + +--- config/Makeso.incl.in.orig Mon Jun 24 12:22:46 2002 ++++ config/Makeso.incl.in +@@ -33,7 +33,7 @@ COMPILE = $(CC) $(INCLUDES) $(CPPFLAGS) + FCOMPILE = $(FC) $(INCLUDES) $(FFLAGS) + + LTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(CC) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) +-FLTCOMPILE = $(LIBTOOL) --mode=compile $(QUIET) $(FC) $(INCLUDES) $(FFLAGS) ++FLTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(QUIET) $(FC) $(INCLUDES) $(FFLAGS) + + LINK = $(LIBTOOL) --mode=link $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) $(FLIBS) -o $@ + diff --git a/math/scilab/patches/patch-ah b/math/scilab/patches/patch-ah new file mode 100644 index 00000000000..3c47fb84c46 --- /dev/null +++ b/math/scilab/patches/patch-ah @@ -0,0 +1,19 @@ +$NetBSD: patch-ah,v 1.7 2003/02/24 03:35:30 dmcmahill Exp $ + +--- routines/pvm/pvm_proc_ctrl.c.orig Thu Sep 12 08:24:47 2002 ++++ routines/pvm/pvm_proc_ctrl.c +@@ -373,7 +373,13 @@ void C2F(scipvmspawn)(char *task, int * + strcpy(cmd, "scilex.exe"); + #else + /* I really need scilab here for gtk -version */ +- strcpy(cmd, "scilab"); ++ if (path = getenv("SCI")){ ++ strcpy(cmd,path); ++ strcat(cmd,"/bin/scilab"); ++ } ++ else { ++ strcpy(cmd, "scilab"); ++ } + #endif + #if (defined __MSC__) || (defined __ABSC__) || defined(__MINGW32__) + if ( _stricmp(task,"null") != 0) diff --git a/math/scilab/patches/patch-ai b/math/scilab/patches/patch-ai new file mode 100644 index 00000000000..93476d3e1eb --- /dev/null +++ b/math/scilab/patches/patch-ai @@ -0,0 +1,13 @@ +$NetBSD: patch-ai,v 1.7 2003/02/24 03:35:30 dmcmahill Exp $ + +--- tests/pvm.tst.orig Wed Jul 31 07:34:45 2002 ++++ tests/pvm.tst +@@ -39,7 +39,7 @@ if size(rest(4),'*')<>n then pause,end + + if type(rest(5))<>10 then pause,end + if size(rest(5),'*')<>n then pause,end +-if rest(5)(n)<>'scilab' then pause,end ++if rest(5)(n)<>SCI+'/bin/scilab' then pause,end + if or(rest(5)(1:n-1)<>"") then pause,end + + if rest(6)<>n then pause,end diff --git a/math/scilab/patches/patch-aj b/math/scilab/patches/patch-aj new file mode 100644 index 00000000000..f0623c98467 --- /dev/null +++ b/math/scilab/patches/patch-aj @@ -0,0 +1,13 @@ +$NetBSD: patch-aj,v 1.7 2003/02/24 03:35:30 dmcmahill Exp $ + +--- tests/pvm.dia.ref.orig Wed Jul 31 07:39:02 2002 ++++ tests/pvm.dia.ref +@@ -73,7 +73,7 @@ if type(rest(5))<>10 then bugmes();quit; + + if size(rest(5),'*')<>n then bugmes();quit;end + +-if rest(5)(n)<>'scilab' then bugmes();quit;end ++if rest(5)(n)<>SCI+'/bin/scilab' then bugmes();quit;end + + if or(rest(5)(1:n-1)<>"") then bugmes();quit;end + |