Update of /cvsroot/fink/experimental/jfmertens/main/finkinfo/sci
In directory sc8-pr-cvs17:/tmp/cvs-serv13575
Modified Files:
lpsolve-scilab.info
Added Files:
atlas.info atlas.patch scilab-atlas.info scilab-atlas.patch
Removed Files:
glpk-java.info glpk.info gnuplot.info lpsolve-extra.info
octave-forge.info octave.info
Log Message:
finally a scilab pkg with which lpsolve-scilab seems to work.
Cleanup too.
--- glpk-java.info DELETED ---
--- NEW FILE: scilab-atlas.patch ---
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 -lcc_dynamic'
+ FC_LDFLAGS='-L/sw/lib -ldl'
FC_PICFLAGS='-fPIC'
LD=ld
LD_LDFLAGS=
Index: lpsolve-scilab.info
===================================================================
RCS file:
/cvsroot/fink/experimental/jfmertens/main/finkinfo/sci/lpsolve-scilab.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lpsolve-scilab.info 2 Mar 2007 01:31:58 -0000 1.5
+++ lpsolve-scilab.info 24 Sep 2007 01:41:59 -0000 1.6
@@ -3,7 +3,7 @@
Version: 5.5.0.10
Revision: 1
# rev-up and change next line at every new version of scilab or lpsolve
-Type: scilab (4.1), maj (5.5)
+Type: scilab (4.1.1), maj (5.5)
BuildDepends: lpsolve%type_raw[maj]-dev (>= %v-1), libxslt-bin, scilab-atlas
(>= %type_raw[scilab]-1) | scilab (>= %type_raw[scilab]-1), sed | ssed
Depends: lpsolve%type_raw[maj]-shlibs (>= %type_raw[maj].0.0-1), scilab-atlas
(>= %type_raw[scilab]-1) | scilab (>= %type_raw[scilab]-1)
--- lpsolve-extra.info DELETED ---
--- NEW FILE: scilab-atlas.info ---
Package: scilab-atlas
Version: 4.1.1
Revision: 1001
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
Depends: gcc42, xaw3d-shlibs, atlas, atk1-shlibs, glib2-shlibs, gtk+2-shlibs,
libgettext3-shlibs, libgtkhtml2-shlibs, libiconv, libncurses5-shlibs,
libxml2-shlibs, pango1-xft2-shlibs, readline5-shlibs, tcltk, vte-shlibs, x11
BuildDepends: tcltk-dev, xaw3d, libncurses5 (>= 5.4-20041023-1006), ocaml,
libsablot (>= 0.98-1024), pango1-xft2-dev
Conflicts: scilab
Replaces: scilab
Source: http://www.scilab.org/download/%v/scilab-%v-src.tar.gz
SourceDirectory: scilab-%v
Source-MD5: 0b603c8e40334d0be97eb4ac104926bf
Patch: %n.patch
PatchScript: <<
#!/bin/sh -ev
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.bak -e 's|.*setslatecjmp.*||g' routines/interf/matimp.f
sed -i -e '21,42d' scripts/scilab.g.in
perl -pi -e 's,-DFAKEXDRFLOAT ,,' pvm3/conf/DARWIN.def
sed -r -e 's;-Wl,-shared -g ;-Wl,-bundle ;' < routines/Javasci/Makefile.linux
> routines/Javasci/Makefile.darwin
sed -ri.bak -e 's,-module,& -bundle_loader %p/lib/scilab-%v/bin/scilex,' \
-e 's,--quiet,,' -e 's,^\t@,\t,' Makemex.in config/Makeso.incl.in
# make the scipad editor not crash on startup
printf "function tklib=gettklib()\n tklib='@GETLIBTK@'\nendfunction\n" >
macros/util/gettklib.sci.in
# don't know how to coax configure to define this:
sed -i.bak -e '/G95_FORTRAN/c \
#define G95_FORTRAN 1' routines/machine.h.in
<<
DescPackaging: Patch and patchscript contain /sw because upstream source does
SetLIBRARY_PATH: %p/lib/gcc4.2/lib
#SetLDFLAGS: -lgfortran
ConfigureParams: --with-gfortran --with-gtk2 --with-tcl-include=%p/include
--with-tcl-library=%p/lib --with-ocaml --with-atlas-library=%p/lib
--without-java
# --with-gfortran ? --without-pvm ? --without-java
CompileScript: <<
#!/bin/sh -ex
perl -pi -e 's|g77|gfortran|g' configure
./configure %c
# 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
routines/lapack/slamch.o
# remove annoying disclaimer from greeting message
make CFLAGS="-U__APPLE__" routines/system/banier.o
make all man
<<
InstallScript: <<
#!/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
<<
PostInstScript: (cd %p/lib/scilab-%v; make)
Description: Software package for numerical computations
License: OSI-Approved
Homepage: http://www.scilab.org
--- octave.info DELETED ---
--- NEW FILE: atlas.patch ---
diff -urN ATLAS.orig/config.c ATLAS/config.c
--- ATLAS.orig/config.c Mon Jun 17 10:37:24 2002
+++ ATLAS/config.c Tue Oct 14 21:29:13 2003
@@ -1955,7 +1955,7 @@
if (OS == OSOSX && !WANTGCC)
{
strcpy(comp, "cc");
- strcat(flag, " -traditional-cpp -faltivec");
+ strcat(flag, " -no-cpp-precomp -faltivec");
}
}
break;
--- glpk.info DELETED ---
--- octave-forge.info DELETED ---
--- gnuplot.info DELETED ---
--- NEW FILE: atlas.info ---
Package: atlas
Version: 3.7.11
Revision: 1
Description: Portably optimal linear algebra software
DescDetail: <<
The current version provides a complete BLAS and LAPACK API.
For many operations, ATLAS achieves performance on par
with machine-specific tuned libraries.
Files installed:
cblas.h : The C header file for the C interface to the BLAS.
liblapack.a : The LAPACK routines provided by ATLAS, plus the rest
of LAPACK from netlib.org.
libcblas.a : The ANSI C interface to the BLAS.
libf77blas.a : The Fortran77 interface to the BLAS.
libatlas.a : The main ATLAS library, providing low-level routines for
all interface libs.
When answering "yes" whether to enable threads, one gets also the threaded
variants libptcblas.a and libptf77blas.a
<<
DescPort: <<
The optimized subset of LAPACK provided by ATLAS is merged
with the full LAPACK from http://www.netlib.org/lapack.
<<
DescUsage: <<
Order is important when linking! Use:
-L%p/lib -llapack -lcblas -lf77blas -latlas
Must be run interactively (asks a lot of questions, use default answers
unless you really know what you are doing). For "architecture" choose
"UNKNOWN" if you have a G3.
<<
Source: mirror:sourceforge:math-atlas/%n%v.tar.gz
Source-MD5: d3c6f302a6dbcd3f30803e1392f20012
Source2: http://www.netlib.org/lapack/lapack-3.1.1.tgz
Source2-MD5: 00b21551a899bcfbaa7b8443e1faeef9
License: BSD
#Patch: %n.patch
PatchScript: <<
## perl -pi -e 's,faltivec,faltivec -save-temps,; s, \-j (2|%d),,' config.c
## perl -pi -e 's, \-j (2|%d),,' config.c
# perl -pi -e 's,ATL_(c|)prow2blkT\.c$,$& \-O2,' makes/Make.gpmm
perl -pi -e 's|g77|gfortran|g' config.c
cd ..; ln -s lapack-3.1.1 LAPACK; cd -
perl -pi -e 's|g77|gfortran|g' ../LAPACK/INSTALL/make.inc.LINUX
<<
BuildDepends: gcc42
SourceDirectory: ATLAS
CompileScript: <<
(cd ../LAPACK; sed -e 's|-funroll-all-loops -fno-f2c -O3|-funroll-all-loops
-O3|g' -e 's,^TIMER,\#TIMER,' -e '/INT_ETIME/s,^\# *,,' <
INSTALL/make.inc.LINUX > make.inc; cd SRC; make all)
(make CC=cc config; export ARCH=`ls -1t Make* | head -n1 | cut -f2 -d"."`; cp
../LAPACK/lapack_LINUX.a lib/$ARCH/liblapack.a; mv Make.$ARCH Make.$ARCH.orig;
sed 's|gcc|cc|g' < Make.$ARCH.orig > Make.$ARCH; make install arch=$ARCH)
<<
InstallScript: <<
mkdir -p %i/lib
mkdir -p %i/include
mkdir -p %i/share/doc/%n
(export ARCH=`ls -1t Make* | head -n1 | cut -f2 -d"."`; ranlib
lib/$ARCH/lib*a; cp lib/$ARCH/lib*a %i/lib)
cp include/cblas.h %i/include
cp doc/* %i/share/doc/%n
cp README %i/share/doc/%n
head -n31 config.c > %i/share/doc/%n/LICENSE
<<
PostInstScript: <<
ranlib %p/lib/libatlas.a
ranlib %p/lib/libcblas.a
ranlib %p/lib/libf77blas.a
ranlib %p/lib/liblapack.a
ranlib %p/lib/libtstatlas.a
ranlib %p/lib/libptcblas.a || true
ranlib %p/lib/libptf77blas.a || true
<<
Homepage: http://math-atlas.sourceforge.net
Maintainer: Jeffrey Whitaker <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
