Update of /cvsroot/fink/experimental/alexkhansen/10.4/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv22104
Modified Files:
octave-3.2.4.info
Added Files:
fltk-backend.info
Log Message:
10.4 tree specific versions.
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.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- octave-3.2.4.info 24 Aug 2011 01:30:56 -0000 1.3
+++ octave-3.2.4.info 31 Aug 2011 21:23:37 -0000 1.4
@@ -1,8 +1,8 @@
Info2: <<
Package: octave%type_pkg[-atlas]
-Type: -atlas (.), oct(3.2.4)
+Type: -atlas (boolean), oct(3.2.4)
Version: 3.2.4
-Revision: 0.0006
+Revision: 0.9000
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -12,13 +12,13 @@
BuildDepends: <<
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
- libcurl4, fltk-x11, x11-dev, libftgl2, qhull6-dev, qrupdate-dev,
- pcre, gcc46-compiler, suitesparse, fink (>= 0.28),
fink-package-precedence, sed,
- imagemagick10-dev,
+ libcurl4, libftgl2, qhull6-dev, qrupdate,
+ pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
+ graphicsmagick-dev, freetype219,
(%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,
graphicsmagick-dev
+BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
Suggests: %{Ni}%type_pkg[oct]-docs
GCC: 4.0
Conflicts: <<
@@ -30,6 +30,8 @@
PatchFile: %{ni}.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
+PatchFile2: %{ni}-%v.patch
+PatchFile2-MD5: 28dea047c7b3e51539a35b76249c8f67
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
@@ -38,20 +40,46 @@
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, ||' \
+ -e '/ibasea/s| ibasea =.*||' \
+ liboctave/oct-sort.cc
+ # should this accompany -D_THREAD_SAFE? in CFLAGS,CXXFLAGS
+ sed -i.orig '/#include.*Range\.h/i\
+#define _REENTRANT' liboctave/lo-specfun.cc
+ # need size_t from <cstddef>
+ sed -i.orig -e '/#define octave_oct_alloc_h/a\
+using std::size_t;' liboctave/oct-alloc.h
+ # 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
+ done
+ # missing qualifier to dependent-name member-function
+ sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' liboctave/oct-inttypes.h
+ # disable FLTK backend
+ patch -p1 < %{PatchFile2}
<<
-SetLDFLAGS: -Wl,-dead_strip_dylibs
+SetLDFLAGS: -Wl,-dead_strip_dylibs
+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' \
- --enable-shared --enable-dl --disable-static --without-mpi --with-hdf5
--with-fftw
+ --enable-shared --enable-dl --disable-static --without-mpi --with-hdf5
--with-fftw \
+ --x-libraries=/usr/X11/lib --x-includes=/usr/X11/include
<<
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3'
export CXXFLAGS='-O3'
- export FFLAGS='-O3'
+ export FFLAGS='-O3 -ff2c'
if [ "%type_pkg[-atlas]" == "" ]
then
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
else a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
@@ -61,14 +89,16 @@
make
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
<<
+
InstallScript: <<
#!/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/
@@ -85,7 +115,7 @@
# remove autogenerated freedesktop.org desktop file
rm -f %i/share/applications/www.%{Ni}.org-%{Ni}.desktop
mkdir -p %i/share/%{Ni}/%v/scripts
- # install the %{Ni}-forge helper scripts
+ # install the octave-forge helper scripts
cp %{Ni}-forge* %i/share/%{Ni}/%v/scripts
chmod a+x %i/share/%{Ni}/%v/scripts/*
<<
@@ -94,6 +124,7 @@
GNUTERM: aqua
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
+
SplitOff: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs
Conflicts: <<
@@ -109,7 +140,7 @@
%{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, qrupdate-shlibs,
readline5-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
Files: <<
lib/%{Ni}-%v
<<
@@ -191,13 +222,16 @@
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
+
Splitoff3: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]
Depends: <<
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
- arpack-shlibs, fftw3-shlibs (>= 3.1.1-7), fltk-x11-shlibs, glpk-shlibs,
- libcurl4-shlibs, octave324-shlibs, pcre-shlibs, ncurses,
- (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
+ arpack-shlibs, fftw3-shlibs (>= 3.1.1-7), glpk-shlibs,
+ graphicsmagick-shlibs, libcurl4-shlibs,
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs, pcre-shlibs,
+ qhull6-shlibs, (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
+ ncurses, gnuplot | gnuplot-nox | gnuplot-nogtk,
+ fltk-backend-aqua-oct%type_pkg[oct] | fltk-backend-x11-oct%type_pkg[oct]
<<
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct],
@@ -323,25 +357,32 @@
<<
DescPort: <<
- Thanks to Per Persson for most (if not all) of the work on the macos X port.
+Thanks to Per Persson for most (if not all) of the work on the macos X port.
+
+Cleanups from David Fang to get the package to build using clang.
<<
DescPackaging: <<
-Set the GNUTERM environment variable to AquaTerm because autodetection
-of DISPLAY seems to cause options to be fed to our gnuplot that it doesn't
understand.
-AquaTerm seems to be a sensible default, particularly since gnuplot-nox is
also a
-legal dependency.
-
Not sane (and now not even compilable) to use private code
from glpk. Import the functions needed so can still use it
even when glpk stops exporting its internals. See:
http://octave.1599824.n4.nabble.com/GLPK-interface-was-Re-Multithreaded-Atlas-td1654632.html
+Set the GNUTERM environment variable to AquaTerm because autodetection
+of DISPLAY seems to cause options to be fed to our gnuplot that it doesn't
understand.
+AquaTerm seems to be a sensible default, particularly since gnuplot-nox is
also a
+legal dependency.
+
+Create manpages for the versioned executables.
+
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.
@@ -349,6 +390,9 @@
variables, and the individual octave-forge packages have to make copies
of the octave scripts during their build process and edit them to use the
package's name.
+
+We don't build the FLTK backend since we are allowing for Aqua and X11 variants
+of that bundle in the fltk-backend-{aqua|x11}.
<<
Homepage: http://www.octave.org/
License: GPL
--- NEW FILE: fltk-backend.info ---
Info2: <<
Package: fltk-backend-%type_pkg[ui]-oct%type_pkg[oct]
Type: ui (x11 aqua), oct(3.2.4)
Version: 3.2.4
Revision: 0.9000
Maintainer: Alexander Hansen <[email protected]>
Description: X11-based graphics backend for octave%type_pkg[oct]
DescDetail: <<
We build fltk-backend.oct separately to allow for variants that use Aqua and
X11.
<<
# disable atlas on 10.7 distro file until atlas is available
Source: mirror:gnu:octave/octave-%v.tar.gz
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
SourceDirectory: octave-%v
BuildDepends: <<
(%type_pkg[ui] = x11) fltk-x11,
(%type_pkg[ui] = x11) x11-dev,
(%type_pkg[ui] = aqua) fltk13-aqua,
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, , libftgl2, qhull6-dev, qrupdate,
pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
graphicsmagick-dev, freetype219, libftgl2
<<
Depends: <<
(%type_pkg[ui] = x11) fltk-x11-shlibs,
(%type_pkg[ui] = x11) x11,
(%type_pkg[ui] = aqua) fltk13-aqua-shlibs,
<<
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev
GCC: 4.0
Conflicts: fltk-backend-aqua-oct%type_pkg[oct],
fltk-backend-x11-oct%type_pkg[oct]
Replaces: fltk-backend-aqua-oct%type_pkg[oct],
fltk-backend-x11-oct%type_pkg[oct]
UseMaxBuildJobs: true
PatchFile: octave.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/octave.1 doc/interpreter/octave-%v.1
cp doc/interpreter/octave-bug.1 doc/interpreter/octave-bug-%v.1
cp doc/interpreter/octave-config.1 doc/interpreter/octave-config-%v.1
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' octave-forge* octaverc
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, ||' \
-e '/ibasea/s| ibasea =.*||' \
liboctave/oct-sort.cc
# should this accompany -D_THREAD_SAFE? in CFLAGS,CXXFLAGS
sed -i.orig '/#include.*Range\.h/i\
#define _REENTRANT' liboctave/lo-specfun.cc
# need size_t from <cstddef>
sed -i.orig -e '/#define octave_oct_alloc_h/a\
using std::size_t;' liboctave/oct-alloc.h
# 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
done
# missing qualifier to dependent-name member-function
sed -i.orig -e '/truncate_int/s|\(return\) \(truncate_int\)|\1
octave_int_base<T>::\2|' liboctave/oct-inttypes.h
<<
SetLDFLAGS: -Wl,-dead_strip_dylibs
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' \
--enable-shared --enable-dl --without-mpi --with-hdf5 --with-fftw \
(%type_pkg[ui] = x11 ) --with-x \
(%type_pkg[ui] = x11 ) --x-libraries=/usr/X11/lib \
(%type_pkg[ui] = x11 ) --x-includes=/usr/X11/include \
(%type_pkg[ui] = x11 ) --without-framework-carbon \
(%type_pkg[ui] = aqua ) --without-x \
(%type_pkg[ui] = aqua ) --with-framework-carbon \
--disable-static
<<
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3'
export CXXFLAGS='-O3'
export FFLAGS='-O3 -ff2c'
a='--with-lapack=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libLAPACK.dylib
--with-blas=-Wl,-framework,Accelerate,-dylib_file,/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib:/System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib'
FLIBDIR="%p/lib/gcc4.6/lib"
./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
make
fink-package-precedence --depfile-ext='.d'
--prohibit-bdep=octave,octave-atlas,octave%type_raw[oct]-dev,octave%type_raw[oct]-atlas-dev,octave305-dev,octave305-atlas-dev
src
<<
InstallScript: <<
mkdir -p %i/lib/octave/%type_raw[oct]/oct/%m-apple-darwin
cp src/fltk_backend.oct %i/lib/octave/%type_raw[oct]/oct/%m-apple-darwin/
<<
DocFiles: COPYING
Homepage: http://www.octave.org/
License: GPL
DescPackaging: <<
Currently we build all of octave and then only install
fltk_backend.oct.
<<
<<
------------------------------------------------------------------------------
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
