7 files changed, 28 insertions, 61 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index 91db43002783..dce22711f70c 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmsh
-PORTVERSION=	2.8.5
-PORTREVISION=	2
+PORTVERSION=	2.9.0
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
@@ -19,6 +18,7 @@ LIB_DEPENDS=	libfltk.so:${PORTSDIR}/x11-toolkits/fltk \
 		libjpeg.so:${PORTSDIR}/graphics/jpeg \
 		libpng.so:${PORTSDIR}/graphics/png \
 		liblapack.so:${PORTSDIR}/math/lapack
+RUN_DEPENDS=	getdp:${PORTSDIR}/science/getdp
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}-source
 
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index 32836de9c5ac..f2913e2f9091 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gmsh/gmsh-2.8.5-source.tgz) = 0ea2fdbcc9ba44c90e03dbc553e7f0ddb2f9044173ac34db123db4fe65af3130
-SIZE (gmsh/gmsh-2.8.5-source.tgz) = 8665258
+SHA256 (gmsh/gmsh-2.9.0-source.tgz) = e80a69494da57a8ca8f9b769bd70480fc882d3b43fb21bd3721becf2e7888882
+SIZE (gmsh/gmsh-2.9.0-source.tgz) = 9036825
 SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911
 SIZE (gmsh/manual.pdf) = 206713
diff --git a/cad/gmsh/files/patch-CMakeLists.txt b/cad/gmsh/files/patch-CMakeLists.txt
index 86b66d7e76b6..ed5ac20789a9 100644
--- a/cad/gmsh/files/patch-CMakeLists.txt
+++ b/cad/gmsh/files/patch-CMakeLists.txt
@@ -8,15 +8,6 @@
  
  set(GMSH_MAJOR_VERSION 2)
  set(GMSH_MINOR_VERSION 8)
-@@ -1017,7 +1018,7 @@
-       # ModelingData
-       TKBRep TKGeomBase TKG3d TKG2d
-       # FoundationClasses
--      TKAdvTools TKMath TKernel)
-+      TKMath TKernel)
-   if(ENABLE_SGEOM)
-     set(OCC_LIBS_REQUIRED ${OCC_LIBS_REQUIRED}
-       # For SGEOM
 @@ -1450,7 +1451,7 @@
      set(GMSH_BIN bin)
      set(GMSH_LIB lib)
diff --git a/cad/gmsh/files/patch-Geo_OCCFace.cpp b/cad/gmsh/files/patch-Geo_OCCFace.cpp
deleted file mode 100644
index aedb1e5f1e2d..000000000000
--- a/cad/gmsh/files/patch-Geo_OCCFace.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- Geo/OCCFace.cpp.orig	2014-02-07 08:31:21.000000000 +0100
-+++ Geo/OCCFace.cpp	2014-11-18 23:35:55.000000000 +0100
-@@ -28,7 +28,11 @@
- #include <BRepMesh_FastDiscret.hxx>
- 
- #if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
--#include <BOPInt_Context.hxx>
-+#  if (OCC_VERSION_MINOR < 8)
-+#  include <BOPInt_Context.hxx>
-+#  else
-+#  include <IntTools_Context.hxx>
-+#  endif
- #include <BOPTools_AlgoTools2D.hxx>
- #include <BOPTools_AlgoTools.hxx>
- #else
-@@ -455,7 +459,7 @@
- void OCCFace::replaceEdgesInternal(std::list<GEdge*> &new_edges)
- {
- 
--#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6)
-+#if (OCC_VERSION_MAJOR == 6) && (OCC_VERSION_MINOR >= 6) && (OCC_VERSION_MINOR < 8)
-   Handle(BOPInt_Context) myContext = new BOPInt_Context;
- #elif defined(OCC_VERSION_HEX) && OCC_VERSION_HEX >= 0x060503
-   Handle(IntTools_Context) myContext = new IntTools_Context;
diff --git a/cad/gmsh/files/patch-Mesh-meshGFace.cpp b/cad/gmsh/files/patch-Mesh-meshGFace.cpp
deleted file mode 100644
index 901c99519594..000000000000
--- a/cad/gmsh/files/patch-Mesh-meshGFace.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- Mesh/meshGFace.cpp-orig	2014-11-28 19:32:56.000000000 +0000
-+++ Mesh/meshGFace.cpp	2014-11-28 19:34:10.000000000 +0000
-@@ -156,7 +156,7 @@
- 	MEdge E = _gf->quadrangles[i]->getEdge(j);
- 	SPoint2 p1, p2;
- 	reparamMeshEdgeOnFace(E.getVertex(0),E.getVertex(1),_gf,p1,p2);
--	std::map<MEdge, MVertex *>::iterator it = _middle.find(E);
-+	std::map<MEdge, MVertex *, Less_Edge>::iterator it = _middle.find(E);
- 	std::map<MEdge, MVertex *, Less_Edge>::iterator it2 = eds.find(E);
- 	m[j] = p1;
- 	if (it == _middle.end() && it2 == eds.end()){
diff --git a/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp b/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp
deleted file mode 100644
index 855c1939a918..000000000000
--- a/cad/gmsh/files/patch-Mesh-meshGFaceBDS.cpp
+++ /dev/null
@@ -1,13 +0,0 @@
---- Mesh/meshGFaceBDS.cpp.orig
-+++ Mesh/meshGFaceBDS.cpp
-@@ -771,8 +771,8 @@
-   while (it != m.edges.end()){
-     BDS_Edge *e = *it;
-     if (!e->deleted && e->numfaces() == 2){
--      std::map<BDS_Point*, MVertex*>::iterator itp1 = recoverMap->find(e->p1);
--      std::map<BDS_Point*, MVertex*>::iterator itp2 = recoverMap->find(e->p2);
-+      std::map<BDS_Point*, MVertex*, PointLessThan>::iterator itp1 = recoverMap->find(e->p1);
-+      std::map<BDS_Point*, MVertex*, PointLessThan>::iterator itp2 = recoverMap->find(e->p2);
-       if (itp1 != recoverMap->end() &&
-           itp2 != recoverMap->end() &&
-           itp1->second == itp2->second) toSplit.insert(e);
diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist
index 18b6894bc59b..0f1978aeb822 100644
--- a/cad/gmsh/pkg-plist
+++ b/cad/gmsh/pkg-plist
@@ -4,6 +4,8 @@ bin/onelab.py
 %%SHARED_LIB%%lib/libGmsh.so
 %%SHARED_LIB%%lib/libGmsh.so.%%VE%%
 %%SHARED_LIB%%lib/libGmsh.so.%%VER%%
+include/gmsh/BasisFactory.h
+include/gmsh/CADDistances.h
 include/gmsh/CGNSOptions.h
 include/gmsh/Cell.h
 include/gmsh/CellComplex.h
@@ -12,6 +14,7 @@ include/gmsh/ChainComplex.h
 include/gmsh/ColorTable.h
 include/gmsh/Context.h
 include/gmsh/ElementType.h
+include/gmsh/FuncSpaceData.h
 include/gmsh/GEdge.h
 include/gmsh/GEdgeCompound.h
 include/gmsh/GEdgeLoop.h
@@ -25,6 +28,10 @@ include/gmsh/GRegion.h
 include/gmsh/GRegionCompound.h
 include/gmsh/GVertex.h
 include/gmsh/GaussIntegration.h
+include/gmsh/GenericEdge.h
+include/gmsh/GenericFace.h
+include/gmsh/GenericRegion.h
+include/gmsh/GenericVertex.h
 include/gmsh/Gmsh.h
 include/gmsh/GmshConfig.h
 include/gmsh/GmshDefines.h
@@ -50,6 +57,18 @@ include/gmsh/MTetrahedron.h
 include/gmsh/MTriangle.h
 include/gmsh/MVertex.h
 include/gmsh/MVertexBoundaryLayerData.h
+include/gmsh/MeshOpt.h
+include/gmsh/MeshOptCommon.h
+include/gmsh/MeshOptObjContrib.h
+include/gmsh/MeshOptObjContribFunc.h
+include/gmsh/MeshOptObjContribScaledNodeDispSq.h
+include/gmsh/MeshOptObjectiveFunction.h
+include/gmsh/MeshOptPatch.h
+include/gmsh/MeshOptVertexCoord.h
+include/gmsh/MeshOptimizer.h
+include/gmsh/MeshQualityObjContribIdealJac.h
+include/gmsh/MeshQualityObjContribInvCond.h
+include/gmsh/MeshQualityOptimizer.h
 include/gmsh/MetricBasis.h
 include/gmsh/Numeric.h
 include/gmsh/OS.h
@@ -60,6 +79,10 @@ include/gmsh/OpenFile.h
 include/gmsh/OptHOM.h
 include/gmsh/OptHomFastCurving.h
 include/gmsh/OptHomMesh.h
+include/gmsh/OptHomIntegralBoundaryDist.h
+include/gmsh/OptHomObjContribCADDist.h
+include/gmsh/OptHomObjContribMetricMin.h
+include/gmsh/OptHomObjContribScaledJac.h
 include/gmsh/OptHomRun.h
 include/gmsh/PView.h
 include/gmsh/PViewData.h
@@ -128,6 +151,7 @@ include/gmsh/polynomialBasis.h
 include/gmsh/simple3D.h
 include/gmsh/simpleFunction.h
 include/gmsh/sparsityPattern.h
+include/gmsh/thermicSolver.h
 include/gmsh/yamakawa.h
 man/man1/gmsh.1.gz
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS.txt