*/*: fix the dependency to net/openmpi4

For ports without USES=mpi:openmpi. For the others, it will be set automatically.
freebsd · Feb 18, 2024 · a62b21d · a62b21d
1 parent 0d309c1
commit a62b21d
Show file tree

Hide file tree

Showing 25 changed files with 32 additions and 32 deletions.
diff --git a/math/cosma/Makefile b/math/cosma/Makefile
@@ -15,9 +15,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BROKEN=		requires OpenMP support that is missing on this architecture
 .endif
 
-BUILD_DEPENDS=	openmpi>0:net/openmpi
+BUILD_DEPENDS=	openmpi4>0:net/openmpi4
 LIB_DEPENDS=	libopenblas.so:math/openblas
-RUN_DEPENDS=	openmpi>0:net/openmpi
+RUN_DEPENDS=	openmpi4>0:net/openmpi4
 
 USES=		cmake:testing
 USE_LDCONFIG=	yes

diff --git a/math/dbcsr/Makefile b/math/dbcsr/Makefile
@@ -38,7 +38,7 @@ OPTIONS_DEFAULT=	MPI OPENMP C_API
 OPTIONS_SUB=		yes
 
 MPI_CMAKE_BOOL=		USE_MPI
-MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+MPI_LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 
 OPENMP_CMAKE_BOOL=	USE_OPENMP
 

diff --git a/math/dune-alugrid/Makefile b/math/dune-alugrid/Makefile
@@ -18,7 +18,7 @@ LIB_DEPENDS=	libalberta_utilities.so:math/alberta \
 		libdunegrid.so:math/dune-grid \
 		libduneuggrid.so:math/dune-uggrid \
 		libmetis.so:math/metis \
-		libmpi.so:net/openmpi \
+		libmpi_cxx.so:net/openmpi4 \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
 

diff --git a/math/dune-common/Makefile b/math/dune-common/Makefile
@@ -12,7 +12,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	metis>0:math/metis \
-		openmpi>0:net/openmpi \
+		openmpi4>0:net/openmpi4 \
 		vc>0:devel/vc # Metis isn't used, see https://gitlab.dune-project.org/core/dune-common/-/issues/306
 LIB_DEPENDS=	libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb

diff --git a/math/dune-fem/Makefile b/math/dune-fem/Makefile
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	arpack++>0:math/arpack++ \
 		dune-localfunctions>=2.6:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid \
 		vc>0:devel/vc \
-		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+		openmpi4>0:net/openmpi4
 LIB_DEPENDS=	libpsurface.so:math/psurface \
 		libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
@@ -41,7 +41,7 @@ LIB_DEPENDS=	libpsurface.so:math/psurface \
 RUN_DEPENDS=	dune-istl>=2.6:math/dune-istl \
 		dune-localfunctions>=2.6:math/dune-localfunctions \
 		dune-spgrid>0:math/dune-spgrid \
-		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+		openmpi4>0:net/openmpi4
 
 USES=		cmake compiler:c++17-lang eigen:3 fortran pkgconfig
 USE_GITLAB=	yes

diff --git a/math/dune-geometry/Makefile b/math/dune-geometry/Makefile
@@ -11,7 +11,7 @@ WWW=		https://www.dune-project.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
-BUILD_DEPENDS=	openmpi>0:net/openmpi \
+BUILD_DEPENDS=	openmpi4>0:net/openmpi4 \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libopenblas.so:math/openblas \

diff --git a/math/dune-grid-glue/Makefile b/math/dune-grid-glue/Makefile
@@ -10,7 +10,7 @@ WWW=		https://www.dune-project.org/
 LICENSE=	GPLv2
 
 BUILD_DEPENDS=	alberta-fem>0:math/alberta \
-		openmpi>0:net/openmpi \
+		openmpi4>0:net/openmpi4 \
 		psurface>0:math/psurface \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \

diff --git a/math/dune-grid/Makefile b/math/dune-grid/Makefile
@@ -12,7 +12,7 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	alberta-fem>0:math/alberta \
-		openmpi>0:net/openmpi \
+		openmpi4>0:net/openmpi4 \
 		psurface>0:math/psurface \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \

diff --git a/math/dune-pdelab/Makefile b/math/dune-pdelab/Makefile
@@ -20,7 +20,7 @@ DUNE_DEPENDS=	dune-common>0:math/dune-common \
 		dune-typetree>0:math/dune-typetree
 BUILD_DEPENDS=	${DUNE_DEPENDS} \
 		suitesparse>0:math/suitesparse \
-		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+		openmpi4>0:net/openmpi4
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
 		libduneuggrid.so:math/dune-uggrid \
@@ -41,7 +41,7 @@ LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${DUNE_DEPENDS} \
 		suitesparse>0:math/suitesparse \
-		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+		openmpi4>0:net/openmpi4
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes

diff --git a/math/dune-polygongrid/Makefile b/math/dune-polygongrid/Makefile
@@ -10,14 +10,14 @@ WWW=		https://www.dune-project.org/
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+BUILD_DEPENDS=	openmpi4>0:net/openmpi4
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libdunegeometry.so:math/dune-geometry \
 		libdunegrid.so:math/dune-grid \
 		libduneuggrid.so:math/dune-uggrid \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
-RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+RUN_DEPENDS=	openmpi4>0:net/openmpi4
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes

diff --git a/math/dune-spgrid/Makefile b/math/dune-spgrid/Makefile
@@ -16,7 +16,7 @@ DUNE_DEPENDS=	dune-common>0:math/dune-common \
 		dune-geometry>0:math/dune-geometry \
 		dune-uggrid>0:math/dune-uggrid
 BUILD_DEPENDS=	${DUNE_DEPENDS} \
-		openmpi>0:net/openmpi \
+		openmpi4>0:net/openmpi4 \
 		vc>0:devel/vc
 RUN_DEPENDS=	${DUNE_DEPENDS}
 

diff --git a/math/dune-typetree/Makefile b/math/dune-typetree/Makefile
@@ -12,10 +12,10 @@ LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	dune-common>0:math/dune-common \
-		openmpi>0:net/openmpi \
+		openmpi4>0:net/openmpi4 \
 		vc>0:devel/vc
 RUN_DEPENDS=	dune-common>0:math/dune-common \
-		openmpi>0:net/openmpi \
+		openmpi4>0:net/openmpi4 \
 		vc>0:devel/vc
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig

diff --git a/math/dune-uggrid/Makefile b/math/dune-uggrid/Makefile
@@ -11,12 +11,12 @@ WWW=		https://www.dune-project.org/
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING.LGPL-2.1
 
-BUILD_DEPENDS=	openmpi>0:net/openmpi \
+BUILD_DEPENDS=	openmpi4>0:net/openmpi4 \
 		vc>0:devel/vc
 LIB_DEPENDS=	libdunecommon.so:math/dune-common \
 		libopenblas.so:math/openblas \
 		libtbb.so:devel/onetbb
-RUN_DEPENDS=	openmpi>0:net/openmpi
+RUN_DEPENDS=	openmpi4>0:net/openmpi4
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig python
 USE_GITLAB=	yes

diff --git a/math/dune-vtk/Makefile b/math/dune-vtk/Makefile
@@ -15,7 +15,7 @@ HPP_DEPENDS=	${LOCALBASE}/include/dune/foamgrid/foamgrid.hh:math/dune-foamgrid \
 BUILD_DEPENDS=	${HPP_DEPENDS} \
 		dune-functions>0:math/dune-functions \
 		suitesparse>0:math/suitesparse \
-		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+		openmpi4>0:net/openmpi4
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
 		libdunecommon.so:math/dune-common \
@@ -40,7 +40,7 @@ LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${HPP_DEPENDS} \
 		suitesparse>0:math/suitesparse \
-		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
+		openmpi4>0:net/openmpi4
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
 USE_GITLAB=	yes

diff --git a/math/elemental/Makefile b/math/elemental/Makefile
@@ -16,7 +16,7 @@ LIB_DEPENDS=	libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
-		libmpi_cxx.so:net/openmpi \
+		libmpi_cxx.so:net/openmpi4 \
 		libopenblas.so:math/openblas \
 		libqd.so:math/qd
 TEST_DEPENDS=	catch>0:devel/catch

diff --git a/math/moab/Makefile b/math/moab/Makefile
@@ -33,7 +33,7 @@ OPTIONS_DEFAULT=	MPI
 OPTIONS_SUB=		yes
 
 MPI_CMAKE_BOOL=		ENABLE_MPI
-MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+MPI_LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 MPI_VARS=		CXX=${LOCALBASE}/mpi/openmpi/bin/mpic++ CC=${LOCALBASE}/mpi/openmpi/bin/mpicc
 MPI_VARS+=		CONFLICTS_BUILD=mpich # otherwise bin/hexmodops gets linked with libmpi.so:net/mpich
 MPI_VARS_OFF=		USES=compiler:c++11-lang

diff --git a/math/parmgridgen/Makefile b/math/parmgridgen/Makefile
@@ -11,7 +11,7 @@ MAINTAINER=	devel@stasyan.com
 COMMENT=	Library for obtaining a sequence of successive coarse grids
 WWW=		http://www.mgnet.org/mgnet-codes-parmgridgen.html
 
-LIB_DEPENDS=	libmpi.so:net/openmpi
+LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 
 ALL_TARGET=	parallel
 USES=		gmake

diff --git a/math/vtk8/Makefile b/math/vtk8/Makefile
@@ -72,7 +72,7 @@ DESIGNER_CMAKE_BOOL=	QT_DESIGNER_PLUGIN
 DESIGNER_USE=		QT=designer
 DESIGNER_IMPLIES=	QT5
 
-MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+MPI_LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 MPI_CMAKE_ON=		-DMPIEXEC=${LOCALBASE}/mpi/openmpi/bin/mpiexec
 
 OSMESA_CMAKE_ARGS=	-DVTK_OPENGL_HAS_OSMESA:BOOL=ON \

diff --git a/misc/py-pytorch/Makefile b/misc/py-pytorch/Makefile
@@ -25,7 +25,7 @@ BUILD_DEPENDS=	cmake:devel/cmake-core \
 		${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR}
 LIB_DEPENDS=	libabsl_flags.so:devel/abseil \
 		libblis.so:math/blis \
-		libmpi.so:net/openmpi \
+		libmpi_cxx.so:net/openmpi4 \
 		libonnx.so:misc/onnx \
 		libopenblas.so:math/openblas \
 		libpthreadpool.so:devel/pthreadpool \

diff --git a/misc/pytorch/Makefile b/misc/pytorch/Makefile
@@ -19,7 +19,7 @@ BUILD_DEPENDS=	gmake:devel/gmake \
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libblis.so:math/blis \
 		libopenblas.so:math/openblas \
-		libmpi.so:net/openmpi \
+		libmpi_cxx.so:net/openmpi4 \
 		libonnx.so:misc/onnx \
 		libpthreadpool.so:devel/pthreadpool \
 		libprotobuf.so:devel/protobuf \

diff --git a/misc/thrill/Makefile b/misc/thrill/Makefile
@@ -12,7 +12,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	armv6 armv7 i386 mips powerpc powerpcspe # static_assert failed due to requirement 'sizeof(unsigned int) == 8' "FOXXLL supports only 64-bit builds"
 
-LIB_DEPENDS=	libmpi.so:net/openmpi
+LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 
 USES=		cmake compiler:c++17-lang fortran
 USE_LDCONFIG=	yes

diff --git a/science/ALPSCore/Makefile b/science/ALPSCore/Makefile
@@ -34,7 +34,7 @@ DOXYGEN_CMAKE_BOOL=	Documentation
 DOXYGEN_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 OPENMPI_CMAKE_BOOL=	ENABLE_MPI
-OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+OPENMPI_LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 
 PORTDOCS=	*
 

diff --git a/science/lammps/Makefile b/science/lammps/Makefile
@@ -63,7 +63,7 @@ EXCEPTIONS_DESC=	Enable the use of C++ exceptions
 EXCEPTIONS_CMAKE_BOOL=	LAMMPS_EXCEPTIONS
 
 MPI_CMAKE_BOOL=		BUILD_MPI PKG_MPIIO
-MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+MPI_LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 MPI_USES=		compiler:c11
 
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG

diff --git a/science/latte/Makefile b/science/latte/Makefile
@@ -33,7 +33,7 @@ DBCSR_BROKEN=		see https://github.com/lanl/LATTE/issues/92
 OPENMP_CMAKE_BOOL=	OPENMP
 
 MPI_CMAKE_BOOL=		DO_MPI
-MPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+MPI_LIB_DEPENDS=	libmpi_cxx.so:net/openmpi4
 MPI_LDFLAGS=		${LOCALBASE}/mpi/openmpi/lib/libmpi_mpifh.so
 MPI_PLIST_FILES=	bin/LATTE_MPI_DOUBLE
 MPI_PLIST_FILES_OFF=	bin/LATTE_DOUBLE

diff --git a/science/sparta/Makefile b/science/sparta/Makefile
@@ -37,7 +37,7 @@ MPI_CXXFLAGS=			-I${LOCALBASE}/mpi/openmpi/include
 MPI_LDFLAGS=			${LOCALBASE}/mpi/openmpi/lib/libmpi.so \
 				${LOCALBASE}/mpi/openmpi/lib/libmpi_cxx.so \
 				-Wl,-rpath=${LOCALBASE}/mpi/openmpi/lib
-MPI_LIB_DEPENDS=		libmpi.so:net/openmpi
+MPI_LIB_DEPENDS=		libmpi_cxx.so:net/openmpi4
 
 PORTSCOUT=	ignore:1 # due to a special version tagging scheme that this project uses portscout fails to find new versions, watching their release page instead