From cdd6075402dc5ef2665e6c994b24a989bae12cd6 Mon Sep 17 00:00:00 2001
From: thierry <thierry@FreeBSD.org>
Date: Sun, 14 Nov 2010 22:00:16 +0000
Subject: Chase the upgrade of MPICH2.

PR:		ports/151868
Approved by:	maho (maintainer)
---
 math/blacs/Makefile                   | 9 ++++-----
 math/blacs/files/Bmake.inc-mpich.diff | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'math')

diff --git a/math/blacs/Makefile b/math/blacs/Makefile
index e5bc8879dc28..81a6871bb232 100644
--- a/math/blacs/Makefile
+++ b/math/blacs/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	blacs
 PORTVERSION=	1.7
-PORTREVISION=	12
+PORTREVISION=	13
 CATEGORIES=	math
 MASTER_SITES=	ftp://ftp.netlib.org/blacs/
 DISTNAME=	BLACS
@@ -32,12 +32,11 @@ WITH_OPENMPI=	yes
 .endif
 
 .if defined(WITH_OPENMPI)
-BUILD_DEPENDS=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
-RUN_DEPENDS=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
+BUILD_DEPENDS+=	${LOCALBASE}/mpi/openmpi/lib/libmpi.so:${PORTSDIR}/net/openmpi
+RUN_DEPENDS+=	${LOCALBASE}/mpi/openmpi/bin/mpirun:${PORTSDIR}/net/openmpi
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-openmpi.diff
 .else
-LIB_DEPENDS=	mpich:${PORTSDIR}/net/mpich2
-RUN_DEPENDS=	${LOCALBASE}/bin/mpirun:${PORTSDIR}/net/mpich2
+LIB_DEPENDS+=	mpich:${PORTSDIR}/net/mpich2
 EXTRA_PATCHES+=	${FILESDIR}/Bmake.inc-mpich.diff
 .endif
 
diff --git a/math/blacs/files/Bmake.inc-mpich.diff b/math/blacs/files/Bmake.inc-mpich.diff
index b3efd0032202..e19a1851ff65 100644
--- a/math/blacs/files/Bmake.inc-mpich.diff
+++ b/math/blacs/files/Bmake.inc-mpich.diff
@@ -35,7 +35,7 @@
     MPILIBdir = $(MPIdir)/lib/
     MPIINCdir = $(MPIdir)/include
 -   MPILIB = $(MPILIBdir)/libmpich.a
-+   MPILIB = $(MPILIBdir)/libmpich.a
++   MPILIB = $(MPILIBdir)/libmpich.a $(MPILIBdir)/libmpl.a -pthread
  
  #  -------------------------------------
  #  All libraries required by the tester.
-- 
cgit