diff --git a/net/aluminum/Makefile b/net/aluminum/Makefile
index 241e01b6bc1f..8ae0e651e355 100644
--- a/net/aluminum/Makefile
+++ b/net/aluminum/Makefile
@@ -1,23 +1,30 @@
 PORTNAME=	Aluminum
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.0.0
+DISTVERSION=	1.2.0
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Generic interface to high-performance communication libraries
 WWW=		https://github.com/LLNL/Aluminum
 
 LICENSE=	APACHE20
 
-LIB_DEPENDS=	libhwloc.so:devel/hwloc2 \
-		libmpi.so:net/openmpi
+LIB_DEPENDS=	libhwloc.so:devel/hwloc2
+TEST_DEPENDS=	cxxopts>0:devel/cxxopts
 
-USES=		cmake compiler:c11
+USES=		cmake:testing compiler:c++17-lang mpi:openmpi
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	LLNL
 
+CMAKE_TESTING_ON=	ALUMINUM_ENABLE_TESTS
+
 LDFLAGS+=	-lexecinfo
 
+post-test:
+.for t in test_exchange test_ops; do
+	@cd ${TEST_WRKSRC}/test && ./${t}
+.endfor
+
 .include <bsd.port.mk>
diff --git a/net/aluminum/distinfo b/net/aluminum/distinfo
index 2a3810920c56..2758a827834f 100644
--- a/net/aluminum/distinfo
+++ b/net/aluminum/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1615142501
-SHA256 (LLNL-Aluminum-v1.0.0_GH0.tar.gz) = 028d12e271817214db5c07c77b0528f88862139c3e442e1b12f58717290f414a
-SIZE (LLNL-Aluminum-v1.0.0_GH0.tar.gz) = 110296
+TIMESTAMP = 1675494972
+SHA256 (LLNL-Aluminum-v1.2.0_GH0.tar.gz) = 2f3725147f4dbc045b945af68d3d747f5dffbe2b8e928deed64136785210bc9a
+SIZE (LLNL-Aluminum-v1.2.0_GH0.tar.gz) = 127828
diff --git a/net/aluminum/pkg-plist b/net/aluminum/pkg-plist
index 490de4250d0a..58ff922457fe 100644
--- a/net/aluminum/pkg-plist
+++ b/net/aluminum/pkg-plist
@@ -1,65 +1,81 @@
+bin/al_info
 include/Al.hpp
 include/Al_config.hpp
 include/aluminum/base.hpp
-include/aluminum/cuda.hpp
-include/aluminum/helper_kernels.hpp
+include/aluminum/cuda/cuda.hpp
+include/aluminum/cuda/cuda_mempool.hpp
+include/aluminum/cuda/events.hpp
+include/aluminum/cuda/gpu_status_flag.hpp
+include/aluminum/cuda/gpu_wait.hpp
+include/aluminum/cuda/helper_kernels.hpp
+include/aluminum/cuda/streams.hpp
+include/aluminum/cuda/sync_memory.hpp
+include/aluminum/datatypes.hpp
 include/aluminum/ht/allgather.hpp
 include/aluminum/ht/allgatherv.hpp
 include/aluminum/ht/allreduce.hpp
 include/aluminum/ht/alltoall.hpp
 include/aluminum/ht/alltoallv.hpp
 include/aluminum/ht/barrier.hpp
 include/aluminum/ht/base_state.hpp
 include/aluminum/ht/bcast.hpp
 include/aluminum/ht/communicator.hpp
 include/aluminum/ht/gather.hpp
 include/aluminum/ht/gatherv.hpp
 include/aluminum/ht/pt2pt.hpp
 include/aluminum/ht/reduce.hpp
 include/aluminum/ht/reduce_scatter.hpp
 include/aluminum/ht/reduce_scatterv.hpp
 include/aluminum/ht/scatter.hpp
 include/aluminum/ht/scatterv.hpp
 include/aluminum/ht_impl.hpp
 include/aluminum/internal.hpp
 include/aluminum/mempool.hpp
 include/aluminum/mpi/allgather.hpp
 include/aluminum/mpi/allgatherv.hpp
 include/aluminum/mpi/allreduce.hpp
 include/aluminum/mpi/alltoall.hpp
 include/aluminum/mpi/alltoallv.hpp
 include/aluminum/mpi/barrier.hpp
 include/aluminum/mpi/base_state.hpp
 include/aluminum/mpi/bcast.hpp
 include/aluminum/mpi/communicator.hpp
 include/aluminum/mpi/gather.hpp
 include/aluminum/mpi/gatherv.hpp
 include/aluminum/mpi/pt2pt.hpp
 include/aluminum/mpi/reduce.hpp
 include/aluminum/mpi/reduce_scatter.hpp
 include/aluminum/mpi/reduce_scatterv.hpp
 include/aluminum/mpi/scatter.hpp
 include/aluminum/mpi/scatterv.hpp
 include/aluminum/mpi/utils.hpp
 include/aluminum/mpi_comm_and_stream_wrapper.hpp
 include/aluminum/mpi_cuda/communicator.hpp
 include/aluminum/mpi_cuda/rma.hpp
 include/aluminum/mpi_cuda/rma_ipc.hpp
 include/aluminum/mpi_cuda/rma_null.hpp
 include/aluminum/mpi_cuda/rma_self.hpp
 include/aluminum/mpi_cuda/util.hpp
 include/aluminum/mpi_cuda_impl.hpp
 include/aluminum/mpi_impl.hpp
 include/aluminum/nccl_impl.hpp
 include/aluminum/profiling.hpp
 include/aluminum/progress.hpp
+include/aluminum/state.hpp
 include/aluminum/trace.hpp
 include/aluminum/tuning_params.hpp
-include/aluminum/utils.hpp
+include/aluminum/utils/caching_allocator.hpp
+include/aluminum/utils/locked_resource_pool.hpp
+include/aluminum/utils/meta.hpp
+include/aluminum/utils/mpsc_queue.hpp
+include/aluminum/utils/spsc_queue.hpp
+include/aluminum/utils/utils.hpp
 lib/cmake/aluminum/AluminumConfig.cmake
 lib/cmake/aluminum/AluminumConfigVersion.cmake
 lib/cmake/aluminum/AluminumTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/aluminum/AluminumTargets.cmake
 lib/cmake/aluminum/FindHWLOC.cmake
 lib/cmake/aluminum/FindNCCL.cmake
+lib/cmake/aluminum/FindRoctracer.cmake
 lib/libAl.so
+lib/libAl.so.1.2.0