diff --git a/math/dune-fem/Makefile b/math/dune-fem/Makefile
index e22e2dec53b7..974d9717edf1 100644
--- a/math/dune-fem/Makefile
+++ b/math/dune-fem/Makefile
@@ -1,68 +1,68 @@
 PORTNAME=	dune-fem
 DISTVERSION=	2.8.0.5
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Finite Element Methods, Finite Volume Methods, etc
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	arpack++>0:math/arpack++ \
 		dune-istl>=2.6:math/dune-istl \
 		dune-localfunctions>=2.6:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid \
 		vc>0:devel/vc \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 LIB_DEPENDS=	libpsurface.so:math/psurface \
 		libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
 		libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
 		libdunepolygongrid.so:math/dune-polygongrid \
 		libduneuggrid.so:math/dune-uggrid \
 		libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsuperlu.so:math/superlu \
 		libamd.so:math/suitesparse-amd \
 		libcamd.so:math/suitesparse-camd \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libcholmod.so:math/suitesparse-cholmod \
 		libcolamd.so:math/suitesparse-colamd \
 		libldl.so:math/suitesparse-ldl \
 		libspqr.so:math/suitesparse-spqr \
 		libumfpack.so:math/suitesparse-umfpack \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	dune-istl>=2.6:math/dune-istl \
 		dune-localfunctions>=2.6:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang eigen:3 fortran pkgconfig
 USE_GITLAB=	yes
 USE_LDCONFIG=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	dune-fem
 GL_TAGNAME=	30e278aa744c908fbf4bbd8b237eb26c0475d16e
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 OPTIONS_DEFINE=		DOCS
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 			sphinx-build:textproc/py-sphinx
 
 PORTDOCS=	*
 
 post-install: # https://gitlab.dune-project.org/dune-fem/dune-fem/-/issues/111
 	${RM} ${STAGEDIR}${PREFIX}/share/dune/cmake/modules/FindPThreads.cmake
 	${RM} ${STAGEDIR}${PREFIX}/share/dune/cmake/modules/FindSIONlib.cmake
 
 .include <bsd.port.mk>
diff --git a/math/dune-istl/Makefile b/math/dune-istl/Makefile
index 0b6485a18779..edc8248b425e 100644
--- a/math/dune-istl/Makefile
+++ b/math/dune-istl/Makefile
@@ -1,41 +1,41 @@
 PORTNAME=	dune-istl
 DISTVERSION=	2.8.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	DUNE framework: Iterative Solver Template Library
 WWW=		https://www.dune-project.org/
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 HPP_DEPENDS=	arpack++>0:math/arpack++ \
 		dune-common>0:math/dune-common \
 		suitesparse>0:math/suitesparse # needed in headers, but OPTIONAL dependency set is wider: https://gitlab.dune-project.org/core/dune-istl/-/issues/97
 BUILD_DEPENDS=	${HPP_DEPENDS} \
 		vc>0:devel/vc
 RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes
 
 GL_SITE=	https://gitlab.dune-project.org
 GL_ACCOUNT=	core
 GL_TAGNAME=	fffb544a61d2c65a0d2fc7c751f36909f06be8f5
 
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS PARMETIS
 OPTIONS_SUB=	yes
 
 DOCS_CMAKE_BOOL=	FREEBSD_INSTALL_DOCS
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen \
 
 PARMETIS_DESC=		Install PerMetis # needed in headers, but license prohibits packaging
 PARMETIS_BUILD_DEPENDS=	ParMetis>0:math/parmetis
 PARMETIS_RUN_DEPENDS=	ParMetis>0:math/parmetis
 
 PORTDOCS=	*
 
 .include <bsd.port.mk>
diff --git a/math/dune-istl/files/patch-cmake_modules_FindARPACKPP.cmake b/math/dune-istl/files/patch-cmake_modules_FindARPACKPP.cmake
index 470baa06ce68..1cde6eeb66bb 100644
--- a/math/dune-istl/files/patch-cmake_modules_FindARPACKPP.cmake
+++ b/math/dune-istl/files/patch-cmake_modules_FindARPACKPP.cmake
@@ -1,21 +1,21 @@
 - math/arpack++ installs headers into include/ARPACK++, not include/arpack++
 
 --- cmake/modules/FindARPACKPP.cmake.orig	2021-01-16 23:52:06 UTC
 +++ cmake/modules/FindARPACKPP.cmake
 @@ -32,14 +32,14 @@ find_package(ARPACK)
  find_path(ARPACKPP_INCLUDE_DIR
    NAMES "arssym.h"
    PATHS ${ARPACKPP_PREFIX} ${ARPACKPP_ROOT}
 -  PATH_SUFFIXES "include" "include/arpack++"
-+  PATH_SUFFIXES "include" "include/ARPACK++"
++  PATH_SUFFIXES "include" "include/arpackpp"
    NO_DEFAULT_PATH
  )
  
  # look for header files, including default paths
  find_path(ARPACKPP_INCLUDE_DIR
    NAMES "arssym.h"
 -  PATH_SUFFIXES "include" "include/arpack++"
-+  PATH_SUFFIXES "include" "include/ARPACK++"
++  PATH_SUFFIXES "include" "include/arpackpp"
  )
  
  # The arpack++ package in Debian also includes a shared library that we have