diff --git a/science/ALPSCore/Makefile b/science/ALPSCore/Makefile
index c555b3e57960..5b0ed91d2ec7 100644
--- a/science/ALPSCore/Makefile
+++ b/science/ALPSCore/Makefile
@@ -1,60 +1,56 @@
 PORTNAME=	ALPSCore
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.2.0
-PORTREVISION=	18
+DISTVERSION=	2.3.1
 CATEGORIES=	science
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generic algorithms and utilities for condensed matter physics
 WWW=		https://github.com/ALPSCore/ALPSCore
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 
-BROKEN_i386=	fails to build: no matching member function for call to 'read'
-BROKEN_powerpc=	fails to build: no matching member function for call to 'read'
-
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libhdf5.so:science/hdf5 \
 		libsz.so:science/libaec
 
 USES=		cmake compiler:c++11-lang eigen:3
 USE_CXXSTD=	c++14
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 TEST_TARGET=	test # 2 to 3 tests fail: https://github.com/ALPSCore/ALPSCore/issues/388
 
 CMAKE_ARGS+=	-DTesting:BOOL=OFF # enable only for the 'test' target
 CMAKE_ARGS_TEST=	-DTesting:BOOL=ON -DExtensiveTesting:BOOL=ON
 CXXFLAGS+=	-DNDEBUG # see https://github.com/ALPSCore/ALPSCore/issues/389
 LDFLAGS+=	-lexecinfo # https://github.com/ALPSCore/ALPSCore/issues/390
 
 OPTIONS_DEFINE=	DOXYGEN DOCS OPENMPI
 OPTIONS_DEFAULT=	OPENMPI
 
 DOXYGEN_IMPLIES=	DOCS
 DOXYGEN_CMAKE_BOOL=	Documentation
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPENMPI_CMAKE_BOOL=	ENABLE_MPI
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 
 PORTDOCS=	*
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MOPENMPI}
 CC=	${LOCALBASE}/mpi/openmpi/bin/mpicc
 CXX=	${LOCALBASE}/mpi/openmpi/bin/mpicxx
 .endif
 
 post-install-DOXYGEN-on:
 	@${RM} ${STAGEDIR}${DOCSDIR}/.tag
 
 pre-test:
 	@cd ${CONFIGURE_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} ${CMAKE_ARGS_TEST} ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS}
 
 .include <bsd.port.post.mk>
diff --git a/science/ALPSCore/distinfo b/science/ALPSCore/distinfo
index 03a91f0a097c..9e2c5864d9d2 100644
--- a/science/ALPSCore/distinfo
+++ b/science/ALPSCore/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1532433744
-SHA256 (ALPSCore-ALPSCore-v2.2.0_GH0.tar.gz) = f7bc9c8f806fb0ad4d38cb6604a10d56ab159ca63aed6530c1f84ecaf40adc61
-SIZE (ALPSCore-ALPSCore-v2.2.0_GH0.tar.gz) = 1404871
+TIMESTAMP = 1694807138
+SHA256 (ALPSCore-ALPSCore-v2.3.1_GH0.tar.gz) = 384f25cd543ded1ac99fe8238db97a5d90d24e1bf83ca8085f494acdd12ed86c
+SIZE (ALPSCore-ALPSCore-v2.3.1_GH0.tar.gz) = 1431788
diff --git a/science/ALPSCore/pkg-plist b/science/ALPSCore/pkg-plist
index fb499f725355..93a6f5d5ad63 100644
--- a/science/ALPSCore/pkg-plist
+++ b/science/ALPSCore/pkg-plist
@@ -1,183 +1,199 @@
 include/alps/accumulators.hpp
 include/alps/accumulators/accumulator.hpp
 include/alps/accumulators/archive_traits.hpp
 include/alps/accumulators/convergence.hpp
 include/alps/accumulators/feature.hpp
 include/alps/accumulators/feature/binning_analysis.hpp
 include/alps/accumulators/feature/count.hpp
 include/alps/accumulators/feature/error.hpp
 include/alps/accumulators/feature/max_num_binning.hpp
 include/alps/accumulators/feature/mean.hpp
 include/alps/accumulators/feature/weight.hpp
 include/alps/accumulators/feature/weight_holder.hpp
 include/alps/accumulators/mpi.hpp
 include/alps/accumulators/namedaccumulators.hpp
 include/alps/accumulators/parameter.hpp
 include/alps/accumulators/wrapper_set.hpp
 include/alps/accumulators/wrappers.hpp
 include/alps/accumulators_.hpp
 include/alps/alea.hpp
 include/alps/alea/autocorr.hpp
 include/alps/alea/batch.hpp
 include/alps/alea/bundle.hpp
 include/alps/alea/complex_op.hpp
 include/alps/alea/computed.hpp
 include/alps/alea/convert.hpp
 include/alps/alea/core.hpp
 include/alps/alea/covariance.hpp
 include/alps/alea/hdf5.hpp
 include/alps/alea/internal/format.hpp
 include/alps/alea/internal/galois.hpp
 include/alps/alea/internal/joined.hpp
 include/alps/alea/internal/outer.hpp
+include/alps/alea/internal/pooling.hpp
 include/alps/alea/internal/util.hpp
 include/alps/alea/mean.hpp
 include/alps/alea/mpi.hpp
 include/alps/alea/plugin/stream_serializer.hpp
 include/alps/alea/propagation.hpp
 include/alps/alea/result.hpp
 include/alps/alea/serialize.hpp
+include/alps/alea/testing.hpp
 include/alps/alea/transform.hpp
 include/alps/alea/transformer.hpp
 include/alps/alea/util.hpp
+include/alps/alea/util/model.hpp
 include/alps/alea/util/serializer.hpp
 include/alps/alea/var_strategy.hpp
 include/alps/alea/variance.hpp
+include/alps/common/view.hpp
 include/alps/config.hpp
 include/alps/dictionary.hpp
 include/alps/gf/flagcheck.hpp
 include/alps/gf/fourier.hpp
 include/alps/gf/gf.hpp
 include/alps/gf/gf_base.hpp
 include/alps/gf/grid.hpp
 include/alps/gf/mesh.hpp
+include/alps/gf/mesh/chebyshev_mesh.hpp
+include/alps/gf/mesh/frequency_meshes.hpp
+include/alps/gf/mesh/index.hpp
+include/alps/gf/mesh/index_meshes.hpp
+include/alps/gf/mesh/legendre_mesh.hpp
+include/alps/gf/mesh/mesh_base.hpp
+include/alps/gf/mesh/numerical_mesh.hpp
+include/alps/gf/mesh/time_meshes.hpp
 include/alps/gf/mpi_bcast.hpp
 include/alps/gf/piecewise_polynomial.hpp
 include/alps/gf/tail.hpp
 include/alps/gf/tail_base.hpp
 include/alps/hdf5.hpp
 include/alps/hdf5/archive.hpp
 include/alps/hdf5/array.hpp
 include/alps/hdf5/boost_optional.hpp
 include/alps/hdf5/complex.hpp
 include/alps/hdf5/config.hpp
 include/alps/hdf5/errors.hpp
 include/alps/hdf5/map.hpp
 include/alps/hdf5/multi_array.hpp
 include/alps/hdf5/pair.hpp
 include/alps/hdf5/pointer.hpp
 include/alps/hdf5/set.hpp
 include/alps/hdf5/shared_array.hpp
 include/alps/hdf5/tensor.hpp
 include/alps/hdf5/tuple.hpp
 include/alps/hdf5/valarray.hpp
 include/alps/hdf5/vector.hpp
 include/alps/mc/api.hpp
 include/alps/mc/check_schedule.hpp
 include/alps/mc/mcbase.hpp
 include/alps/mc/mpiadapter.hpp
 include/alps/mc/random01.hpp
 include/alps/mc/stop_callback.hpp
 include/alps/numeric/boost_array_functions.hpp
 include/alps/numeric/boost_multi_array_functions.hpp
 include/alps/numeric/check_size.hpp
 include/alps/numeric/checked_divide.hpp
 include/alps/numeric/inf.hpp
 include/alps/numeric/is_zero.hpp
 include/alps/numeric/outer_product.hpp
 include/alps/numeric/real.hpp
 include/alps/numeric/rectangularize.hpp
 include/alps/numeric/scalar.hpp
 include/alps/numeric/set_negative_0.hpp
 include/alps/numeric/special_functions.hpp
+include/alps/numeric/tensors.hpp
 include/alps/numeric/tensors/data_storage.hpp
 include/alps/numeric/tensors/data_view.hpp
 include/alps/numeric/tensors/tensor_base.hpp
 include/alps/numeric/tensors/view.hpp
 include/alps/numeric/vector_functions.hpp
 include/alps/params.hpp
 include/alps/params/convenience_params.hpp
 include/alps/params/dict_exceptions.hpp
 include/alps/params/dict_types.hpp
 include/alps/params/dict_value.hpp
 include/alps/params/dict_value_impl.hpp
 include/alps/params/hdf5_variant.hpp
 include/alps/params/iniparser_interface.hpp
 include/alps/params/mpi_variant.hpp
 include/alps/params/params_impl.hpp
 include/alps/params/serialize_variant.hpp
+include/alps/serialization/core.hpp
+include/alps/serialization/eigen.hpp
+include/alps/serialization/util.hpp
 include/alps/testing/fp_compare.hpp
 include/alps/testing/near.hpp
 include/alps/testing/unique_file.hpp
 include/alps/type_traits/are_all_integrals.hpp
 include/alps/type_traits/average_type.hpp
 include/alps/type_traits/change_value_type.hpp
 include/alps/type_traits/common.hpp
 include/alps/type_traits/covariance_type.hpp
 include/alps/type_traits/element_type.hpp
 include/alps/type_traits/has_value_type.hpp
 include/alps/type_traits/index_sequence.hpp
 include/alps/type_traits/is_complex.hpp
 include/alps/type_traits/is_scalar.hpp
 include/alps/type_traits/is_sequence.hpp
 include/alps/type_traits/slice.hpp
 include/alps/type_traits/tuple_traits.hpp
 include/alps/utilities/boost_mpi.hpp
 include/alps/utilities/cast.hpp
 include/alps/utilities/deprecated.hpp
 include/alps/utilities/fs/get_basename.hpp
 include/alps/utilities/fs/get_dirname.hpp
 include/alps/utilities/fs/get_extension.hpp
 include/alps/utilities/fs/remove_extensions.hpp
 include/alps/utilities/gtest_par_xml_output.hpp
 include/alps/utilities/make_copy.hpp
 include/alps/utilities/mpi.hpp
 include/alps/utilities/mpi_map.hpp
 include/alps/utilities/mpi_optional.hpp
 include/alps/utilities/mpi_pair.hpp
 include/alps/utilities/mpi_vector.hpp
 include/alps/utilities/remove_cvr.hpp
 include/alps/utilities/short_print.hpp
 include/alps/utilities/signal.hpp
 include/alps/utilities/size.hpp
 include/alps/utilities/stacktrace.hpp
 include/alps/utilities/stringify.hpp
 include/alps/utilities/temporary_filename.hpp
 include/alps/utilities/type_wrapper.hpp
 lib/libalps-accumulators.so
 lib/libalps-alea.so
 lib/libalps-gf.so
 lib/libalps-hdf5.so
 lib/libalps-mc.so
 lib/libalps-params.so
 lib/libalps-utilities.so
 libdata/pkgconfig/alps-accumulators.pc
 libdata/pkgconfig/alps-alea.pc
 libdata/pkgconfig/alps-gf.pc
 libdata/pkgconfig/alps-hdf5.pc
 libdata/pkgconfig/alps-mc.pc
 libdata/pkgconfig/alps-params.pc
 libdata/pkgconfig/alps-utilities.pc
 %%DATADIR%%/ALPSCoreConfig.cmake
 %%DATADIR%%/ALPSCoreConfigVersion.cmake
 share/alps-accumulators/alps-accumulators-%%CMAKE_BUILD_TYPE%%.cmake
 share/alps-accumulators/alps-accumulators.cmake
 share/alps-accumulators/alps-accumulatorsConfig.cmake
 share/alps-alea/alps-alea-%%CMAKE_BUILD_TYPE%%.cmake
 share/alps-alea/alps-alea.cmake
 share/alps-alea/alps-aleaConfig.cmake
 share/alps-gf/alps-gf-%%CMAKE_BUILD_TYPE%%.cmake
 share/alps-gf/alps-gf.cmake
 share/alps-gf/alps-gfConfig.cmake
 share/alps-hdf5/alps-hdf5-%%CMAKE_BUILD_TYPE%%.cmake
 share/alps-hdf5/alps-hdf5.cmake
 share/alps-hdf5/alps-hdf5Config.cmake
 share/alps-mc/alps-mc-%%CMAKE_BUILD_TYPE%%.cmake
 share/alps-mc/alps-mc.cmake
 share/alps-mc/alps-mcConfig.cmake
 share/alps-params/alps-params-%%CMAKE_BUILD_TYPE%%.cmake
 share/alps-params/alps-params.cmake
 share/alps-params/alps-paramsConfig.cmake
 share/alps-utilities/alps-utilities-%%CMAKE_BUILD_TYPE%%.cmake
 share/alps-utilities/alps-utilities.cmake
 share/alps-utilities/alps-utilitiesConfig.cmake