Update of /cvsroot/fink/experimental/alexkhansen/10.4/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv12193
Modified Files:
octave-3.2.4.info
Log Message:
Update dependencies
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/10.4/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octave-3.2.4.info 23 Aug 2011 11:17:47 -0000 1.1
+++ octave-3.2.4.info 23 Aug 2011 16:04:22 -0000 1.2
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
-Revision: 0.0002
+Revision: 0.0004
Maintainer: Alexander Hansen <alexkhan...@users.sourceforge.net>
# disable atlas on 10.7 distro file until atlas is available
@@ -11,17 +11,16 @@
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
BuildDepends: <<
- glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7), libcurl4,
- pcre, gcc46, suitesparse, qhull, fink (>= 0.28),
fink-package-precedence, sed,
- graphicsmagick-dev,
+ arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
+ libcurl4,
+ pcre, gcc46-compiler, suitesparse, qhull, fink (>= 0.28),
fink-package-precedence, sed,
+ imagemagick10-dev,
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
Suggests: %{Ni}%type_pkg[oct]-docs
GCC: 4.0
-SetCXX: llvm-g++
-SetCC: llvm-gcc
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}, (%type_raw[-atlas] != -atlas)
%{Ni}-atlas,
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
@@ -41,9 +40,9 @@
sed -i -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
<<
-SetLDFLAGS: -Wl,-dead_strip_dylibs
+SetLDFLAGS: -Wl,-dead_strip_dylibs
ConfigureParams: <<
- F77=%p/bin/gfortran --host=%m-apple-darwin --build=%m-apple-darwin \
+ F77=%p/bin/gfortran-fsf-4.6 --host=%m-apple-darwin
--build=%m-apple-darwin \
--infodir='${prefix}/share/info' --mandir='${prefix}/share/man'
--libexecdir='${prefix}/lib' \
--enable-shared --enable-dl --disable-static --without-mpi --with-hdf5
--with-fftw
<<
@@ -59,7 +58,7 @@
FLIBDIR="%p/lib/gcc4.6/lib"
./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
- fink-package-precedence --depfile-ext='.d'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev
src
+ fink-package-precedence --depfile-ext='.d'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-atlas-dev,%{Ni}305-dev,%{Ni}305-atlas-dev
src
<<
InfoTest: <<
TestScript: make check || exit 2
@@ -82,8 +81,6 @@
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
done
popd
- # remove TeX stuff which may have been generated:
- rm %i/share/%{Ni}/ls-R %i/lib/%{Ni}/ls-R
# remove autogenerated freedesktop.org desktop file
rm -f %i/share/applications/www.%{Ni}.org-%{Ni}.desktop
mkdir -p %i/share/%{Ni}/%v/scripts
@@ -111,14 +108,14 @@
%{Ni} (<< 3.0.5-5), %{Ni}-atlas (<< 3.0.5-5),
%{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
- Depends: fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, readline5-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
+ Depends: fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, readline5-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
Files: <<
lib/%{Ni}-%v
<<
Shlibs: <<
- %p/lib/%{Ni}-%v/libcruft.dylib 0.0.0 %n (>=3.0.5-5)
- %p/lib/%{Ni}-%v/lib%{Ni}.dylib 0.0.0 %n (>=3.0.5-5)
- %p/lib/%{Ni}-%v/liboctinterp.dylib 0.0.0 %n (>=3.0.5-5)
+ %p/lib/%{Ni}-%v/libcruft.dylib 0.0.0 %n (>=3.2.4-0)
+ %p/lib/%{Ni}-%v/lib%{Ni}.dylib 0.0.0 %n (>=3.2.4-0)
+ %p/lib/%{Ni}-%v/liboctinterp.dylib 0.0.0 %n (>=3.2.4-0))
<<
DescDetail: <<
This package contains shared libraries which are used by the Octave
@@ -197,10 +194,8 @@
Package: octave%type_pkg[oct]%type_pkg[-atlas]
Depends: <<
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
- glpk-shlibs, gnuplot (>=4.2.0) | gnuplot-nox | gnuplot-nogtk,
- fftw3-shlibs (>= 3.1.1-7),
- ncurses, aquaterm, libcurl4-shlibs,
- pcre-shlibs,
+ arpack-shlibs, fftw3-shlibs (>= 3.1.1-7), fltk-aqua-shlibs, glpk-shlibs,
+ libcurl4-shlibs, octave324-shlibs, pcre-shlibs, ncurses,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
<<
Conflicts: <<
------------------------------------------------------------------------------
Get a FREE DOWNLOAD! and learn more about uberSVN rich system,
user administration capabilities and model configuration. Take
the hassle out of deploying and managing Subversion and the
tools developers use with it. http://p.sf.net/sfu/wandisco-d2d-2
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
