Date: Wed, 2 Mar 2022 05:57:27 GMT From: Stephen Montgomery-Smith <stephen@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 37921ce1a2f0 - main - cad/netgen: Update to 6.2.2201. Message-ID: <202203020557.2225vRX0076149@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by stephen: URL: https://cgit.FreeBSD.org/ports/commit/?id=37921ce1a2f0efe73f418862d377e3dced2dd713 commit 37921ce1a2f0efe73f418862d377e3dced2dd713 Author: Stephen Montgomery-Smith <stephen@FreeBSD.org> AuthorDate: 2022-03-02 05:57:05 +0000 Commit: Stephen Montgomery-Smith <stephen@FreeBSD.org> CommitDate: 2022-03-02 05:57:05 +0000 cad/netgen: Update to 6.2.2201. --- cad/netgen/Makefile | 5 ++--- cad/netgen/distinfo | 10 +++++----- cad/netgen/files/patch-CMakeLists.txt | 11 +++++++++++ cad/netgen/files/patch-ng_CMakeLists.txt | 14 -------------- cad/netgen/pkg-plist | 16 ++++++++++------ 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/cad/netgen/Makefile b/cad/netgen/Makefile index 9ab50e4fedd5..5dd8a4042bc0 100644 --- a/cad/netgen/Makefile +++ b/cad/netgen/Makefile @@ -1,8 +1,7 @@ # Created by: Thierry Thomas <thierry@FreeBSD.org> PORTNAME= netgen -PORTVERSION= 6.2.2105 -PORTREVISION= 1 +PORTVERSION= 6.2.2201 DISTVERSIONPREFIX= v CATEGORIES= cad @@ -19,7 +18,7 @@ USES= cmake python tcl tk gl xorg USE_GITHUB= yes GH_ACCOUNT= NGSolve -GH_TUPLE= NGSolve:pybind11:v2.4.3:pybind11/external_dependencies/pybind11 +GH_TUPLE= NGSolve:pybind11:v2.7.1:pybind11/external_dependencies/pybind11 USE_GL= gl glu USE_XORG= x11 xmu xi diff --git a/cad/netgen/distinfo b/cad/netgen/distinfo index f611064951f2..113c2f3c3c76 100644 --- a/cad/netgen/distinfo +++ b/cad/netgen/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1633221366 -SHA256 (NGSolve-netgen-v6.2.2105_GH0.tar.gz) = 0caf91173d252f536e33a0b370b79af9c4fbbb63f4f419479c9dacccbff4beb8 -SIZE (NGSolve-netgen-v6.2.2105_GH0.tar.gz) = 3372181 -SHA256 (NGSolve-pybind11-v2.4.3_GH0.tar.gz) = 1eed57bc6863190e35637290f97a20c81cfe4d9090ac0a24f3bbf08f265eb71d -SIZE (NGSolve-pybind11-v2.4.3_GH0.tar.gz) = 571127 +TIMESTAMP = 1646198516 +SHA256 (NGSolve-netgen-v6.2.2201_GH0.tar.gz) = d1a35ffbad27f69b9dedbe814cabc5423c87c4b1da6414b1d9a19c51e2650ebc +SIZE (NGSolve-netgen-v6.2.2201_GH0.tar.gz) = 3392783 +SHA256 (NGSolve-pybind11-v2.7.1_GH0.tar.gz) = 616d1c42e4cf14fa27b2a4ff759d7d7b33006fdc5ad8fd603bb2c22622f27020 +SIZE (NGSolve-pybind11-v2.7.1_GH0.tar.gz) = 668217 diff --git a/cad/netgen/files/patch-CMakeLists.txt b/cad/netgen/files/patch-CMakeLists.txt new file mode 100644 index 000000000000..b045ce93aa20 --- /dev/null +++ b/cad/netgen/files/patch-CMakeLists.txt @@ -0,0 +1,11 @@ +--- CMakeLists.txt.orig 2022-03-02 05:28:33 UTC ++++ CMakeLists.txt +@@ -281,6 +281,8 @@ else() + add_library(netgen_python INTERFACE) + endif() + ++target_link_libraries(netgen_python INTERFACE pthread) ++ + if (USE_PYTHON) + add_subdirectory(external_dependencies/pybind11) + find_path(PYBIND_INCLUDE_DIR pybind11/pybind11.h HINTS ${PYTHON_INCLUDE_DIR}) diff --git a/cad/netgen/files/patch-ng_CMakeLists.txt b/cad/netgen/files/patch-ng_CMakeLists.txt deleted file mode 100644 index 98e814b52965..000000000000 --- a/cad/netgen/files/patch-ng_CMakeLists.txt +++ /dev/null @@ -1,14 +0,0 @@ -To fix this linker error: - ld: error: libsrc/interface/libinterface.so: undefined reference to pthread_create [--no-allow-shlib-undefined] -bang pthread into the executable. It's not a **good** fix, though. - ---- ng/CMakeLists.txt.orig 2021-03-18 07:16:55 UTC -+++ ng/CMakeLists.txt -@@ -32,6 +32,7 @@ if(USE_GUI) - endif(NOT APPLE) - - target_link_libraries( netgen nglib gui netgen_python ${MPI_mpi_LIBRARY} ${MPI_CXX_LIBRARIES} ${LIBTOGL} ${ZLIB_LIBRARIES} ${JPEG_LIBRARIES} ${FFMPEG_LIBRARIES} ${X11_Xmu_LIB} ${X11_X11_LIB} ${OCC_LIBRARIES} ${TK_LIBRARY} ${TCL_LIBRARY}) -+ target_link_libraries( netgen pthread ) - - if(NOT WIN32) - target_link_libraries( netgen mesh stlvis stl geom2dvis interface geom2d csg stl visual csgvis ) diff --git a/cad/netgen/pkg-plist b/cad/netgen/pkg-plist index 3f3188f3ebb9..876f465da21c 100644 --- a/cad/netgen/pkg-plist +++ b/cad/netgen/pkg-plist @@ -163,9 +163,7 @@ include/mydefs.hpp include/nginterface.h include/nginterface_v2.hpp include/nglib.h -include/occ/occgeom.hpp -include/occ/occmeshsurf.hpp -include/occ/vsocc.hpp +include/ngtcl.hpp include/pybind11/LICENSE include/pybind11/attr.h include/pybind11/buffer_info.h @@ -178,11 +176,13 @@ include/pybind11/detail/common.h include/pybind11/detail/descr.h include/pybind11/detail/init.h include/pybind11/detail/internals.h +include/pybind11/detail/type_caster_base.h include/pybind11/detail/typeid.h include/pybind11/eigen.h include/pybind11/embed.h include/pybind11/eval.h include/pybind11/functional.h +include/pybind11/gil.h include/pybind11/iostream.h include/pybind11/numpy.h include/pybind11/operators.h @@ -191,6 +191,7 @@ include/pybind11/pybind11.h include/pybind11/pytypes.h include/pybind11/stl.h include/pybind11/stl_bind.h +include/pybind11/stl/filesystem.h include/soldata.hpp include/stlgeom/meshstlsurface.hpp include/stlgeom/stlgeom.hpp @@ -215,13 +216,13 @@ lib/libinterface.so lib/libmesh.so lib/libngcore.so lib/libnglib.so -lib/libocc.so -lib/liboccvis.so lib/libstl.so lib/libstlvis.so lib/libvisual.so %%PYTHON_SITELIBDIR%%/netgen/NgOCC.py %%PYTHON_SITELIBDIR%%/netgen/__init__.py +%%PYTHON_SITELIBDIR%%/netgen/__main__.py +%%PYTHON_SITELIBDIR%%/netgen/config.py %%PYTHON_SITELIBDIR%%/netgen/csg.py %%PYTHON_SITELIBDIR%%/netgen/geom2d.py %%PYTHON_SITELIBDIR%%/netgen/gui.py @@ -229,9 +230,12 @@ lib/libvisual.so %%PYTHON_SITELIBDIR%%/netgen/meshing.py %%PYTHON_SITELIBDIR%%/netgen/occ.py %%PYTHON_SITELIBDIR%%/netgen/read_gmsh.py +%%PYTHON_SITELIBDIR%%/netgen/read_meshio.py %%PYTHON_SITELIBDIR%%/netgen/stl.py +%%PYTHON_SITELIBDIR%%/netgen/version.py %%PYTHON_SITELIBDIR%%/netgen/webgui.py -%%PYTHON_SITELIBDIR%%/pyngcore%%PYTHON_EXT_SUFFIX%%.so +%%PYTHON_SITELIBDIR%%/pyngcore/__init__.py +%%PYTHON_SITELIBDIR%%/pyngcore/pyngcore%%PYTHON_EXT_SUFFIX%%.so %%DATADIR%%/boundarycondition.geo %%DATADIR%%/boxcyl.geo %%DATADIR%%/circle_on_cube.geo
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203020557.2225vRX0076149>