diff --git a/math/dune-grid/Makefile b/math/dune-grid/Makefile index 72f3cfe07d17..bdbd426c6c66 100644 --- a/math/dune-grid/Makefile +++ b/math/dune-grid/Makefile @@ -1,46 +1,46 @@ PORTNAME= dune-grid DISTVERSIONPREFIX= v -DISTVERSION= 2.8.0 -PORTREVISION= 15 +DISTVERSION= 2.11.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= DUNE framework: Geometry transformations, reference elements, etc WWW= https://www.dune-project.org/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/LICENSE.md -BUILD_DEPENDS= alberta-fem>0:math/alberta \ - openmpi4>0:net/openmpi4 \ - psurface>0:math/psurface \ +BUILD_DEPENDS= psurface>0:math/psurface \ vc>0:devel/vc LIB_DEPENDS= libdunecommon.so:math/dune-common \ libdunegeometry.so:math/dune-geometry \ libduneuggrid.so:math/dune-uggrid \ + libmpi.so:net/openmpi \ libopenblas.so:math/openblas \ libtbb.so:devel/onetbb -RUN_DEPENDS= alberta-fem>0:math/alberta # binaries aren't linked with alberta, instead users' binaries are linked with it -RUN_DEPENDS+= psurface>0:math/psurface +RUN_DEPENDS= psurface>0:math/psurface USES= cmake compiler:c++17-lang fortran pkgconfig python:build USE_GITLAB= yes USE_LDCONFIG= yes GL_SITE= https://gitlab.dune-project.org GL_ACCOUNT= core -GL_TAGNAME= de36e4b4e99da4cd7a120a39779345e701821115 +GL_TAGNAME= 360045cbc742b79b29ec4c583dbe5560eb066ac0 CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_ARGS= -DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so +CMAKE_OFF= DUNE_ENABLE_PYTHONBINDINGS +CMAKE_ARGS= -DTBB_INCLUDE_DIR=${LOCALBASE}/include -DTBB_LIBRARIES=${LOCALBASE}/lib/libtbb.so \ + -DCMAKE_DISABLE_FIND_PACKAGE_Alberta=ON + +PLIST_SUB+= DUNE_GRID_CMAKE_HASH=bbddf3311de4ff25f44ffec0dbf3dda4 OPTIONS_DEFINE= DOCS OPTIONS_SUB= yes DOCS_CMAKE_BOOL= FREEBSD_INSTALL_DOCS -DOCS_BUILD_DEPENDS= doxygen:devel/doxygen \ - sphinx-build:textproc/py-sphinx +DOCS_BUILD_DEPENDS= sphinx-build:textproc/py-sphinx PORTDOCS= * .include diff --git a/math/dune-grid/distinfo b/math/dune-grid/distinfo index 831a0c3cea6a..3034f96d6037 100644 --- a/math/dune-grid/distinfo +++ b/math/dune-grid/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630918537 -SHA256 (core-dune-grid-de36e4b4e99da4cd7a120a39779345e701821115_GL0.tar.gz) = 144ba77e119c32866ac8e77b78a6ac35eca51f297224d100b2f24fcd6830849f -SIZE (core-dune-grid-de36e4b4e99da4cd7a120a39779345e701821115_GL0.tar.gz) = 2952593 +TIMESTAMP = 1774915231 +SHA256 (core-dune-grid-360045cbc742b79b29ec4c583dbe5560eb066ac0_GL0.tar.gz) = bc63b9e2cf5d0388e1cb29badde5cdcd41b8c5c9ff33f897224aa339efde000d +SIZE (core-dune-grid-360045cbc742b79b29ec4c583dbe5560eb066ac0_GL0.tar.gz) = 2988490 diff --git a/math/dune-grid/files/patch-CMakeLists.txt b/math/dune-grid/files/patch-CMakeLists.txt index 8439fee6fd34..e983538fa8c5 100644 --- a/math/dune-grid/files/patch-CMakeLists.txt +++ b/math/dune-grid/files/patch-CMakeLists.txt @@ -1,12 +1,10 @@ ---- CMakeLists.txt.orig 2020-03-14 17:27:33 UTC +--- CMakeLists.txt.orig 2026-03-31 04:09:25 UTC +++ CMakeLists.txt -@@ -21,7 +21,9 @@ include(DuneMacros) - dune_project() +@@ -61,6 +61,6 @@ add_subdirectory("dune") + set(HAVE_UG ${HAVE_DUNE_UGGRID}) add_subdirectory("dune") -+if (FREEBSD_INSTALL_DOCS) add_subdirectory("doc") -+endif() - add_subdirectory("lib") + add_subdirectory("src") + add_subdirectory("cmake/modules") - # finalize the dune project, e.g. generating config.h etc. diff --git a/math/dune-grid/files/patch-doc_CMakeLists.txt b/math/dune-grid/files/patch-doc_CMakeLists.txt new file mode 100644 index 000000000000..b8f775dc6ad0 --- /dev/null +++ b/math/dune-grid/files/patch-doc_CMakeLists.txt @@ -0,0 +1,11 @@ +--- doc/CMakeLists.txt.orig 2026-03-30 23:37:35.770967000 -0700 ++++ doc/CMakeLists.txt 2026-03-30 23:37:58.442251000 -0700 +@@ -1,6 +1,8 @@ + # SPDX-FileCopyrightText: Copyright © DUNE Project contributors, see file LICENSE.md in module root + # SPDX-License-Identifier: LicenseRef-GPL-2.0-only-with-DUNE-exception + ++if (FREEBSD_INSTALL_DOCS) + add_subdirectory(doxygen) ++endif() + add_subdirectory(grids) + add_subdirectory(recipes) diff --git a/math/dune-grid/pkg-plist b/math/dune-grid/pkg-plist index 650689fba8ed..91b8bcf5a209 100644 --- a/math/dune-grid/pkg-plist +++ b/math/dune-grid/pkg-plist @@ -1,275 +1,288 @@ +include/dune-grid-config.hh include/dune/grid/albertagrid.hh include/dune/grid/albertagrid/agrid.hh include/dune/grid/albertagrid/albertagrid.cc include/dune/grid/albertagrid/albertaheader.hh include/dune/grid/albertagrid/albertareader.hh include/dune/grid/albertagrid/algebra.hh include/dune/grid/albertagrid/backuprestore.hh include/dune/grid/albertagrid/capabilities.hh include/dune/grid/albertagrid/coordcache.hh include/dune/grid/albertagrid/datahandle.hh include/dune/grid/albertagrid/dgfparser.hh include/dune/grid/albertagrid/dofadmin.hh include/dune/grid/albertagrid/dofvector.hh include/dune/grid/albertagrid/elementinfo.hh include/dune/grid/albertagrid/entity.cc include/dune/grid/albertagrid/entity.hh include/dune/grid/albertagrid/entityseed.hh include/dune/grid/albertagrid/geometry.cc include/dune/grid/albertagrid/geometry.hh include/dune/grid/albertagrid/geometrycache.hh include/dune/grid/albertagrid/geometryreference.hh include/dune/grid/albertagrid/gridfactory.hh include/dune/grid/albertagrid/gridfamily.hh include/dune/grid/albertagrid/gridview.hh include/dune/grid/albertagrid/hierarchiciterator.hh include/dune/grid/albertagrid/indexsets.hh include/dune/grid/albertagrid/indexstack.hh include/dune/grid/albertagrid/intersection.cc include/dune/grid/albertagrid/intersection.hh include/dune/grid/albertagrid/intersectioniterator.hh include/dune/grid/albertagrid/leafiterator.hh include/dune/grid/albertagrid/level.hh include/dune/grid/albertagrid/leveliterator.hh include/dune/grid/albertagrid/macrodata.hh include/dune/grid/albertagrid/macroelement.hh include/dune/grid/albertagrid/meshpointer.hh include/dune/grid/albertagrid/misc.hh include/dune/grid/albertagrid/persistentcontainer.hh include/dune/grid/albertagrid/projection.hh include/dune/grid/albertagrid/refinement.hh include/dune/grid/albertagrid/structuredgridfactory.hh include/dune/grid/albertagrid/transformation.hh include/dune/grid/albertagrid/treeiterator.hh include/dune/grid/albertagrid/undefine-2.0.hh include/dune/grid/albertagrid/undefine-3.0.hh include/dune/grid/common/adaptcallback.hh include/dune/grid/common/backuprestore.hh include/dune/grid/common/boundaryprojection.hh include/dune/grid/common/boundarysegment.hh include/dune/grid/common/capabilities.hh include/dune/grid/common/datahandleif.hh include/dune/grid/common/defaultgridview.hh include/dune/grid/common/entity.hh include/dune/grid/common/entityiterator.hh include/dune/grid/common/entityseed.hh include/dune/grid/common/exceptions.hh include/dune/grid/common/geometry.hh include/dune/grid/common/grid.hh include/dune/grid/common/gridenums.hh include/dune/grid/common/gridfactory.hh include/dune/grid/common/gridinfo.hh include/dune/grid/common/gridview.hh include/dune/grid/common/indexidset.hh include/dune/grid/common/intersection.hh include/dune/grid/common/intersectioniterator.hh include/dune/grid/common/mapper.hh include/dune/grid/common/mcmgmapper.hh include/dune/grid/common/partitionset.hh include/dune/grid/common/rangegenerators.hh include/dune/grid/common/scsgmapper.hh include/dune/grid/common/sizecache.hh +include/dune/grid/concepts.hh +include/dune/grid/concepts/archetypes/datahandle.hh +include/dune/grid/concepts/archetypes/entity.hh +include/dune/grid/concepts/archetypes/geometry.hh +include/dune/grid/concepts/archetypes/messagebuffer.hh +include/dune/grid/concepts/datahandle.hh +include/dune/grid/concepts/entity.hh +include/dune/grid/concepts/entityiterator.hh +include/dune/grid/concepts/geometry.hh +include/dune/grid/concepts/grid.hh +include/dune/grid/concepts/gridview.hh +include/dune/grid/concepts/indexidset.hh +include/dune/grid/concepts/intersection.hh +include/dune/grid/concepts/intersectioniterator.hh +include/dune/grid/concepts/messagebuffer.hh include/dune/grid/geometrygrid.hh include/dune/grid/geometrygrid/backuprestore.hh include/dune/grid/geometrygrid/cachedcoordfunction.hh include/dune/grid/geometrygrid/capabilities.hh include/dune/grid/geometrygrid/coordfunction.hh include/dune/grid/geometrygrid/coordfunctioncaller.hh include/dune/grid/geometrygrid/cornerstorage.hh include/dune/grid/geometrygrid/datahandle.hh include/dune/grid/geometrygrid/declaration.hh include/dune/grid/geometrygrid/entity.hh include/dune/grid/geometrygrid/entityseed.hh include/dune/grid/geometrygrid/geometry.hh include/dune/grid/geometrygrid/grid.hh include/dune/grid/geometrygrid/gridfamily.hh include/dune/grid/geometrygrid/gridview.hh include/dune/grid/geometrygrid/hostcorners.hh include/dune/grid/geometrygrid/identity.hh include/dune/grid/geometrygrid/idset.hh include/dune/grid/geometrygrid/indexsets.hh include/dune/grid/geometrygrid/intersection.hh include/dune/grid/geometrygrid/intersectioniterator.hh include/dune/grid/geometrygrid/iterator.hh include/dune/grid/geometrygrid/persistentcontainer.hh include/dune/grid/identitygrid.hh include/dune/grid/identitygrid/identitygridentity.hh include/dune/grid/identitygrid/identitygridentityseed.hh include/dune/grid/identitygrid/identitygridgeometry.hh include/dune/grid/identitygrid/identitygridhierarchiciterator.hh include/dune/grid/identitygrid/identitygridindexsets.hh include/dune/grid/identitygrid/identitygridintersectioniterator.hh include/dune/grid/identitygrid/identitygridintersections.hh include/dune/grid/identitygrid/identitygridleafiterator.hh include/dune/grid/identitygrid/identitygridleveliterator.hh -include/dune/grid/io/file/amiramesh/amirameshreader.cc -include/dune/grid/io/file/amiramesh/amirameshwriter.cc -include/dune/grid/io/file/amiramesh/psurfaceboundary.hh -include/dune/grid/io/file/amirameshreader.hh -include/dune/grid/io/file/amirameshwriter.hh include/dune/grid/io/file/dgfparser.hh include/dune/grid/io/file/dgfparser/blocks/basic.hh include/dune/grid/io/file/dgfparser/blocks/boundarydom.hh include/dune/grid/io/file/dgfparser/blocks/boundaryseg.hh include/dune/grid/io/file/dgfparser/blocks/cube.hh include/dune/grid/io/file/dgfparser/blocks/dim.hh include/dune/grid/io/file/dgfparser/blocks/general.hh include/dune/grid/io/file/dgfparser/blocks/gridparameter.hh include/dune/grid/io/file/dgfparser/blocks/interval.hh include/dune/grid/io/file/dgfparser/blocks/periodicfacetrans.hh include/dune/grid/io/file/dgfparser/blocks/polygon.hh include/dune/grid/io/file/dgfparser/blocks/polyhedron.hh include/dune/grid/io/file/dgfparser/blocks/projection.hh include/dune/grid/io/file/dgfparser/blocks/simplex.hh include/dune/grid/io/file/dgfparser/blocks/simplexgeneration.hh include/dune/grid/io/file/dgfparser/blocks/vertex.hh include/dune/grid/io/file/dgfparser/dgfexception.hh include/dune/grid/io/file/dgfparser/dgfgeogrid.hh include/dune/grid/io/file/dgfparser/dgfgridfactory.hh include/dune/grid/io/file/dgfparser/dgfidentitygrid.hh include/dune/grid/io/file/dgfparser/dgfoned.hh include/dune/grid/io/file/dgfparser/dgfparser.hh include/dune/grid/io/file/dgfparser/dgfug.hh include/dune/grid/io/file/dgfparser/dgfwriter.hh include/dune/grid/io/file/dgfparser/dgfyasp.hh include/dune/grid/io/file/dgfparser/entitykey.hh include/dune/grid/io/file/dgfparser/entitykey_inline.hh include/dune/grid/io/file/dgfparser/gridptr.hh include/dune/grid/io/file/dgfparser/macrogrid.hh include/dune/grid/io/file/dgfparser/parser.hh +include/dune/grid/io/file/gmsh/filereader.hh +include/dune/grid/io/file/gmsh/gmsh2parser.hh +include/dune/grid/io/file/gmsh/gmsh4reader.hh +include/dune/grid/io/file/gmsh/gmsh4reader.impl.hh +include/dune/grid/io/file/gmsh/gridcreatorinterface.hh +include/dune/grid/io/file/gmsh/gridcreators/continuousgridcreator.hh +include/dune/grid/io/file/gmsh/types.hh +include/dune/grid/io/file/gmsh/utility/errors.hh +include/dune/grid/io/file/gmsh/utility/string.hh +include/dune/grid/io/file/gmsh/utility/version.hh include/dune/grid/io/file/gmshreader.hh include/dune/grid/io/file/gmshwriter.hh include/dune/grid/io/file/gnuplot.hh include/dune/grid/io/file/gnuplot/gnuplot.cc include/dune/grid/io/file/printgrid.hh include/dune/grid/io/file/starcdreader.hh include/dune/grid/io/file/vtk.hh include/dune/grid/io/file/vtk/b64enc.hh include/dune/grid/io/file/vtk/basicwriter.hh include/dune/grid/io/file/vtk/boundaryiterators.hh include/dune/grid/io/file/vtk/boundarywriter.hh include/dune/grid/io/file/vtk/common.hh include/dune/grid/io/file/vtk/corner.hh include/dune/grid/io/file/vtk/corneriterator.hh include/dune/grid/io/file/vtk/dataarraywriter.hh include/dune/grid/io/file/vtk/function.hh include/dune/grid/io/file/vtk/functionwriter.hh include/dune/grid/io/file/vtk/pointiterator.hh include/dune/grid/io/file/vtk/pvtuwriter.hh include/dune/grid/io/file/vtk/skeletonfunction.hh include/dune/grid/io/file/vtk/streams.hh include/dune/grid/io/file/vtk/subsamplingvtkwriter.hh include/dune/grid/io/file/vtk/volumeiterators.hh include/dune/grid/io/file/vtk/volumewriter.hh include/dune/grid/io/file/vtk/vtksequencewriter.hh include/dune/grid/io/file/vtk/vtksequencewriterbase.hh include/dune/grid/io/file/vtk/vtkwriter.hh include/dune/grid/io/file/vtk/vtuwriter.hh include/dune/grid/onedgrid.hh include/dune/grid/onedgrid/nulliteratorfactory.hh include/dune/grid/onedgrid/onedgridentity.hh include/dune/grid/onedgrid/onedgridentityseed.hh include/dune/grid/onedgrid/onedgridfactory.hh include/dune/grid/onedgrid/onedgridhieriterator.hh include/dune/grid/onedgrid/onedgridindexsets.hh include/dune/grid/onedgrid/onedgridintersectioniterators.hh include/dune/grid/onedgrid/onedgridintersections.hh include/dune/grid/onedgrid/onedgridleafiterator.hh include/dune/grid/onedgrid/onedgridleveliterator.hh include/dune/grid/onedgrid/onedgridlist.hh include/dune/grid/onedgrid/onedgridviews.hh include/dune/grid/test/basicunitcube.hh include/dune/grid/test/check-albertareader.hh include/dune/grid/test/checkadaptation.hh include/dune/grid/test/checkcomcorrectness.hh include/dune/grid/test/checkcommunicate.hh include/dune/grid/test/checkentitylifetime.hh include/dune/grid/test/checkentityseed.hh include/dune/grid/test/checkgeometry.hh include/dune/grid/test/checkgeometryinfather.hh include/dune/grid/test/checkgridfactory.hh include/dune/grid/test/checkidset.hh include/dune/grid/test/checkindexset.hh include/dune/grid/test/checkintersectionit.hh include/dune/grid/test/checkintersectionlifetime.hh include/dune/grid/test/checkiterators.hh include/dune/grid/test/checkjacobians.hh include/dune/grid/test/checkpartition.hh include/dune/grid/test/checktwists.hh include/dune/grid/test/functions.hh include/dune/grid/test/gridcheck.hh include/dune/grid/test/staticcheck.hh include/dune/grid/uggrid.hh include/dune/grid/uggrid/ug_undefs.hh include/dune/grid/uggrid/uggridentity.hh include/dune/grid/uggrid/uggridentityseed.hh include/dune/grid/uggrid/uggridfactory.hh include/dune/grid/uggrid/uggridgeometry.hh include/dune/grid/uggrid/uggridhieriterator.hh include/dune/grid/uggrid/uggridindexsets.hh include/dune/grid/uggrid/uggridintersectioniterators.hh include/dune/grid/uggrid/uggridintersections.hh include/dune/grid/uggrid/uggridleafiterator.hh include/dune/grid/uggrid/uggridleveliterator.hh include/dune/grid/uggrid/uggridlocalgeometry.hh include/dune/grid/uggrid/uggridrenumberer.hh include/dune/grid/uggrid/uggridviews.hh include/dune/grid/uggrid/ugincludes.hh include/dune/grid/uggrid/uglbgatherscatter.hh include/dune/grid/uggrid/ugmessagebuffer.hh include/dune/grid/uggrid/ugwrapper.hh include/dune/grid/utility/entitycommhelper.hh include/dune/grid/utility/globalindexset.hh include/dune/grid/utility/gridinfo-gmsh-main.hh include/dune/grid/utility/gridinfo.hh include/dune/grid/utility/gridtype.hh include/dune/grid/utility/hierarchicsearch.hh include/dune/grid/utility/hostgridaccess.hh include/dune/grid/utility/multiindex.hh include/dune/grid/utility/parmetisgridpartitioner.hh include/dune/grid/utility/persistentcontainer.hh include/dune/grid/utility/persistentcontainerinterface.hh include/dune/grid/utility/persistentcontainermap.hh include/dune/grid/utility/persistentcontainervector.hh include/dune/grid/utility/persistentcontainerwrapper.hh include/dune/grid/utility/structuredgridfactory.hh include/dune/grid/utility/tensorgridfactory.hh include/dune/grid/utility/vertexorderfactory.hh include/dune/grid/yaspgrid.hh include/dune/grid/yaspgrid/backuprestore.hh include/dune/grid/yaspgrid/coordinates.hh include/dune/grid/yaspgrid/partitioning.hh include/dune/grid/yaspgrid/structuredyaspgridfactory.hh include/dune/grid/yaspgrid/torus.hh include/dune/grid/yaspgrid/yaspgridentity.hh include/dune/grid/yaspgrid/yaspgridentityseed.hh include/dune/grid/yaspgrid/yaspgridgeometry.hh include/dune/grid/yaspgrid/yaspgridhierarchiciterator.hh include/dune/grid/yaspgrid/yaspgrididset.hh include/dune/grid/yaspgrid/yaspgridindexsets.hh include/dune/grid/yaspgrid/yaspgridintersection.hh include/dune/grid/yaspgrid/yaspgridintersectioniterator.hh include/dune/grid/yaspgrid/yaspgridleveliterator.hh include/dune/grid/yaspgrid/yaspgridpersistentcontainer.hh include/dune/grid/yaspgrid/ygrid.hh lib/cmake/dune-grid/dune-grid-config-version.cmake lib/cmake/dune-grid/dune-grid-config.cmake -lib/cmake/dune-grid/dune-grid-targets-%%CMAKE_BUILD_TYPE%%.cmake +lib/cmake/dune-grid/dune-grid-scoped-targets-%%DUNE_GRID_CMAKE_HASH%%-release.cmake +lib/cmake/dune-grid/dune-grid-scoped-targets-%%DUNE_GRID_CMAKE_HASH%%.cmake lib/cmake/dune-grid/dune-grid-targets.cmake lib/dunecontrol/dune-grid/dune.module -lib/dunegridam2cmake.lib -lib/libdunealbertagrid1d.so -lib/libdunealbertagrid2d.so -lib/libdunealbertagrid3d.so lib/libdunegrid.so libdata/pkgconfig/dune-grid.pc %%DATADIR%%/config.h.cmake share/dune/cmake/modules/AddAlbertaFlags.cmake -share/dune/cmake/modules/AddAmiraMeshFlags.cmake -share/dune/cmake/modules/AddPsurfaceFlags.cmake share/dune/cmake/modules/DuneGridMacros.cmake share/dune/cmake/modules/FindAlberta.cmake -share/dune/cmake/modules/FindAmiraMesh.cmake -share/dune/cmake/modules/FindPsurface.cmake share/dune/cmake/modules/GridType.cmake -share/dune/cmake/modules/UseUG.cmake