diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index 3d9686bd29f0..115f15a2d9fc 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,111 +1,112 @@
 PORTNAME=	mpich
 PORTVERSION=	4.1.2
+PORTREVISION=	1
 CATEGORIES=	net parallel
 MASTER_SITES=	https://www.mpich.org/static/downloads/${DISTVERSION}/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Portable implementation of MPI-1, MPI-2 and MPI-3
 WWW=		https://www.mpich.org/
 
 LICENSE=	MPICH
 LICENSE_NAME=	MPICH
 LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 # Unfortunately mpicc is BROKEN with sh (Bad substitution on arrays)
 BUILD_DEPENDS=	bash:shells/bash
 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
 RUN_DEPENDS=	bash:shells/bash
 
 CONFLICTS=	mpd
 GNU_CONFIGURE=	yes
 INSTALL_TARGET=	install-strip
 USES=		compiler:c11 libtool localbase perl5 pkgconfig python:build
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 OPTIONS_DEFINE=		DOCS FORTRAN L0
 OPTIONS_GROUP=		PM
 OPTIONS_GROUP_PM=	GFORKER HYDRA
 OPTIONS_RADIO=		DEFAULTPM
 OPTIONS_RADIO_DEFAULTPM=DGFORKER DHYDRA
 OPTIONS_DEFAULT=	FORTRAN GFORKER HYDRA DHYDRA L0
 OPTIONS_SUB=		yes
 
 FORTRAN_USES=			fortran
 FORTRAN_CONFIGURE_ENABLE=	fortran
 FORTRAN_CONFIGURE_ON=		\
 	MPICH_MPICC_LDFLAGS="${MPICH_LDFLAGS}" \
 	MPICH_MPICXX_LDFLAGS="${MPICH_LDFLAGS}" \
 	MPICH_MPIF77_LDFLAGS="${MPICH_LDFLAGS}" \
 	MPICH_MPIFORT_LDFLAGS="${MPICH_LDFLAGS}"
 MPICH_LDFLAGS=	-Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \
 		-L${LOCALBASE}/lib/gcc${_GCC_VER} -B${LOCALBASE}/bin
 
 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
 
 HYDRA_LIB_DEPENDS=	libtorque.so:sysutils/torque
 
 L0_DESC=		oneAPI Level Zero support
 L0_LIB_DEPENDS=		libze_loader.so:devel/level-zero
 L0_CONFIGURE_OFF=	--without-ze
 
 CONFIGURE_ARGS=	--enable-fast=""	\
 		--with-libfabric=${LOCALBASE} \
 		pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
 		MPICHLIB_CFLAGS="${CFLAGS}" \
 		CFLAGS="-I${LOCALBASE}/include/json-c ${CFLAGS_F2018}" \
 		MPICHLIB_CPPFLAGS="${CPPFLAGS}" CPPFLAGS="" \
 		MPICHLIB_CXXFLAGS="${CXXFLAGS}" CXXFLAGS="" \
 		MPICHLIB_FFLAGS="${FFLAGS}" FFLAGS="" \
 		MPICHLIB_FCFLAGS="${FCFLAGS}" FCFLAGS="" \
 		MPICHLIB_LDFLAGS="${LDFLAGS}" LDFLAGS="" \
 		MPICHLIB_LIBS="${LIBS}" \
 		LIBS="-L${LOCALBASE}/lib -lepoll-shim -ljson-c -lm"	\
 		BASH_SHELL=${LOCALBASE}/bin/bash
 
 .include <bsd.port.options.mk>
 
 .for pm in ${OPTIONS_GROUP_PM}
 . if ${PORT_OPTIONS:M${pm}}
 .  if empty(PMLIST)
 PMLIST=		${pm:tl}
 .  elif ${PORT_OPTIONS:MD${pm}}
 PMLIST:=	${pm:tl},${PMLIST}
 .  else
 PMLIST:=	${PMLIST},${pm:tl}
 .  endif
 . endif
 .endfor
 
 .if empty(PMLIST)
 CONFIGURE_ARGS+=--without-pm
 PLIST_SUB+=	EXEC="@comment " EXECGFORKER="@comment "
 .else
 CONFIGURE_ARGS+=--with-pm=${PMLIST}
 PLIST_SUB+=	EXEC=""
 .if ${PMLIST:M*,gforker*}
 PLIST_SUB+=	EXECGFORKER=""
 .else
 PLIST_SUB+=	EXECGFORKER="@comment "
 .endif
 .endif
 
 post-extract:
 	${FIND} ${WRKSRC} -name "*.orig" -delete
 
 post-patch:
 	${RM} -r ${WRKSRC}/www
 
 .include <bsd.port.mk>
diff --git a/net/mpich/files/patch-src_pm_hydra_lib_tools_bootstrap_external_slurm__query__node__list.c b/net/mpich/files/patch-src_pm_hydra_lib_tools_bootstrap_external_slurm__query__node__list.c
new file mode 100644
index 000000000000..920a91348c9a
--- /dev/null
+++ b/net/mpich/files/patch-src_pm_hydra_lib_tools_bootstrap_external_slurm__query__node__list.c
@@ -0,0 +1,11 @@
+--- src/pm/hydra/lib/tools/bootstrap/external/slurm_query_node_list.c.orig	2023-06-06 14:38:37 UTC
++++ src/pm/hydra/lib/tools/bootstrap/external/slurm_query_node_list.c
+@@ -26,7 +26,7 @@ static HYD_status list_to_nodes(char *str)
+ #if defined(HAVE_SLURM)
+ static HYD_status list_to_nodes(char *str)
+ {
+-    hostlist_t hostlist;
++    hostlist_t *hostlist;
+     char *host;
+     int k = 0;
+     HYD_status status = HYD_SUCCESS;