git: 697c7df81364 - main - net/mpich: update to 3.4.2

[Jan Beich]

The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=697c7df81364032a207540f1c8ee14131031cbe9

commit 697c7df81364032a207540f1c8ee14131031cbe9
Author:     Jan Beich <jbeich at FreeBSD.org>
AuthorDate: 2021-05-25 17:37:05 +0000
Commit:     Jan Beich <jbeich at FreeBSD.org>
CommitDate: 2021-05-29 17:25:49 +0000

    net/mpich: update to 3.4.2
    
    Changes:        https://www.mpich.org/2021/05/28/mpich-3-4-2-released/
    Reported by:    GitHub (watch releases)
---
 net/mpich/Makefile              | 11 +++++++----
 net/mpich/distinfo              |  6 +++---
 net/mpich/files/patch-configure | 17 +++++++----------
 net/mpich/pkg-plist             |  6 +++---
 4 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/net/mpich/Makefile b/net/mpich/Makefile
index cb4f0b32b0d7..8bf142dc5587 100644
--- a/net/mpich/Makefile
+++ b/net/mpich/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	mpich
-PORTVERSION=	3.4.1
+PORTVERSION=	3.4.2
 CATEGORIES=	net parallel
 MASTER_SITES=	https://www.mpich.org/static/downloads/${DISTVERSION}/
 
@@ -27,7 +27,7 @@ USES=		compiler:c11 libtool perl5 pkgconfig
 USE_LDCONFIG=	yes
 TEST_TARGET=	check
 
-OPTIONS_DEFINE=		DOCS FORTRAN
+OPTIONS_DEFINE=		DOCS FORTRAN L0
 OPTIONS_GROUP=		PM
 OPTIONS_GROUP_PM=	GFORKER HYDRA
 OPTIONS_RADIO=		DEFAULTPM
@@ -52,8 +52,11 @@ DEFAULTPM_DESC=	Default process manager
 DGFORKER_DESC=	Make gforker the default process manager
 DHYDRA_DESC=	Make hydra the default process manager
 
-CONFIGURE_ENV=	ac_cv_header_level_zero_ze_api_h=no \
-		ac_cv_lib_ze_loader_zeInit=no
+L0_DESC=		oneAPI Level Zero support
+L0_LIB_DEPENDS=		libze_loader.so:devel/level-zero
+L0_CONFIGURE_ENV_OFF=	ac_cv_header_level_zero_ze_api_h=no \
+			ac_cv_lib_ze_loader_zeInit=no
+
 CONFIGURE_ARGS=	--enable-fast="" --with-hwloc-prefix=${LOCALBASE} \
 		--with-libfabric=${LOCALBASE} \
 		pkgconfigdir="${PREFIX}/libdata/pkgconfig" \
diff --git a/net/mpich/distinfo b/net/mpich/distinfo
index f54eda95910d..b52284854af8 100644
--- a/net/mpich/distinfo
+++ b/net/mpich/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1613793948
-SHA256 (mpich-3.4.1.tar.gz) = 8836939804ef6d492bcee7d54abafd6477d2beca247157d92688654d13779727
-SIZE (mpich-3.4.1.tar.gz) = 30720928
+TIMESTAMP = 1621964225
+SHA256 (mpich-3.4.2.tar.gz) = 5c19bea8b84e8d74cca5f047e82b147ff3fba096144270e3911ad623d6c587bf
+SIZE (mpich-3.4.2.tar.gz) = 32850822
diff --git a/net/mpich/files/patch-configure b/net/mpich/files/patch-configure
index 3bd3dede4864..6f24e6b3da55 100644
--- a/net/mpich/files/patch-configure
+++ b/net/mpich/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2021-01-22 20:23:00 UTC
+--- configure.orig	2021-05-26 20:57:14 UTC
 +++ configure
-@@ -1209,8 +1209,6 @@ HWLOC_top_builddir
+@@ -1217,8 +1217,6 @@ HWLOC_top_builddir
  hwloclib
  hwloclibdir
  hwlocsrcdir
@@ -9,7 +9,7 @@
  VISIBILITY_CFLAGS
  BUILD_PROFILING_LIB_FALSE
  BUILD_PROFILING_LIB_TRUE
-@@ -31185,337 +31183,7 @@ if test "$NEEDSPLIB" = "yes" ; then
+@@ -31276,337 +31274,7 @@ if test "$NEEDSPLIB" = "yes" ; then
      VISIBILITY_CFLAGS=""
  fi
  
@@ -347,7 +347,7 @@
  # ----------------------------------------------------------------------------
  # HWLOC
  # ----------------------------------------------------------------------------
-@@ -45612,18 +45280,8 @@ the same routine with arguments of different types." "
+@@ -46449,18 +46117,8 @@ the same routine with arguments of different types." "
  fi
  
  addarg=$pac_cv_prog_f77_mismatched_args_parm
@@ -367,16 +367,13 @@
      bindings="$bindings f77"
  
  $as_echo "#define HAVE_FORTRAN_BINDING 1" >>confdefs.h
-@@ -51252,7 +50910,11 @@ $as_echo_n "checking alignment of wchar_t... " >&6; }
- if ${ac_cv_alignof_wchar_t+:} false; then :
+@@ -52094,6 +51752,9 @@ if ${ac_cv_alignof_wchar_t+:} false; then :
    $as_echo_n "(cached) " >&6
  else
--  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_wchar_t"        "0
-+  if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_wchar_t"        "
-+
+   if ac_fn_c_compute_int "$LINENO" "(long int) offsetof (ac__type_alignof_, y)" "ac_cv_alignof_wchar_t"        "$ac_includes_default
 +#ifdef STDC_HEADERS
 +# include <stddef.h>
 +#endif
- 
  #ifndef offsetof
  # define offsetof(type, member) ((char *) &((type *) 0)->member - (char *) 0)
+ #endif
diff --git a/net/mpich/pkg-plist b/net/mpich/pkg-plist
index 758c30004fa7..365f3f2f7496 100644
--- a/net/mpich/pkg-plist
+++ b/net/mpich/pkg-plist
@@ -27,18 +27,18 @@ include/mpiof.h
 lib/libmpi.a
 lib/libmpi.so
 lib/libmpi.so.12
-lib/libmpi.so.12.1.10
+lib/libmpi.so.12.1.11
 lib/libmpich.so
 lib/libmpichcxx.so
 %%FORTRAN%%lib/libmpichf90.so
 lib/libmpicxx.a
 lib/libmpicxx.so
 lib/libmpicxx.so.12
-lib/libmpicxx.so.12.1.10
+lib/libmpicxx.so.12.1.11
 %%FORTRAN%%lib/libmpifort.a
 %%FORTRAN%%lib/libmpifort.so
 %%FORTRAN%%lib/libmpifort.so.12
-%%FORTRAN%%lib/libmpifort.so.12.1.10
+%%FORTRAN%%lib/libmpifort.so.12.1.11
 lib/libmpl.so
 lib/libopa.so
 libdata/pkgconfig/mpich.pc