git: 63578536f49b - main - math/dune-grid: update 2.8.0 → 2.11.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Tue, 31 Mar 2026 17:23:13 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=63578536f49b07c0461101d71754319148d4944d

commit 63578536f49b07c0461101d71754319148d4944d
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2026-03-31 17:09:54 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2026-03-31 17:23:01 +0000

    math/dune-grid: update 2.8.0 → 2.11.0
---
 math/dune-grid/Makefile                       | 22 +++++++-------
 math/dune-grid/distinfo                       |  6 ++--
 math/dune-grid/files/patch-CMakeLists.txt     | 12 ++++----
 math/dune-grid/files/patch-doc_CMakeLists.txt | 11 +++++++
 math/dune-grid/pkg-plist                      | 43 +++++++++++++++++----------
 5 files changed, 58 insertions(+), 36 deletions(-)

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,7 +1,6 @@
 PORTNAME=	dune-grid
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.8.0
-PORTREVISION=	15
+DISTVERSION=	2.11.0
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -11,17 +10,15 @@ 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
@@ -29,17 +26,20 @@ 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=	*
 
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,3 +1,4 @@
+include/dune-grid-config.hh
 include/dune/grid/albertagrid.hh
 include/dune/grid/albertagrid/agrid.hh
 include/dune/grid/albertagrid/albertagrid.cc
@@ -69,6 +70,21 @@ 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
@@ -102,11 +118,6 @@ 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
@@ -137,6 +148,16 @@ 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
@@ -254,22 +275,14 @@ 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