git: ab8bda9bf6db - main - science/hypre: Update 2.22.1 -> 2.23.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Thu, 07 Oct 2021 18:44:23 UTC
The branch main has been updated by yuri:

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

commit ab8bda9bf6db2d136dfc161c38af7ce6e95c561f
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2021-10-07 16:26:24 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2021-10-07 18:43:15 +0000

    science/hypre: Update 2.22.1 -> 2.23.0
    
    Reported by:    portscout
---
 science/hypre/Makefile  | 40 ++++++++--------------------------------
 science/hypre/distinfo  |  6 +++---
 science/hypre/pkg-plist | 19 +++++++++++++++----
 3 files changed, 26 insertions(+), 39 deletions(-)

diff --git a/science/hypre/Makefile b/science/hypre/Makefile
index 7d783a234601..9f220b712de7 100644
--- a/science/hypre/Makefile
+++ b/science/hypre/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	hypre
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.22.1
+DISTVERSION=	2.23.0
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -15,7 +15,7 @@ LICENSE_FILE_MIT=	${WRKSRC}/../LICENSE-MIT
 
 BROKEN_powerpc64=	fails to compile: ./DistributedMatrixPilutSolver.h:97:20: expected ')' before '->' token
 
-USES=		blaslapack fortran gmake localbase
+USES=		blaslapack cmake:testing fortran localbase
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
@@ -23,10 +23,8 @@ GH_ACCOUNT=	hypre-space
 
 WRKSRC_SUBDIR=	src
 
-HAS_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-blas --with-blas-lib=${BLASLIB} \
-		--with-lapack --with-lapack-lib=${LAPACKLIB} \
-		--enable-shared
+CMAKE_ON=	HYPRE_ENABLE_SHARED HYPRE_WITH_OPENMP
+CMAKE_TESTING_ON=	HYPRE_BUILD_TESTS # tests are only built and not run, see https://github.com/hypre-space/hypre/issues/502
 
 OPTIONS_DEFINE=		DOCS
 OPTIONS_SINGLE=		MPI
@@ -34,42 +32,20 @@ OPTIONS_SINGLE_MPI=	NOMPI MPICH OPENMPI
 OPTIONS_DEFAULT=	MPICH
 
 NOMPI_DESC=		Build without parallel processing support
-NOMPI_CONFIGURE_ON=	--without-MPI
+NOMPI_CMAKE_ON=		-DHYPRE_WITH_MPI=OFF
 
 MPICH_LIB_DEPENDS=	libmpich.so:net/mpich
 MPICH_CONFIGURE_ENV=	CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx
-MPICH_CONFIGURE_WITH=	MPI-include=${LOCALBASE}/include \
-			MPI-lib-dirs=${LOCALBASE}/lib
+
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 OPENMPI_CONFIGURE_ENV=	CC=${LOCALBASE}/mpi/openmpi/bin/mpicc \
 			CXX=${LOCALBASE}/mpi/openmpi/bin/mpicxx
-OPENMPI_CONFIGURE_WITH=	MPI-include=${LOCALBASE}/mpi/openmpi/include \
-			MPI-lib-dirs=${LOCALBASE}/mpi/openmpi/lib
-
-TEST_TARGET=	check
-
-SHL3=	${PORTVERSION}
-SHL2=	${SHL3:R}
-SHL1=	${SHL2:R}
+OPENMPI_BROKEN=		doesn't switch to openmpi in cmake build
 
 PORTDOCS=	*
 
-post-patch:
-# Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
-	@${REINPLACE_CMD} -i .c++20 '/utilities/s/-I/-iquote/' \
-		${WRKSRC}/FEI_mv/*/Makefile
-
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/hypre/include/* ${STAGEDIR}${PREFIX}/include
-	${INSTALL_LIB} ${WRKSRC}/hypre/lib/libHYPRE-${SHL3}.so	\
-		${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL2}
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL2} \
-		${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL1}
-	${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL2} \
-		${STAGEDIR}${PREFIX}/lib/libHYPRE.so
-
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${COPYTREE_SHARE} ${WRKSRC}/docs/usr-manual ${STAGEDIR}${DOCSDIR}
+	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} usr-manual ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/science/hypre/distinfo b/science/hypre/distinfo
index 81f776c60c21..35ce49edcf11 100644
--- a/science/hypre/distinfo
+++ b/science/hypre/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1629563248
-SHA256 (hypre-space-hypre-v2.22.1_GH0.tar.gz) = c1e7761b907c2ee0098091b69797e9be977bff8b7fd0479dc20cad42f45c4084
-SIZE (hypre-space-hypre-v2.22.1_GH0.tar.gz) = 6037099
+TIMESTAMP = 1633620943
+SHA256 (hypre-space-hypre-v2.23.0_GH0.tar.gz) = 8a9f9fb6f65531b77e4c319bf35bfc9d34bf529c36afe08837f56b635ac052e2
+SIZE (hypre-space-hypre-v2.23.0_GH0.tar.gz) = 6070515
diff --git a/science/hypre/pkg-plist b/science/hypre/pkg-plist
index bc9e5ff88552..daae88f27054 100644
--- a/science/hypre/pkg-plist
+++ b/science/hypre/pkg-plist
@@ -4,6 +4,9 @@ include/HYPRE_DistributedMatrixPilutSolver_types.h
 include/HYPRE_IJ_mv.h
 include/HYPRE_MatvecFunctions.h
 include/HYPRE_config.h
+include/HYPRE_distributed_matrix_mv.h
+include/HYPRE_distributed_matrix_protos.h
+include/HYPRE_distributed_matrix_types.h
 include/HYPRE_error_f.h
 include/HYPRE_krylov.h
 include/HYPRE_lobpcg.h
@@ -17,21 +20,27 @@ include/HYPRE_struct_ls.h
 include/HYPRE_struct_mv.h
 include/HYPRE_utilities.h
 include/HYPREf.h
+include/IJ_matrix.h
+include/IJ_vector.h
 include/_hypre_IJ_mv.h
+include/_hypre_blas.h
+include/_hypre_lapack.h
 include/_hypre_parcsr_ls.h
 include/_hypre_parcsr_mv.h
 include/_hypre_sstruct_ls.h
 include/_hypre_sstruct_mv.h
 include/_hypre_struct_ls.h
 include/_hypre_struct_mv.h
-include/_hypre_struct_mv.hpp
 include/_hypre_utilities.h
-include/_hypre_utilities.hpp
+include/aux_par_vector.h
+include/aux_parcsr_matrix.h
 include/csr_block_matrix.h
 include/csr_matmultivec.h
 include/distributed_matrix.h
+include/f2c.h
 include/fortran.h
 include/fortran_matrix.h
+include/hypre_blas.h
 include/interpreter.h
 include/krylov.h
 include/lobpcg.h
@@ -43,6 +52,8 @@ include/par_multivector.h
 include/seq_multivector.h
 include/seq_mv.h
 include/temp_multivector.h
+lib/cmake/HYPRE/HYPREConfig.cmake
+lib/cmake/HYPRE/HYPREConfigVersion.cmake
+lib/cmake/HYPRE/HYPRETargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/HYPRE/HYPRETargets.cmake
 lib/libHYPRE.so
-lib/libHYPRE.so.2
-lib/libHYPRE.so.2.22