svn commit: r531494 - in head/net/py-mpi4py: . files

[Danilo Egea Gondolfo]

Author: danilo
Date: Sun Apr 12 09:18:34 2020
New Revision: 531494
URL: https://svnweb.freebsd.org/changeset/ports/531494

Log:
  - Update to 3.0.3
  - Move OpenMPI support to net/openmpi3. OpenMPI 1 and 2 are deprecated

Modified:
  head/net/py-mpi4py/Makefile
  head/net/py-mpi4py/distinfo
  head/net/py-mpi4py/files/mpi.cfg

Modified: head/net/py-mpi4py/Makefile
==============================================================================
--- head/net/py-mpi4py/Makefile	Sun Apr 12 09:16:58 2020	(r531493)
+++ head/net/py-mpi4py/Makefile	Sun Apr 12 09:18:34 2020	(r531494)
@@ -1,8 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	mpi4py
-DISTVERSION=	3.0.0
-PORTREVISION=	3
+DISTVERSION=	3.0.3
 CATEGORIES=	net parallel python
 MASTER_SITES=	CHEESESHOP
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +17,7 @@ USE_PYTHON=	distutils cython autoplist concurrent
 
 OPTIONS_DEFINE=		DOCS MANPAGES
 OPTIONS_SINGLE=		MP
-OPTIONS_SINGLE_MP=	MPICH2 OPENMPI OPENMPI2
+OPTIONS_SINGLE_MP=	MPICH2 OPENMPI
 OPTIONS_DEFAULT=	OPENMPI # the only non-failing MPI implementation
 MP_DESC=		MPI Implementation
 
@@ -26,19 +25,12 @@ MPICH2_USES=		fortran
 MPICH2_LIB_DEPENDS=	libmpich.so:net/mpich2
 MPICH2_LDFLAGS=		${LOCALBASE}/lib/gcc${GCC_DEFAULT}/libgcc_s.so
 
-OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
+OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi3
 
-OPENMPI2_DESC=		${OPENMPI_DESC} 2.x
-OPENMPI2_LIB_DEPENDS=	libmpi.so:net/openmpi2
-
 PORTDOCS=		*
 
 do-patch-OPENMPI-on:
 	@${CP} ${FILESDIR}/mpi.cfg ${WRKSRC}/
-	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mpi.cfg
-
-do-patch-OPENMPI2-on:
-	@${CP} ${FILESDIR}/mpi2.cfg ${WRKSRC}/mpi.cfg
 	@${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/mpi.cfg
 
 do-install-DOCS-on:

Modified: head/net/py-mpi4py/distinfo
==============================================================================
--- head/net/py-mpi4py/distinfo	Sun Apr 12 09:16:58 2020	(r531493)
+++ head/net/py-mpi4py/distinfo	Sun Apr 12 09:18:34 2020	(r531494)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1537487949
-SHA256 (mpi4py-3.0.0.tar.gz) = b457b02d85bdd9a4775a097fac5234a20397b43e073f14d9e29b6cd78c68efd7
-SIZE (mpi4py-3.0.0.tar.gz) = 1426843
+TIMESTAMP = 1586541409
+SHA256 (mpi4py-3.0.3.tar.gz) = 012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f
+SIZE (mpi4py-3.0.3.tar.gz) = 1429389

Modified: head/net/py-mpi4py/files/mpi.cfg
==============================================================================
--- head/net/py-mpi4py/files/mpi.cfg	Sun Apr 12 09:16:58 2020	(r531493)
+++ head/net/py-mpi4py/files/mpi.cfg	Sun Apr 12 09:18:34 2020	(r531494)
@@ -1,5 +1,5 @@
 [mpi]
-mpi_dir              = %%LOCALBASE%%/mpi/openmpi
+mpi_dir              = %%LOCALBASE%%/mpi/openmpi3
 mpicc                = %(mpi_dir)s/bin/mpicc
 mpicxx               = %(mpi_dir)s/bin/mpicxx
 library_dirs         = %(mpi_dir)s/lib