git: 3e61f8fcd4d0 - main - net/openmpi4: upgrade to 4.1.6

The branch main has been updated by thierry:

URL: https://cgit.FreeBSD.org/ports/commit/?id=3e61f8fcd4d0c0070edd2c0ad0d5baa348dc39bd

commit 3e61f8fcd4d0c0070edd2c0ad0d5baa348dc39bd
Author:     Thierry Thomas <thierry@FreeBSD.org>
AuthorDate: 2024-01-25 12:11:04 +0000
Commit:     Thierry Thomas <thierry@FreeBSD.org>
CommitDate: 2024-02-18 09:22:34 +0000

    net/openmpi4: upgrade to 4.1.6
    
    Changelog at <https://raw.githubusercontent.com/open-mpi/ompi/v4.1.x/NEWS>.
---
 net/Makefile           |  1 +
 net/openmpi4/Makefile  | 26 ++++++++++++++------------
 net/openmpi4/distinfo  |  6 +++---
 net/openmpi4/pkg-descr |  3 +++
 net/openmpi4/pkg-plist |  2 +-
 5 files changed, 22 insertions(+), 16 deletions(-)

diff --git a/net/Makefile b/net/Makefile
index fe3e44a9f8a4..32cb5c55fbd0 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -578,6 +578,7 @@
     SUBDIR += openldap26-server
     SUBDIR += openmdns
     SUBDIR += openmpi
+    SUBDIR += openmpi4
     SUBDIR += openntpd
     SUBDIR += openpgm
     SUBDIR += openradius
diff --git a/net/openmpi4/Makefile b/net/openmpi4/Makefile
index 3205fcf31bd8..467c3bb8570f 100644
--- a/net/openmpi4/Makefile
+++ b/net/openmpi4/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	openmpi
-PORTVERSION=	4.1.5
-PORTREVISION=	4
+PORTVERSION=	4.1.6
 CATEGORIES=	net parallel
-MASTER_SITES=	http://www.open-mpi.org/software/ompi/v${PORTVERSION:R}/downloads/
+MASTER_SITES=	https://download.open-mpi.org/release/open-mpi/v${PORTVERSION:R}/
 PKGNAMESUFFIX=	4
 
 MAINTAINER=	ports@FreeBSD.org
@@ -21,21 +20,22 @@ LIB_DEPENDS=	libhwloc.so.15:devel/hwloc2 \
 USES=		fortran gmake libtool:keepla localbase perl5 \
 		pkgconfig shebangfix tar:bzip2
 
-HAS_CONFIGURE=	yes
+CONFLICTS_INSTALL=	openmpi-5*
+
 USE_PERL5=	build
 
 MPIBASE?=	mpi
-MPIDIR?=	${MPIBASE}/${PKGBASE}
+MPIDIR?=	${MPIBASE}/${PORTNAME}
 
-PLIST_SUB+=	MPIBASE=${MPIBASE}
 PLIST_SUB+=	MPIDIR=${MPIDIR}
 
 # Workaround for https://github.com/open-mpi/ompi/issues/7516
 CONFIGURE_ENV+=		DISABLE_gds_ds12=1 DISABLE_gds_ds21=1
 
-CONFIGURE_ARGS+=	--prefix=${PREFIX}/${MPIDIR} \
-			--mandir=${PREFIX}/${MPIDIR}/share/man \
-			--program-prefix= \
+GNU_CONFIGURE=	yes
+GNU_CONFIGURE_PREFIX=	${PREFIX}/${MPIDIR}
+GNU_CONFIGURE_MANPREFIX=${PREFIX}/${MPIDIR}/share
+CONFIGURE_ARGS+=	--program-prefix= \
 			--with-hwloc=external \
 			--with-libltdl \
 			--without-ofi \
@@ -52,6 +52,8 @@ USE_LDCONFIG=	${PREFIX}/${MPIDIR}/lib
 
 MANDIRS=	${PREFIX}/${MPIDIR}/share/man
 
+TEST_TARGET=	check
+
 SHEBANG_FILES=	ompi/mca/common/monitoring/profile2mat.pl \
 		ompi/mca/common/monitoring/aggregate_profile.pl
 
@@ -116,8 +118,8 @@ PLIST_SUB+=	NO_MCA_PATCHER_OVERWRITE="@comment "
 PLIST_SUB+=	NO_MCA_PATCHER_OVERWRITE=""
 .endif
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g' \
+pre-configure:
+	${REINPLACE_CMD} -e 's|$$(libdir)/pkgconfig|${LOCALBASE}/libdata/pkgconfig|g' \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.am \
 		${WRKSRC}/ompi/tools/wrappers/Makefile.in \
 		${WRKSRC}/opal/tools/wrappers/Makefile.am \
@@ -126,7 +128,7 @@ post-patch:
 		${WRKSRC}/orte/tools/wrappers/Makefile.in \
 		${WRKSRC}/opal/mca/pmix/pmix3x/pmix/Makefile.am \
 		${WRKSRC}/opal/mca/pmix/pmix3x/pmix/Makefile.in
-	@${REINPLACE_CMD} 's|define MCA_hwloc_external_.*header "|&${LOCALBASE}/include/|' \
+	${REINPLACE_CMD} 's|define MCA_hwloc_external_.*header "|&${LOCALBASE}/include/|' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/openmpi4/distinfo b/net/openmpi4/distinfo
index c27c85883c26..04dc08ca4aa6 100644
--- a/net/openmpi4/distinfo
+++ b/net/openmpi4/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1677228694
-SHA256 (openmpi-4.1.5.tar.bz2) = a640986bc257389dd379886fdae6264c8cfa56bc98b71ce3ae3dfbd8ce61dbe3
-SIZE (openmpi-4.1.5.tar.bz2) = 10045426
+TIMESTAMP = 1706177680
+SHA256 (openmpi-4.1.6.tar.bz2) = f740994485516deb63b5311af122c265179f5328a0d857a567b85db00b11e415
+SIZE (openmpi-4.1.6.tar.bz2) = 10017002
diff --git a/net/openmpi4/pkg-descr b/net/openmpi4/pkg-descr
index 3f77761cd467..a8bcd178898a 100644
--- a/net/openmpi4/pkg-descr
+++ b/net/openmpi4/pkg-descr
@@ -6,3 +6,6 @@ vendors, application developers and computer science researchers.
 
 Open MPI is based on an open component architecture allowing modular
 replacement of many system components without recompilation.
+
+This is the legacy version, but the latest one with support of 32 bits
+platforms.
diff --git a/net/openmpi4/pkg-plist b/net/openmpi4/pkg-plist
index 381b5d2f4b52..7346154b40f3 100644
--- a/net/openmpi4/pkg-plist
+++ b/net/openmpi4/pkg-plist
@@ -101,7 +101,7 @@ libdata/pkgconfig/pmix.pc
 %%MPIDIR%%/lib/libmpi.la
 %%MPIDIR%%/lib/libmpi.so
 %%MPIDIR%%/lib/libmpi.so.40
-%%MPIDIR%%/lib/libmpi.so.40.30.5
+%%MPIDIR%%/lib/libmpi.so.40.30.6
 %%MPIDIR%%/lib/libmpi_cxx.la
 %%MPIDIR%%/lib/libmpi_cxx.so
 %%MPIDIR%%/lib/libmpi_cxx.so.40