Update of /cvsroot/fink/dists/10.4/unstable/main/finkinfo/10.4-EOL/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv11440

Added Files:
        qrupdate.info qhull6.info qhull6.patch 
Log Message:
sync with 10.!4, validated on powerpc-darwin8


--- NEW FILE: qrupdate.info ---
Package: qrupdate
Version: 1.1.1
Revision: 1
Source: mirror:sourceforge:%{Ni}/1.1/%N-%v.tar.gz
Source-MD5: 7782c7ee6c234e56a72d6b86c1856fa0
Description: QR and Cholesky decomposition library
DescDetail: <<
qrupdate is a Fortran library for fast updates of QR, Cholesky decompositions.
<<
DescUsage: <<
This package contains a static library, header, and unversioned dylib.
<<
DescPackaging: <<
Patch out hardcoded /usr/local.

Uses GNU 'install -D', so we patch that out and use 'mkdir -p' first to avoid
BuildDepends: coreutils-default.

Doesn't get along with current Fink atlas, so use Accelerate.framework.

Use -ff2c to attempt to be compatible with Accelerate.
<<
Maintainer: Alexander Hansen <[email protected]>
License: GPL

BuildDepends: gcc46-compiler
Depends: %N-shlibs (=%v-%r)
BuildDependsOnly: true

PatchScript: <<
        #!/bin/sh -ev
        sed -i.orig -e 's|/usr/local|%p|g' \
                -e '/FC/s|gfortran|&-fsf-4.6|' \
                -e '/FFLAGS/s|-O3|-ff2c -g &|' \
                -e 's|-lblas||' \
                -e 's|-llapack||' \
                Makeconf
        sed -i.orig -e 's|install -D|install|g' src/Makefile
        # recursive parallel Makefiles please -- fangism
        sed -i.orig -e '/make -C/s|make|+&|' Makefile
        sed -i.orig2 -e '/BLAS=/i\
LDFLAGS=-framework Accelerate' Makeconf
        sed -i.orig -e '/FFLAGS.*LIBS/s|(FFLAGS)|& $(LDFLAGS)|' test/Makefile
<<

CompileScript: <<
        make solib && make lib
<<

InfoTest: <<
        TestScript:  make test || exit 2
<<

InstallScript: <<
        mkdir -p %i/lib
        make -j1 install-shlib install-staticlib DESTDIR=%d
<<

DocFiles: COPYING README

SplitOff: <<
        Package: %N-shlibs
        Depends: gcc46-shlibs
        Files: lib/lib%N.1*.dylib
        DocFiles: COPYING README
        Shlibs:  %p/lib/lib%N.1.dylib 0.0.0 %n (>= 1.1.1-1)
        DescUsage: This package contains a shared library.
<<

--- 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

--- 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:  <<
#!/bin/sh -ev
sed -e 's,@INSTPREFIX@,%i,' -e 's,@FINKPREFIX@,%p,' %{PatchFile} | patch -p1
sed -i.orig -e 's|-Wno-sign-conversion||' \
        -e '/^qtest:/s|$| bin/rbox bin/qhull|' \
        -e '1i\
.SUFFIXES: .c .cpp .o' 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.
        <<
<<


------------------------------------------------------------------------------
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

Reply via email to