misc/adios2: Update 2.8.3 → 2.9.0

Reported by:	portscout

(cherry picked from commit 0b77a5a55602b5f9769497a794aefa339793b74d)

5 files changed, 47 insertions, 26 deletions

diff --git a/misc/adios2/Makefile b/misc/adios2/Makefile
index 035ed4afcb0f..1873a699a2aa 100644
--- a/misc/adios2/Makefile
+++ b/misc/adios2/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	adios2
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.8.3
+DISTVERSION=	2.9.0
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -10,7 +10,6 @@ WWW=		https://github.com/ornladios/ADIOS2
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BROKEN=		upgrade of cmake to 3.24.0 broke adios2, see https://github.com/ornladios/ADIOS2/issues/3348
 BROKEN_i386=	constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469
 BROKEN_powerpc=	constant expression evaluates to 18446744073709551613 which cannot be narrowed to type 'unsigned int': https://github.com/ornladios/ADIOS2/issues/2469
 
@@ -47,7 +46,7 @@ GH_ACCOUNT=	ornladios
 GH_PROJECT=	ADIOS2
 
 CMAKE_ARGS=	-DFREEBSD_PYTHON_VERSION=${PYTHON_VER}
-CMAKE_OFF=	BUILD_TESTING
+CMAKE_OFF=	BUILD_TESTING ADIOS2_BUILD_EXAMPLES
 LDFLAGS+=	-lepoll-shim
 
 OPTIONS_DEFINE=	DOCS
diff --git a/misc/adios2/distinfo b/misc/adios2/distinfo
index ed531559e93a..3c79026b7611 100644
--- a/misc/adios2/distinfo
+++ b/misc/adios2/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1659243751
-SHA256 (ornladios-ADIOS2-v2.8.3_GH0.tar.gz) = 4906ab1899721c41dd918dddb039ba2848a1fb0cf84f3a563a1179b9d6ee0d9f
-SIZE (ornladios-ADIOS2-v2.8.3_GH0.tar.gz) = 5755297
+TIMESTAMP = 1680327969
+SHA256 (ornladios-ADIOS2-v2.9.0_GH0.tar.gz) = 69f98ef58c818bb5410133e1891ac192653b0ec96eb9468590140f2552b6e5d1
+SIZE (ornladios-ADIOS2-v2.9.0_GH0.tar.gz) = 6236536
diff --git a/misc/adios2/files/patch-cmake_DetectOptions.cmake b/misc/adios2/files/patch-cmake_DetectOptions.cmake
index 415ed96552c5..52e5d5c6488b 100644
--- a/misc/adios2/files/patch-cmake_DetectOptions.cmake
+++ b/misc/adios2/files/patch-cmake_DetectOptions.cmake
@@ -1,8 +1,8 @@
 - fix the python version
 
---- cmake/DetectOptions.cmake.orig	2022-03-29 11:54:45 UTC
+--- cmake/DetectOptions.cmake.orig	2023-03-30 20:01:59 UTC
 +++ cmake/DetectOptions.cmake
-@@ -312,12 +312,12 @@ if(NOT SHARED_LIBS_SUPPORTED)
+@@ -351,12 +351,12 @@ if(NOT SHARED_LIBS_SUPPORTED)
  endif()
  
  if(ADIOS2_USE_Python STREQUAL AUTO)
@@ -17,7 +17,7 @@
    if(ADIOS2_HAVE_MPI)
      find_package(PythonModule REQUIRED COMPONENTS mpi4py mpi4py/mpi4py.h)
    endif()
-@@ -334,7 +334,7 @@ endif()
+@@ -373,7 +373,7 @@ endif()
  
  # 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/files/patch-cmake_install_post_CMakeLists.txt b/misc/adios2/files/patch-cmake_install_post_CMakeLists.txt
new file mode 100644
index 000000000000..c04a26aa883e
--- /dev/null
+++ b/misc/adios2/files/patch-cmake_install_post_CMakeLists.txt
@@ -0,0 +1,13 @@
+- workaround for https://github.com/ornladios/ADIOS2/issues/3348 - install into the staged dir is broken
+
+--- cmake/install/post/CMakeLists.txt.orig	2023-03-30 20:01:59 UTC
++++ cmake/install/post/CMakeLists.txt
+@@ -28,7 +28,7 @@ else()
+   set(ADIOS2_CONFIG_MPIFC 0)
+ endif()
+ 
+-if(NOT WIN32)
++if(NOT WIN32 AND NOT CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
+   configure_file(
+     ${CMAKE_CURRENT_SOURCE_DIR}/generate-adios2-config.sh.in
+     ${CMAKE_CURRENT_BINARY_DIR}/generate-adios2-config.sh
diff --git a/misc/adios2/pkg-plist b/misc/adios2/pkg-plist
index cc8e3cb29b18..a0d8f0a711f7 100644
--- a/misc/adios2/pkg-plist
+++ b/misc/adios2/pkg-plist
@@ -1,4 +1,3 @@
-bin/adios2-config
 bin/adios2_deactivate_bp
 bin/adios2_iotest
 bin/adios2_json_pp
@@ -30,20 +29,24 @@ include/adios2/core/Engine.h
 include/adios2/core/Group.h
 include/adios2/core/IO.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/VariableCompound.h
+include/adios2/core/VariableStruct.h
 include/adios2/cxx11/ADIOS.h
 include/adios2/cxx11/ADIOS.inl
+include/adios2/cxx11/ADIOSView.h
 include/adios2/cxx11/Attribute.h
 include/adios2/cxx11/Engine.h
 include/adios2/cxx11/Group.h
 include/adios2/cxx11/IO.h
+include/adios2/cxx11/KokkosView.h
 include/adios2/cxx11/Operator.h
 include/adios2/cxx11/Query.h
 include/adios2/cxx11/Types.h
 include/adios2/cxx11/Variable.h
+include/adios2/cxx11/VariableNT.h
 include/adios2/cxx11/fstream/ADIOS2fstream.h
 include/adios2/engine/bp3/BP3Reader.h
 include/adios2/engine/bp3/BP3Writer.h
@@ -71,7 +74,13 @@ include/adios2/engine/skeleton/SkeletonReader.h
 include/adios2/engine/skeleton/SkeletonWriter.h
 include/adios2/engine/ssc/SscHelper.h
 include/adios2/engine/ssc/SscReader.h
+include/adios2/engine/ssc/SscReaderBase.h
+include/adios2/engine/ssc/SscReaderGeneric.h
+include/adios2/engine/ssc/SscReaderNaive.h
 include/adios2/engine/ssc/SscWriter.h
+include/adios2/engine/ssc/SscWriterBase.h
+include/adios2/engine/ssc/SscWriterGeneric.h
+include/adios2/engine/ssc/SscWriterNaive.h
 include/adios2/engine/sst/SstParamParser.h
 include/adios2/engine/sst/SstReader.h
 include/adios2/engine/sst/SstWriter.h
@@ -111,7 +120,9 @@ include/adios2/helper/adiosCommDummy.h
 include/adios2/helper/adiosCommMPI.h
 include/adios2/helper/adiosDynamicBinder.h
 include/adios2/helper/adiosFunctions.h
+include/adios2/helper/adiosGPUFunctions.h
 include/adios2/helper/adiosJSONcomplex.h
+include/adios2/helper/adiosKokkos.h
 include/adios2/helper/adiosLog.h
 include/adios2/helper/adiosMath.h
 include/adios2/helper/adiosMath.inl
@@ -187,12 +198,12 @@ include/adios2/toolkit/shm/TokenChain.h
 include/adios2/toolkit/sst/SSTConfig.h
 include/adios2/toolkit/sst/cp/cp_internal.h
 include/adios2/toolkit/sst/cp/ffs_marshal.h
-include/adios2/toolkit/sst/dp_interface.h
 include/adios2/toolkit/sst/sst.h
 include/adios2/toolkit/sst/sst_comm.h
 include/adios2/toolkit/sst/sst_comm_fwd.h
 include/adios2/toolkit/sst/sst_data.h
 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/FileIME.h
@@ -206,20 +217,20 @@ include/adios2/toolkit/zmq/zmqreqrep/ZmqReqRep.h
 include/adios2_c.h
 lib/cmake/adios2/CMakeFindDependencyMacro.cmake
 lib/cmake/adios2/FindBZip2.cmake
-lib/cmake/adios2/FindBlosc.cmake
+lib/cmake/adios2/FindBlosc2.cmake
 lib/cmake/adios2/FindCrayDRC.cmake
 lib/cmake/adios2/FindDAOS.cmake
 lib/cmake/adios2/FindDataSpaces.cmake
 lib/cmake/adios2/FindHDF5.cmake
 lib/cmake/adios2/FindIME.cmake
 lib/cmake/adios2/FindLIBFABRIC.cmake
-lib/cmake/adios2/FindMGARD.cmake
 lib/cmake/adios2/FindMPI.cmake
 lib/cmake/adios2/FindPkgConfig.cmake
 lib/cmake/adios2/FindPython.cmake
 lib/cmake/adios2/FindPythonModule.cmake
 lib/cmake/adios2/FindSZ.cmake
 lib/cmake/adios2/FindSodium.cmake
+lib/cmake/adios2/FindUCX.cmake
 lib/cmake/adios2/FindZeroMQ.cmake
 lib/cmake/adios2/Findpugixml.cmake
 lib/cmake/adios2/adios2-c-targets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -284,10 +295,10 @@ lib/libadios2_atl.so.2
 lib/libadios2_atl.so.2.2.1
 lib/libadios2_c.so
 lib/libadios2_c.so.2
-lib/libadios2_c.so.2.8.3
+lib/libadios2_c.so.2.9.0
 lib/libadios2_c_mpi.so
 lib/libadios2_c_mpi.so.2
-lib/libadios2_c_mpi.so.2.8.3
+lib/libadios2_c_mpi.so.2.9.0
 lib/libadios2_cmenet.so
 lib/libadios2_cmfabric.so
 lib/libadios2_cmmulticast.so
@@ -297,16 +308,16 @@ lib/libadios2_cmudp.so
 lib/libadios2_cmzplenet.so
 lib/libadios2_core.so
 lib/libadios2_core.so.2
-lib/libadios2_core.so.2.8.3
+lib/libadios2_core.so.2.9.0
 lib/libadios2_core_mpi.so
 lib/libadios2_core_mpi.so.2
-lib/libadios2_core_mpi.so.2.8.3
+lib/libadios2_core_mpi.so.2.9.0
 lib/libadios2_cxx11.so
 lib/libadios2_cxx11.so.2
-lib/libadios2_cxx11.so.2.8.3
+lib/libadios2_cxx11.so.2.9.0
 lib/libadios2_cxx11_mpi.so
 lib/libadios2_cxx11_mpi.so.2
-lib/libadios2_cxx11_mpi.so.2.8.3
+lib/libadios2_cxx11_mpi.so.2.9.0
 lib/libadios2_dill.so
 lib/libadios2_dill.so.2
 lib/libadios2_dill.so.2.4.1
@@ -315,14 +326,14 @@ lib/libadios2_enet.so.1
 lib/libadios2_enet.so.1.3.14
 lib/libadios2_evpath.so
 lib/libadios2_ffs.so
-lib/libadios2_ffs.so.1
-lib/libadios2_ffs.so.1.6.0
+lib/libadios2_ffs.so.2
+lib/libadios2_ffs.so.2.0.0
 lib/libadios2_fortran.so
 lib/libadios2_fortran.so.2
-lib/libadios2_fortran.so.2.8.3
+lib/libadios2_fortran.so.2.9.0
 lib/libadios2_fortran_mpi.so
 lib/libadios2_fortran_mpi.so.2
-lib/libadios2_fortran_mpi.so.2.8.3
+lib/libadios2_fortran_mpi.so.2.9.0
 lib/libadios2_perfstubs.so
 %%PYTHON_SITELIBDIR%%/adios2/__init__.py
 %%PYTHON_SITELIBDIR%%/adios2/adios2%%PYTHON_EXT_SUFFIX%%.so
@@ -349,5 +360,3 @@ share/iotest-config/pipe2_05_add_variables.txt
 share/iotest-config/pipe2_06_busy.txt
 share/iotest-config/wf_2_to_1.txt
 share/iotest-config/wf_2_to_1.xml
-@dir include/adios2/toolkit/sst/dp
-@dir include/adios2/toolkit/sst/util