Update of /cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci
In directory vz-cvs-3.sog:/tmp/cvs-serv18274/sci
Modified Files:
qrupdate.info
Added Files:
octave-10.7.patch octave-3.2.4.info octave.patch qhull.info
qhull.patch
Removed Files:
qhull6.info qhull6.patch
Log Message:
Refactored qrupdate and qhull
Octave to common tree.
--- qhull6.info DELETED ---
--- NEW FILE: octave.patch ---
diff -Nurd -x'*~' octave-@[email protected]/src/DLD-FUNCTIONS/__glpk__.cc
octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc
--- octave-@[email protected]/src/DLD-FUNCTIONS/__glpk__.cc 2009-01-16
01:46:23.000000000 -0500
+++ octave-@OCTVERSION@/src/DLD-FUNCTIONS/__glpk__.cc 2010-10-15
17:50:25.000000000 -0400
@@ -59,8 +59,20 @@
#else
-void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info);
-void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info);
+void _glp_lib_print_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+ int (*hook)(void *, const char *) = (int(*)(void *, const char *))
+ (func);
+ glp_term_hook(hook, info);
+ return;
+}
+
+void _glp_lib_fault_hook (int (*func)(void *info, char *buf), void *info)
+{ /* stolen from glpk-4.26 */
+ assert(func == func);
+ assert(info == info);
+ return;
+}
#endif
}
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-comp
octave-@[email protected]//octave-forge-comp
--- octave-@OCTVERSION@//octave-forge-comp 1969-12-31 19:00:00.000000000
-0500
+++ octave-@[email protected]//octave-forge-comp 2011-08-11
20:23:10.000000000 -0400
@@ -0,0 +1,4 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -V
+pkg prefix bld/share/octave/@OCTVERSION@/packages
bld/lib/octave/@OCTVERSION@/packages
+pkg global_list bld/share/octave/@OCTVERSION@/octave_packages
+pkg install -verbose -nodeps ./@PKGNAME@/
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-compile.sh
octave-@[email protected]//octave-forge-compile.sh
--- octave-@OCTVERSION@//octave-forge-compile.sh 1969-12-31
19:00:00.000000000 -0500
+++ octave-@[email protected]//octave-forge-compile.sh 2011-08-11
20:23:10.000000000 -0400
@@ -0,0 +1,7 @@
+#!/bin/sh -ev
+cd ..
+mkdir -p bld/share/octave/@OCTVERSION@/packages
bld/lib/octave/@OCTVERSION@/packages
+cp @FINKPREFIX@/share/octave/@OCTVERSION@/scripts/octave-forge-comp
@FINKPREFIX@/share/octave/@OCTVERSION@/scripts/octave-forge-inst bld
+chmod a+x bld/octave-forge*
+sed -i.bak -e "s/@PKGNAME@/$1/" bld/octave-forge*
+bld/octave-forge-comp
\ No newline at end of file
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-inst
octave-@[email protected]//octave-forge-inst
--- octave-@OCTVERSION@//octave-forge-inst 1969-12-31 19:00:00.000000000
-0500
+++ octave-@[email protected]//octave-forge-inst 2011-08-11
20:23:10.000000000 -0400
@@ -0,0 +1,7 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -q
+load share/octave/@OCTVERSION@/octave_packages;
+apfx = global_packages {1}.archprefix;
+global_packages {1}.archprefix = regexprep(apfx,'.*bld','@FINKPREFIX@');
+dr = global_packages {1}.dir;
+global_packages {1}.dir = regexprep(dr,'.*bld','@FINKPREFIX@');
+save -text share/octave/@OCTVERSION@/octave_packages global_packages
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-install.sh
octave-@[email protected]//octave-forge-install.sh
--- octave-@OCTVERSION@//octave-forge-install.sh 1969-12-31
19:00:00.000000000 -0500
+++ octave-@[email protected]//octave-forge-install.sh 2011-08-11
20:23:10.000000000 -0400
@@ -0,0 +1,5 @@
+#!/bin/sh -ev
+cd $2
+cp -r $3/../bld/{share,lib} .
+$3/../bld/octave-forge-inst
+mv share/octave/@OCTVERSION@/octave_packages
share/octave/@OCTVERSION@/packages/$1/.
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-postinst
octave-@[email protected]//octave-forge-postinst
--- octave-@OCTVERSION@//octave-forge-postinst 1969-12-31 19:00:00.000000000
-0500
+++ octave-@[email protected]//octave-forge-postinst 2011-08-11
20:23:10.000000000 -0400
@@ -0,0 +1,6 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -q
+load @FINKPREFIX@/share/octave/@OCTVERSION@/packages/@PKGNAME@/octave_packages
+newpackage = global_packages;
+load @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages
+global_packages = {global_packages{:},newpackage{:}};
+save -text @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages global_packages
diff -Nurd '-x*~' octave-@OCTVERSION@//octave-forge-prerm
octave-@[email protected]//octave-forge-prerm
--- octave-@OCTVERSION@//octave-forge-prerm 1969-12-31 19:00:00.000000000
-0500
+++ octave-@[email protected]//octave-forge-prerm 2011-08-11
20:23:10.000000000 -0400
@@ -0,0 +1,9 @@
+#!@FINKPREFIX@/bin/octave-@OCTVERSION@ -q
+load @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages
+for i = 1:length(global_packages)
+ if strcmp(global_packages{i}.name,'@PKGNAME@')
+ global_packages(i) = [];
+ break
+ endif
+endfor
+save -text @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages global_packages
diff -Naur startup/octaverc.null startup/octaverc
--- startup/octaverc.null 2011-08-12 14:21:47.000000000 -0400
+++ startup/octaverc 2011-08-12 12:32:41.000000000 -0400
@@ -0,0 +1,24 @@
+## System-wide startup file for Octave.
+##
+## This file should contain any commands that should be executed each
+## time Octave starts for every user at this site.
+
+## Configure readline using the file inputrc in the Octave startup
+## directory.
+
+read_readline_init_file (sprintf ("%s%s%s",
+ octave_config_info ("startupfiledir"),
+ filesep, "inputrc"));
+
+if (strcmp (PAGER (), "less") && isempty (getenv ("LESS")))
+ PAGER_FLAGS ('-e -X -P"-- less ?pB(%pB\\%):--. (f)orward, (b)ack, (q)uit$"');
+endif
+
+## This appears here instead of in the pkg/PKG_ADD file so that --norc
+## will also skip automatic loading of packages.
+
+try
+ pkg global_list @FINKPREFIX@/var/octave/@OCTVERSION@/octave_packages
+catch
+end_try_catch
+pkg ("load", "auto");
diff -Nurd '-x*~' octave-@OCTVERSION@/doc/interpreter/mkoctfile-@[email protected]
octave-@[email protected]/doc/interpreter/mkoctfile-@[email protected]
--- octave-@OCTVERSION@/doc/interpreter/mkoctfile-@[email protected]
2011-08-12 22:01:38.000000000 -0400
+++ octave-@[email protected]/doc/interpreter/mkoctfile-@[email protected]
2011-08-12 22:18:42.000000000 -0400
@@ -19,11 +19,11 @@
.\"
.\" This page was contributed by Dirk Eddelbuettel <[email protected]>
.\"
-.TH MKOCTFILE 1 "1 November 2002" "GNU Octave"
+.TH mkoctfile-@OCTVERSION@ 1 "1 November 2002" "GNU Octave"
.SH NAME
-mkoctfile \- Compile dynamic-load modules for GNU Octave
+mkoctfile-@OCTVERSION@ \- Compile dynamic-load modules for GNU Octave
.SH SYNOPSIS
-.BR mkoctfile\ [\-IDIR]\ [\-DDEF]\ [\-lLIB]\ [\-LDIR]\ [\-M|\-\-depend]\
+.BR mkoctfile-@OCTVERSION@\ [\-IDIR]\ [\-DDEF]\ [\-lLIB]\ [\-LDIR]\
[\-M|\-\-depend]\
[\-c]\ [\-o FILE|\-\-output FILE]\ [\-p VAR|\-\-print VAR]\ [\-s|\-\-strip]\
[\-v|\-\-verbose]\ [\-h|\-?|\-\-help]\ \fIfile\fP .\|.\|.
.SH DESCRIPTION
diff -Nurd '-x*~' octave-@OCTVERSION@/doc/interpreter/octave-@[email protected]
octave-@[email protected]/doc/interpreter/octave-@[email protected]
--- octave-@OCTVERSION@/doc/interpreter/octave-@[email protected] 2011-08-12
22:00:40.000000000 -0400
+++ octave-@[email protected]/doc/interpreter/octave-@[email protected]
2011-08-12 22:18:40.000000000 -0400
@@ -16,19 +16,19 @@
.\" along with Octave; see the file COPYING. If not, see
.\" <http://www.gnu.org/licenses/>.
.\"
-.TH Octave 1 "Jan 8 1996"
+.TH Octave-@OCTVERSION@ 1 "Jan 8 1996"
.SH NAME
-octave \- A high-level interactive language for numerical computations.
+octave-@OCTVERSION@ \- A high-level interactive language for numerical
computations.
.SH SYNOPSIS
.nf
-octave [options]
+octave-@OCTVERSION@ [options]
.fi
.SH OPTIONS
-The complete set of command-line options for octave is available by
+The complete set of command-line options for octave-@OCTVERSION@ is available
by
running the command
.nf
- octave \-\-help
+ octave-@OCTVERSION@ \-\-help
.fi
.SH DESCRIPTION
diff -Nurd '-x*~' octave-@OCTVERSION@/doc/interpreter/octave-bug-@[email protected]
octave-@[email protected]/doc/interpreter/octave-bug-@[email protected]
--- octave-@OCTVERSION@/doc/interpreter/octave-bug-@[email protected]
2011-08-12 22:01:04.000000000 -0400
+++ octave-@[email protected]/doc/interpreter/octave-bug-@[email protected]
2011-08-12 22:13:25.000000000 -0400
@@ -18,18 +18,18 @@
.\"
.\" This page was contributed by Dirk Eddelbuettel <[email protected]>
.\"
-.TH octave-bug 1 "6 March 2000" GNU
+.TH octave-bug-@OCTVERSION@ 1 "6 March 2000" GNU
.SH NAME
-octave-bug \- report a bug in GNU Octave
+octave-bug-@OCTVERSION@ \- report a bug in GNU Octave
.SH SYNOPSIS
-.B octave-bug
+.B octave-bug-@OCTVERSION@
.RB [\| \-s
.IR subject \|]
.SH DESCRIPTION
-.B octave-bug
+.B octave-bug-@OCTVERSION@
is a shell script to help the user compose and mail bug reports
concerning Octave in a standard format.
-.B octave-bug
+.B octave-bug-@OCTVERSION@
is typically invoked by the Octave command
.B bug_report
which is intended to be called interactively from within Octave. This
@@ -37,7 +37,7 @@
template bug report file and starts an editor on that file. The bug report
will be sent to the bug-octave mailing list once the editing has been
completed (this assumes of course that your system can use email). However,
-the user could also call \fBoctave-bug\fR outside of Octave.
+the user could also call \fBoctave-bug-@OCTVERSION@\fR outside of Octave.
.PP
Please read the `Bugs' chapter in the Octave manual to find out how to submit
a bug report that will enable the Octave maintainers to fix the problem. If
@@ -50,7 +50,7 @@
be quoted.
.SH ENVIRONMENT VARIABLES
.B
-octave-bug
+octave-bug-@OCTVERSION@
uses the environment variables
.BR USER,
.BR EDITOR,
@@ -60,7 +60,7 @@
.SH VERSION
This document was last revised for Octave version 2.0.16.
.SH SEE ALSO
-.BR octave (1),
+.BR octave-@OCTVERSION@ (1),
.BR bashbug (1)
.SH AUTHOR
.nf
diff -Nurd '-x*~'
octave-@OCTVERSION@/doc/interpreter/octave-config-@[email protected]
octave-@[email protected]/doc/interpreter/octave-config-@[email protected]
--- octave-@OCTVERSION@/doc/interpreter/octave-config-@[email protected]
2011-08-12 22:01:22.000000000 -0400
+++ octave-@[email protected]/doc/interpreter/octave-config-@[email protected]
2011-08-12 22:18:38.000000000 -0400
@@ -18,23 +18,23 @@
.\"
.\" This page was contributed by Dirk Eddelbuettel <[email protected]>.
.\"
-.TH OCTAVE-CONFIG 1 "19 February 2003" "GNU Octave"
+.TH OCTAVE-CONFIG-@OCTVERSION@ 1 "19 February 2003" "GNU Octave"
.SH NAME
-octave-config - GNU Octave component and library information retrieval
+octave-config-@OCTVERSION@ - GNU Octave component and library information
retrieval
.SH SYNOPSIS
-.B octave-config
+.B octave-config-@OCTVERSION@
.RI [ options ]
.SH DESCRIPTION
.PP
-.B octave-config
+.B octave-config-@OCTVERSION@
is a tool to obtain directory information for
.I .oct
and
.I .m
files for
-.BR octave (1).
+.BR octave-@OCTVERSION@ (1).
.SH OPTIONS
-.B octave-config
+.B octave-config-@OCTVERSION@
accepts the following options:
.TP 8
.B \--m-site-dir
@@ -72,7 +72,7 @@
.TP 8
.B \-h|-?|--help
Display a help page about
-.B octave-config
+.B octave-config-@OCTVERSION@
.SH AUTHOR
John W. Eaton <[email protected]>
diff -Nurd -x'*~' octave-@OCTVERSION@/mkoctfile.in
octave-@[email protected]/mkoctfile.in
--- octave-@OCTVERSION@/mkoctfile.in 2009-01-16 01:46:22.000000000 -0500
+++ octave-@[email protected]/mkoctfile.in 2011-08-19 11:17:32.000000000
-0400
@@ -36,6 +36,7 @@
DEFAULT_LIBDIR=%OCTAVE_CONF_LIBDIR%
DEFAULT_OCTINCLUDEDIR=%OCTAVE_CONF_OCTINCLUDEDIR%
DEFAULT_OCTLIBDIR=%OCTAVE_CONF_OCTLIBDIR%
+FINK_COMPILER_DIR=@FINKPREFIX@/var/lib/fink/path-prefix-@WRAPPER@
if [ -n "$OCTAVE_HOME" ]; then
DEFAULT_BINDIR="`echo $DEFAULT_BINDIR | $SED
"s,^$OCTAVE_PREFIX,$OCTAVE_HOME,"`"
@@ -73,10 +74,10 @@
: ${F77=%OCTAVE_CONF_F77%}
: ${FFLAGS=%OCTAVE_CONF_FFLAGS%}
: ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
-: ${CC=%OCTAVE_CONF_CC%}
+: ${CC=$FINK_COMPILER_DIR/%OCTAVE_CONF_CC%}
: ${CFLAGS=%OCTAVE_CONF_CFLAGS%}
: ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%}
-: ${CXX=%OCTAVE_CONF_CXX%}
+: ${CXX=$FINK_COMPILER_DIR/%OCTAVE_CONF_CXX%}
: ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
: ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
: ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
@@ -85,7 +86,7 @@
: ${DEPEND_FLAGS=%OCTAVE_CONF_DEPEND_FLAGS%}
: ${DEPEND_EXTRA_SED_PATTERN=%OCTAVE_CONF_DEPEND_EXTRA_SED_PATTERN%}
-: ${DL_LD=%OCTAVE_CONF_DL_LD%}
+: ${DL_LD=$FINK_COMPILER_DIR/%OCTAVE_CONF_DL_LD%}
: ${DL_LDFLAGS=%OCTAVE_CONF_MKOCTFILE_DL_LDFLAGS%}
: ${RLD_FLAG=%OCTAVE_CONF_RLD_FLAG%}
@@ -98,7 +99,7 @@
: ${FFTW_LIBS=%OCTAVE_CONF_FFTW_LIBS%}
: ${LIBS=%OCTAVE_CONF_LIBS%}
: ${FLIBS=%OCTAVE_CONF_FLIBS%}
-: ${LD_CXX=%OCTAVE_CONF_LD_CXX%}
+: ${LD_CXX=$FINK_COMPILER_DIR/%OCTAVE_CONF_LD_CXX%}
: ${LDFLAGS=%OCTAVE_CONF_LDFLAGS%}
: ${LD_STATIC_FLAG=%OCTAVE_CONF_LD_STATIC_FLAG%}
: ${LFLAGS=$DEFAULT_LFLAGS}
--- NEW FILE: octave-3.2.4.info ---
Info2: <<
Package: octave%type_pkg[-atlas]
Type: -atlas (.), oct(3.2.4)
Version: 3.2.4
Revision: 0.0009
Maintainer: Alexander Hansen <[email protected]>
# disable atlas on 10.7 distro file until atlas is available
Source: mirror:gnu:%{Ni}/%{Ni}-%v.tar.gz
Source-MD5: 90c39fa9e241ad2e978bcee4682a2ba9
BuildDepends: <<
arpack, glpk-dev, hdf5.7, readline5, libncurses5, fftw3 (>= 3.1.1-7),
libcurl4, fltk-x11, x11-dev, libftgl2, qhull6-dev, qrupdate,
pcre, gcc46-compiler, suitesparse, fink (>= 0.30.0),
fink-package-precedence, sed,
graphicsmagick-dev,
(%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
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)
<<
Replaces: %{Ni}, %{Ni}-atlas, %{Ni}3.0.2 ( << 3.0.2-5), %{Ni}3.0.2-atlas ( <<
3.0.2-5)
UseMaxBuildJobs: true
PatchFile: %{ni}.patch
PatchFile-MD5: efef1c4d103b5c87d25ad1a2d0671469
PatchFile2: %{ni}-10.7.patch
PatchFile2-MD5: a04b8081dbe76972f823d098097a26a2
PatchScript: <<
#!/bin/sh -ev
cp doc/interpreter/%{Ni}.1 doc/interpreter/%{Ni}-%v.1
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
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
perl -pi -e 's|(qhull[/.])|lib\1|g ; s|lqhull|lqhull6|' configure
# 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
# 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
done
# 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 for 10.7 only, but may work on earlier OSes
patch -p1 < %{PatchFile2}
<<
# SetLDFLAGS: -Wl,-dead_strip_dylibs
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 --disable-static --without-mpi --with-hdf5
--with-fftw \
--x-includes=/usr/X11R6/include --x-libraries=/usr/X11R6/lib
<<
CompileScript: <<
#!/bin/sh -ev
export CFLAGS='-O3'
export CXXFLAGS='-O3'
export FFLAGS='-O3 -ff2c'
if [ "%type_pkg[-atlas]" == "" ]
then
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'
else a='--with-lapack=%p/lib/liblapack.dylib
--with-blas=%p/lib/libf77blas.dylib'
fi
FLIBDIR="%p/lib/gcc4.6/lib"
./configure FLIBS="${FLIBDIR}/libgfortran.dylib" %c $a
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: <<
# 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
<<
<<
InstallScript: <<
#!/bin/sh -ev
export MAKEFLAGS=-j1
make install DESTDIR=%d
# install Fink-specific %{Ni}rc which points at our oct-versioned
# package directory
cp %b/%{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
pushd %i/bin
# clear out hardcoded Fink sed
for file in mkoctfile-%v %{Ni}-bug-%v %{Ni}-config-%v
do
perl -pi -e 's|%p/bin/sed|/usr/bin/sed|g' $file
done
popd
# 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
cp %{Ni}-forge* %i/share/%{Ni}/%v/scripts
chmod a+x %i/share/%{Ni}/%v/scripts/*
<<
InfoDocs: %{Ni}.info
RuntimeVars: <<
GNUTERM: aqua
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
SplitOff: <<
Package: octave%type_pkg[oct]%type_pkg[-atlas]-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)
<<
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)
<<
Depends: fftw3-shlibs, gcc46-shlibs, hdf5.7-shlibs, readline5-shlibs,
(%type_raw[-atlas] = -atlas) atlas-shlibs (>= 3.8.1-1)
Files: <<
lib/%{Ni}-%v
<<
Shlibs: <<
%p/lib/%{Ni}-%v/libcruft.dylib 0.0.0 %n (>=3.2.4-0)
%p/lib/%{Ni}-%v/lib%{Ni}.dylib 0.0.0 %n (>=3.2.4-0)
%p/lib/%{Ni}-%v/liboctinterp.dylib 0.0.0 %n (>=3.2.4-0))
<<
DescDetail: <<
This package contains shared libraries which are used by the Octave
interpreter itself, as well as for packages that build against Octave,
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.
<<
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),
gcc46-compiler, (%type_raw[-atlas] = atlas) atlas (>= 3.8.1-1)
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
<<
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
<<
BuildDependsOnly: true
Files: <<
include/%{Ni}-%v
bin/mkoctfile*
bin/octave-config*
share/man/man1/mkoctfile.1
share/man/man1/octave-config.1
<<
PostInstScript: <<
os_version=`sw_vers -productVersion | cut -d. -f2`
case $os_version in
7) sed -i -e 's|@WRAPPER@|clang|' %p/bin/mkoctfile-%v ;;
6) sed -i -e 's|@WRAPPER@|10.6|' %p/bin/mkoctfile-%v ;;
5) sed -i -e 's|@WRAPPER@|g++-4.0|' %p/bin/mkoctfile-%v
;;
esac
<<
DescDetail: <<
This package contains files needed to build against Octave, including
headers and the mkoctfile executable.
Note: mkoctfile encodes the compiler wrappers that Fink uses.
Use "fink reinstall %n" if you update your OS in-place
and it will be updated for your new OS version.
<<
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.
<<
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)
<<
Conflicts: <<
(%type_raw[-atlas] = atlas) %{Ni}%type_pkg[oct],
(%type_raw[-atlas] != atlas) %{Ni}%type_pkg[oct]-atlas,
(%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)
<<
Files: <<
share/%{Ni}/%v
lib/%{Ni}/%v
bin/%{Ni}-%v
bin/%{Ni}-bug-%v
var/%{Ni}/%v
<<
DescDetail: <<
The %{Ni}%type_pkg[oct]%type_pkg[-atlas] package contains versioned
executables, as well as all of the
core functionality of the Octave interpreter. Note that the GNU info
file,
which provides the core documentation, is installed as part of the %{Ni}
package.
Octave provides a convenient command line interface for solving linear
and
nonlinear problems numerically, and for performing other numerical
experiments using a language that is mostly compatible with Matlab.
It may also be used as a batch-oriented language.
Octave has extensive tools for solving common numerical linear algebra
problems, finding the roots of nonlinear equations, integrating ordinary
functions, manipulating polynomials, and integrating ordinary
differential
and differential-algebraic equations. It is easily extensible and
customizable via user-defined functions written in Octave's own
language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
<<
DescUsage: <<
By default the plotting output (via gnuplot) is directed to AquaTerm.
This can be overidden in your startup scripts, e.g.
export GNUTERM=x11
in bash
or
setenv GNUTERM x11
in tcsh.
Note: Fink's Octave implementation modifies one of the startup files,
%p/share/%{Ni}/%v/m/startup/octaverc,
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc'
or '-f' flags in your Octave script, these packages won't be visible.
You'll need torun the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
DocFiles: BUGS ChangeLog README ROADMAP SENDING-PATCHES COPYING
<<
Description: MATLAB-like language for computations
DescDetail: <<
The %{Ni}%type_pkg[-atlas] package contains unversioned executables and an
unversioned directory tree.
Octave provides a convenient command line interface for solving linear and
nonlinear problems numerically, and for performing other numerical
experiments using a language that is mostly compatible with Matlab.
It may also be used as a batch-oriented language.
Octave has extensive tools for solving common numerical linear algebra
problems, finding the roots of nonlinear equations, integrating ordinary
functions, manipulating polynomials, and integrating ordinary differential
and differential-algebraic equations. It is easily extensible and
customizable via user-defined functions written in Octave's own language,
or using dynamically loaded modules written in C++, C, Fortran,
or other languages.
Note: mkoctfile encodes the compiler wrappers that Fink uses.
Use "fink reinstall %{Ni}%v%type_pkg[atlas]" if you update your OS in-place
and it will be updated for your new OS version.
<<
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.
export GNUTERM=x11
in bash
or
setenv GNUTERM x11
in tcsh.
Note: Fink's Octave implementation modifies one of the startup files,
%p/share/%{Ni}/%v/m/startup/octaverc,
to initialize octave sessions to know about Fink's octave-versioned
install location for octave-forge packages. If you use the '--norc' or '-f'
flags in your Octave script, these packages won't be visible. You'll need to
run the following command in your script:
pkg global_list %p/var/octave/%v/octave_packages
<<
DescPort: <<
Thanks to Per Persson for most (if not all) of the work on the macos X port.
<<
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
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,
to make upgrades easier for us and for users.
As of 3.0.5-5: 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.
Unfortunately, Octave's 'pkg' tool doesn't seem to know how to deal with
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.
<<
Homepage: http://www.octave.org/
License: GPL
<<
--- qhull6.patch DELETED ---
--- NEW FILE: octave-10.7.patch ---
--- octave-3.2.4/src/display.cc 2009-08-13 01:56:02.000000000 -0400
+++ octave-3.2.4.patched/src/display.cc 2011-08-27 15:08:31.000000000 -0400
@@ -65,12 +65,18 @@
warning ("no graphical display found");
#elif defined (HAVE_FRAMEWORK_CARBON)
+ /* for 10.7 */
+ size_t displayBitsPerPixel (CGDirectDisplayID displayId);
+
+
CGDirectDisplayID display = CGMainDisplayID ();
if (display)
{
- dp = CGDisplayBitsPerPixel (display);
+
+ /*dp = CGDisplayBitsPerPixel (display);*/
+ dp = displayBitsPerPixel (display);
ht = CGDisplayPixelsHigh (display);
wd = CGDisplayPixelsWide (display);
@@ -150,6 +156,24 @@
return retval;
}
+ size_t displayBitsPerPixel (CGDirectDisplayID displayId) {
+
+ CGDisplayModeRef mode =
CGDisplayCopyDisplayMode(displayId);
+ size_t depth = 0;
+
+ CFStringRef pixEnc =
CGDisplayModeCopyPixelEncoding(mode);
+ if(CFStringCompare(pixEnc, CFSTR(IO32BitDirectPixels),
kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ depth = 32;
+ else if(CFStringCompare(pixEnc,
CFSTR(IO16BitDirectPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ depth = 16;
+ else if(CFStringCompare(pixEnc,
CFSTR(IO8BitIndexedPixels), kCFCompareCaseInsensitive) == kCFCompareEqualTo)
+ depth = 8;
+
+ CFRelease(pixEnc);
+ CFRelease(mode);
+ return depth;
+ }
+
/*
;;; Local Variables: ***
;;; mode: C++ ***
--- NEW FILE: qhull.info ---
Package: qhull
Version: 2011.1
Revision: 1
Description: Calculate convex hulls and related structures
License: BSD
Maintainer:
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.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
ln -sf lib%Nstatic.a lib%N.a
popd
# add directory with symlinks for compatibility with prior %v
mkdir %i/include/%n
cd %i/include/%n
for file in ../lib%N/*
do
ln -s $file
done
<<
DocFiles: Announce.txt COPYING.txt README.txt REGISTER.txt index.htm
Homepage: http://www.qhull.org/
SplitOff: <<
Package: %N6-shlibs
Files: lib/lib%N bs hull.org/ t README.txt REGISTER.txt
index.htm PointSet::&|;' src/libqhullcpp/QhullPointSet.h
3.8.1-1) ev,%{Ni}305-dev,%{Ni}305-atlas-dev
src 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' ØD&ÿ ØD&ÿ È=Àt±* pÏD&ÿ "ÁÃs±* ÞÃs±* ØD&ÿ ðÀÃs±* OØD&ÿ @ØD&ÿ 8ØD&ÿ Ûäs±* p ØD&ÿ óÈÃs±* êÄs±* pÏD&ÿ @ÎD&ÿ ëÝÃs±* G H I J K M N O P ØD&ÿ ØD&ÿ Hõt±* ÑD&ÿ "ÁÃs±* ÞÃs±* ØD&ÿ 0oDu±* óÈÃs±* àt±* )tt±* `Du±* ØdDu±* ¨iDu±* êÄs±* Hõt±* ÑD&ÿ PÏD&ÿ ëÝÃs±* 8õt±* ÑD&ÿ ÏD&ÿ ëÝÃs±* (õt±* ÑD&ÿ °ÏD&ÿ ëÝÃs±* õt±* ÑD&ÿ àÏD&ÿ ëÝÃs±*
¨nDu±* óÈÃs±* ¨iDu±* `ÊD&ÿ xtt±* æÇÃs±* ØdDu±* ÐD&ÿ yxtt±* æÇÃs±* `Du±* °ÐD&ÿ Zxtt±* æÇÃs±* Ø$tt±* àt±* )tt±* `Du±* Øàt±* ØdDu±* ¨iDu±* êÄs±* Ûäs±* ý?t±* ØD&ÿ p»st±* `ÒD&ÿ 0ÑD&ÿ ëÝÃs±* 5 6 7 8 : < = > ? @ B D ØD&ÿ ØD&ÿ àý<t±* ØD&ÿ óÈÃs±* èÔäs±* àÐD&ÿ ý?t±* æÇÃs±* èÔäs±* Õ_@f ÆS
Qöl±í Á
t±* ØD&ÿ àý<t±* pÓD&ÿ @ÒD&ÿ ëÝÃs±* u]ÞÓ
4Q ÷U^Qʧ ¶uª¹ñìò*Äv´Et±* ÀÙD&ÿ F§u±* F§u±* ?åBt±* ÙD&ÿ ØD&ÿ ÔD&ÿ OØD&ÿ @ØD&ÿ 8ØD&ÿ ÛD&ÿ B§u±* ÐÙD&ÿ Øàt±* àt±* êÄs±* ÿÿÿÿÿÿÿÿB§u±* ØD&ÿ ëÝÃs 6.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.
<<
<<
Index: qrupdate.info
===================================================================
RCS file:
/cvsroot/fink/experimental/alexkhansen/common/finkinfo/sci/qrupdate.info,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- qrupdate.info 26 Aug 2011 19:53:47 -0000 1.5
+++ qrupdate.info 27 Aug 2011 21:21:27 -0000 1.6
@@ -1,34 +1,39 @@
-Info2: <<
-Package: qrupdate%type_pkg[-shlibs]
-Type: -shlibs (-shlibs)
+Package: qrupdate
Version: 1.1.1
-Revision: 0.07
-Source: mirror:sourceforge:%{Ni}/1.1/%{Ni}-%v.tar.gz
+Revision: 0.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 shared 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: <<
-Abuse Type so that we can use %Ni instead of "qrupdate".
-
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: gcc46-shlibs
-BuildDependsOnly: false
+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||'\
+ -e 's|-llapack||' \
Makeconf
sed -i.orig -e 's|install -D|install|g' src/Makefile
# recursive parallel Makefiles please -- fangism
@@ -51,18 +56,13 @@
make -j1 install-shlib install-staticlib DESTDIR=%d
<<
-Shlibs: %p/lib/lib%{Ni}.1.dylib 0.0.0 %n (>= 1.1.1-1)
-
DocFiles: COPYING README
SplitOff: <<
- Package: qrupdate-dev
- Depends: %N (= %v-%r)
- Files: lib/*a lib/lib%{Ni}.dylib
+ Package: %N-shlibs
+ Depends: gcc46-shlibs
+ Files: lib/lib%N.1*.dylib
DocFiles: COPYING README
- DescUsage: <<
- This package contains a static library, header, and
- unversioned dylib.
- <<
-<<
+ Shlibs: %p/lib/lib%N.1.dylib 0.0.0 %n (>= 1.1.1-1)
+ DescUsage: This package contains a shared library.
<<
--- NEW FILE: qhull.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
------------------------------------------------------------------------------
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
