Upgrade to 2.21-2.

5 files changed, 22 insertions, 42 deletions

diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index 69da5d99b27f..8603868acbe0 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	freefem++
-DISTVERSION=	2.20-1
+DISTVERSION=	2.21-2
 CATEGORIES=	math science
 MASTER_SITES=	http://www.freefem.org/ff++/ftp/
 
diff --git a/math/freefem++/distinfo b/math/freefem++/distinfo
index 13be66753c5f..c0f87b44b203 100644
--- a/math/freefem++/distinfo
+++ b/math/freefem++/distinfo
@@ -1,3 +1,3 @@
-MD5 (freefem++-2.20-1.tar.gz) = 16734a2be43d5c6aab01e3d4654617fd
-SHA256 (freefem++-2.20-1.tar.gz) = 5c966cb413f03c98cad619fbb5edcd355c96d3fea96f14ca7000ee8b7ec61f9c
-SIZE (freefem++-2.20-1.tar.gz) = 10752048
+MD5 (freefem++-2.21-2.tar.gz) = f5532730391f6cacc47642e960bd56d5
+SHA256 (freefem++-2.21-2.tar.gz) = 5ca7f8f7b896e7fccbe2f16ec64cdec636f934ff615397ea5e1b344e915b7d4d
+SIZE (freefem++-2.21-2.tar.gz) = 10863641
diff --git a/math/freefem++/files/patch-configure b/math/freefem++/files/patch-configure
index c016f7b5fdcd..773859246429 100644
--- a/math/freefem++/files/patch-configure
+++ b/math/freefem++/files/patch-configure
@@ -1,20 +1,11 @@
---- configure.orig	Tue Sep 19 21:24:02 2006
-+++ configure	Wed Sep 20 22:32:15 2006
-@@ -9371,7 +9371,7 @@
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- $ac_includes_default
--#include <mpicxx.h>
-+#include <mpi.h>
- _ACEOF
- rm -f conftest.$ac_objext
- if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-@@ -9415,7 +9415,7 @@
- cat confdefs.h >>conftest.$ac_ext
- cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
--#include <mpicxx.h>
-+#include <mpi.h>
- _ACEOF
- if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+--- configure.orig	2007-11-19 21:40:20.000000000 +0100
++++ configure	2007-11-23 19:06:25.000000000 +0100
+@@ -9600,7 +9600,7 @@
+ 
+ 
+ 
+-for ac_header in mpicxx.h mpi/cxx/mpicxx.h ompi/mpi/cxx/mpicxx.h openmpi/ompi/mpi/cxx/mpicxx.h mpi++.h
++for ac_header in mpi.h mpicxx.h mpi/cxx/mpicxx.h ompi/mpi/cxx/mpicxx.h openmpi/ompi/mpi/cxx/mpicxx.h mpi++.h
+ do
+ as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ if eval "test \"\${$as_ac_Header+set}\" = set"; then
diff --git a/math/freefem++/files/patch-src_Makefile.in b/math/freefem++/files/patch-src_Makefile.in
index 4c1bdcc7013a..294b25540c6c 100644
--- a/math/freefem++/files/patch-src_Makefile.in
+++ b/math/freefem++/files/patch-src_Makefile.in
@@ -1,13 +1,13 @@
---- 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@
- 
+--- src/Makefile.in.orig	2007-11-19 21:40:21.000000000 +0100
++++ src/Makefile.in	2007-11-23 19:09:06.000000000 +0100
+@@ -219,8 +219,9 @@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
 +# FreeBSD patch: don't install bamg, which is available as math/bamg
  SUBDIRS = bamglib femlib  Graphics Algo lglib fflib std x11	\
 -nw mpi agl glx ide bamg bin-win32 
 +nw mpi agl glx ide bin-win32 
  
  EXTRA_DIST = FreeFem++-CoCoa Carbon.r
- subdir = src
+ all: all-recursive
diff --git a/math/freefem++/files/patch-src_fflib_AFunction.cpp b/math/freefem++/files/patch-src_fflib_AFunction.cpp
deleted file mode 100644
index efef53ac36c7..000000000000
--- a/math/freefem++/files/patch-src_fflib_AFunction.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./src/fflib/AFunction.cpp.orig	2007-10-22 18:10:22.000000000 +0200
-+++ ./src/fflib/AFunction.cpp	2007-11-13 22:27:16.000000000 +0100
-@@ -1265,7 +1265,7 @@
-     const E_Array & a=  ta ? *tea->v : *ea;
-     cout << " pv =" << pv << " size = "<< a.size() << endl;
-     ffassert(pv >=0 && pv <a.size());
--    return a[pv];
-+    return (* a.v)[pv];
- }
- 
- C_F0  opDot::code2(const basicAC_F0 &args) const