[Frugalware-git] frugalware-current: scilab-5.3.3-1-i686

2011-09-11 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=4c0424f73674d86da9aaee5b9f7ddc39bfb461b5

commit 4c0424f73674d86da9aaee5b9f7ddc39bfb461b5
Author: Melko 
Date:   Sun Sep 11 15:23:39 2011 +0200

scilab-5.3.3-1-i686

* fix build on x86_64 (last try)

diff --git a/source/xapps-extra/scilab/FrugalBuild 
b/source/xapps-extra/scilab/FrugalBuild
index c125a76..4627753 100644
--- a/source/xapps-extra/scilab/FrugalBuild
+++ b/source/xapps-extra/scilab/FrugalBuild
@@ -27,7 +27,7 @@ fi

build() {
Fcd
-   [ "$CARCH" == "x86_64" ] && CXXFLAGS="$CXXFLAGS -fPIC"
+   [ "$CARCH" == "x86_64" ] && export CXXFLAGS="$CXXFLAGS -fPIC" && export 
CFLAGS="$CFLAGS -fPIC"
sed -i '15090s|thirdparty|thirdparty/checkstyle|' configure || Fdie
Fbuild --without-gui --without-javasci --without-jdk --disable-build-help \
--disable-build-localization --with-hdf5 --without-scicos \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] frugalware-current: scilab-5.3.3-1-i686

2011-09-11 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=292fe2e4c5d8275bc169a1c4f88d9e72d8cde9ff

commit 292fe2e4c5d8275bc169a1c4f88d9e72d8cde9ff
Author: Melko 
Date:   Sun Sep 11 14:21:06 2011 +0200

scilab-5.3.3-1-i686

* build with new lapack

diff --git a/source/xapps-extra/scilab/FrugalBuild 
b/source/xapps-extra/scilab/FrugalBuild
index 1515a7e..c125a76 100644
--- a/source/xapps-extra/scilab/FrugalBuild
+++ b/source/xapps-extra/scilab/FrugalBuild
@@ -7,7 +7,7 @@ pkgrel=1
pkgdesc="Scilab is a scientific software package for numerical computations."
url="http://www.scilab.org/";
depends=('pcre>=8.12' 'libgfortran>=4.6.1' 'libgomp>=4.6.1' 'libxml2>=2.7.8' 
'fftw>=3.2.2' 'hdf5>=1.8.7')
-makedepends=('gcc-gfortran>=4.5.2-2' 'blas>=3.3.1' 'lapack>=3.3.1' 
'umfpack>=5.5.1' 'ocaml>=3.12.1')
+makedepends=('gcc-gfortran>=4.5.2-2' 'blas>=3.3.1' 'lapack>=3.3.1-2' 
'umfpack>=5.5.1' 'ocaml>=3.12.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
options=('scriptlet')
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] frugalware-current: scilab-5.3.3-1-i686

2011-09-11 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=c8aece432083f58fb5817e9aa7fcc51fb38b7a93

commit c8aece432083f58fb5817e9aa7fcc51fb38b7a93
Author: Melko 
Date:   Sun Sep 11 13:51:02 2011 +0200

scilab-5.3.3-1-i686

* fix build on x86_64 (first try)

diff --git a/source/xapps-extra/scilab/FrugalBuild 
b/source/xapps-extra/scilab/FrugalBuild
index 1d9718d..1515a7e 100644
--- a/source/xapps-extra/scilab/FrugalBuild
+++ b/source/xapps-extra/scilab/FrugalBuild
@@ -27,6 +27,7 @@ fi

build() {
Fcd
+   [ "$CARCH" == "x86_64" ] && CXXFLAGS="$CXXFLAGS -fPIC"
sed -i '15090s|thirdparty|thirdparty/checkstyle|' configure || Fdie
Fbuild --without-gui --without-javasci --without-jdk --disable-build-help \
--disable-build-localization --with-hdf5 --without-scicos \
___
Frugalware-git mailing list
Frugalware-git@frugalware.org
http://frugalware.org/mailman/listinfo/frugalware-git


[Frugalware-git] frugalware-current: scilab-5.3.3-1-i686

2011-09-11 Thread Melko
Git-Url: 
http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=dc35bc2947e26c99733e3b2d20d751b6c2f18d4d

commit dc35bc2947e26c99733e3b2d20d751b6c2f18d4d
Author: Melko 
Date:   Sun Sep 11 13:33:46 2011 +0200

scilab-5.3.3-1-i686

* version bump
* disable gui (I hope can have this back soon)

diff --git a/source/xapps-extra/scilab/FrugalBuild 
b/source/xapps-extra/scilab/FrugalBuild
index d15bb6f..1d9718d 100644
--- a/source/xapps-extra/scilab/FrugalBuild
+++ b/source/xapps-extra/scilab/FrugalBuild
@@ -2,40 +2,36 @@
# Maintainer: voroskoi 

pkgname=scilab
-pkgver=4.1.2
-pkgrel=5
+pkgver=5.3.3
+pkgrel=1
pkgdesc="Scilab is a scientific software package for numerical computations."
url="http://www.scilab.org/";
-depends=('vte>=0.26.2' 'ncurses' 'libgtkhtml>=2.11.1-4' 'libgfortran' 
'readline' 'libgcc' 'libxml2>=2.7.8' 'xaw3d' 'ocaml')
-makedepends=('gcc-gfortran>=4.5.2-2')
+depends=('pcre>=8.12' 'libgfortran>=4.6.1' 'libgomp>=4.6.1' 'libxml2>=2.7.8' 
'fftw>=3.2.2' 'hdf5>=1.8.7')
+makedepends=('gcc-gfortran>=4.5.2-2' 'blas>=3.3.1' 'lapack>=3.3.1' 
'umfpack>=5.5.1' 'ocaml>=3.12.1')
groups=('xapps-extra')
archs=('i686' 'x86_64')
-license="Scilab License"
options=('scriptlet')
-up2date="lynx -dump 
http://scilabsoft.inria.fr/download/index_download.php?page=release.html |grep 
scilab.*-src.tar.gz |sed -ne 's/.*b-\(.*\)-src.*/\1/; 1 p'"
-source=($url/download/$pkgver/$pkgname-$pkgver-src.tar.gz gcc45.patch)
-sha1sums=('d3f3190bd11fe23eebec03fe9feaced0406ddfe3' \
-  'fc5fa60c708be076f719ca13ce2a5a7ad0e273aa')
+up2date="Flastarchive $url/communities/developer_zone/scilab_versions/stable 
-src.tar.gz"
+source=($url/download/$pkgver/$pkgname-$pkgver-src.tar.gz \
+   configure-hdf5-vercheck.patch)
+sha1sums=('0bb26846737651a62565f877e2d660f90e2b4b26' \
+  '9a569040d77c075de1fe897afe2c1f4c441c36a6')

-build() {
-   Fpatchall
-   Fconf --disable-static \
-   --without-tk \
-   --with-gtk2 \
-   --with-gnu-ld \
-   --with-gfortran
-   Fsed "=\ -O" "=\ $CFLAGS" Makefile.incl
-   unset MAKEFLAGS
-   make all || Fdie
-   Fsed "PREFIX=/usr" "PREFIX=$Fdestdir/$Fprefix" Makefile
-   Fmakeinstall
-
-   # Fixing symlinks
-   Fln ../lib/$pkgname-$pkgver/bin/scilab /usr/bin/scilab
-   Fln ../lib/$pkgname-$pkgver/bin/intersci /usr/bin/intersci
-   Fln ../lib/$pkgname-$pkgver/bin/intersci-n /usr/bin/intersci-n
+if [ "$CARCH" = "i686" ]; then
+   source=(${source[@]} 
$url/download/$pkgver/prerequirements-$pkgname-$pkgver-src.tar.gz)
+   sha1sums=("${sha1sums[@]}" 'fdcff4929c91e4ddc33e1b46626f6ba5d76a375a')
+elif [ "$CARCH" = "x86_64" ]; then
+   source=(${source[@]} 
$url/download/$pkgver/prerequirements-$pkgname-$pkgver-x86_64-src.tar.gz)
+   sha1sums=("${sha1sums[@]}" 'c23e58702746e5fa9b01eb978bd93022b5ed3b04')
+fi

-   Fsed "SCI=\"$Fdestdir/$pkgname-$pkgver\"" 
"SCI=\"/usr/lib/$pkgname-$pkgver\"" 
$Fdestdir/usr/lib/$pkgname-$pkgver/bin/scilab
+build() {
+   Fcd
+   sed -i '15090s|thirdparty|thirdparty/checkstyle|' configure || Fdie
+   Fbuild --without-gui --without-javasci --without-jdk 
--disable-build-help \
+   --disable-build-localization --with-hdf5 --without-scicos \
+   --without-xcos --with-ocaml --without-modelica --with-fftw \
+   --without-pvm --with-umfpack --without-matio --without-tk
}

# optimization OK
diff --git a/source/xapps-extra/scilab/configure-hdf5-vercheck.patch 
b/source/xapps-extra/scilab/configure-hdf5-vercheck.patch
new file mode 100644
index 000..0f1d875
--- /dev/null
+++ b/source/xapps-extra/scilab/configure-hdf5-vercheck.patch
@@ -0,0 +1,24 @@
+--- configure.bak  2011-07-10 11:28:35.833136771 +0200
 configure  2011-07-10 11:28:45.023136232 +0200
+@@ -19495,21 +19495,6 @@
+ // #line 19495 "configure"
+ import ncsa.hdf.hdf5lib.H5;
+
+-public class conftest {
+-public static void main(String[] argv) {
+-String minVersion="1.8.4";
+-int[] vers = new int[3];
+-try { H5.H5get_libversion(vers); }
+-catch (Throwable ex) {System.exit(-1);}
+-String ver = vers[0] + "."+ vers[1] +"."+vers[2];
+-
+-System.out.println(ver);
+-  if (minVersion.compareTo(ver) > 0) {
+-   System.exit(-1);
+-}
+-
+-}
+-}
+ EOF
+
+ CLASSPATH=$ac_java_classpath
diff --git a/source/xapps-extra/scilab/gcc45.patch 
b/source/xapps-extra/scilab/gcc45.patch
deleted file mode 100644
index ec15e50..000
--- a/source/xapps-extra/scilab/gcc45.patch
+++ /dev/null
@@ -1,23 +0,0 @@
 routines/system/msgs.f
-+++ routines/system/msgs.f
-@@ -82,7 +82,7 @@
-   call showstack()
-   goto 
-  109  continue
--  write(buf(1:5),'(1pI5)') ierr
-+  write(buf(1:5),'(I5)') ierr
-   call basout(io, w