diff --git a/math/dune-istl/Makefile b/math/dune-istl/Makefile index 9778289562d9..56b0b66211e5 100644 --- a/math/dune-istl/Makefile +++ b/math/dune-istl/Makefile @@ -1,40 +1,39 @@ PORTNAME= dune-istl -DISTVERSION= 2.7.1 -PORTREVISION= 1 +DISTVERSION= 2.8.0 CATEGORIES= math MAINTAINER= yuri@FreeBSD.org COMMENT= DUNE framework: Iterative Solver Template Library 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_COMMIT= 761b28aa1deaa786ec55584ace99667545f1b493 +GL_COMMIT= 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 diff --git a/math/dune-istl/distinfo b/math/dune-istl/distinfo index b4829c82f30f..c6851156655a 100644 --- a/math/dune-istl/distinfo +++ b/math/dune-istl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1617891504 -SHA256 (core-dune-istl-761b28aa1deaa786ec55584ace99667545f1b493_GL0.tar.gz) = aecec493195afc26f339ae725789cbf59ae6074e98c7b70a1966e4783c2dd8ba -SIZE (core-dune-istl-761b28aa1deaa786ec55584ace99667545f1b493_GL0.tar.gz) = 387383 +TIMESTAMP = 1630950387 +SHA256 (core-dune-istl-fffb544a61d2c65a0d2fc7c751f36909f06be8f5_GL0.tar.gz) = 6f511ac59d7e7000cba7dc9fa142f50c971aa2be354836635c954e650338c6d9 +SIZE (core-dune-istl-fffb544a61d2c65a0d2fc7c751f36909f06be8f5_GL0.tar.gz) = 409673 diff --git a/math/dune-istl/files/patch-CMakeLists.txt b/math/dune-istl/files/patch-CMakeLists.txt index 0784be0647c5..448ec36ccef8 100644 --- a/math/dune-istl/files/patch-CMakeLists.txt +++ b/math/dune-istl/files/patch-CMakeLists.txt @@ -1,12 +1,12 @@ ---- CMakeLists.txt.orig 2020-03-14 18:22:22 UTC +--- CMakeLists.txt.orig 2021-08-31 13:58:37 UTC +++ CMakeLists.txt @@ -25,7 +25,9 @@ dune_project() add_subdirectory(cmake/modules) add_subdirectory(dune) +if (FREEBSD_INSTALL_DOCS) add_subdirectory(doc) +endif() - add_subdirectory(lib) - # finalize the dune project, e.g. generating config.h etc. + # if Python bindings are enabled, include necessary sub directories. + if( DUNE_ENABLE_PYTHONBINDINGS ) diff --git a/math/dune-istl/pkg-plist b/math/dune-istl/pkg-plist index db78bc106bbd..a1fa130b1c6a 100644 --- a/math/dune-istl/pkg-plist +++ b/math/dune-istl/pkg-plist @@ -1,87 +1,90 @@ include/dune/istl/allocator.hh include/dune/istl/basearray.hh +include/dune/istl/bccsmatrix.hh +include/dune/istl/bccsmatrixinitializer.hh include/dune/istl/bcrsmatrix.hh include/dune/istl/bdmatrix.hh +include/dune/istl/blocklevel.hh include/dune/istl/btdmatrix.hh include/dune/istl/bvector.hh include/dune/istl/cholmod.hh include/dune/istl/colcompmatrix.hh include/dune/istl/common/counter.hh include/dune/istl/common/registry.hh include/dune/istl/eigenvalue/arpackpp.hh include/dune/istl/eigenvalue/poweriteration.hh +include/dune/istl/foreach.hh include/dune/istl/gsetc.hh include/dune/istl/ildl.hh include/dune/istl/ilu.hh include/dune/istl/ilusubdomainsolver.hh include/dune/istl/io.hh include/dune/istl/istlexception.hh include/dune/istl/ldl.hh include/dune/istl/matrix.hh include/dune/istl/matrixindexset.hh include/dune/istl/matrixmarket.hh include/dune/istl/matrixmatrix.hh include/dune/istl/matrixredistribute.hh include/dune/istl/matrixutils.hh include/dune/istl/multitypeblockmatrix.hh include/dune/istl/multitypeblockvector.hh include/dune/istl/novlpschwarz.hh include/dune/istl/operators.hh include/dune/istl/overlappingschwarz.hh include/dune/istl/owneroverlapcopy.hh include/dune/istl/paamg/aggregates.hh include/dune/istl/paamg/amg.hh include/dune/istl/paamg/combinedfunctor.hh include/dune/istl/paamg/construction.hh include/dune/istl/paamg/dependency.hh include/dune/istl/paamg/fastamg.hh include/dune/istl/paamg/fastamgsmoother.hh include/dune/istl/paamg/galerkin.hh include/dune/istl/paamg/globalaggregates.hh include/dune/istl/paamg/graph.hh include/dune/istl/paamg/graphcreator.hh include/dune/istl/paamg/hierarchy.hh include/dune/istl/paamg/indicescoarsener.hh include/dune/istl/paamg/kamg.hh include/dune/istl/paamg/matrixhierarchy.hh include/dune/istl/paamg/parameters.hh include/dune/istl/paamg/pinfo.hh include/dune/istl/paamg/properties.hh include/dune/istl/paamg/renumberer.hh include/dune/istl/paamg/smoother.hh include/dune/istl/paamg/transfer.hh include/dune/istl/paamg/twolevelmethod.hh -include/dune/istl/pardiso.hh include/dune/istl/preconditioner.hh include/dune/istl/preconditioners.hh include/dune/istl/repartition.hh include/dune/istl/scalarproducts.hh include/dune/istl/scaledidmatrix.hh include/dune/istl/schwarz.hh include/dune/istl/solver.hh include/dune/istl/solvercategory.hh include/dune/istl/solverfactory.hh +include/dune/istl/solverregistry.hh include/dune/istl/solvers.hh include/dune/istl/solvertype.hh include/dune/istl/spqr.hh include/dune/istl/superlu.hh include/dune/istl/superlufunctions.hh include/dune/istl/supermatrix.hh include/dune/istl/test/laplacian.hh include/dune/istl/test/matrixtest.hh include/dune/istl/test/multirhstest.hh include/dune/istl/test/vectortest.hh include/dune/istl/umfpack.hh include/dune/istl/vbvector.hh lib/cmake/dune-istl/dune-istl-config-version.cmake lib/cmake/dune-istl/dune-istl-config.cmake lib/dunecontrol/dune-istl/dune.module -lib/duneistlam2cmake.lib libdata/pkgconfig/dune-istl.pc %%DATADIR%%/config.h.cmake share/dune/cmake/modules/AddARPACKPPFlags.cmake share/dune/cmake/modules/AddSuperLUFlags.cmake share/dune/cmake/modules/DuneIstlMacros.cmake share/dune/cmake/modules/FindARPACK.cmake share/dune/cmake/modules/FindARPACKPP.cmake share/dune/cmake/modules/FindSuperLU.cmake