Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory vz-cvs-3.sog:/tmp/cvs-serv11774
Modified Files:
octave-3.2.4.info qhull6.info
Added Files:
octave-3.2.4.patch
Removed Files:
qhull.info qhull.patch
Log Message:
sync with 10.!4/unstable
--- qhull.info DELETED ---
--- NEW FILE: octave-3.2.4.patch ---
diff -Nurd octave-3.2.4.orig/src/Makefile.in octave-3.2.4/src/Makefile.in
--- octave-3.2.4.orig/src/Makefile.in 2009-06-03 08:32:49.000000000 -0400
+++ octave-3.2.4/src/Makefile.in 2011-08-30 18:51:07.000000000 -0400
@@ -67,7 +67,7 @@
cellfun.cc chol.cc ccolamd.cc colamd.cc colloc.cc \
conv2.cc convhulln.cc daspk.cc dasrt.cc dassl.cc det.cc \
dispatch.cc dlmread.cc dmperm.cc eig.cc eigs.cc fft.cc \
- fft2.cc fftn.cc fftw.cc filter.cc find.cc fltk_backend.cc \
+ fft2.cc fftn.cc fftw.cc filter.cc find.cc \
gammainc.cc gcd.cc getgrent.cc getpwent.cc getrusage.cc \
givens.cc hess.cc hex2num.cc inv.cc kron.cc lookup.cc \
lsode.cc lu.cc luinc.cc matrix_type.cc max.cc md5sum.cc \
@@ -327,9 +327,6 @@
$(DLD_PICOBJ): \
ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS))
-fltk_backend.o pic/fltk_backend.o: \
- ALL_CXXFLAGS := $(filter-out $(DLL_CXXDEFS), $(ALL_CXXFLAGS)
$(GRAPHICS_CFLAGS))
-
XERBLA = ../libcruft/blas-xtra/xerbla.o
ifdef FPICFLAG
PIC_XERBLA = ../libcruft/blas-xtra/pic/xerbla.o
@@ -669,7 +666,6 @@
regexp.oct: OCT_LINK_DEPS += $(REGEX_LIBS)
urlwrite.oct: OCT_LINK_DEPS += $(CURL_LIBS)
__glpk__.oct: OCT_LINK_DEPS += $(GLPK_LIBS)
-fltk_backend.oct: OCT_LINK_DEPS += $(GRAPHICS_LIBS) $(FT2_LIBS)
check: all
.PHONY: check
--- qhull.patch DELETED ---
Index: octave-3.2.4.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/octave-3.2.4.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- octave-3.2.4.info 26 Aug 2011 23:52:47 -0000 1.6
+++ octave-3.2.4.info 1 Sep 2011 01:15:15 -0000 1.7
@@ -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: 1
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -12,15 +12,16 @@
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,
imagemagick10-dev
Suggests: %{Ni}%type_pkg[oct]-docs
GCC: 4.0
+
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)
@@ -30,6 +31,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,37 +41,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\
+ sed -i.orig -e '/#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
- # 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
+ # 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
# 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
+SetLIBS: -lGraphicsMagick -lmetis
ConfigureParams: <<
--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
@@ -96,14 +108,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/
@@ -120,7 +134,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/*
<<
@@ -129,6 +143,7 @@
GNUTERM: aqua
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
+
SplitOff: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-shlibs
Conflicts: <<
@@ -144,7 +159,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
<<
@@ -226,13 +241,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],
@@ -358,25 +376,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.
@@ -384,6 +409,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
Index: qhull6.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/qhull6.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qhull6.info 25 Aug 2011 19:32:03 -0000 1.3
+++ qhull6.info 1 Sep 2011 01:15:15 -0000 1.4
@@ -3,7 +3,7 @@
Revision: 1
Description: Calculate convex hulls and related structures
License: BSD
-Maintainer: Stefan Langerman <[email protected]>
+Maintainer: Alexander Hansen <[email protected]>
DescDetail: <<
Qhull computes convex hulls, Delaunay triangulations, halfspace
intersections about a point, Voronoi diagrams, furthest-site
@@ -21,6 +21,10 @@
Upstream doesn't appear to grok OS X, so we handcraft the dylib's
install_name.
<<
+DescPackaging: <<
+The prior static-only qhull package was maintained by Stefan Langerman
+<[email protected]>.
+<<
Source: http://www.qhull.org/download/qhull-%v-src.tgz
Source-MD5: a65061cf2a6e6581182f4df0f3667a8e
@@ -54,9 +58,8 @@
InstallScript: <<
#!/bin/sh -ev
make -j1 install
- cd %i/lib
- rm lib%N.dylib
- ln -s lib%N6.2.0.dylib lib%N.dylib
+ pushd %i/lib
+ ln -sf lib%N.2.0.dylib lib%N.dylib
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt index.htm
@@ -64,7 +67,7 @@
SplitOff: <<
Package: %N-shlibs
Files: lib/lib%N.2.0.dylib
- Shlibs: %p/lib/libqhull6.2.0.dylib 0.0.0 %n (>= 2011.1-1)
+ Shlibs: %p/lib/lib%N.2.0.dylib 0.0.0 %n (>= 2011.1-1)
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt
DescUsage: <<
This package contains the shared library.
@@ -74,11 +77,11 @@
Package: %N-dev
BuildDependsOnly: true
Depends: %N-shlibs (= %v-%r)
- Conflicts: qhull
+ Conflicts: qhull
Replaces: qhull
Files: <<
- include
- lib
+ include
+ lib
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt
DescUsage: <<
------------------------------------------------------------------------------
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
