diff --git a/science/polytope/Makefile b/science/polytope/Makefile index 2afc875ea600..b96b7928e664 100644 --- a/science/polytope/Makefile +++ b/science/polytope/Makefile @@ -1,32 +1,37 @@ PORTNAME= polytope -DISTVERSION= 0.7.3 +DISTVERSION= 0.7.3-18 +DISTVERSIONSUFFIX= -gcf83206 CATEGORIES= science MAINTAINER= yuri@FreeBSD.org COMMENT= Library for generating Voronoi and Voronoi-like tessellations -WWW= https://github.com/pbtoast/polytope +WWW= https://github.com/LLNL/polytope LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${LOCALBASE}/include/boost/geometry.hpp:devel/boost-libs LIB_DEPENDS= libsz.so:science/libaec USES= cmake:testing USE_LDCONFIG= yes USE_GITHUB= yes -GH_ACCOUNT= pbtoast +GH_ACCOUNT= LLNL + +CXXFLAGS+= -D_LIBCPP_HARDENING_MODE=_LIBCPP_HARDENING_MODE_NONE # prevent hardening issues with libc++ CMAKE_ON= BUILD_SHARED_LIBS CMAKE_OFF= TESTING -CMAKE_TESTING_ON= TESTING # 1 test is known to fail, see https://github.com/pbtoast/polytope/issues/18 +CMAKE_TESTING_ON= TESTING OPTIONS_DEFINE= SILO OPTIONS_DEFAULT= SILO SILO_DESC= Use SILO reader/writer SILO_CMAKE_BOOL= USE_SILO SILO_LIB_DEPENDS= libsiloh5.so:science/silo +# tests as of 0.7.3-18: 96% tests passed, 1 tests failed out of 28 + .include diff --git a/science/polytope/distinfo b/science/polytope/distinfo index 26dcd6cce169..f53895c10660 100644 --- a/science/polytope/distinfo +++ b/science/polytope/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1686150327 -SHA256 (pbtoast-polytope-0.7.3_GH0.tar.gz) = f32817b44d2a3b98407531980b89d0a31b0c14b8b30de37a6a7bc6ec91e48bf1 -SIZE (pbtoast-polytope-0.7.3_GH0.tar.gz) = 6854100 +TIMESTAMP = 1761847798 +SHA256 (LLNL-polytope-0.7.3-18-gcf83206_GH0.tar.gz) = 4800b6f16d33b9c909d7cd39f8507d75584abd93ffab86ad38170e8c41572839 +SIZE (LLNL-polytope-0.7.3-18-gcf83206_GH0.tar.gz) = 6854889 diff --git a/science/polytope/files/patch-src_CMakeLists.txt b/science/polytope/files/patch-src_CMakeLists.txt index 731eabaac985..311c5e49463a 100644 --- a/science/polytope/files/patch-src_CMakeLists.txt +++ b/science/polytope/files/patch-src_CMakeLists.txt @@ -1,22 +1,13 @@ - uses std::integer_sequence C++14 feature ---- src/CMakeLists.txt.orig 2022-12-03 08:18:04 UTC +--- src/CMakeLists.txt.orig 2025-10-29 23:24:46 UTC +++ src/CMakeLists.txt -@@ -17,7 +17,7 @@ endif() +@@ -17,7 +17,7 @@ if (HAVE_TRIANGLE) # TriangleTessellator and triangle source if (HAVE_TRIANGLE) list(APPEND TESSELLATOR_SOURCES TriangleTessellator.cc) - add_library(triangle STATIC predicates.cc triangle.c) + add_library(triangle predicates.cc triangle.c) #set(TRIANGLE_LIB triangle PARENT_SCOPE) set(TRIANGLE_LIB triangle) set_target_properties(triangle PROPERTIES -@@ -49,7 +49,7 @@ endif() - file(GLOB HEADERS *.hh) - list(APPEND HEADERS "${PROJECT_BINARY_DIR}/polytope.hh") - --add_library(polytope STATIC -+add_library(polytope - ${TESSELLATOR_SOURCES} ${IO_SOURCES} ErrorHandler.cc - polytope_internal_abort.cc) - diff --git a/science/polytope/pkg-plist b/science/polytope/pkg-plist index 1a3ad063500d..b31319b1417f 100644 --- a/science/polytope/pkg-plist +++ b/science/polytope/pkg-plist @@ -1,45 +1,48 @@ include/polytope/BoostOrphanage.hh include/polytope/BoostTessellator.hh include/polytope/BoostTessellatorTraits.hh include/polytope/Clipper2d.hh include/polytope/DimensionTraits.hh include/polytope/ErrorHandler.hh include/polytope/IntPointMap.hh include/polytope/KeyTraits.hh include/polytope/MeshEditor.hh include/polytope/OrphanageBase.hh include/polytope/PLC.hh include/polytope/PLC_Boost_2d.hh include/polytope/PLC_CSG_2d.hh include/polytope/PLC_CSG_3d.hh include/polytope/Point.hh include/polytope/QuantTessellation.hh include/polytope/QuantizedCoordinates.hh include/polytope/QuantizedTessellation2d.hh include/polytope/QuantizedTessellation3d.hh include/polytope/ReducedPLC.hh include/polytope/SiloReader.hh include/polytope/SiloWriter.hh include/polytope/Tessellation.hh include/polytope/Tessellator.hh include/polytope/TessellatorInline.hh include/polytope/TetgenTessellator.hh include/polytope/TriangleTessellator.hh include/polytope/VoroPP_2d.hh include/polytope/VoroPP_3d.hh include/polytope/clipQuantizedTessellation.hh include/polytope/convexHull_2d.hh include/polytope/convexHull_3d.hh include/polytope/findBoundaryElements.hh include/polytope/makeBoxPLC.hh include/polytope/polytope.hh include/polytope/polytope_geometric_utilities.hh include/polytope/polytope_internal.hh include/polytope/polytope_parallel_utilities.hh include/polytope/polytope_serialize.hh include/polytope/polytope_tessellator_utilities.hh include/polytope/polytope_write_OOGL.hh include/polytope/removeElements.hh include/polytope/simplifyPLCfacets.hh include/polytope/snapToBoundary.hh +lib/cmake/polytope-config.cmake +lib/cmake/polytope-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/polytope-targets.cmake lib/libpolytope.so