Update of /cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv20049
Modified Files:
octave-3.2.4.info
Added Files:
qhull-2011.1.info qhull-2011.1.patch suitesparse-3.6.1.info
suitesparse-3.6.1.patch
Removed Files:
qhull.info qhull.patch suitesparse.info suitesparse.patch
Log Message:
Keep .info files of the older %v of suitesparse and qhull around until
maintainers get a chance to modify their packages accordingly.
Cleanup on octave-3.2.4
--- suitesparse.info DELETED ---
--- NEW FILE: qhull-2011.1.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
--- NEW FILE: qhull-2011.1.info ---
Package: qhull
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.%n.org/download/%n-%v-src.tgz
Source-MD5: a65061cf2a6e6581182f4df0f3667a8e
SourceDirectory: %n-%v
BuildDepends: fink (>= 0.24.12-1)
Depends: %N6-shlibs (= %v-%r )
PatchFile: %n-%v.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%N6.2.0.dylib lib%N6.dylib
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt index.htm
Homepage: http://www.qhull.org/
SplitOff: <<
Package: %N6-shlibs
Files: lib/lib%N6.2.0.dylib
Shlibs: %p/lib/lib%N6.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: %N6-dev
BuildDependsOnly: true
Depends: %N6-shlibs (= %v-%r)
Conflicts: qhull (<< 2011.1-1)
Replaces: qhull (<< 2011.1-1)
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: suitesparse-3.6.1.info ---
Package: suitesparse
Version: 3.6.1
Revision: 1
Source:
http://www.cise.ufl.edu/research/sparse/SuiteSparse/SuiteSparse-%v.tar.gz
Source-MD5: 88a44890e8f61cdbb844a76b7259d876
SourceDirectory: SuiteSparse
BuildDepends: fink (>= 0.24.12), metis (= 4.0.3-1)
PatchFile: %n-%v.patch
PatchFile-MD5: 86e123887db5bcc19880b49fe4ffe2e6
PatchScript: <<
#!/bin/sh -ev
sed -e 's,@METISPREFIX@,%p,g' %{PatchFile} | patch -p1
sed -i.bak -e 's,^CFLAGS = -O,&3 -fstrict-aliasing,'
C{,X}Sparse/Lib/Makefile
sed -i -e 's,I$(METIS_PATH)/Lib,I$(METIS_PATH)/include,'
CHOLMOD/Lib/Makefile
for file in `find .`
do
if [ -f $file ]
then
sed -i -e 's|-no-cpp-precomp||g' $file
fi
done
<<
# avoid race condidtion
UseMaxBuildJobs: false
CompileScript: <<
#! /bin/sh -ev
# Compile SuiteSparse with METIS.
export CHOLMOD_CONFIG=''
echo **** Start: Message from SuiteSparse CompileScript ****
echo CHOLMOD_CONFIG = $CHOLMOD_CONFIG
echo **** Stop: Message from SuiteSparse CompileScript ****
make default
<<
InstallScript: <<
#! /bin/sh -ev
install -d %i/lib
find . -name 'lib*.a' -exec install -m 644 \{\} %i/lib \;
rm %i/lib/libcsparse.a
ranlib %i/lib/lib*.a
install -d %i/include/%N
install -p -m 644 \
`find . -name '*.h'|egrep -v
'^\./(CSparse/|CXSparse_n|UMFPACK/Source/)|/(MATLAB|Demo|Tcov)/|_(internal|version)\.h$'`
\
%i/include/%N
for f in `ls -1 {,*/,CHOLMOD/*/}*.txt|egrep -v '_newfiles|MATLAB'|sed -e
's,^,./,' -e 's,/[^/]*$,,'|sort -u`
do install -d %i/share/doc/%n/$f; install -p -m 644 $f/*.txt
%i/share/doc/%n/$f; done
for f in `ls -1d */Doc|fgrep -v _newfiles|sed -e 's,/[^/]*$,,'`
do install -d %i/share/doc/%n/$f; install -p -m 644 $f/Doc/*
%i/share/doc/%n/$f; done
cd %i/share/doc/%n
# replace duplicates by symlinks
for n in lesser gpl; do
l=`ls -1 {,*/}*/$n.txt`
target=`tail -n1<<<"$l"`
list=`sed -e '$d'<<<"$l"`
for f in $list; do g=`sed -e 's,[^/]\+,..,g' -e 's,\.\.$,,' <<<"$f"`;
ln -fs $g$target $f; done
done
# clean up
find . \( -name Makefile \
-o -name '*.bib' -o -name '*.tex' -o -name '*.stex' -o -name '*.sed*'
-o -name '*.awk' -o -name '*diff' -o -name '*proto' \
\) -exec rm \{\} \;
cd -
<<
Description: Suite of Sparse matrix packages
License: GPL/LGPL
Maintainer: Ben Abbott <[email protected]>
Homepage: http://www.cise.ufl.edu/research/sparse/SuiteSparse/
Index: octave-3.2.4.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/common/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 28 Aug 2011 01:58:20 -0000 1.3
+++ octave-3.2.4.info 29 Aug 2011 17:46:52 -0000 1.4
@@ -89,11 +89,7 @@
<<
InfoTest: <<
- TestScript: <<
-# mv src/DLD-FUNCTIONS/qr.cc src/DLD-FUNCTIONS/qr.broken
- make check || exit 2
-# mv src/DLD-FUNCTIONS/qr.broken src/DLD-FUNCTIONS/qr.cc
- <<
+ TestScript: make check || exit 2
<<
InstallScript: <<
@@ -117,7 +113,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/*
<<
--- qhull.info DELETED ---
--- suitesparse.patch DELETED ---
--- qhull.patch DELETED ---
--- NEW FILE: suitesparse-3.6.1.patch ---
diff -urN -x .DS_Store originals/SuiteSparse/KLU/Include/klu_internal.h
SuiteSparse/KLU/Include/klu_internal.h
--- originals/SuiteSparse/KLU/Include/klu_internal.h 2007-05-04
17:00:06.000000000 -0400
+++ SuiteSparse/KLU/Include/klu_internal.h 2008-03-22 20:19:59.000000000
-0400
@@ -9,7 +9,7 @@
#include "klu.h"
#include "btf.h"
-#include "klu_version.h"
+/*#include "klu_version.h"*/
/* ==========================================================================
*/
/* make sure debugging and printing is turned off */
@@ -36,6 +36,8 @@
#include <limits.h>
#include <stdlib.h>
#include <math.h>
+/* moved klu_version.h after math.h to circumvent compile error on ppc */
+#include "klu_version.h"
#undef ASSERT
#ifndef NDEBUG
diff -Nurd SuiteSparse/UFconfig/UFconfig.mk
SuiteSparse.patched//UFconfig/UFconfig.mk
--- SuiteSparse/UFconfig/UFconfig.mk 2011-05-10 16:47:15.000000000 -0400
+++ SuiteSparse.patched//UFconfig/UFconfig.mk 2011-08-24 15:14:47.000000000
-0400
@@ -33,8 +33,8 @@
# C compiler and compiler flags: These will normally not give you optimal
# performance. You should select the optimization parameters that are best
# for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example.
-CC = cc
-CFLAGS = -O3 -fexceptions
+#CC = cc
+#CFLAGS = -O3 -fexceptions
# C++ compiler (also uses CFLAGS)
CPLUSPLUS = g++
@@ -54,7 +54,7 @@
F77LIB =
# C and Fortran libraries
-LIB = -lm
+#LIB = -lm
# For compiling MATLAB mexFunctions (MATLAB 7.5 or later)
MEX = mex -O -largeArrayDims -lmwlapack -lmwblas
@@ -91,8 +91,8 @@
# naming the BLAS and LAPACK library (*.a or *.so) files.
# This is probably slow ... it might connect to the Standard Reference BLAS:
-BLAS = -lblas -lgfortran
-LAPACK = -llapack
+#BLAS = -lblas -lgfortran
+#LAPACK = -llapack
# NOTE: this next option for the "Goto BLAS" has nothing to do with a "goto"
# statement. Rather, the Goto BLAS is written by Dr. Kazushige Goto.
@@ -132,13 +132,13 @@
# The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB,
etc.
# You may wish to use an absolute path. METIS is optional. Compile
# CHOLMOD with -DNPARTITION if you do not wish to use METIS.
-METIS_PATH = ../../metis-4.0
-METIS = ../../metis-4.0/libmetis.a
+#METIS_PATH = ../../metis-4.0
+#METIS = ../../metis-4.0/libmetis.a
# If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
# options:
-# METIS_PATH =
-# METIS =
+METIS_PATH = @METISPREFIX@
+METIS = @METISPREFIX@/lib/libmetis.a
#------------------------------------------------------------------------------
# UMFPACK configuration:
@@ -194,7 +194,7 @@
# -DNSUNPERF for Solaris only. If defined, do not use the Sun
# Performance Library
-CHOLMOD_CONFIG =
+CHOLMOD_CONFIG =
#------------------------------------------------------------------------------
# SuiteSparseQR configuration:
@@ -232,7 +232,7 @@
#------------------------------------------------------------------------------
# Using default compilers:
-# CC = gcc
+CC = gcc
# CFLAGS = -O3 -fexceptions
# alternatives:
@@ -286,10 +286,10 @@
# As recommended by macports, http://suitesparse.darwinports.com/
# I've tested them myself on Mac OSX 10.6.1 (Snow Leopard), on my MacBook Air.
-# F77 = gfortran
-# CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
-# BLAS = -framework Accelerate
-# LAPACK = -framework Accelerate
+F77 = gfortran
+CFLAGS = -O3 -fno-common -no-cpp-precomp -fexceptions
+BLAS = -framework Accelerate
+LAPACK = -framework Accelerate
# Using netlib.org LAPACK and BLAS compiled by gfortran, with and without
# optimzation:
------------------------------------------------------------------------------
EMC VNX: the world's simplest storage, starting under $10K
The only unified storage solution that offers unified management
Up to 160% more powerful than alternatives and 25% more efficient.
Guaranteed. http://p.sf.net/sfu/emc-vnx-dev2dev
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
