diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2007-04-18 22:04:29 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2007-04-18 22:04:29 +0000 |
| commit | e85730c12d94911286f9efa29e38ce65ad1c5039 (patch) | |
| tree | 9c52f3ca89e50c80c8a81dcffcf00e533ea2266f /math/freefem++/files | |
| parent | - My editor spammed the Makefile last time, fix weird error. It seems to be (diff) | |
Upgrade to 2.16-0.
Notes
Notes:
svn path=/head/; revision=190318
Diffstat (limited to 'math/freefem++/files')
| -rw-r--r-- | math/freefem++/files/patch-src::femlib::MatriceCreuse.hpp | 18 | ||||
| -rw-r--r-- | math/freefem++/files/patch-src_Makefile.in | 8 |
2 files changed, 19 insertions, 7 deletions
diff --git a/math/freefem++/files/patch-src::femlib::MatriceCreuse.hpp b/math/freefem++/files/patch-src::femlib::MatriceCreuse.hpp index 49158a300ba7..2f196ed5e095 100644 --- a/math/freefem++/files/patch-src::femlib::MatriceCreuse.hpp +++ b/math/freefem++/files/patch-src::femlib::MatriceCreuse.hpp @@ -1,11 +1,23 @@ ---- ./src/femlib/MatriceCreuse.hpp.orig Fri Jun 25 10:56:36 2004 -+++ ./src/femlib/MatriceCreuse.hpp Thu Jul 8 00:19:27 2004 -@@ -10,7 +10,7 @@ +--- ./src/femlib/MatriceCreuse.hpp.orig Mon Apr 16 15:29:19 2007 ++++ ./src/femlib/MatriceCreuse.hpp Wed Apr 18 22:10:17 2007 +@@ -10,15 +10,19 @@ #include <umfpack.h> #else #ifdef HAVE_UMFPACK_UMFPACK_H -#include <umfpack/umfpack.h> +#include <UMFPACK/umfpack.h> #else + #ifdef HAVE_BIG_UMFPACK_UMFPACK_H + #include <UMFPACK/umfpack.h> + #else ++#ifdef HAVE_UFSPARSE_UMFPACK_H ++#include <ufsparse/umfpack.h> ++#else // Defaults to a local version of the UMFPACK headers + #include "../../download/include/umfpack.h" + ++#endif // HAVE_UFSPARSE_UMFPACK_H + #endif // HAVE_BIG_UMFPACK_UMFPACK_H + #endif // HAVE_UMFPACK_UMFPACK_H + #endif // HAVE_UMFPACK_H diff --git a/math/freefem++/files/patch-src_Makefile.in b/math/freefem++/files/patch-src_Makefile.in index 5e154e3ba5f1..4c1bdcc7013a 100644 --- a/math/freefem++/files/patch-src_Makefile.in +++ b/math/freefem++/files/patch-src_Makefile.in @@ -1,11 +1,11 @@ ---- src/Makefile.in.orig Mon May 15 19:03:38 2006 -+++ src/Makefile.in Mon May 15 21:13:28 2006 -@@ -150,8 +150,9 @@ +--- src/Makefile.in.orig Wed Apr 18 12:01:44 2007 ++++ src/Makefile.in Wed Apr 18 21:30:10 2007 +@@ -154,8 +154,9 @@ ff_wget = @ff_wget@ install_sh = @install_sh@ +# FreeBSD patch: don't install bamg, which is available as math/bamg - SUBDIRS = bamglib femlib iml Graphics Algo umfpack lglib fflib std x11 \ + SUBDIRS = bamglib femlib Graphics Algo lglib fflib std x11 \ -nw mpi agl glx ide bamg bin-win32 +nw mpi agl glx ide bin-win32 |