- Update to 2.8.3.

This commit is contained in:
Stephen Montgomery-Smith 2013-09-27 20:28:16 +00:00
parent 84c78de2a9
commit 60c4e5c852
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=328513
4 changed files with 22 additions and 31 deletions

View file

@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= gmsh
PORTVERSION= 2.8.2
PORTVERSION= 2.8.3
CATEGORIES= cad
MASTER_SITES= http://www.geuz.org/gmsh/src/ \
http://glaros.dtc.umn.edu/gkhome/fetch/sw/metis/

View file

@ -1,4 +1,4 @@
SHA256 (gmsh/gmsh-2.8.2-source.tgz) = 0b3bd9fc2144dac36240a6ecfe4d367b0ef0a852653e7d088ebcb56970124fa1
SIZE (gmsh/gmsh-2.8.2-source.tgz) = 8325766
SHA256 (gmsh/gmsh-2.8.3-source.tgz) = 44ef0fc74cf89f3270b65a01a0eab296d947ac9cf442499b35e9db99d3c2312e
SIZE (gmsh/gmsh-2.8.3-source.tgz) = 11844933
SHA256 (gmsh/manual.pdf) = 8a682ee7f02380f52d5efdde5f9f9d8e927a4f4eb29287a878c1016225568911
SIZE (gmsh/manual.pdf) = 206713

View file

@ -1,43 +1,32 @@
--- 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" OFF)
+option(INSTALL_DOCS "Install the docs (FreeBSD only)" ON)
--- CMakeLists.txt.orig 2013-09-27 12:59:06.000000000 +0000
+++ CMakeLists.txt 2013-09-27 17:45:20.000000000 +0000
@@ -84,6 +84,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 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
- include include/oce opencascade)
+ include include/oce opencascade OpenCAS/ros/inc)
if(OCC_INC)
set_config_option(HAVE_OCC "OpenCascade")
list(APPEND EXTERNAL_LIBRARIES ${OCC_LIBS})
@@ -1166,7 +1170,7 @@
else(ENABLE_OS_SPECIFIC_INSTALL)
set(GMSH_MINOR_VERSION 8)
@@ -1318,7 +1319,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)
@@ -1185,7 +1189,7 @@
else(WIN32 OR CYGWIN)
@@ -1339,7 +1340,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
@@ -1198,11 +1202,13 @@
install(TARGETS shared DESTINATION lib OPTIONAL)
endif(ENABLE_BUILD_SHARED)
@@ -1394,11 +1395,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)
@ -46,13 +35,13 @@
-install(FILES ${CREDITS_FILE} DESTINATION ${GMSH_DOC})
-install(FILES ${TUTORIAL_FILES} DESTINATION ${GMSH_DOC}/tutorial)
-install(FILES ${DEMO_FILES} DESTINATION ${GMSH_DOC}/demos)
+if(INSTALL_DOCS)
+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(INSTALL_DOCS)
+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)

View file

@ -3,7 +3,7 @@ bin/onelab.py
%%STATIC_LIB%%lib/libGmsh.a
%%SHARED_LIB%%lib/libGmsh.so
%%SHARED_LIB%%lib/libGmsh.so.2.8
%%SHARED_LIB%%lib/libGmsh.so.2.8.2
%%SHARED_LIB%%lib/libGmsh.so.2.8.3
include/gmsh/CGNSOptions.h
include/gmsh/Cell.h
include/gmsh/CellComplex.h
@ -57,7 +57,9 @@ include/gmsh/OctreeInternals.h
include/gmsh/OctreePost.h
include/gmsh/OpenFile.h
include/gmsh/OptHOM.h
include/gmsh/OptHomFastCurving.h
include/gmsh/OptHomMesh.h
include/gmsh/OptHomRun.h
include/gmsh/PView.h
include/gmsh/PViewData.h
include/gmsh/PViewDataGModel.h
@ -73,6 +75,7 @@ include/gmsh/SPoint3.h
include/gmsh/STensor3.h
include/gmsh/SVector3.h
include/gmsh/StringUtils.h
include/gmsh/SuperEl.h
include/gmsh/VertexArray.h
include/gmsh/Voronoi3D.h
include/gmsh/bezierBasis.h
@ -180,7 +183,6 @@ include/gmsh/yamakawa.h
%%PORTDOCS%%%%DOCSDIR%%/tutorial/t6.geo
%%PORTDOCS%%%%DOCSDIR%%/tutorial/t7.geo
%%PORTDOCS%%%%DOCSDIR%%/tutorial/t8.geo
%%PORTDOCS%%%%DOCSDIR%%/tutorial/t8.par
%%PORTDOCS%%%%DOCSDIR%%/tutorial/t9.geo
%%PORTDOCS%%%%DOCSDIR%%/tutorial/view1.pos
%%PORTDOCS%%%%DOCSDIR%%/tutorial/view2.pos