Upgrade to 2.2.1.

Changelog at <http://geuz.org/gmsh/doc/VERSIONS>.

4 files changed, 15 insertions, 25 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index e2f0e21b795c..eee527b885c4 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gmsh
-PORTVERSION=	2.2.0
+PORTVERSION=	2.2.1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/
 DISTNAME=	${PORTNAME}-${PORTVERSION}-source
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index 27d308190ca8..2d4fd293a85d 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,3 +1,3 @@
-MD5 (gmsh-2.2.0-source.tgz) = aa7b264706b0f7462ccd52b67be2f7a3
-SHA256 (gmsh-2.2.0-source.tgz) = 5e489eab58cba5549c6662abdba814b4d982ebc4aa9be5fa09c5f24f390066d3
-SIZE (gmsh-2.2.0-source.tgz) = 2361156
+MD5 (gmsh-2.2.1-source.tgz) = 9970707d602d00386ff64ac7ff3db36d
+SHA256 (gmsh-2.2.1-source.tgz) = 1d3708818a0bc5ad3c88b1cd269a022993d83333abdb847067cd9a968def10b2
+SIZE (gmsh-2.2.1-source.tgz) = 2410975
diff --git a/cad/gmsh/files/patch-Post_AdaptiveViews.cpp b/cad/gmsh/files/patch-Post_AdaptiveViews.cpp
deleted file mode 100644
index 5c0c58378686..000000000000
--- a/cad/gmsh/files/patch-Post_AdaptiveViews.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./Post/AdaptiveViews.cpp.orig	Mon Jul  9 15:54:37 2007
-+++ ./Post/AdaptiveViews.cpp	Mon Jul 23 22:42:06 2007
-@@ -20,6 +20,7 @@
- 
- #include <stdio.h>
- #include <math.h>
-+#include <time.h>
- #include <list>
- #include <set>
- #include "AdaptiveViews.h"
diff --git a/cad/gmsh/files/patch-configure b/cad/gmsh/files/patch-configure
index 9df5a80da6c2..e941945e5a54 100644
--- a/cad/gmsh/files/patch-configure
+++ b/cad/gmsh/files/patch-configure
@@ -1,15 +1,15 @@
---- configure.orig	2008-02-22 07:49:32.000000000 +0100
-+++ configure	2008-02-24 16:13:08.000000000 +0100
-@@ -3631,7 +3631,7 @@
-   GMSH_DIRS="${GMSH_DIRS} Graphics Fltk"
-   GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshPlugin"
-   GMSH_LIBS="${GMSH_LIBS} -lGmshMesh -lGmshGeo -lGmshPost -lGmshCommon"
--  GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel"
-+  GMSH_LIBS="${GMSH_LIBS} -lGmshDataStr -lGmshNumeric -lGmshParallel ${LDFLAGS}"
+--- configure.orig	2008-06-08 00:43:58.000000000 +0200
++++ configure	2008-06-18 19:16:58.000000000 +0200
+@@ -3652,7 +3652,7 @@
+ 
+   GMSH_DIRS="Common Geo Mesh Post Numeric Parser Plugin Graphics Fltk"
+   GMSH_LIBS="-Llib -lGmshFltk -lGmshParser -lGmshGraphics -lGmshPlugin -lGmshMesh"
+-  GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshPost -lGmshCommon -lGmshNumeric"
++  GMSH_LIBS="${GMSH_LIBS} -lGmshGeo -lGmshPost -lGmshCommon -lGmshNumeric ${LDFLAGS}"
    FLAGS="-DHAVE_FLTK ${FLAGS}"
  
    if test "x${FLTK_PREFIX}" != "x" ; then
-@@ -4890,7 +4890,7 @@
+@@ -4918,7 +4918,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
    ac_check_lib_save_LIBS=$LIBS
@@ -18,7 +18,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -4950,7 +4950,7 @@
+@@ -4978,7 +4978,7 @@
        GMSH_LIBS="${GMSH_LIBS} -lcgns"
        FLAGS="${FLAGS} -DHAVE_LIBCGNS"
      else
@@ -27,7 +27,7 @@
        FLAGS="${FLAGS} -DHAVE_LIBCGNS -I${CGNS_PREFIX}/include"
      fi
    fi
-@@ -5041,7 +5041,7 @@
+@@ -5069,7 +5069,7 @@
        FLAGS="${FLAGS} -DHAVE_OCC"
      else
        GMSH_LIBS="${GMSH_LIBS} -L${OCC_PREFIX}/lib ${OCC_LIBS}"