git: 35fcb76960e9 - main - misc/adios2: update 2.9.1 → 2.10.1

From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Wed, 29 May 2024 08:49:38 UTC
The branch main has been updated by yuri:

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

commit 35fcb76960e9379f2db04dbf8398bf34f579736a
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2024-05-29 08:28:02 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2024-05-29 08:49:20 +0000

    misc/adios2: update 2.9.1 → 2.10.1
    
    Reported by:    portscout
---
 misc/adios2/Makefile                              |  15 ++--
 misc/adios2/distinfo                              |   6 +-
 misc/adios2/files/patch-cmake_DetectOptions.cmake |  20 +++--
 misc/adios2/pkg-plist                             | 102 ++++++++++++++--------
 4 files changed, 89 insertions(+), 54 deletions(-)

diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile
index 236948e8492d..0db413aa4481 100644
--- a/misc/adios2/Makefile
+++ b/misc/adios2/Makefile
@@ -1,7 +1,6 @@
 PORTNAME=	adios2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.9.1
-PORTREVISION=	2
+DISTVERSION=	2.10.1
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -20,22 +19,22 @@ BUILD_DEPENDS=	bash:shells/bash \
 		pybind11>0:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}pybind11>=2.4:devel/py-pybind11@${PY_FLAVOR} \
 		${PY_DEPENDS}
-LIB_DEPENDS=	libblosc.so:archivers/c-blosc \
+LIB_DEPENDS=	libblosc2.so:archivers/c-blosc2 \
 		libepoll-shim.so:devel/libepoll-shim \
 		libfabric.so:net/libfabric \
-		libffi.so:devel/libffi \
 		libhdf5.so:science/hdf5 \
+		liblz4.so:archivers/liblz4 \
 		libmpi.so:net/mpich \
-		libpng.so:graphics/png \
+		libpng16.so:graphics/png \
 		libsodium.so:security/libsodium \
-		libsz.so:science/libaec \
 		libzmq.so:net/libzmq4 \
-		libzfp.so:devel/zfp
+		libzfp.so:devel/zfp \
+		libzstd.so:archivers/zstd
 RUN_DEPENDS=	bash:shells/bash \
 		${PY_DEPENDS}
 
 USES=		bison cmake:testing compiler:c++11-lang fortran localbase:ldflags pkgconfig \
-		perl5 python shebangfix
+		perl5 python shebangfix sqlite
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	cmake/install/post/adios2-config.pre.sh.in cmake/install/post/generate-adios2-config.sh.in \
diff --git a/misc/adios2/distinfo b/misc/adios2/distinfo
index e9cd06dbe0c4..3268f17f26fb 100644
--- a/misc/adios2/distinfo
+++ b/misc/adios2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1691126373
-SHA256 (ornladios-ADIOS2-v2.9.1_GH0.tar.gz) = ddfa32c14494250ee8a48ef1c97a1bf6442c15484bbbd4669228a0f90242f4f9
-SIZE (ornladios-ADIOS2-v2.9.1_GH0.tar.gz) = 6253728
+TIMESTAMP = 1716957131
+SHA256 (ornladios-ADIOS2-v2.10.1_GH0.tar.gz) = ce776f3a451994f4979c6bd6d946917a749290a37b7433c0254759b02695ad85
+SIZE (ornladios-ADIOS2-v2.10.1_GH0.tar.gz) = 7207041
diff --git a/misc/adios2/files/patch-cmake_DetectOptions.cmake b/misc/adios2/files/patch-cmake_DetectOptions.cmake
index 52e5d5c6488b..7bc4df81f7d5 100644
--- a/misc/adios2/files/patch-cmake_DetectOptions.cmake
+++ b/misc/adios2/files/patch-cmake_DetectOptions.cmake
@@ -1,23 +1,27 @@
 - fix the python version
 
---- cmake/DetectOptions.cmake.orig	2023-03-30 20:01:59 UTC
+--- cmake/DetectOptions.cmake.orig	2024-05-29 01:42:27 UTC
 +++ cmake/DetectOptions.cmake
-@@ -351,12 +351,12 @@ if(NOT SHARED_LIBS_SUPPORTED)
+@@ -394,15 +394,15 @@ if(ADIOS2_USE_PIP)
  endif()
  
- if(ADIOS2_USE_Python STREQUAL AUTO)
--  find_package(Python 3 COMPONENTS Interpreter Development NumPy)
-+  find_package(Python ${FREEBSD_PYTHON_VERSION} EXACT COMPONENTS Interpreter Development NumPy)
+ if(ADIOS2_USE_PIP)
+-  find_package(Python 3.8 REQUIRED COMPONENTS Interpreter Development.Module)
++  find_package(Python ${FREEBSD_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development.Module)
+   set(ADIOS2_HAVE_PIP TRUE)
+ elseif(ADIOS2_USE_Python STREQUAL AUTO)
+-  find_package(Python 3.8 COMPONENTS Interpreter Development)
++  find_package(Python ${FREEBSD_PYTHON_VERSION} COMPONENTS Interpreter Development)
    if(Python_FOUND AND ADIOS2_HAVE_MPI)
      find_package(PythonModule COMPONENTS mpi4py mpi4py/mpi4py.h)
    endif()
  elseif(ADIOS2_USE_Python)
--  find_package(Python 3 REQUIRED COMPONENTS Interpreter Development NumPy)
-+  find_package(Python ${FREEBSD_PYTHON_VERSION} EXACT REQUIRED COMPONENTS Interpreter Development NumPy)
+-  find_package(Python 3.8 REQUIRED COMPONENTS Interpreter Development)
++  find_package(Python ${FREEBSD_PYTHON_VERSION} REQUIRED COMPONENTS Interpreter Development)
    if(ADIOS2_HAVE_MPI)
      find_package(PythonModule REQUIRED COMPONENTS mpi4py mpi4py/mpi4py.h)
    endif()
-@@ -373,7 +373,7 @@ endif()
+@@ -419,7 +419,7 @@ if(BUILD_TESTING AND NOT Python_Interpreter_FOUND)
  
  # Even if no python support, we still want the interpreter for tests
  if(BUILD_TESTING AND NOT Python_Interpreter_FOUND)
diff --git a/misc/adios2/pkg-plist b/misc/adios2/pkg-plist
index 660d96b2b050..cb43ca0f8354 100644
--- a/misc/adios2/pkg-plist
+++ b/misc/adios2/pkg-plist
@@ -1,6 +1,8 @@
+bin/adios2_campaign_manager
 bin/adios2_deactivate_bp
 bin/adios2_iotest
 bin/adios2_json_pp
+bin/adios2_remote_server
 bin/adios2_reorganize
 bin/adios2_reorganize_mpi
 bin/bp2h5
@@ -9,7 +11,6 @@ bin/bp4dbg
 bin/bp5dbg
 bin/bpls
 bin/sst_conn_tool
-include/Info.h
 include/adios2.h
 include/adios2/c/adios2_c_adios.h
 include/adios2/c/adios2_c_attribute.h
@@ -29,11 +30,13 @@ include/adios2/core/CoreTypes.h
 include/adios2/core/Engine.h
 include/adios2/core/Group.h
 include/adios2/core/IO.h
+include/adios2/core/Info.h
 include/adios2/core/Operator.h
 include/adios2/core/Span.h
 include/adios2/core/Stream.h
 include/adios2/core/Variable.h
 include/adios2/core/VariableBase.h
+include/adios2/core/VariableDerived.h
 include/adios2/core/VariableStruct.h
 include/adios2/cxx11/ADIOS.h
 include/adios2/cxx11/ADIOS.inl
@@ -56,6 +59,13 @@ include/adios2/engine/bp4/BP4Writer.h
 include/adios2/engine/bp5/BP5Engine.h
 include/adios2/engine/bp5/BP5Reader.h
 include/adios2/engine/bp5/BP5Writer.h
+include/adios2/engine/campaign/CampaignData.h
+include/adios2/engine/campaign/CampaignManager.h
+include/adios2/engine/campaign/CampaignReader.h
+include/adios2/engine/campaign/CampaignRecord.h
+include/adios2/engine/daos/DaosEngine.h
+include/adios2/engine/daos/DaosReader.h
+include/adios2/engine/daos/DaosWriter.h
 include/adios2/engine/dataman/DataManMonitor.h
 include/adios2/engine/dataman/DataManReader.h
 include/adios2/engine/dataman/DataManWriter.h
@@ -102,6 +112,7 @@ include/adios2/fortran/adios2_engine_put_mod.mod
 include/adios2/fortran/adios2_functions_allocate_mod.mod
 include/adios2/fortran/adios2_functions_mod.mod
 include/adios2/fortran/adios2_io_define_attribute_mod.mod
+include/adios2/fortran/adios2_io_define_derived_variable_mod.mod
 include/adios2/fortran/adios2_io_define_variable_mod.mod
 include/adios2/fortran/adios2_io_mod.mod
 include/adios2/fortran/adios2_io_mod.smod
@@ -155,6 +166,7 @@ include/adios2/operator/compress/CompressSirius.h
 include/adios2/operator/compress/CompressZFP.h
 include/adios2/operator/plugin/PluginOperator.h
 include/adios2/operator/plugin/PluginOperatorInterface.h
+include/adios2/operator/refactor/RefactorMDR.h
 include/adios2/toolkit/aggregator/mpi/MPIAggregator.h
 include/adios2/toolkit/aggregator/mpi/MPIChain.h
 include/adios2/toolkit/aggregator/mpi/MPIShmChain.h
@@ -162,6 +174,9 @@ include/adios2/toolkit/burstbuffer/FileDrainer.h
 include/adios2/toolkit/burstbuffer/FileDrainerSingleThread.h
 include/adios2/toolkit/dataspaces/ds.h
 include/adios2/toolkit/dataspaces/ds_data.h
+include/adios2/toolkit/derived/ExprHelper.h
+include/adios2/toolkit/derived/Expression.h
+include/adios2/toolkit/derived/Function.h
 include/adios2/toolkit/format/bp/BPBase.h
 include/adios2/toolkit/format/bp/BPBase.inl
 include/adios2/toolkit/format/bp/BPSerializer.h
@@ -181,6 +196,7 @@ include/adios2/toolkit/format/buffer/Buffer.h
 include/adios2/toolkit/format/buffer/BufferV.h
 include/adios2/toolkit/format/buffer/chunk/ChunkV.h
 include/adios2/toolkit/format/buffer/ffs/BufferFFS.h
+include/adios2/toolkit/format/buffer/heap/BufferMalloc.h
 include/adios2/toolkit/format/buffer/heap/BufferSTL.h
 include/adios2/toolkit/format/buffer/ipc/BufferSystemV.h
 include/adios2/toolkit/format/buffer/malloc/MallocV.h
@@ -193,6 +209,8 @@ include/adios2/toolkit/query/Index.h
 include/adios2/toolkit/query/Query.h
 include/adios2/toolkit/query/Util.h
 include/adios2/toolkit/query/Worker.h
+include/adios2/toolkit/remote/Remote.h
+include/adios2/toolkit/remote/remote_common.h
 include/adios2/toolkit/shm/SerializeProcesses.h
 include/adios2/toolkit/shm/Spinlock.h
 include/adios2/toolkit/shm/TokenChain.h
@@ -207,8 +225,10 @@ include/adios2/toolkit/transport/Transport.h
 include/adios2/toolkit/transport/file/FileAWSSDK.h
 include/adios2/toolkit/transport/file/FileDaos.h
 include/adios2/toolkit/transport/file/FileFStream.h
+include/adios2/toolkit/transport/file/FileHTTP.h
 include/adios2/toolkit/transport/file/FileIME.h
 include/adios2/toolkit/transport/file/FilePOSIX.h
+include/adios2/toolkit/transport/file/FileRemote.h
 include/adios2/toolkit/transport/file/FileStdio.h
 include/adios2/toolkit/transport/null/NullTransport.h
 include/adios2/toolkit/transport/shm/ShmSystemV.h
@@ -216,16 +236,13 @@ include/adios2/toolkit/transportman/TransportMan.h
 include/adios2/toolkit/zmq/zmqpubsub/ZmqPubSub.h
 include/adios2/toolkit/zmq/zmqreqrep/ZmqReqRep.h
 include/adios2_c.h
-lib/adios2_evpath_modules/libadios2_cmenet.so
-lib/adios2_evpath_modules/libadios2_cmfabric.so
-lib/adios2_evpath_modules/libadios2_cmmulticast.so
-lib/adios2_evpath_modules/libadios2_cmselect.so
-lib/adios2_evpath_modules/libadios2_cmsockets.so
-lib/adios2_evpath_modules/libadios2_cmudp.so
-lib/adios2_evpath_modules/libadios2_cmzplenet.so
+lib/adios2-evpath-modules-2_10/libadios2_cmenet.so
+lib/adios2-evpath-modules-2_10/libadios2_cmmulticast.so
+lib/adios2-evpath-modules-2_10/libadios2_cmselect.so
+lib/adios2-evpath-modules-2_10/libadios2_cmsockets.so
+lib/adios2-evpath-modules-2_10/libadios2_cmudp.so
 lib/cmake/adios2/CMakeFindDependencyMacro.cmake
 lib/cmake/adios2/FindBZip2.cmake
-lib/cmake/adios2/FindBlosc2.cmake
 lib/cmake/adios2/FindCrayDRC.cmake
 lib/cmake/adios2/FindDAOS.cmake
 lib/cmake/adios2/FindDataSpaces.cmake
@@ -299,55 +316,70 @@ lib/cmake/adios2/upstream/FindPython/Support.cmake
 lib/cmake/adios2/upstream/GoogleTest.cmake
 lib/libEncryptionOperator.so
 lib/libadios2_atl.so
-lib/libadios2_atl.so.2
-lib/libadios2_atl.so.2.2.1
+lib/libadios2_atl.so.2.10
+lib/libadios2_atl.so.2.10.1
 lib/libadios2_c.so
-lib/libadios2_c.so.2
-lib/libadios2_c.so.2.9.1
+lib/libadios2_c.so.2.10
+lib/libadios2_c.so.2.10.1
 lib/libadios2_c_mpi.so
-lib/libadios2_c_mpi.so.2
-lib/libadios2_c_mpi.so.2.9.1
+lib/libadios2_c_mpi.so.2.10
+lib/libadios2_c_mpi.so.2.10.1
 lib/libadios2_core.so
-lib/libadios2_core.so.2
-lib/libadios2_core.so.2.9.1
+lib/libadios2_core.so.2.10
+lib/libadios2_core.so.2.10.1
 lib/libadios2_core_mpi.so
-lib/libadios2_core_mpi.so.2
-lib/libadios2_core_mpi.so.2.9.1
+lib/libadios2_core_mpi.so.2.10
+lib/libadios2_core_mpi.so.2.10.1
 lib/libadios2_cxx11.so
-lib/libadios2_cxx11.so.2
-lib/libadios2_cxx11.so.2.9.1
+lib/libadios2_cxx11.so.2.10
+lib/libadios2_cxx11.so.2.10.1
 lib/libadios2_cxx11_mpi.so
-lib/libadios2_cxx11_mpi.so.2
-lib/libadios2_cxx11_mpi.so.2.9.1
+lib/libadios2_cxx11_mpi.so.2.10
+lib/libadios2_cxx11_mpi.so.2.10.1
 lib/libadios2_dill.so
-lib/libadios2_dill.so.2
-lib/libadios2_dill.so.2.4.1
+lib/libadios2_dill.so.2.10
+lib/libadios2_dill.so.2.10.1
 lib/libadios2_enet.so
-lib/libadios2_enet.so.1
-lib/libadios2_enet.so.1.3.14
+lib/libadios2_enet.so.2.10
+lib/libadios2_enet.so.2.10.1
 lib/libadios2_evpath.so
+lib/libadios2_evpath.so.2.10
+lib/libadios2_evpath.so.2.10.1
 lib/libadios2_ffs.so
-lib/libadios2_ffs.so.2
-lib/libadios2_ffs.so.2.0.0
+lib/libadios2_ffs.so.2.10
+lib/libadios2_ffs.so.2.10.1
 lib/libadios2_fortran.so
-lib/libadios2_fortran.so.2
-lib/libadios2_fortran.so.2.9.1
+lib/libadios2_fortran.so.2.10
+lib/libadios2_fortran.so.2.10.1
 lib/libadios2_fortran_mpi.so
-lib/libadios2_fortran_mpi.so.2
-lib/libadios2_fortran_mpi.so.2.9.1
+lib/libadios2_fortran_mpi.so.2.10
+lib/libadios2_fortran_mpi.so.2.10.1
 lib/libadios2_perfstubs.so
+lib/libadios2_perfstubs.so.2.10
+lib/libadios2_perfstubs.so.2.10.1
 %%PYTHON_SITELIBDIR%%/adios2/__init__.py
-%%PYTHON_SITELIBDIR%%/adios2/adios2%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON_SITELIBDIR%%/adios2/adios.py
+%%PYTHON_SITELIBDIR%%/adios2/attribute.py
+%%PYTHON_SITELIBDIR%%/adios2/bindings/__init__.py
+%%PYTHON_SITELIBDIR%%/adios2/bindings/adios2_bindings%%PYTHON_EXT_SUFFIX%%.so
 %%PYTHON_SITELIBDIR%%/adios2/bp4dbg/__init__.py
 %%PYTHON_SITELIBDIR%%/adios2/bp4dbg/data.py
 %%PYTHON_SITELIBDIR%%/adios2/bp4dbg/idxtable.py
 %%PYTHON_SITELIBDIR%%/adios2/bp4dbg/metadata.py
 %%PYTHON_SITELIBDIR%%/adios2/bp4dbg/utils.py
 %%PYTHON_SITELIBDIR%%/adios2/bp5dbg/__init__.py
-%%PYTHON_SITELIBDIR%%/adios2/bp5dbg/data.py
 %%PYTHON_SITELIBDIR%%/adios2/bp5dbg/idxtable.py
 %%PYTHON_SITELIBDIR%%/adios2/bp5dbg/metadata.py
+%%PYTHON_SITELIBDIR%%/adios2/bp5dbg/metametadata.py
 %%PYTHON_SITELIBDIR%%/adios2/bp5dbg/utils.py
+%%PYTHON_SITELIBDIR%%/adios2/engine.py
+%%PYTHON_SITELIBDIR%%/adios2/file_reader.py
+%%PYTHON_SITELIBDIR%%/adios2/io.py
+%%PYTHON_SITELIBDIR%%/adios2/operator.py
+%%PYTHON_SITELIBDIR%%/adios2/stream.py
+%%PYTHON_SITELIBDIR%%/adios2/test/__init__.py
+%%PYTHON_SITELIBDIR%%/adios2/test/simple_read_write.py
+%%PYTHON_SITELIBDIR%%/adios2/variable.py
 share/iotest-config/coupling2.xml
 share/iotest-config/coupling2_blocking_01_simple.txt
 share/iotest-config/coupling2_blocking_02_dump_result.txt