svn commit: r559497 - in head/math/blacs: . files

[Thierry Thomas]

Author: thierry
Date: Mon Dec 28 16:09:52 2020
New Revision: 559497
URL: https://svnweb.freebsd.org/changeset/ports/559497

Log:
  - Set the license;
  
  - Switch to MPICH 3, so that BLACS can be installed together with ScaLAPACK.

Modified:
  head/math/blacs/Makefile
  head/math/blacs/files/Bmake.inc-mpich.diff
  head/math/blacs/files/pkg-message.in

Modified: head/math/blacs/Makefile
==============================================================================
--- head/math/blacs/Makefile	Mon Dec 28 15:57:34 2020	(r559496)
+++ head/math/blacs/Makefile	Mon Dec 28 16:09:52 2020	(r559497)
@@ -3,7 +3,7 @@
 
 PORTNAME=	blacs
 PORTVERSION=	1.7
-PORTREVISION=	37
+PORTREVISION=	38
 CATEGORIES=	math
 MASTER_SITES=	NETLIB/blacs
 DISTNAME=	BLACS
@@ -14,8 +14,11 @@ EXTRACT_ONLY=	mpiblacs.tgz blacstester.tgz mpiblacs-pa
 MAINTAINER=	ports at FreeBSD.org
 COMMENT=	BLACS (Basic Linear Algebra Communication Subprograms)
 
+# See http://icl.cs.utk.edu/lapack-forum/archives/lapack/msg01200.html
+LICENSE=	BSD3CLAUSE
+
 SUB_FILES=	pkg-message
-USES=		fortran gmake
+USES=		fortran gmake localbase
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	DOCS
@@ -29,7 +32,7 @@ DOCS_DISTFILES=	blacs_install.ps f77blacsqref.ps lawn9
 OPENMPI_LIB_DEPENDS=	libmpi.so:net/openmpi
 OPENMPI_EXTRA_PATCHES=	${FILESDIR}/Bmake.inc-openmpi.diff
 
-MPICH_LIB_DEPENDS=	libmpich.so:net/mpich2
+MPICH_LIB_DEPENDS=	libmpi.so:net/mpich
 MPICH_EXTRA_PATCHES=	${FILESDIR}/Bmake.inc-mpich.diff
 
 .include <bsd.port.pre.mk>

Modified: head/math/blacs/files/Bmake.inc-mpich.diff
==============================================================================
--- head/math/blacs/files/Bmake.inc-mpich.diff	Mon Dec 28 15:57:34 2020	(r559496)
+++ head/math/blacs/files/Bmake.inc-mpich.diff	Mon Dec 28 16:09:52 2020	(r559497)
@@ -35,7 +35,7 @@
     MPILIBdir = $(MPIdir)/lib/
     MPIINCdir = $(MPIdir)/include
 -   MPILIB = $(MPILIBdir)/libmpich.a
-+   MPILIB = $(MPILIBdir)/libmpich.a $(MPILIBdir)/libmpl.a -pthread
++   MPILIB = -lmpi -lmpifort -pthread
  
  #  -------------------------------------
  #  All libraries required by the tester.

Modified: head/math/blacs/files/pkg-message.in
==============================================================================
--- head/math/blacs/files/pkg-message.in	Mon Dec 28 15:57:34 2020	(r559496)
+++ head/math/blacs/files/pkg-message.in	Mon Dec 28 16:09:52 2020	(r559497)
@@ -6,10 +6,8 @@
 
  Example:
   % cd %%PREFIX%%/share/BLACS/TESTING
-  % %%LOCALBASE%%/bin/mpd &
   % %%LOCALBASE%%/bin/mpirun -np 4 ./xCbtest_MPI-FreeBSD
   % %%LOCALBASE%%/bin/mpirun -np 4 ./xFbtest_MPI-FreeBSD
-  % %%LOCALBASE%%/bin/mpdallexit
 
  Or, if you're using OpenMPI:
   % cd %%PREFIX%%/share/BLACS/TESTING