git: dc7f1464f0c5 - main - science/pastix: upgrade to v6.3.2

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Thierry Thomas <thierry_at_FreeBSD.org>
Date: Thu, 14 Dec 2023 18:34:03 UTC
The branch main has been updated by thierry:

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

commit dc7f1464f0c55a03454bd8af4eb4a93db0827c7a
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2023-12-14 14:22:11 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2023-12-14 18:34:00 +0000

    science/pastix: upgrade to v6.3.2
    
    Changelog at <https://gitlab.inria.fr/solverstack/pastix/-/releases/v6.3.2>.
---
 science/pastix/Makefile  | 10 +++++----
 science/pastix/distinfo  |  6 +++---
 science/pastix/pkg-plist | 55 +++++++++++++++++++++++-------------------------
 3 files changed, 35 insertions(+), 36 deletions(-)

diff --git a/science/pastix/Makefile b/science/pastix/Makefile
index 90eaef1a2bfd..e5c240557b75 100644
--- a/science/pastix/Makefile
+++ b/science/pastix/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	pastix
-PORTVERSION=	6.3.1
-PORTREVISION=	1
+PORTVERSION=	6.3.2
 CATEGORIES=	science
 MASTER_SITES=	https://gitlab.inria.fr/solverstack/pastix/uploads/${GL_TAG}/
 
@@ -29,11 +28,13 @@ USES=		cmake blaslapack:openblas fortran pkgconfig python
 #		14e36c1586c9ba13f938b1a89f51c080d6551392:s	\
 #		31cd2bbb0d76f2b9fd83011d8f079d97540b0ba8:m
 #GL_SUBDIR=	spm:s cmake_modules/morse_cmake:m
-GL_TAG=		ad8f528a3f6c012762e9a903b28315f8	# tarball with submodules
+GL_TAG=		32711239db22edb6c291282b581b9e0b	# tarball with submodules
 
 LDFLAGS+=	-lm
 CMAKE_ARGS=	-DBUILD_SHARED_LIBS:BOOL=ON	\
-		-DPASTIX_ORDERING_METIS:BOOL=ON
+		-DPASTIX_ORDERING_METIS:BOOL=ON	\
+		-DPython_VERSION_MAJOR=${PYTHON_MAJOR_VER}	\
+		-DPython_VERSION_MINOR=${PYTHON_VER:E}
 USE_LDCONFIG=	yes
 TEST_TARGET=	test
 
@@ -46,6 +47,7 @@ EX2FIX2=	example example/old wrappers/julia wrappers/fortran90 wrappers/python
 pre-configure:
 .for ex in ${EX2FIX}
 	${REINPLACE_CMD} -e 's|DESTINATION examples|DESTINATION ${EXAMPLESDIR}/${ex:C/examples//:C/example//}|'	\
+			-e 's|share/doc/spm/examples|${EXAMPLESDIR}/spm|'	\
 		${WRKSRC}/${ex}/CMakeLists.txt
 .endfor
 .for ex in ${EX2FIX2}
diff --git a/science/pastix/distinfo b/science/pastix/distinfo
index 2eae997ae617..57dfb03afa36 100644
--- a/science/pastix/distinfo
+++ b/science/pastix/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1700222960
-SHA256 (pastix-6.3.1.tar.gz) = 290464d73b7d43356e4735a29932bf6f23a88e94ec7139ba7744c21e42c52681
-SIZE (pastix-6.3.1.tar.gz) = 2065915
+TIMESTAMP = 1702559693
+SHA256 (pastix-6.3.2.tar.gz) = c4da8802d1933eecf8c09d7e63c014c81ccf353fe623142e9f5c5fc65ed82ee0
+SIZE (pastix-6.3.2.tar.gz) = 2077150
diff --git a/science/pastix/pkg-plist b/science/pastix/pkg-plist
index 7e1d8259c2cd..0b950389dde2 100644
--- a/science/pastix/pkg-plist
+++ b/science/pastix/pkg-plist
@@ -1,5 +1,3 @@
-bin/pastix_completion.sh
-bin/pastix_env.sh
 include/pastix.h
 include/pastix/api.h
 include/pastix/cblas.h
@@ -17,10 +15,6 @@ include/pastix/spmf.mod
 include/pastix/spmf_bindings.mod
 include/pastix/spmf_enums.mod
 include/pastix/spmf_interfaces.mod
-include/pastixf.mod
-include/pastixf_bindings.mod
-include/pastixf_enums.mod
-include/pastixf_interfaces.mod
 include/spm.h
 include/spm/c_spm.h
 include/spm/config.h
@@ -29,12 +23,16 @@ include/spm/d_spm.h
 include/spm/datatypes.h
 include/spm/mpi.h
 include/spm/p_spm.h
+include/spm/pastixf.mod
+include/spm/pastixf_bindings.mod
+include/spm/pastixf_enums.mod
+include/spm/pastixf_interfaces.mod
 include/spm/s_spm.h
+include/spm/spmf.mod
+include/spm/spmf_bindings.mod
+include/spm/spmf_enums.mod
+include/spm/spmf_interfaces.mod
 include/spm/z_spm.h
-include/spmf.mod
-include/spmf_bindings.mod
-include/spmf_enums.mod
-include/spmf_interfaces.mod
 lib/cmake/pastix/PASTIXConfig.cmake
 lib/cmake/pastix/PASTIXConfigVersion.cmake
 lib/cmake/pastix/cblasTargets.cmake
@@ -69,23 +67,22 @@ lib/libpastixf.so.6
 lib/libpastixf.so.%%VER%%
 lib/libspm.so
 lib/libspm.so.1
-lib/libspm.so.1.2.0
+lib/libspm.so.1.2.2
 lib/libspmf.so
 lib/libspmf.so.1
-lib/libspmf.so.1.2.0
-lib/python/pypastix/__init__.py
-lib/python/pypastix/__pastix__.py
-lib/python/pypastix/enum.py
-lib/python/pypastix/pastix.py
-lib/python/pypastix/solver.py
-lib/python/spm/__init__.py
-lib/python/spm/__spm__.py
-lib/python/spm/enum.py
-lib/python/spm/spm.py
+lib/libspmf.so.1.2.2
+%%PYTHON_SITELIBDIR%%/spm/__init__.py
+%%PYTHON_SITELIBDIR%%/spm/__pastix__.py
+%%PYTHON_SITELIBDIR%%/spm/__spm__.py
+%%PYTHON_SITELIBDIR%%/spm/enum.py
+%%PYTHON_SITELIBDIR%%/spm/pastix.py
+%%PYTHON_SITELIBDIR%%/spm/solver.py
+%%PYTHON_SITELIBDIR%%/spm/spm.py
 libdata/pkgconfig/pastix.pc
 libdata/pkgconfig/pastixf.pc
 libdata/pkgconfig/spm.pc
 libdata/pkgconfig/spmf.pc
+share/bash-completion/completions/pastix/pastix
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/analyze
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/analyze.c
@@ -145,13 +142,13 @@ libdata/pkgconfig/spmf.pc
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/example_mdof1.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/example_mdof2
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/example_mdof2.c
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/fortran90/spmf_driver
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/fortran90/spmf_driver.F90
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/fortran90/spmf_rebalance
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/fortran90/spmf_rebalance.F90
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/fortran90/spmf_user
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/fortran90/spmf_user.F90
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/python/spm_driver.py
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/wrappers/python/spm_scipy.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/fortran/spmf_driver
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/fortran/spmf_driver.F90
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/fortran/spmf_rebalance
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/fortran/spmf_rebalance.F90
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/fortran/spmf_user
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/fortran/spmf_user.F90
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/python/spm_driver.py
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/spm/python/spm_scipy.py
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/step-by-step
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/step-by-step.c