From eabb08641d3f261305e6366830051288c0f56439 Mon Sep 17 00:00:00 2001 From: Stephen Montgomery-Smith Date: Mon, 18 Jan 2016 02:17:41 +0000 Subject: [PATCH] - Update to 2.11.0. --- cad/gmsh/Makefile | 2 +- cad/gmsh/distinfo | 4 +-- cad/gmsh/files/patch-CMakeLists.txt | 47 ----------------------------- cad/gmsh/pkg-plist | 3 ++ 4 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 cad/gmsh/files/patch-CMakeLists.txt diff --git a/cad/gmsh/Makefile b/cad/gmsh/Makefile index ba51ebbfdde9..9148421da0d5 100644 --- a/cad/gmsh/Makefile +++ b/cad/gmsh/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gmsh -PORTVERSION= 2.9.3 +PORTVERSION= 2.11.0 CATEGORIES= cad MASTER_SITES= http://www.geuz.org/gmsh/src/ \ http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/ diff --git a/cad/gmsh/distinfo b/cad/gmsh/distinfo index 9aa7791902c2..7e4710693ad9 100644 --- a/cad/gmsh/distinfo +++ b/cad/gmsh/distinfo @@ -1,4 +1,4 @@ -SHA256 (gmsh/gmsh-2.9.3-source.tgz) = 9fc4b376f53c1b84267d0f10896830acb6e41fff393386768169cba3558eb8c6 -SIZE (gmsh/gmsh-2.9.3-source.tgz) = 9670596 +SHA256 (gmsh/gmsh-2.11.0-source.tgz) = 2b6d810cc3817ac2c7f5fdd09b9f4b1ed7b93365f6e6574052c73db957a497c6 +SIZE (gmsh/gmsh-2.11.0-source.tgz) = 11147053 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 deleted file mode 100644 index ed5ac20789a9..000000000000 --- a/cad/gmsh/files/patch-CMakeLists.txt +++ /dev/null @@ -1,47 +0,0 @@ ---- CMakeLists.txt.orig 2014-07-09 09:27:58.000000000 +0200 -+++ CMakeLists.txt 2014-11-17 23:45:13.000000000 +0100 -@@ -89,6 +89,7 @@ - opt(VORO3D "Enable Voro3D (for hex meshing, experimental)" ${DEFAULT}) - opt(WRAP_JAVA "Enable generation of Java wrappers (experimental)" OFF) - opt(WRAP_PYTHON "Enable generation of Python wrappers" OFF) -+opt(INSTALL_DOCS "Install the docs (FreeBSD only)" ON) - - set(GMSH_MAJOR_VERSION 2) - set(GMSH_MINOR_VERSION 8) -@@ -1450,7 +1451,7 @@ - set(GMSH_BIN bin) - set(GMSH_LIB lib) - 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) -@@ -1471,7 +1472,7 @@ - set(GMSH_BIN bin) - set(GMSH_LIB lib) - 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 -@@ -1524,11 +1525,13 @@ - if(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) - install(FILES ${GMSH_API} DESTINATION include/gmsh) - endif(ENABLE_BUILD_LIB OR ENABLE_BUILD_SHARED OR ENABLE_BUILD_DYNAMIC) --install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt) --install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC}) --install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC}) --install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial) --install(FILES ${DEMO_FILES} DESTINATION ${GMSH_DOC}/demos) -+if(ENABLE_INSTALL_DOCS) -+ install(FILES ${WELCOME_FILE} DESTINATION ${GMSH_DOC} RENAME README.txt) -+ install(FILES ${LICENSE_FILE} DESTINATION ${GMSH_DOC}) -+ install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC}) -+ install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial) -+ install(FILES ${DEMO_FILES} DESTINATION ${GMSH_DOC}/demos) -+endif(ENABLE_INSTALL_DOCS) - if(UNIX AND NOT CYGWIN) - install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/doc/gmsh.1 DESTINATION ${GMSH_MAN}) - endif(UNIX AND NOT CYGWIN) diff --git a/cad/gmsh/pkg-plist b/cad/gmsh/pkg-plist index 0f1978aeb822..f001233bf13b 100644 --- a/cad/gmsh/pkg-plist +++ b/cad/gmsh/pkg-plist @@ -103,6 +103,7 @@ include/gmsh/StringUtils.h include/gmsh/SuperEl.h include/gmsh/VertexArray.h include/gmsh/Voronoi3D.h +include/gmsh/adaptiveData.h include/gmsh/bezierBasis.h include/gmsh/boundaryLayersData.h include/gmsh/cartesian.h @@ -195,7 +196,9 @@ man/man1/gmsh.1.gz %%PORTDOCS%%%%DOCSDIR%%/demos/tower.i4 %%PORTDOCS%%%%DOCSDIR%%/demos/tower.i5 %%PORTDOCS%%%%DOCSDIR%%/demos/transfinite.geo +%%PORTDOCS%%%%DOCSDIR%%/demos/view_groups.geo %%PORTDOCS%%%%DOCSDIR%%/tutorial/bgmesh.pos +%%PORTDOCS%%%%DOCSDIR%%/tutorial/image.png %%PORTDOCS%%%%DOCSDIR%%/tutorial/t1.geo %%PORTDOCS%%%%DOCSDIR%%/tutorial/t10.geo %%PORTDOCS%%%%DOCSDIR%%/tutorial/t11.geo