Update of /cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv29850
Modified Files:
fltk-backend-oct-3.2.4.info octave-3.2.4.info
octave324-docs.info
Log Message:
sync. w/ 10.!4/stable, validated on powerpc-darwin8
Index: octave324-docs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/octave324-docs.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- octave324-docs.info 19 Oct 2011 18:27:25 -0000 1.1
+++ octave324-docs.info 4 Nov 2011 21:58:44 -0000 1.2
@@ -1,15 +1,14 @@
Package: octave324-docs
Version: 3.2.4
-Revision: 1
+Revision: 2
Maintainer: Alexander Hansen <[email protected]>
BuildDependsOnly: false
Source: mirror:gnu:octave/octave-%v.tar.gz
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
-Recommends: octave324 | octave324-atlas
+Recommends: octave324-interpreter
CompileScript: <<
- #!/bin/sh -ev
-echo "No compile needed"
+true
<<
InstallScript: <<
#!/bin/sh -ev
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/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 19 Oct 2011 18:27:25 -0000 1.1
+++ octave-3.2.4.info 4 Nov 2011 21:58:44 -0000 1.2
@@ -1,43 +1,76 @@
Info2: <<
-Package: octave%type_pkg[-atlas]
-Type: -atlas (boolean), oct(3.2.4), gcc (4.6)
+Package: octave%type_pkg[-atlas]%type_pkg[-x11]
+Type: -atlas (boolean), oct(3.2.4), gcc (4.6), -x11 (boolean)
Version: 3.2.4
-Revision: 228
+Revision: 601
# Distribution: 10.6
+#atlas-only on x86_64
+# Architecture: (%type_raw[-atlas] != -atlas) i386
Maintainer: Alexander Hansen <[email protected]>
-Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.gz
-Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
-
BuildDepends: <<
- glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
- libcurl4, libftgl2, qhull6-dev, flag-sort,
- pcre, gcc%type_pkg[gcc]-compiler, suitesparse-metis, fink (>= 0.30.0),
fink-package-precedence, sed,
- graphicsmagick-dev, freetype219,
- (%type_raw[-atlas] = -atlas) atlas,
- (%type_raw[-atlas] = -atlas) qrupdate-atlas (>=1.1.1-5),
- (%type_raw[-atlas] != -atlas) qrupdate (>=1.1.1-5),
- (%type_raw[-atlas] = -atlas) arpack-atlas (>= 96patched-6),
- (%type_raw[-atlas] != -atlas) arpack (>= 96patched-6)
+ fftw3 (>= 3.1.1-7),
+ gcc%type_pkg[gcc]-compiler,
+ glpk-dev,
+ graphicsmagick-dev,
+ hdf5.7,
+ libcurl4,
+ libftgl2,
+ pcre,
+ qhull6-dev,
+ readline5,
+ sed,
+ suitesparse-metis,
+ fink (>= 0.30.0-1),
+ fink-package-precedence,
+ flag-sort,
+ (%type_raw[-x11] != -x11) fltk13-aqua,
+ (%type_raw[-x11] = -x11) fltk-x11,
+ (%type_raw[-x11] = -x11) x11-dev,
+ (%type_raw[-atlas] != -atlas) qrupdate (>=1.1.1-5),
+ (%type_raw[-atlas] != -atlas) arpack (>= 96patched-6),
+ (%type_raw[-atlas] = -atlas) atlas (>= 3.8.1-1),
+ (%type_raw[-atlas] = -atlas) qrupdate-atlas (>=1.1.1-5),
+ (%type_raw[-atlas] = -atlas) arpack-atlas (>= 96patched-6)
<<
-Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
+Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11] (=%v-%r)
BuildConflicts: coot-dev, broken-gcc, lammpi-dev, fort77, 4ti2-dev,
imagemagick10-dev
Suggests: %{Ni}%type_pkg[oct]-docs
-GCC: 4.0
-
+Provides: <<
+
octave-interpreter,
+(%type_raw[-x11] = -x11) octave-interpreter-x11,
+(%type_raw[-x11] != -x11) octave-interpreter-aqua,
+(%type_raw[-atlas] = -atlas) octave-interpreter-atlas,
+(%type_raw[-atlas] != -atlas) octave-interpreter-veclib
+<<
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)
+ %{Ni},
+ %{Ni}-atlas,
+ %{Ni}-x11,
+ %{Ni}-atlas-x11,
+ %{Ni}3.0.2 ( << 3.0.2-5),
+ %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
-Replaces: %{Ni}, %{Ni}-atlas, %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( <<
3.0.2-5)
-UseMaxBuildJobs: false
+Replaces: <<
+ %{Ni},
+ %{Ni}-atlas,
+ %{Ni}-x11,
+ %{Ni}-atlas-x11,
+ %{Ni}3.0.2 ( << 3.0.2-5),
+ %{Ni}3.0.2-atlas ( << 3.0.2-5)
+<<
+
+Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.gz
+Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
PatchFile: %{ni}-glpk.patch
PatchFile-MD5: a4861a0803cfbbbb8892019cd5f217d2
-PatchFile2: %{ni}.patch
-PatchFile2-MD5: 94f6e470ee04b0e2837709966fc31420
-PatchFile3: %{ni}-%v.patch
-PatchFile3-MD5: a09d6337e021085a8c9d14c5bdcdf088
+PatchFile2: %{ni}-manpages.patch
+PatchFile2-MD5: 647cff8601e837e8b8e46d15867b14f0
+PatchFile3: %{ni}.patch
+PatchFile3-MD5: adc4d6257e51ca5d8a45472c8ee036ca
+PatchFile4: %{ni}-GM.patch
+PatchFile4-MD5: 7f016e7d32fa32a0b2962f35892f52a9
PatchScript: <<
#!/bin/sh -ev
#fix for use of glpk private internals
@@ -47,29 +80,32 @@
cp doc/interpreter/%{Ni}-bug.1 doc/interpreter/%{Ni}-bug-%v.1
cp doc/interpreter/%{Ni}-config.1 doc/interpreter/%{Ni}-config-%v.1
cp doc/interpreter/mkoctfile.1 doc/interpreter/mkoctfile-%v.1
- #Fink-specific changes
+ # fix executable names in versioned manpages
sed -e 's/@OCTVERSION@/%v/g' %{PatchFile2} | patch -p1
- sed -i -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
+ #Fink-specific structural changes
+ sed -e 's/@OCTVERSION@/%v/g' -e 's|@FINKPREFIX@|%p|g' %{PatchFile3} |
patch -p1
+ # Put in the Fink tree.
+ sed -i.orig -e 's|@FINKPREFIX@|%p|g' %{Ni}-forge* %{Ni}rc
doc/interpreter/*.1 mkoctfile.in
# Put compiler information without 'flag-sort' into oct-conf.h, which
in
# turn gets harcoded into the Octave interpreter's 'octave_config_info'
# function, which is then used by some of the octave-forge packages at
# configure time. Also do this for mkoctfile.in.
- sed -i.bak -e "s|%%OCTAVE_CONF_CC%%|\"`which gcc`\"|" \
+ sed -i.orig -e "s|%%OCTAVE_CONF_CC%%|\"`which gcc`\"|" \
-e "s|%%OCTAVE_CONF_CXXCPP%%|\"`which g++`
-E\"|" \
-e "s|%%OCTAVE_CONF_CXX%%|\"`which g++`\"|" \
-e "s|%%OCTAVE_CONF_DL_LD%%|\"`which g++`\"|" \
-e "s|%%OCTAVE_CONF_LD_CXX%%|\"`which g++`\"|" \
- -e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile.in
+ -e "s|%%OCTAVE_CONF_SH_LD%%|\"`which g++`\"|"
src/oct-conf.h.in mkoctfile*in
# Add the BLAS C library for the -atlas variant.
if [ "%type_pkg[-atlas]" = "-atlas" ]
- then sed -i.bak -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
- src/oct-conf.h.in
mkoctfile.in
+ then sed -i.orig -e
's|%%OCTAVE_CONF_BLAS_LIBS%%|"%p/lib/liblapack.dylib %p/lib/libf77blas.dylib
%p/lib/libcblas.dylib"|' \
+ src/oct-conf.h.in mkoctfile*in
fi
- # disable FLTK backend since that's in a separate package, and make
sure GraphicsMagick
- # gets activated properly.
- patch -p1 < %{PatchFile3}
+ # Make sure GraphicsMagick gets activated properly.
+ sed -e 's/@OCTVERSION@/%v/g' %{PatchFile4} | patch -p1
+ perl -pi.orig -e 's|(#include
\<GraphicsMagick/Magick\+\+\.h\>)|\1\nusing namespace Magick;|'
src/DLD-FUNCTIONS/__magick_read__.cc
# fix lib name for qhull6
- perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
+ perl -pi.orig -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
@@ -95,58 +131,84 @@
sed -i.orig -e 's|template static|template|g' liboctave/eigs-base.cc
<<
+GCC: 4.0
+UseMaxBuildJobs: true
SetCC: flag-sort -r gcc
SetCXX: flag-sort -r g++
# SetLDFLAGS: -Wl,-dead_strip_dylibs
SetLIBS: -lGraphicsMagick -lmetis
+
ConfigureParams: <<
- F77=%p/bin/gfortran-fsf-%type_raw[gcc] --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 \
- --x-libraries=/usr/X11R6/lib --x-includes=/usr/X11R6/include
+ (%type_raw[-atlas] != -atlas) --with-lapack=-Wl,-framework,Accelerate
\
+ (%type_raw[-atlas] != -atlas) --with-blas=-Wl,-framework,Accelerate \
+ (%type_raw[-atlas] = -atlas) --with-lapack=%p/lib/liblapack.dylib \
+ (%type_raw[-atlas] = -atlas) --with-blas=%p/lib/libf77blas.dylib \
+ (%type_raw[-x11] != -x11) --with-framework-carbon \
+ (%type_raw[-x11] = -x11) --without-framework-carbon \
+ --with-x \
+ --x-libraries=/usr/X11/lib \
+ --x-includes=/usr/X11/include \
+ --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-dependency-tracking
<<
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3 -MD'
export CXXFLAGS='-O3 -MD'
export FFLAGS='-O3'
+ export F77=%p/bin/gfortran-fsf-%type_raw[gcc]
+ FLIBDIR="%p/lib/gcc%type_raw[gcc]/lib"
+ export FLIBS="${FLIBDIR}/libgfortran.dylib"
if [ "%type_pkg[-atlas]" == "" ]
then
- a='--with-lapack=-Wl,-framework,Accelerate
--with-blas=-Wl,-framework,Accelerate'
export FFLAGS='-O3 -ff2c'
else
- a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
export FFLAGS='-O3'
fi
- FLIBDIR="%p/lib/gcc%type_raw[gcc]/lib"
- ./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
- make
+ %{default_script}
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,saclib-gcc46,saclib
src
<<
InfoTest: <<
TestScript: <<
- # doesn't work on 10.6/i386
- mv src/ov-struct.cc src/ov-struct.cc.testfails
# doesn't work anywhere
mv scripts/image/imread.m scripts/image/imread.m.testfails
+ # doesn't work on 10.6/i386
+ mv src/ov-struct.cc src/ov-struct.cc.testfails
+ mv scripts/miscellaneous/setfield.m
scripts/miscellaneous.m.testfails
+ # doesn't work on 10.6/i386/atlas:
+ mv scripts/linear-algebra/onenormest.m
scripts/linear-algebra/onenormest.m.testfails
make check || exit 2
mv scripts/image/imread.m.testfails scripts/image/imread.m
mv src/ov-struct.cc.testfails src/ov-struct.cc
+ mv scripts/miscellaneous/setfield.m.testfails
scripts/miscellaneous.m
+ mv scripts/linear-algebra/onenormest.m.testfails
scripts/linear-algebra/onenormest.m
<<
<<
InstallScript: <<
#!/bin/sh -ev
- export MAKEFLAGS=-j1
make install DESTDIR=%d
+ # Install versioned manpages
+ cp doc/interpreter/*-%v.1 %i/share/man/man1
# Install Fink-specific octaverc which points at our oct-versioned
# package directory.
- cp %b/%{Ni}rc %i/share/%{Ni}/%v/m/startup
+ cp %{Ni}rc %i/share/%{Ni}/%v/m/startup
mkdir -p %i/var/%{Ni}/%v/
# install examples
mkdir -p %i/share/%{Ni}/%v/doc/examples
cp -R examples %i/share/%{Ni}/%v/doc/examples
+ # clear out hardcoded Fink sed.
pushd %i/bin
# clear out hardcoded Fink sed.
for file in mkoctfile-%v %{Ni}-bug-%v %{Ni}-config-%v
@@ -166,14 +228,8 @@
-e "s|flag-sort -r g++|`which g++`|g" \
%i/bin/%{Ni}-bug-%v
# for the -atlas variant, add libcblas.dylib to BLAS_LIBS:
- if ["%type_pkg[-atlas]" = "-atlas"]
- then perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
- %i/bin/%{ni}-bug-%v
- # for x86_64 non-atlas, set it to find the Accelerate Framework.
- elif ["%m" = "x86_64"]
- then perl -pi -e 's|(BLAS_LIBS=).*|$1"-Wl,-framework,Accelerate"|' \
- %i/bin/%{ni}-bug-%v
- fi
+ perl -pi -e 's|(%p/lib/liblapack.dylib %p/lib/libf77blas.dylib)|$1
%p/lib/libcblas.dylib|' \
+ %i/bin/%{ni}-bug-%v
# generate Fink-gcc enabled mkoctfile
cp %i/bin/mkoctfile-%type_raw[oct]
%i/bin/mkoctfile-%type_raw[oct]-gcc%type_raw[gcc]
perl -pi -e \
@@ -188,29 +244,46 @@
RuntimeVars: <<
GNUTERM: aqua
<<
-DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
+DocFiles: BUGS COPYING ChangeLog* NEWS* PROJECTS README ROADMAP SENDING-PATCHES
SplitOff: <<
- Package: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs
+ Package: octave%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11]-shlibs
Conflicts: <<
- (%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-shlibs,
- (%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-shlibs,
- (%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
- (%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
- %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
+ %{Ni}%type_pkg[oct]-shlibs,
+ %{Ni}%type_pkg[oct]-x11-shlibs,
+ %{Ni}%type_pkg[oct]-atlas-shlibs,
+ %{Ni}%type_pkg[oct]-atlas-x11-shlibs,
+ (%type_raw[-atlas] = -atlas) %{Ni} (<< 3.0.5-5),
+ (%type_raw[-atlas] != -atlas) %{Ni}-atlas (<< 3.0.5-5),
+ %{Ni}3.0.2 ( << 3.0.2-5),
+ %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Replaces: <<
- (%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-shlibs,
- (%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-shlibs,
- %{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)
+ (%type_raw[-atlas] = atlas)
%{Ni}%type_pkg[oct]-shlibs,
+ (%type_raw[-atlas] != atlas)
%{Ni}%type_pkg[oct]-atlas-shlibs,
+ %{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, gcc%type_pkg[gcc]-shlibs, hdf5.7-shlibs,
readline5-shlibs,
- (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
- (%type_raw[-atlas] = -atlas) qrupdate-atlas-shlibs (>=
1.1.1-5),
- (%type_raw[-atlas] != -atlas) qrupdate-shlibs (>= 1.1.1-5)
+ fftw3-shlibs,
+ gcc%type_pkg[gcc]-shlibs,
+ hdf5.7-shlibs,
+ readline5-shlibs,
+ (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
+ (%type_raw[-atlas] = -atlas) qrupdate-atlas-shlibs (>=
1.1.1-5),
+ (%type_raw[-atlas] != -atlas) qrupdate-shlibs (>= 1.1.1-5)
<<
+ Provides: <<
+
+ liboctave%type_pkg[oct],
+ (%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas,
+ (%type_raw[-atlas] != -atlas) liboctave%type_pkg[oct]-veclib,
+ (%type_raw[-x11] = -x11) liboctave%type_pkg[oct]-x11,
+ (%type_raw[-x11] != -x11) liboctave%type_pkg[oct]-aqua
+ <<
+
Files: <<
lib/%{Ni}-%v
<<
@@ -225,37 +298,58 @@
such as the various octave-forge packages.
<<
DescUsage: <<
- To use mkoctfile to build dynamically loadable modules, you will need
- to install the hdf5-oldapi and fftw3 packages, as well as
- %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
- It cannot Depend on them since they are BuildDependsOnly.
-
- Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or
- installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend
- on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
- hdf5-oldapi and fftw3.
+Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]%type_pkg[-x11]-shlibs or
+installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11]-shlibs and BuildDepend
+on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need to
BuildDepend on
+hdf5-oldapi and fftw3.
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
SplitOff2: <<
- Package: octave%type_pkg[oct]%type_pkg[-atlas]-dev
- Depends: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
gcc%type_pkg[gcc]-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
+ Package: octave%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11]-dev
+ Depends: <<
+ octave%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11]-shlibs
(=%v-%r),
+ gcc%type_pkg[gcc]-compiler
+ <<
Conflicts: <<
- (%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
- (%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
- (%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
- (%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
- %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5),
- %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
- mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
+ %{Ni}%type_pkg[oct]-dev,
+ %{Ni}%type_pkg[oct]-x11-dev,
+ %{Ni}%type_pkg[oct]-atlas-dev,
+ %{Ni}%type_pkg[oct]-atlas-x11-dev,
+ %{Ni}305-dev,
+ %{Ni}305-atlas-dev,
+ %{Ni}343-dev,
+ %{Ni}343-atlas-dev,
+ %{Ni}343-x11-dev,
+ %{Ni}343-atlas-x11-dev,
+ (%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
+ (%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
+ %{Ni}3.0.2 ( << 3.0.2-5),
+ %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Replaces: <<
- (%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
- (%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
- %{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),
- %{Ni}305-dev, %{Ni}305-atlas-dev, %{Ni}342-dev,
%{Ni}342-atlas-dev,
- mkoctfile%type_pkg[oct]-gcc46,
mkoctfile%type_pkg[oct]-gcc46-atlas
+ %{Ni}%type_pkg[oct]-dev,
+ %{Ni}%type_pkg[oct]-x11-dev,
+ %{Ni}%type_pkg[oct]-atlas-dev,
+ %{Ni}%type_pkg[oct]-atlas-x11-dev,
+ %{Ni}305-dev,
+ %{Ni}305-atlas-dev,
+ %{Ni}343-dev,
+ %{Ni}343-atlas-dev,
+ %{Ni}343-x11-dev,
+ %{Ni}343-atlas-x11-dev,
+ %{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)
+ <<
+ Provides: <<
+
+ liboctave%type_pkg[oct]-dev,
+ (%type_raw[-atlas] = -atlas) liboctave%type_pkg[oct]-atlas-dev,
+ (%type_raw[-atlas] != -atlas)
liboctave%type_pkg[oct]-veclib-dev,
+ (%type_raw[-x11] = -x11) liboctave%type_pkg[oct]-x11-dev,
+ (%type_raw[-x11] != -x11) liboctave%type_pkg[oct]-aqua-dev
<<
BuildDependsOnly: true
@@ -263,8 +357,8 @@
include/%{Ni}-%v
bin/mkoctfile*
bin/octave-config*
- share/man/man1/mkoctfile.1
- share/man/man1/octave-config.1
+ share/man/man1/mkoctfile*.1
+ share/man/man1/octave-config*.1
<<
DescDetail: <<
@@ -273,14 +367,8 @@
<<
DescUsage: <<
To use mkoctfile to build dynamically loadable modules, you will need
- to install the hdf5-oldapi and fftw3 packages, as well as
- %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
- It cannot Depend on them since they are BuildDependsOnly.
-
- Any package that either links to the libraries in
%{Ni}%type_pkg[-atlas]-shlibs or
- installs an extension should Depend on
%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend
- on %{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need
to BuildDepend on
- hdf5-oldapi and fftw3.
+ to install the hdf5-oldapi and fftw3 packages.
+ %n cannot Depend on them since they are BuildDependsOnly.
<<
DescPackaging: <<
We Make up an extra mkoctfile which uses a Fink gcc for packages that
need
@@ -290,36 +378,60 @@
<<
Splitoff3: <<
- Package: octave%type_pkg[oct]%type_pkg[-atlas]
+ Package: octave%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11]
Depends: <<
- %{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs (=%v-%r),
- 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),
+ %{Ni}%type_pkg[oct]%type_pkg[-atlas]%type_pkg[-x11]-shlibs (=%v-%r),
ncurses, gnuplot | gnuplot-nox | gnuplot-nogtk,
- fltk-backend-aqua-oct%type_pkg[oct] |
fltk-backend-x11-oct%type_pkg[oct],
- (%type_raw[-atlas] = -atlas) arpack-atlas-shlibs (>= 96patched-6),
- (%type_raw[-atlas] != -atlas) arpack-shlibs (>= 96patched-6)
+ fftw3-shlibs (>= 3.1.1-7),
+ glpk-shlibs,
+ graphicsmagick-shlibs,
+ libcurl4-shlibs,
+ pcre-shlibs,
+ qhull6-shlibs,
+ (%type_raw[-x11] != -x11) fltk13-aqua-shlibs,
+ (%type_raw[-x11] = -x11) fltk-x11-shlibs,
+ (%type_raw[-atlas] != -atlas) arpack-shlibs (>= 96patched-6),
+ (%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1),
+ (%type_raw[-atlas] = -atlas) arpack-atlas-shlibs (>= 96patched-6)
<<
Conflicts: <<
- (%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct],
- (%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas,
+ %{Ni}%type_pkg[oct],
+ %{Ni}%type_pkg[oct]-x11,
+ %{Ni}%type_pkg[oct]-atlas,
+ %{Ni}%type_pkg[oct]-atlas-x11,
(%type_raw[-atlas] = atlas) %{Ni} (<< 3.0.5-5),
(%type_raw[-atlas] != atlas) %{Ni}-atlas (<< 3.0.5-5),
- %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( << 3.0.2-5)
+ %{Ni}3.0.2 ( << 3.0.2-5),
+ %{Ni}3.0.2-atlas ( << 3.0.2-5)
<<
Replaces: <<
- (%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct]-dev,
- (%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas-dev,
- %{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)
+ %{Ni}%type_pkg[oct],
+ %{Ni}%type_pkg[oct]-x11,
+ %{Ni}%type_pkg[oct]-atlas,
+ %{Ni}%type_pkg[oct]-atlas-x11,
+ fltk-backend-aqua-oct%type_pkg[oct] (<= %v-2),
+ fltk-backend-x11-oct%type_pkg[oct] (<= %v-2),
+ %{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)
+ <<
+ Provides: <<
+
octave%type_pkg[oct]-interpreter,
+ (%type_raw[-x11] = -x11)
octave%type_pkg[oct]-interpreter-x11,
+ (%type_raw[-x11] != -x11)
octave%type_pkg[oct]-interpreter-aqua,
+ (%type_raw[-atlas] = -atlas) octave%type_pkg[oct]-interpreter-atlas,
+ (%type_raw[-atlas] != -atlas) octave%type_pkg[oct]-interpreter-veclib
<<
+
Files: <<
share/%{Ni}/%v
lib/%{Ni}/%v
bin/%{Ni}-%v
bin/%{Ni}-bug-%v
var/%{Ni}/%v
+ share/man/man1/%{Ni}-%v.1
+ share/man/man1/%{Ni}-bug-%v.1
<<
DescDetail: <<
The %{Ni}%type_pkg[oct]%type_pkg[-atlas] package contains versioned
executables, as well as all of the
@@ -385,17 +497,6 @@
or other languages.
<<
DescUsage: <<
-To use mkoctfile to build dynamically loadable modules, you will need
-to install the hdf5-oldapi and fftw3 packages, as well as
-%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev.
-It cannot Depend on them since they are BuildDependsOnly.
-
-Any package that either links to the libraries in
-%{Ni}%type_pkg[-atlas]-shlibs or installs an extension should Depend on
-%{Ni}%type_pkg[oct]%type_pkg[-atlas]-shlibs and BuildDepend on
-%{Ni}%type_pkg[oct]%type_pkg[-atlas]-dev. In addition, it will need to
-BuildDepend on hdf5-oldapi and fftw3.
-
By default the plotting output (via gnuplot) is directed to AquaTerm.
This can be overidden in your startup scripts, e.g.
@@ -422,6 +523,10 @@
DescPort: <<
Thanks to Per Persson for most (if not all) of the work on the macos X port.
+Apply fix from
http://lukassen.wordpress.com/2010/01/18/taming-snow-leopard-cgdisplaybitsperpixel-deprication/
,
+with improvements from Peter O'Gorman and Daniel Macks, to display.cc to work
around the lack of
+CGDisplayBitsPerPixel on 10.7.
+
Cleanups from David Fang to get the package to build using clang.
As of revision 225: the non-atlas variant is built with -ff2c in the FFLAGS,
@@ -460,8 +565,8 @@
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}.
+We remove the FLTK backend module since we are allowing for Aqua and X11
+variants of that in the fltk-backend-{aqua|x11}-oct324 packages.
As of revision 225:
@@ -489,11 +594,22 @@
Get rid of the ugly construction previously used for setting the BLAS and
LAPACK libraries.
-Fix issue in which BLAS_LIBS wasn't getting properly encoded for the x86_64
-non-atlas variant.
-
Now includes an additional mkoctfile which uses Fink's gcc46 compilers instead
of Xcode's.
+
+As of revision 601:
+
+It turns out that liboctinterp.3.2.4.dylib links to X11 if the package is
+configured to build the FLTK graphics with X11, so we'll migrate to a fully-
+varianted octave package and leave fltk-backend-oct324-(aqua|x11) just as
+a dummy upgrade package.
+
+Create new Provides in a new namespace and with new projections to avoid
+unwieldy | lists in the octave-forge packages.
+
+Actually _install_ the manpages for the versioned executables.
+
+Disable non-atlas (vecLib) option on x86_64 due to misbuilding.
<<
Homepage: http://www.octave.org/
License: GPL
Index: fltk-backend-oct-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/stable/main/finkinfo/10.4-EOL/sci/fltk-backend-oct-3.2.4.info,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- fltk-backend-oct-3.2.4.info 18 Oct 2011 23:50:45 -0000 1.1
+++ fltk-backend-oct-3.2.4.info 4 Nov 2011 21:58:44 -0000 1.2
@@ -1,119 +1,21 @@
Info2: <<
Package: fltk-backend%type_pkg[-ui]-oct%type_pkg[oct]
-Type: -ui (-x11 -aqua), oct(3.2.4)
+Type: -ui (-x11 -aqua), oct(3.2.4), bundle
Version: 3.2.4
-Revision: 2
+Revision: 3
Maintainer: Alexander Hansen <[email protected]>
-Description: Graphics backend for octave-%type_raw[oct]
-DescDetail: <<
-We build fltk-backend.oct separately to allow for variants that use Aqua and
-X11. Install fltk-backend-aqua-oct%type_pkg[oct] if you want the Aqua
-interface or fltk-backend-x11-oct%type_pkg[oct] if you want the X11 one.
+Description: OBSOLETE: functionality now in octave324
+DescDetail: <<
+This package is obsolete and can be removed.
+Its functionality has been subsumed into octave324 | octave324-x11.
<<
+HomePage:
http://wiki.finkproject.org/index.php/Fink:Packaging:Obsolete_Packages
-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 | qrupdate-atlas, flag-sort,
- pcre, gcc46-compiler, suitesparse-metis, fink (>= 0.30.0), 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,
imagemagick10-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: false
-
-PatchFile: octave-glpk.patch
-PatchFile-MD5: a4861a0803cfbbbb8892019cd5f217d2
-PatchFile2: %{ni}%type_pkg[oct].patch
-PatchFile2-MD5: 4897b35503d3ffa49f3f5547669feb29
-
-PatchScript: <<
- #!/bin/sh -ev
- patch -p1 < %{PatchFile}
- sed -e 's/@OCTVERSION@/%v/g' %{PatchFile2} | patch -p1
- # 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
- perl -pi -e 's/scripts doc/scripts/; s/INSTALL.OCTAVE//' Makefile
-<<
-
-SetCC: flag-sort -r gcc
-SetCXX: flag-sort -r g++
-# 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 -MD'
- export CXXFLAGS='-O3 -MD'
- export FFLAGS='-O3'
-
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
- pushd libcruft
- make all
- popd
- pushd liboctave
- make all
- popd
- pushd src
- make all
+ fink-obsolete-packages,
+ (%type_raw[-ui] = -aqua) octave324-interpreter-aqua,
+ (%type_raw[-ui] = -x11) octave324-interpreter-atlas
<<
-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.
-<<
-<<
+<<
------------------------------------------------------------------------------
RSA(R) Conference 2012
Save $700 by Nov 18
Register now
http://p.sf.net/sfu/rsa-sfdev2dev1
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
