Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory sc8-pr-cvs5.sourceforge.net:/tmp/cvs-serv12041
Modified Files:
scilab-atlas.info scilab-atlas.patch
Log Message:
new upstream version.
Index: scilab-atlas.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scilab-atlas.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- scilab-atlas.info 22 Nov 2006 16:44:44 -0000 1.5
+++ scilab-atlas.info 19 Dec 2006 14:19:51 -0000 1.6
@@ -1,40 +1,38 @@
Package: scilab-atlas
-Version: 3.0
-Revision: 1008
-Architecture: powerpc
+Version: 4.1
+Revision: 1001
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-Depends: g77, tcltk, xaw3d-shlibs
-BuildDepends: tcltk-dev, xaw3d, libncurses5 (>= 5.4-20041023-1006), ocaml,
atlas, libsablot (>= 0.98-1024)
+Depends: g95, tcltk, xaw3d-shlibs, atlas
+BuildDepends: tcltk-dev, xaw3d, libncurses5 (>= 5.4-20041023-1006), ocaml,
libsablot (>= 0.98-1024)
Conflicts: scilab
Replaces: scilab
-Source: ftp://ftp.inria.fr/INRIA/Scilab/distributions/scilab-%v.src.tar.gz
+Source: http://www.scilab.org/download/%v/scilab-%v-src.tar.gz
SourceDirectory: scilab-%v
-Source-MD5: d6fc5fe12519f99ccdd492c4ba96935a
+Source-MD5: 3003fe63088558b931a11127fb8d8ccc
+Patch: %n.patch
PatchScript: <<
perl -pi -e 's,(head|tail) +\-([0-9]),\1 \-n\2,g' scripts/sc_cpp
perl -pi -e 's|[/]sw/|%p/|g' configure
perl -pi -e 's,\#ifdef B42UNIX,#define B42UNIX\n#ifdef B42UNIX,'
routines/console/zzledt.c
- perl -pi -e 's,static int max_plus1,extern int max_plus1,'
routines/xsci/jpc_inter.c
- perl -pi -e 's,int max_plus1;,,' routines/xsci/x_data.c
+ perl -pi -e 's|.*setslatecjmp.*||g' routines/interf/matimp.f
+ /usr/bin/sed -i -e '21,42d' scripts/scilab.g.in
<<
DescPackaging: Patch and patchscript contain /sw because upstream source does
-ConfigureParams: --without-pvm --with-atlas-library=%p/lib
--with-tcl-include=%p/include --with-tcl-library=%p/lib --with-ocaml
+ConfigureParams: --without-pvm --with-tcl-include=%p/include
--with-tcl-library=%p/lib --with-ocaml --without-java
--with-atlas-library=%p/lib
CompileScript: <<
#!/bin/sh -ex
+ perl -pi -e 's|g77|g95|g' configure
./configure %c
- # The periX11 compiler bug is now fixed in the sources
- # make CFLAGS='-O -I/usr/X11R6/include' routines/graphics/periX11.o
+# on intel, dlamc1 needs -ffloat-store, otherwise it produces an infinite loop
+# doesn't harm on ppc either
+ make FC_OPTIONS="-O2 -ffloat-store" routines/lapack/dlamch.o
+# remove annoying disclaimer from greeting message
+ make CFLAGS="-U__APPLE__" routines/system/banier.o
make all man
<<
InstallScript: <<
- mkdir -p %i/lib
- mkdir -p %i/bin
- touch .binary
- echo bin/scilex
- (cd tests; make distclean)
- (cd examples; make distclean)
- (cd .. ; tar cf - scilab-%v | (cd %i/lib; tar xf -))
- rm .binary
+#!/bin/sh -ex
+ make install PREFIX=%i DESTDIR=%p
ln -fs %p/lib/scilab-%v/bin/scilab %i/bin/scilab
ln -fs %p/lib/scilab-%v/bin/intersci %i/bin/intersci
ln -fs %p/lib/scilab-%v/bin/intersci-n %i/bin/intersci-n
@@ -42,4 +40,4 @@
PostInstScript: (cd %p/lib/scilab-%v; make)
Description: Software package for numerical computations
License: OSI-Approved
-Homepage: http://www-rocq.inria.fr/scilab/
+Homepage: http://www.scilab.org
Index: scilab-atlas.patch
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/scilab-atlas.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scilab-atlas.patch 20 Jan 2006 20:30:40 -0000 1.1
+++ scilab-atlas.patch 19 Dec 2006 14:19:51 -0000 1.2
@@ -1,22 +1,273 @@
---- scilab-3.0_ori/configure Fri Jul 9 10:28:05 2004
-+++ scilab-3.0/configure Wed Aug 11 17:20:47 2004
-@@ -22460,7 +22460,7 @@
- FC=g77
+diff -ur scilab-4.0_ori/routines/console/dynamic_menus.c
scilab-4.0/routines/console/dynamic_menus.c
+--- scilab-4.0_ori/routines/console/dynamic_menus.c 2005-10-22
20:53:10.000000000 +0200
++++ scilab-4.0/routines/console/dynamic_menus.c 2006-06-18
11:30:09.000000000 +0200
+@@ -3,6 +3,9 @@
+ * [EMAIL PROTECTED]
+ * Changed: steer, jpc 2004
+ *--------------------------------------------------------------------------*/
++#ifdef __APPLE__
++#include <stdio.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #include <stdio.h>
+diff -ur scilab-4.0_ori/routines/interf/intinterp.c
scilab-4.0/routines/interf/intinterp.c
+--- scilab-4.0_ori/routines/interf/intinterp.c 2005-11-05 22:19:15.000000000
+0100
++++ scilab-4.0/routines/interf/intinterp.c 2006-06-18 11:25:57.000000000
+0200
+@@ -10,6 +10,9 @@
+ #if WIN32
+ #include <string.h>
+ #endif
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #include <math.h>
+
+
+diff -ur scilab-4.0_ori/routines/os_specific/link_SYSV.c
scilab-4.0/routines/os_specific/link_SYSV.c
+--- scilab-4.0_ori/routines/os_specific/link_SYSV.c 2003-02-04
22:16:08.000000000 +0100
++++ scilab-4.0/routines/os_specific/link_SYSV.c 2006-06-18
11:27:24.000000000 +0200
+@@ -34,7 +34,7 @@
+ #endif
+
+
+-#if defined(linux) || defined(netbsd) || defined(freebsd)
++#if defined(linux) || defined(netbsd) || defined(freebsd) ||
defined(__APPLE__)
+ #include <unistd.h>
+ #include <sys/wait.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/scicos/matscicos.c
scilab-4.0/routines/scicos/matscicos.c
+--- scilab-4.0_ori/routines/scicos/matscicos.c 2005-11-05 22:19:15.000000000
+0100
++++ scilab-4.0/routines/scicos/matscicos.c 2006-06-18 11:34:24.000000000
+0200
+@@ -3,6 +3,9 @@
+ /* INRIA 2005 */
+ /* Allan CORNET */
+
/*-----------------------------------------------------------------------------------*/
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #if WIN32
+ #include <Windows.h>
+ #include "../os_specific/win_mem_alloc.h"
+diff -ur scilab-4.0_ori/routines/wintools/intOEMconvert.h
scilab-4.0/routines/wintools/intOEMconvert.h
+--- scilab-4.0_ori/routines/wintools/intOEMconvert.h 2005-05-10
16:52:08.000000000 +0200
++++ scilab-4.0/routines/wintools/intOEMconvert.h 2006-06-18
11:39:18.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTOEMCONVERT__
+ #define __INTOEMCONVERT__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intabout.h
scilab-4.0/routines/wintools/intabout.h
+--- scilab-4.0_ori/routines/wintools/intabout.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intabout.h 2006-06-18 11:40:02.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTABOUT__
+ #define __INTABOUT__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intconsoledos.h
scilab-4.0/routines/wintools/intconsoledos.h
+--- scilab-4.0_ori/routines/wintools/intconsoledos.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intconsoledos.h 2006-06-18
11:40:34.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTCONSOLEDOS__
+ #define __INTCONSOLEDOS__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intfileassociationbox.h
scilab-4.0/routines/wintools/intfileassociationbox.h
+--- scilab-4.0_ori/routines/wintools/intfileassociationbox.h 2005-09-18
21:18:49.000000000 +0200
++++ scilab-4.0/routines/wintools/intfileassociationbox.h 2006-06-18
11:44:52.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTFILEASSOCIATIONBOX__
+ #define __INTFILEASSOCIATIONBOX__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include "../wsci/FilesAssociationBox.h"
+ #include "../wsci/wgnuplib.h"
+diff -ur scilab-4.0_ori/routines/wintools/intihmcolor.h
scilab-4.0/routines/wintools/intihmcolor.h
+--- scilab-4.0_ori/routines/wintools/intihmcolor.h 2005-08-05
23:26:44.000000000 +0200
++++ scilab-4.0/routines/wintools/intihmcolor.h 2006-06-18 11:44:21.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTIHMCOLOR__
+ #define __INTIHMCOLOR__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intmcisendstring.h
scilab-4.0/routines/wintools/intmcisendstring.h
+--- scilab-4.0_ori/routines/wintools/intmcisendstring.h 2005-05-02
20:35:23.000000000 +0200
++++ scilab-4.0/routines/wintools/intmcisendstring.h 2006-06-18
11:38:30.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTMCISENDSTRING__
+ #define __INTMCISENDSTRING__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intpathname.h
scilab-4.0/routines/wintools/intpathname.h
+--- scilab-4.0_ori/routines/wintools/intpathname.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intpathname.h 2006-06-18 11:41:38.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTPATHNAME__
+ #define __INTPATHNAME__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intprintbox.h
scilab-4.0/routines/wintools/intprintbox.h
+--- scilab-4.0_ori/routines/wintools/intprintbox.h 2005-08-03
15:26:51.000000000 +0200
++++ scilab-4.0/routines/wintools/intprintbox.h 2006-06-18 11:43:35.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTPRINTBOX__
+ #define __INTPRINTBOX__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intsetlanguagemenu.h
scilab-4.0/routines/wintools/intsetlanguagemenu.h
+--- scilab-4.0_ori/routines/wintools/intsetlanguagemenu.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intsetlanguagemenu.h 2006-06-18
11:42:12.000000000 +0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTSETLANGUAGEMENU__
+ #define __INTSETLANGUAGEMENU__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/inttoolbar.h
scilab-4.0/routines/wintools/inttoolbar.h
+--- scilab-4.0_ori/routines/wintools/inttoolbar.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/inttoolbar.h 2006-06-18 11:42:36.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTTOOLBAR__
+ #define __INTTOOLBAR__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/inttoprint.h
scilab-4.0/routines/wintools/inttoprint.h
+--- scilab-4.0_ori/routines/wintools/inttoprint.h 2005-08-04
14:12:02.000000000 +0200
++++ scilab-4.0/routines/wintools/inttoprint.h 2006-06-18 11:43:56.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTTOPRINT__
+ #define __INTTOPRINT__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intwinopen.h
scilab-4.0/routines/wintools/intwinopen.h
+--- scilab-4.0_ori/routines/wintools/intwinopen.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intwinopen.h 2006-06-18 11:43:00.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTWINOPEN__
+ #define __INTWINOPEN__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #endif
+diff -ur scilab-4.0_ori/routines/wintools/intwintools.h
scilab-4.0/routines/wintools/intwintools.h
+--- scilab-4.0_ori/routines/wintools/intwintools.h 2005-03-02
16:47:56.000000000 +0100
++++ scilab-4.0/routines/wintools/intwintools.h 2006-06-18 11:37:20.000000000
+0200
+@@ -5,6 +5,9 @@
+ #ifndef __INTWINTOOLS__
+ #define __INTWINTOOLS__
+
++#ifdef __APPLE__
++#include <string.h>
++#endif
+ #ifdef WIN32
+ #include <windows.h>
+ #include <stdio.h>
+--- scilab-4.0/routines/interf/matelm.f~ 2006-01-23 18:12:31.000000000
+0100
++++ scilab-4.0/routines/interf/matelm.f 2006-06-18 12:33:47.000000000
+0200
+@@ -5080,7 +5080,7 @@
+ tiniest = dlamch('u')
+ if ( tiniest/b .ne. 0.d0 ) then
+ c denormalised number are used
+- do i = 1, dlamch('n') - 1
++ do i = 1, int(dlamch('n')) - 1
+ tiniest = tiniest / b
+ enddo
+ endif
+--- scilab-4.0/routines/interf/matdes.c~ 2006-02-01 15:25:08.000000000
+0100
++++ scilab-4.0/routines/interf/matdes.c 2006-06-18 14:41:02.000000000
+0200
+@@ -5166,7 +5166,7 @@
+
+
+
/*-----------------------------------------------------------------------------------*/
+-int move(char *fname,unsigned long fname_len)
++int scimove(char *fname,unsigned long fname_len)
+ {
+ long hdl;
+ integer m1,n1,l1,m2,n2,l2,m3,n3,l3,n;
+--- scilab-4.0/routines/interf/intgraphics.c~ 2005-12-05 11:18:49.000000000
+0100
++++ scilab-4.0/routines/interf/intgraphics.c 2006-06-18 14:41:26.000000000
+0200
+@@ -84,7 +84,7 @@
+ extern int sci_delete _PARAMS((char *fname, unsigned long fname_len));
+ extern int addcb _PARAMS((char *fname, unsigned long fname_len));
+ extern int copy _PARAMS((char *fname, unsigned long
subwinparenttarget));
+-extern int move _PARAMS((char *fname, unsigned long fname_len));
++extern int scimove _PARAMS((char *fname, unsigned long fname_len));
+ extern int glue _PARAMS((char *fname, unsigned long fname_len));
+ extern int unglue _PARAMS((char *fname, unsigned long fname_len));
+ extern int drawnow _PARAMS((char *fname, unsigned long fname_len));
+@@ -181,7 +181,7 @@
+ {sci_delete,"delete"},
+ {addcb,"addcb"},
+ {copy,"copy"},
+- {move,"move"},
++ {scimove,"move"},
+ {glue,"glue"},
+ {unglue,"unglue"},
+ {drawnow,"drawnow"},
+--- scilab/configure.orig 2006-12-18 06:52:31.000000000 -0700
++++ scilab/configure 2006-12-18 06:52:49.000000000 -0700
+@@ -25983,7 +25983,7 @@
+ FC=g95
FC_OPTIONS='-O2'
FC_OPTIONS_O0=
-- FC_LDFLAGS='-L/sw/lib -ldl'
-+ FC_LDFLAGS='-L/sw/lib -ldl -lcc_dynamic'
+- FC_LDFLAGS='-L/sw/lib -ldl -lcc_dynamic'
++ FC_LDFLAGS='-L/sw/lib -ldl'
FC_PICFLAGS='-fPIC'
LD=ld
LD_LDFLAGS=
---- scilab-3.0/routines/console/zzledt.c~ Wed Oct 6 18:10:01 2004
-+++ scilab-3.0/routines/console/zzledt.c Wed Jan 5 23:09:05 2005
-@@ -68,7 +68,7 @@
- #if defined(netbsd) || defined(freebsd)
- #define TERMCAP
- #endif
--
-+#define B42UNIX
- #include <stdio.h>
- #include <ctype.h>
- #include "../machine.h"
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
