4 files changed, 49 insertions, 42 deletions

diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile
index efe9639e64ec..c18b32805af6 100644
--- a/cad/gmsh/Makefile
+++ b/cad/gmsh/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	gmsh
-PORTVERSION=	2.6.1
+PORTVERSION=	2.7.0
 CATEGORIES=	cad
 MASTER_SITES=	http://www.geuz.org/gmsh/src/ \
 		http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/
@@ -38,6 +38,7 @@ CMAKE_ARGS+=	-DCMAKE_SKIP_RPATH:BOOL=YES \
 		-DCMAKE_VERBOSE_MAKEFILE:BOOL=YES
 
 .if !defined(WITHOUT_STATIC_LIB)
+CMAKE_ARGS+=	-DENABLE_BUILD_LIB=ON
 ALL_TARGET+=	lib
 PLIST_SUB+=	STATIC_LIB=""
 .else
@@ -45,6 +46,7 @@ PLIST_SUB+=	STATIC_LIB="@comment "
 .endif
 
 .if !defined(WITHOUT_SHARED_LIB)
+CMAKE_ARGS+=	-DENABLE_BUILD_SHARED=ON
 ALL_TARGET+=	shared
 PLIST_SUB+=	SHARED_LIB=""
 USE_LDCONFIG=	yes
@@ -196,10 +198,6 @@ post-patch:
 		-e s+share/man/man1+man/man1+ ${WRKSRC}/CMakeLists.txt
 
 post-install:
-.if !defined(WITHOUT_SHARED_LIB)
-	${MV} -f ${PREFIX}/lib/libGmsh.so ${PREFIX}/lib/libGmsh.so.0
-	${LN} -s ${PREFIX}/lib/libGmsh.so.0 ${PREFIX}/lib/libGmsh.so
-.endif
 .if !defined(WITHOUT_METIS)
 	${MKDIR} ${DOCSDIR}/metis
 	${INSTALL_DATA} ${WRKDIR}/manual.pdf ${DOCSDIR}/metis
diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo
index 6f46b5ffc830..8a01f76e1865 100644
--- a/cad/gmsh/distinfo
+++ b/cad/gmsh/distinfo
@@ -1,4 +1,4 @@
-SHA256 (gmsh/gmsh-2.6.1-source.tgz) = 9644474d203560196654896243af2e82f794894ccabbf3eb06b024da0aee0d0c
-SIZE (gmsh/gmsh-2.6.1-source.tgz) = 6193189
+SHA256 (gmsh/gmsh-2.7.0-source.tgz) = 4a6910f9ebbbfcff47a3f9b3b91abb83572b905edfa6d7003954941ea47150c3
+SIZE (gmsh/gmsh-2.7.0-source.tgz) = 8138155
 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 d93f6326b9da..be855ba76a68 100644
--- a/cad/gmsh/files/patch-CMakeLists.txt
+++ b/cad/gmsh/files/patch-CMakeLists.txt
@@ -1,38 +1,14 @@
---- CMakeLists.txt.orig	2012-03-03 00:03:38.000000000 +0100
-+++ CMakeLists.txt	2012-03-03 16:05:27.000000000 +0100
-@@ -63,6 +63,7 @@
- option(ENABLE_TETGEN_NEW "Enable experimental version of Tetgen" OFF)
+--- CMakeLists.txt.orig	2013-03-08 18:06:45.000000000 +0000
++++ CMakeLists.txt	2013-03-09 20:13:20.000000000 +0000
+@@ -70,6 +70,7 @@
+ option(ENABLE_VORO3D "Enable Voro3D" ${DEFAULT})
  option(ENABLE_WRAP_JAVA "Build Java wrappers" OFF)
- option(ENABLE_WRAP_PYTHON "Build Python wrappers" ${DEFAULT})
+ option(ENABLE_WRAP_PYTHON "Build Python wrappers" OFF)
 +option(INSTALL_DOCS "Install the docs (FreeBSD only)" ON)
  
  set(GMSH_MAJOR_VERSION 2)
- set(GMSH_MINOR_VERSION 5)
-@@ -671,13 +672,16 @@
-     endif(NOT HAVE_METIS)
-     find_library(TAUCS_LIB taucs PATH_SUFFIXES lib)
-     if(TAUCS_LIB)
--      find_path(TAUCS_INC "taucs.h" PATH_SUFFIXES src include taucs)
--      if(TAUCS_INC)
--        set_config_option(HAVE_TAUCS "Taucs")
--        add_definitions(-DTAUCS_CILK)
--        list(APPEND EXTERNAL_LIBRARIES ${TAUCS_LIB})
--        list(APPEND EXTERNAL_INCLUDES ${TAUCS_INC})
--      endif(TAUCS_INC)
-+      find_library(COMPAT_LIB compat)
-+      if (COMPAT_LIB)
-+        find_path(TAUCS_INC "taucs.h" PATH_SUFFIXES src include taucs)
-+        if(TAUCS_INC)
-+          set_config_option(HAVE_TAUCS "Taucs")
-+          add_definitions(-DTAUCS_CILK)
-+          list(APPEND EXTERNAL_LIBRARIES ${TAUCS_LIB})
-+          list(APPEND EXTERNAL_INCLUDES ${TAUCS_INC})
-+        endif(TAUCS_INC)
-+      endif(COMPAT_LIB)
-     endif(TAUCS_LIB)
-   endif(ENABLE_TAUCS)
- 
-@@ -819,7 +823,7 @@
+ set(GMSH_MINOR_VERSION 7)
+@@ -881,7 +885,7 @@
    list(LENGTH OCC_LIBS NUM_OCC_LIBS)
    if(NUM_OCC_LIBS EQUAL NUM_OCC_LIBS_REQUIRED)
      find_path(OCC_INC "BRep_Tool.hxx" PATHS ENV CASROOT PATH_SUFFIXES inc 
@@ -41,9 +17,27 @@
      if(OCC_INC)
        set_config_option(HAVE_OCC "OpenCascade")
        list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS})
-@@ -1117,11 +1121,13 @@
- install(TARGETS gmsh DESTINATION ${GMSH_BIN} OPTIONAL)
- install(TARGETS lib shared DESTINATION lib OPTIONAL)
+@@ -1166,7 +1170,7 @@
+   else(ENABLE_OS_SPECIFIC_INSTALL)
+     set(GMSH_BIN bin)
+     set(GMSH_DOC share/doc/gmsh)
+-    set(GMSH_MAN share/man/man1)
++    set(GMSH_MAN man/man1)
+   endif(ENABLE_OS_SPECIFIC_INSTALL)
+   if(CYGWIN)
+     unix2dos(GMSH_API)
+@@ -1185,7 +1189,7 @@
+ else(WIN32 OR CYGWIN)
+   set(GMSH_BIN bin)
+   set(GMSH_DOC share/doc/gmsh)
+-  set(GMSH_MAN share/man/man1)
++  set(GMSH_MAN man/man1)
+ endif(WIN32 OR CYGWIN)
+ 
+ # mark targets as optional so we can install them separately if needed
+@@ -1198,11 +1202,13 @@
+   install(TARGETS shared DESTINATION lib OPTIONAL)
+ endif(ENABLE_BUILD_SHARED)
  install(FILES ${GMSH_API} DESTINATION include/gmsh)
 -install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt)
 -install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC})
diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist
index 8ebb5cb4c485..c0d3026a51c1 100644
--- a/cad/gmsh/pkg-plist
+++ b/cad/gmsh/pkg-plist
@@ -1,12 +1,17 @@
+
+
+
 bin/gmsh
 %%STATIC_LIB%%lib/libGmsh.a
 %%SHARED_LIB%%lib/libGmsh.so
-%%SHARED_LIB%%lib/libGmsh.so.0
+%%SHARED_LIB%%lib/libGmsh.so.2.7
+%%SHARED_LIB%%lib/libGmsh.so.2.7.0
 include/gmsh/CGNSOptions.h
 include/gmsh/Cell.h
 include/gmsh/CellComplex.h
 include/gmsh/Chain.h
 include/gmsh/ChainComplex.h
+include/gmsh/ColorTable.h
 include/gmsh/Context.h
 include/gmsh/GEdge.h
 include/gmsh/GEdgeCompound.h
@@ -46,13 +51,17 @@ include/gmsh/MTriangle.h
 include/gmsh/MVertex.h
 include/gmsh/MVertexBoundaryLayerData.h
 include/gmsh/Numeric.h
+include/gmsh/OS.h
 include/gmsh/Octree.h
 include/gmsh/OctreeInternals.h
 include/gmsh/OctreePost.h
+include/gmsh/OpenFile.h
 include/gmsh/OptHOM.h
 include/gmsh/OptHomMesh.h
 include/gmsh/PView.h
 include/gmsh/PViewData.h
+include/gmsh/PViewDataGModel.h
+include/gmsh/PViewOptions.h
 include/gmsh/Pair.h
 include/gmsh/ParamCoord.h
 include/gmsh/PluginManager.h
@@ -63,6 +72,7 @@ include/gmsh/SPoint2.h
 include/gmsh/SPoint3.h
 include/gmsh/STensor3.h
 include/gmsh/SVector3.h
+include/gmsh/StringUtils.h
 include/gmsh/VertexArray.h
 include/gmsh/Voronoi3D.h
 include/gmsh/cartesian.h
@@ -82,11 +92,13 @@ include/gmsh/gmp_blas.h
 include/gmsh/gmp_matrix.h
 include/gmsh/gmp_normal_form.h
 include/gmsh/gmshLevelset.h
+include/gmsh/groupOfElements.h
 include/gmsh/laplaceTerm.h
 include/gmsh/linearSystem.h
 include/gmsh/linearSystemCSR.h
 include/gmsh/linearSystemFull.h
 include/gmsh/linearSystemGMM.h
+include/gmsh/linearSystemPETSc.h
 include/gmsh/mathEvaluator.h
 include/gmsh/mathex.h
 include/gmsh/meshGEdge.h
@@ -94,9 +106,11 @@ include/gmsh/meshGFace.h
 include/gmsh/meshGFaceDelaunayInsertion.h
 include/gmsh/meshGFaceElliptic.h
 include/gmsh/meshGFaceOptimize.h
+include/gmsh/meshMetric.h
 include/gmsh/meshPartition.h
 include/gmsh/meshPartitionOptions.h
 include/gmsh/mpz.h
+include/gmsh/nodalBasis.h
 include/gmsh/orthogonalTerm.h
 include/gmsh/partitionEdge.h
 include/gmsh/periodical.h
@@ -120,6 +134,7 @@ include/gmsh/yamakawa.h
 %%PORTDOCS%%%%DOCSDIR%%/demos/filter.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/hex.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/homology.geo
+%%PORTDOCS%%%%DOCSDIR%%/demos/indheat.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/isosurf.script
 %%PORTDOCS%%%%DOCSDIR%%/demos/lowmem-anim.geo
 %%PORTDOCS%%%%DOCSDIR%%/demos/machine.geo