summaryrefslogtreecommitdiff
path: root/math
diff options
context:
space:
mode:
authorThierry Thomas <thierry@FreeBSD.org>2007-04-18 22:04:29 +0000
committerThierry Thomas <thierry@FreeBSD.org>2007-04-18 22:04:29 +0000
commite85730c12d94911286f9efa29e38ce65ad1c5039 (patch)
tree9c52f3ca89e50c80c8a81dcffcf00e533ea2266f /math
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')
-rw-r--r--math/freefem++/Makefile2
-rw-r--r--math/freefem++/distinfo6
-rw-r--r--math/freefem++/files/patch-src::femlib::MatriceCreuse.hpp18
-rw-r--r--math/freefem++/files/patch-src_Makefile.in8
-rw-r--r--math/freefem++/pkg-plist1
5 files changed, 24 insertions, 11 deletions
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index ee86a7efc935..8ac0448bfd16 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -6,7 +6,7 @@
#
PORTNAME= freefem++
-DISTVERSION= 2.15-1
+PORTVERSION= 2.16
CATEGORIES= math science
MASTER_SITES= http://www.freefem.org/ff++/ftp/
diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo
index db23c0830efe..fcf21884dd9d 100644
--- a/math/freefem++/distinfo
+++ b/math/freefem++/distinfo
@@ -1,3 +1,3 @@
-MD5 (freefem++-2.15-1.tar.gz) = 1af785a66d9464c6cea55f1644b6ceda
-SHA256 (freefem++-2.15-1.tar.gz) = b5533b86f7056602465ac4f4d16651a110534b64eea1fb1ced6e76a1e466daa6
-SIZE (freefem++-2.15-1.tar.gz) = 10621498
+MD5 (freefem++-2.16.tar.gz) = 273491f70cfde00e421a33fc56358def
+SHA256 (freefem++-2.16.tar.gz) = 0d422596771cd009c7c7419d8eb24862b1e85d9db22767dea712c0c80ea9cd45
+SIZE (freefem++-2.16.tar.gz) = 10582541
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
diff --git a/math/freefem++/pkg-plist b/math/freefem++/pkg-plist
index 634ad985d565..7b60c1e1c7d5 100644
--- a/math/freefem++/pkg-plist
+++ b/math/freefem++/pkg-plist
@@ -226,6 +226,7 @@ bin/FreeFem++-nw
%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/medit.edp
%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/mesh.edp
%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/movemesh.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/nl-elast-neo-Hookean.edp
%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/nolinear-elas.edp
%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/onde.edp
%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/periodic4.edp