Upgrade to V2.6-1.

Changelog at <http://www.freefem.org/ff++/ftp/INNOVATION>.

5 files changed, 24 insertions, 10 deletions

diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 25978e4..86b3ec4 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freefem++
-DISTVERSION=	2.4-1
+DISTVERSION=	2.6-1
 CATEGORIES=	math science
 MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo
index 692a086..f12eef9 100644
--- a/math/freefem++/distinfo
+++ b/math/freefem++/distinfo
@@ -1,3 +1,3 @@
-MD5 (freefem++-2.4-1.tar.gz) = 9f2c644b5e367b5348e7aef1199a167a
-SHA256 (freefem++-2.4-1.tar.gz) = 8ccd4ef41d98a7480544a1c60974c09775351416c7a8d4fcda2e7170141d2517
-SIZE (freefem++-2.4-1.tar.gz) = 10239518
+MD5 (freefem++-2.6-1.tar.gz) = 407b4b8f8ad58e3353a122d854e8234a
+SHA256 (freefem++-2.6-1.tar.gz) = ede92a43c7621b16e3135b12398491958f65ae6963b92b0d84ab0228a8b860af
+SIZE (freefem++-2.6-1.tar.gz) = 10595980
diff --git a/math/freefem++/files/patch-src_Makefile.in b/math/freefem++/files/patch-src_Makefile.in
index 5e75b2b..880e440 100644
--- a/math/freefem++/files/patch-src_Makefile.in
+++ b/math/freefem++/files/patch-src_Makefile.in
@@ -1,12 +1,12 @@
---- src/Makefile.in.orig	Fri Jan 27 22:33:41 2006
-+++ src/Makefile.in	Tue Feb  7 20:58:23 2006
+--- src/Makefile.in.orig	Tue Apr 11 23:08:53 2006
++++ src/Makefile.in	Tue Apr 11 23:58:23 2006
 @@ -208,8 +208,9 @@
  sharedstatedir = @sharedstatedir@
  sysconfdir = @sysconfdir@
  target_alias = @target_alias@
-+# FreeBSD patch: don't install bamg, wich is available as math/bamg.
++# FreeBSD patch: don't install bamg, which is available as math/bamg
  SUBDIRS = bamglib femlib iml Graphics Algo umfpack lglib fflib std x11	\
--nw mpi agl glx ide bin-win32 bamg
+-nw mpi agl glx ide bamg bin-win32 
 +nw mpi agl glx ide bin-win32
  
  EXTRA_DIST = FreeFem++-CoCoa Carbon.r
diff --git a/math/freefem++/files/patch-src_mpi_Makefile.in b/math/freefem++/files/patch-src_mpi_Makefile.in
new file mode 100644
index 0000000..d9672f8
--- /dev/null
+++ b/math/freefem++/files/patch-src_mpi_Makefile.in
@@ -0,0 +1,13 @@
+--- src/mpi/Makefile.in.orig	Wed Apr 12 11:31:03 2006
++++ src/mpi/Makefile.in	Wed Apr 12 21:25:05 2006
+@@ -227,8 +227,8 @@
+ FreeFem___mpi_SOURCES = ../Graphics/sansrgraph.cpp parallelempi.cpp	\
+ ../lglib/lg.tab.cpp
+ 
+-FreeFem___mpi_DEPENDENCIES = ../fflib/libff.a
+-LDADD = ../fflib/libff.a @UMFPACKLIB@ @ARPACKLIB@ @BLASLIB@
++FreeFem___mpi_DEPENDENCIES = ../fflib/libff.a ../lglib/liblg.a
++LDADD = ../fflib/libff.a ../lglib/liblg.a @UMFPACKLIB@ @ARPACKLIB@ @BLASLIB@
+ AM_CXXFLAGS = -DPARALLELE
+ INCLUDES = -I../fflib -I../Graphics -I../femlib
+ all: all-am
diff --git a/math/freefem++/pkg-plist b/math/freefem++/pkg-plist
index 45e0cd8..08f2a01 100644
--- a/math/freefem++/pkg-plist
+++ b/math/freefem++/pkg-plist
@@ -28,6 +28,7 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bb.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bug-arg-string.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bug-mesh.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/bug/bug-toto.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugborder.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugf.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/bug/bugv1.18.edp
@@ -114,8 +115,6 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/error.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/fem.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/fem3.hpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/load/ff-mt19937ar.cpp
-%%PORTDOCS%%%%EXAMPLESDIR%%/load/ff-mt19937ar.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/ffstack.hpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/funcTemplate.cpp
 %%PORTDOCS%%%%EXAMPLESDIR%%/load/funcTemplate.edp
@@ -159,6 +158,7 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/testFE.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/testadp.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/teste.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/AdaptResidualErrorIndicator.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/FE.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/FEComplex.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/LapDG2.edp
@@ -217,6 +217,7 @@ bin/FreeFem++-nw
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/sparse-cmatrix.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/sparse-matrix.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/sphere.edp
+%%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/string.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/tablefunction.edp
 %%PORTDOCS%%%%EXAMPLESDIR%%/tutorial/xyf
 %%PORTDOCS%%%%EXAMPLESDIR%%/wafer-heating-laser-axi.edp