git: 09f0bf2ada08 - main - net/mpich: Upgrade mpich from 4.2.1 to 4.2.2

The branch main has been updated by tz:

URL: https://cgit.FreeBSD.org/ports/commit/?id=09f0bf2ada083c098fadf42160afe96cad9c2660

commit 09f0bf2ada083c098fadf42160afe96cad9c2660
Author:     Torsten Zuehlsdorff <tz@FreeBSD.org>
AuthorDate: 2024-07-08 13:47:54 +0000
Commit:     Torsten Zuehlsdorff <tz@FreeBSD.org>
CommitDate: 2024-07-08 13:49:59 +0000

    net/mpich: Upgrade mpich from 4.2.1 to 4.2.2
    
      - Remove default slurm dependency and make it an option (Bug 279777)
      - Remove HYDRA dependency on torque (not needed)
      - Revert removal of HYDRA option
    
    PR:             280184, 279777
    Approved by:     Laurent Chardon <laurent.chardon@gmail.com> (maintainer)
---
 net/mpich/Makefile  | 20 ++++++++++++--------
 net/mpich/distinfo  |  6 +++---
 net/mpich/pkg-plist | 11 ++++++++---
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 2be87db25831..0ebce9491b4d 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	mpich
-DISTVERSION=	4.2.1
-PORTREVISION=	2
+DISTVERSION=	4.2.2
 CATEGORIES=	net parallel
 MASTER_SITES=	https://www.mpich.org/static/downloads/${DISTVERSION}/
 
@@ -16,7 +15,6 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 LIB_DEPENDS=	libhwloc.so:devel/hwloc2	\
 		libjson-c.so:devel/json-c	\
 		libfabric.so:net/libfabric	\
-		libslurm.so:sysutils/slurm-wlm	\
 		libepoll-shim.so:devel/libepoll-shim
 
 CONFLICTS=	mpd
@@ -28,12 +26,12 @@ TEST_TARGET=	check
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
-OPTIONS_DEFINE=		DOCS FORTRAN L0
+OPTIONS_DEFINE=		DOCS FORTRAN SLURM L0
 OPTIONS_GROUP=		PM
-OPTIONS_GROUP_PM=	GFORKER
+OPTIONS_GROUP_PM=	GFORKER HYDRA
 OPTIONS_RADIO=		DEFAULTPM
-OPTIONS_RADIO_DEFAULTPM=DGFORKER
-OPTIONS_DEFAULT=	FORTRAN GFORKER DHYDRA
+OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA
+OPTIONS_DEFAULT=	FORTRAN GFORKER HYDRA DHYDRA
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=			fortran
@@ -48,13 +46,19 @@ MPICH_LDFLAGS=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 
 PM_DESC=	Process managers
 GFORKER_DESC=	Simple local process manager
+HYDRA_DESC=	Parallel process manager
 DEFAULTPM_DESC=	Default process manager
 DGFORKER_DESC=	Make gforker the default process manager
 DHYDRA_DESC=	Make hydra the default process manager
 
+SLURM_DESC=		Extra Slurm support
+SLURM_LIB_DEPENDS=	libslurm.so:sysutils/slurm-wlm
+SLURM_CONFIGURE_WITH=	slurm
+SLURM_IMPLIES=		HYDRA
+
 L0_DESC=		oneAPI Level Zero support
 L0_LIB_DEPENDS=		libze_loader.so:devel/level-zero
-L0_CONFIGURE_OFF=	--without-ze
+L0_CONFIGURE_WITH=	ze
 
 CONFIGURE_ARGS=	--enable-fast=""	\
 		--with-libfabric=${LOCALBASE} \
diff --git a/net/mpich/distinfo b/net/mpich/distinfo
index bf868a214c65..e2da02a40b2e 100644
--- a/net/mpich/distinfo
+++ b/net/mpich/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713430822
-SHA256 (mpich-4.2.1.tar.gz) = 23331b2299f287c3419727edc2df8922d7e7abbb9fd0ac74e03b9966f9ad42d7
-SIZE (mpich-4.2.1.tar.gz) = 39915201
+TIMESTAMP = 1720056694
+SHA256 (mpich-4.2.2.tar.gz) = 883f5bb3aeabf627cb8492ca02a03b191d09836bbe0f599d8508351179781d41
+SIZE (mpich-4.2.2.tar.gz) = 40241352
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index a6f443c49761..6f514a042eca 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -1,12 +1,17 @@
+%%HYDRA%%bin/hydra_nameserver
+%%HYDRA%%bin/hydra_persist
+%%HYDRA%%bin/hydra_pmi_proxy
 bin/mpic++
 bin/mpicc
 bin/mpichversion
 bin/mpicxx
 %%EXEC%%bin/mpiexec
 %%EXECGFORKER%%bin/mpiexec.gforker
+%%HYDRA%%bin/mpiexec.hydra
 %%FORTRAN%%bin/mpif77
 %%FORTRAN%%bin/mpif90
 %%FORTRAN%%bin/mpifort
+%%HYDRA%%bin/mpirun
 bin/mpivars
 bin/parkill
 include/mpi.h
@@ -35,18 +40,18 @@ include/mpiof.h
 lib/libmpi.a
 lib/libmpi.so
 lib/libmpi.so.12
-lib/libmpi.so.12.4.1
+lib/libmpi.so.12.4.2
 lib/libmpich.so
 lib/libmpichcxx.so
 %%FORTRAN%%lib/libmpichf90.so
 lib/libmpicxx.a
 lib/libmpicxx.so
 lib/libmpicxx.so.12
-lib/libmpicxx.so.12.4.1
+lib/libmpicxx.so.12.4.2
 %%FORTRAN%%lib/libmpifort.a
 %%FORTRAN%%lib/libmpifort.so
 %%FORTRAN%%lib/libmpifort.so.12
-%%FORTRAN%%lib/libmpifort.so.12.4.1
+%%FORTRAN%%lib/libmpifort.so.12.4.2
 lib/libmpl.so
 lib/libopa.so
 libdata/pkgconfig/mpich.pc