Update of /cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv13417/common/finkinfo/sci
Modified Files:
octave-3.2.4.info
Log Message:
Closing in
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci/octave-3.2.4.info,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- octave-3.2.4.info 29 Aug 2011 17:46:52 -0000 1.4
+++ octave-3.2.4.info 29 Aug 2011 21:24:46 -0000 1.5
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
-Revision: 0.5000
+Revision: 0.8000
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -13,7 +13,7 @@
BuildDepends: <<
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, fltk13-aqua, x11-dev, libftgl2, qhull6-dev, qrupdate,
- pcre, gcc46-compiler, suitesparse, fink (>= 0.30.0),
fink-package-precedence, sed,
+ pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
graphicsmagick-dev,
(%type_raw[-atlas] = atlas) atlas
<<
@@ -39,7 +39,12 @@
cp doc/interpreter/mkoctfile.1 doc/interpreter/mkoctfile-%v.1
sed -e 's/@OCTVERSION@/%v/g' %{PatchFile} | patch -p1
sed -i -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
+ # fix lib name for qhull6
perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
+ # wrong include dir for qhull6
+ for f in `grep -l -r "qhull_a\.h" src`
+ do sed -i.orig -e '/include/s|qhull/|lib&|' $f
+ done
# more patching by fangism
# silence some warnings
sed -i.orig -e '/ibasea/s|\*ibasea, ||' \
@@ -51,12 +56,6 @@
# need size_t from <cstddef>
sed -i.orig -e '/#define octave_oct_alloc_h/a\
using std::size_t;' liboctave/oct-alloc.h
- # wrong namespace?
- # sed -i.orig -e '/Quantum/s|Magick|&Lib|g'
src/DLD-FUNCTIONS/__magick_read__.cc
- # wrong include dir for qhull
- for f in `grep -l -r "qhull_a\.h" src`
- do sed -i.orig -e '/include/s|qhull/|lib&|' $f
- done
# needed by clang++, safe for g++: using-declaration as typedef
for f in liboctave/DiagArray2.h liboctave/intNDArray.h
do sed -i.orig -e '/using.*element_type;/s|using|& typename|' $f
@@ -66,7 +65,7 @@
<<
SetLDFLAGS: -Wl,-dead_strip_dylibs
-SetLIBS: -lGraphicsMagick
+SetLIBS: -lGraphicsMagick -lmetis
ConfigureParams: <<
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' \
@@ -96,7 +95,7 @@
#!/bin/sh -ev
export MAKEFLAGS=-j1
make install DESTDIR=%d
- # install Fink-specific %{Ni}rc which points at our oct-versioned
+ # install Fink-specific octaverc which points at our oct-versioned
# package directory
cp %b/%{Ni}rc %i/share/%{Ni}/%v/m/startup
mkdir -p %i/var/%{Ni}/%v/
@@ -367,10 +366,13 @@
Remove a desktop file that gets generated only for users with GNOME/KDE
installed.
-As of 3.0.5-5, we have split the package up into runtime, development, and
library packages,
+Patch mkoctfile.in so that it uses Fink's compiler wrappers
+when building octave packages by hand. This is critical for 10.6/i386 users.
+
+We have split the package up into runtime, development, and library packages,
to make upgrades easier for us and for users.
-As of 3.0.5-5: generate common octave-forge bash and octave scripts,
+We generate common octave-forge bash and octave scripts,
based on the ones by Johnathan Stickel in the original octave-forge-foo
packages, in _this_ package, so that any required changes can be made in
a common location rather than spread out over many packages.
------------------------------------------------------------------------------
Special Offer -- Download ArcSight Logger for FREE!
Finally, a world-class log management solution at an even better
price-free! And you'll get a free "Love Thy Logs" t-shirt when you
download Logger. Secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsisghtdev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
