Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv9818/10.4/unstable/main/finkinfo/sci
Modified Files:
freesolid.info libplplot10-shlibs.info octave-3.0.5.info
qhull.info
Added Files:
qhull6.info qhull6.patch
Log Message:
Revert qhull versioned dependencies, because new package is "qhull6".
Add said qhull6.
Update octave to use qhull6.
Index: octave-3.0.5.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/octave-3.0.5.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- octave-3.0.5.info 19 Aug 2011 21:39:10 -0000 1.3
+++ octave-3.0.5.info 29 Aug 2011 20:56:36 -0000 1.4
@@ -2,7 +2,7 @@
Package: octave%type_pkg[-atlas]
Type: -atlas (boolean), oct(3.0.5)
Version: 3.0.5
-Revision: 7
+Revision: 8
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
@@ -12,7 +12,7 @@
BuildDepends: <<
glpk-dev, hdf5.7-oldapi, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4,
- pcre, gcc46, suitesparse, qhull, fink (>= 0.28),
fink-package-precedence, sed,
+ pcre, gcc46-compiler, suitesparse-metis, metis, qhull6-dev, fink (>=
0.28), fink-package-precedence, sed,
(%type_raw[-atlas] = atlas) atlas
<<
Depends: %{Ni}%type_pkg[oct]%type_pkg[-atlas] (=%v-%r)
@@ -36,12 +36,19 @@
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
<<
SetCPPFLAGS: -I%p/opt/hdf5v1.6/include
SetLDFLAGS: -Wl,-dead_strip_dylibs -L%p/opt/hdf5v1.6/lib
+SetLIBS: -lmetis
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,14 +66,16 @@
make
fink-package-precedence --depfile-ext='.d'
--prohibit-bdep=%{Ni},%{Ni}-atlas,%{Ni}%type_raw[oct]-dev,%{Ni}%type_raw[oct]-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 +94,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/*
<<
@@ -196,7 +205,7 @@
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),
+ fftw3-shlibs (>= 3.1.1-7), qhull6-shlibs,
ncurses, aquaterm, libcurl4-shlibs,
pcre-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
Index: libplplot10-shlibs.info
===================================================================
RCS file:
/cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/libplplot10-shlibs.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- libplplot10-shlibs.info 29 Aug 2011 18:10:16 -0000 1.3
+++ libplplot10-shlibs.info 29 Aug 2011 20:56:36 -0000 1.4
@@ -17,7 +17,7 @@
pango1-xft2-ft219-dev (>= 1.24.5-4),
pixman (>= 0.16.0-1),
pkgconfig,
- qhull (= 2002.1-11),
+ qhull,
readline5,
swig,
x11-dev
--- NEW FILE: qhull6.info ---
Package: qhull6
Version: 2011.1
Revision: 1
Description: Calculate convex hulls and related structures
License: BSD
Maintainer: Alexander Hansen <[email protected]>
DescDetail: <<
Qhull computes convex hulls, Delaunay triangulations, halfspace
intersections about a point, Voronoi diagrams, furthest-site
Delaunay triangulations, and furthest-site Voronoi diagrams.
It runs in 2-d, 3-d, 4-d, and higher dimensions. It implements
the Quickhull algorithm for computing the convex hull. Qhull
handles roundoff errors from floating point arithmetic. It
computes volumes, surface areas, and approximations to the
convex hull.
<<
DescUsage: <<
This package contains the executables, manpages, and other documentation.
<<
DescPort: <<
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
SourceDirectory: qhull-%v
BuildDepends: fink (>= 0.24.12-1)
Depends: %N-shlibs (= %v-%r )
Conflicts: qhull
Replaces: qhull
PatchFile: %n.patch
PatchFile-MD5: 8498f1f42b4aa2c2a47fd70353acb293
PatchScript: <<
sed -e 's,@INSTPREFIX@,%i,' -e 's,@FINKPREFIX@,%p,' %{PatchFile} | patch -p1
sed -i -e 's|-Wno-sign-conversion||' Makefile
# fangism: g++-4.0 needs qualifier on friend member class, even if
forward-declared
sed -i.orig -e
'/friend.*class.*const_iterator;/s|const_iterator|QhullPointSet::&|;'
src/libqhullcpp/QhullPointSet.h
<<
GCC: 4.0
CompileScript: make
InfoTest: <<
TestScript: make test || exit 2
<<
InstallScript: <<
#!/bin/sh -ev
make -j1 install
pushd %i/lib
ln -sf lib%N.2.0.dylib lib%N.dylib
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt index.htm
Homepage: http://www.qhull.org/
SplitOff: <<
Package: %N-shlibs
Files: lib/lib%N.2.0.dylib
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.
<<
<<
SplitOff2: <<
Package: %N-dev
BuildDependsOnly: true
Depends: %N-shlibs (= %v-%r)
Conflicts: qhull
Replaces: qhull
Files: <<
include
lib
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt
DescUsage: <<
This package contains the header files, static libraries, and the
unversioned dylib.
<<
<<
--- NEW FILE: qhull6.patch ---
diff -Nurd qhull-2011.1/Makefile qhull-2011.1.patched/Makefile
--- qhull-2011.1/Makefile 2011-05-14 14:00:48.000000000 -0400
+++ qhull-2011.1.patched/Makefile 2011-08-25 12:07:26.000000000 -0400
@@ -64,12 +64,12 @@
# You may build the qhull programs without using a library
# make qhullx
-DESTDIR = /usr/local
+DESTDIR = @INSTPREFIX@
BINDIR = $(DESTDIR)/bin
-DOCDIR = $(DESTDIR)/share/doc/packages/qhull
+DOCDIR = $(DESTDIR)/share/doc/qhull
INCDIR = $(DESTDIR)/include
LIBDIR = $(DESTDIR)/lib
-MANDIR = $(DESTDIR)/man/man1
+MANDIR = $(DESTDIR)/share/man/man1
# if you do not have enscript, try a2ps or just use lpr. The files are text.
PRINTMAN = enscript -2rl
@@ -80,16 +80,16 @@
#for Gnu's gcc compiler, -O2 for optimization, -g for debugging
# -fno-strict-aliasing not needed for gcc 4.4+ (segfault in qset.c)
CC = gcc
-CC_OPTS1 = -O2 -fPIC -ansi -fno-strict-aliasing -Isrc/libqhull $(CC_WARNINGS)
+CC_OPTS1 = -O2 -fPIC -ansi -fno-common -fno-strict-aliasing -Isrc/libqhull
$(CC_WARNINGS)
CXX = g++
# libqhullcpp must be before libqhull
CXX_OPTS1 = -O2 -Dqh_QHpointer -Isrc/ -Isrc/libqhullcpp -Isrc/libqhull
$(CXX_WARNINGS)
# for shared library link
-CC_OPTS3 =
+CC_OPTS3 = -dynamiclib -install_name @FINKPREFIX@/lib/libqhull6.2.0.dylib
# Define qhull_VERSION in CMakeLists.txt, Makefile, qhull-exports.def, and
qhull-warn.pri
qhull_VERSION_MAJOR=6
-SO = so.6.2.0
+SO = 2.0.dylib
# On MinGW,
# make SO=dll
@@ -432,7 +432,7 @@
lib/libqhull$(qhull_VERSION_MAJOR).$(SO): $(LIBQHULLSP_OBJS)
$(CC) -shared -o $@ $(CC_OPTS3) $^
- cd lib && ln -f -s libqhull$(qhull_VERSION_MAJOR).$(SO)
libqhull$(qhull_VERSION_MAJOR).so
+ cd lib && ln -f -s libqhull$(qhull_VERSION_MAJOR).$(SO)
libqhull$(qhull_VERSION_MAJOR).dylib
# don't use ../qconvex. Does not work on Red Hat Linux
bin/qconvex: src/qconvex/qconvex.o lib/libqhullstatic.a
@@ -457,7 +457,7 @@
bin/user_eg: src/user_eg/user_eg.c lib/libqhull$(qhull_VERSION_MAJOR).$(SO)
echo -e '\n== If user_eg fails to link, switch to -lqhullstatic_p.\n==
On MinGW/Cygwin, use "make SO=dll"'
echo -e "\\n== and copy lib/libqhull$(qhull_VERSION_MAJOR).$(SO) to
bin\\n\\n"
- $(CC) -o $@ $< -Dqh_QHpointer $(CC_OPTS1) $(CC_OPTS3) -Llib
-lqhull$(qhull_VERSION_MAJOR) -lm
+ $(CC) -o $@ $< -Dqh_QHpointer $(CC_OPTS1) -Llib
-lqhull$(qhull_VERSION_MAJOR) -lm
bin/user_eg2: src/user_eg2/user_eg2.o lib/libqhullstatic.a
$(CC) -o $@ $< $(CC_OPTS2) -Llib -lqhullstatic -lm
Index: qhull.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/qhull.info,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- qhull.info 29 Aug 2011 18:10:16 -0000 1.3
+++ qhull.info 29 Aug 2011 20:56:36 -0000 1.4
@@ -1,6 +1,6 @@
Package: qhull
Version: 2002.1
-Revision: 11
+Revision: 12
Description: Calculate convex hulls and related structures
License: BSD
Maintainer: Stefan Langerman <[email protected]>
@@ -8,8 +8,8 @@
Source-MD5: c86d0a6356929b44a3cc8a0ab80a78a4
SourceDirectory: qhull%v
BuildDepends: fink (>= 0.24.12-1)
-Conflicts: %n6-dev
-Replaces: %n6-dev
+Conflicts: %n6, %n6-dev
+Replaces: %n6, %n6-dev
PatchFile: %n.patch
PatchFile-MD5: 40e137bcce91e051c3456d7ba0668b5c
CompileScript: <<
Index: freesolid.info
===================================================================
RCS file: /cvsroot/fink/dists/10.4/unstable/main/finkinfo/sci/freesolid.info,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- freesolid.info 29 Aug 2011 18:10:16 -0000 1.2
+++ freesolid.info 29 Aug 2011 20:56:36 -0000 1.3
@@ -7,7 +7,7 @@
Source: mirror:sourceforge:freesolid/FreeSOLID-%v.zip
Source-MD5: 835ac39b2fc12a3e18311276f2def5e0
-BuildDepends: qhull (= 2002.1-11)
+BuildDepends: qhull
Depends: %N-shlibs (= %v-%r)
BuildDependsOnly: true
------------------------------------------------------------------------------
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
