diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2009-11-28 10:44:56 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2009-11-28 10:44:56 +0000 |
| commit | 532f881192e54b6a05668cf16b6189f5bdd6b7e5 (patch) | |
| tree | 98425fe5718b372e97a66d6b0f071f732e042bd3 /math/blacs | |
| parent | a9969884fb77e493740fae5649c192f9c5a9ab15 (diff) | |
| download | ports-532f881192e54b6a05668cf16b6189f5bdd6b7e5.tar.gz ports-532f881192e54b6a05668cf16b6189f5bdd6b7e5.zip | |
- Chase relocation of net/mpich2
- Bump PORTREVISION if needed
- Fix some portlint errors.
Notes
Notes:
svn path=/head/; revision=244904
Diffstat (limited to 'math/blacs')
| -rw-r--r-- | math/blacs/Makefile | 6 | ||||
| -rw-r--r-- | math/blacs/files/Bmake.inc-mpich.diff | 2 | ||||
| -rw-r--r-- | math/blacs/files/pkg-message.in | 8 |
3 files changed, 8 insertions, 8 deletions
diff --git a/math/blacs/Makefile b/math/blacs/Makefile index 98832be54db6..e5bc8879dc28 100644 --- a/math/blacs/Makefile +++ b/math/blacs/Makefile @@ -7,7 +7,7 @@ PORTNAME= blacs PORTVERSION= 1.7 -PORTREVISION= 11 +PORTREVISION= 12 CATEGORIES= math MASTER_SITES= ftp://ftp.netlib.org/blacs/ DISTNAME= BLACS @@ -28,7 +28,7 @@ SUB_FILES= pkg-message .include <bsd.port.pre.mk> .if exists(${LOCALBASE}/mpi/openmpi/bin/mpirun) -WITH_OPENMPI= yes +WITH_OPENMPI= yes .endif .if defined(WITH_OPENMPI) @@ -37,7 +37,7 @@ 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}/mpich2/bin/mpirun:${PORTSDIR}/net/mpich2 +RUN_DEPENDS= ${LOCALBASE}/bin/mpirun:${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 c4d362b8d6b0..b3efd0032202 100644 --- a/math/blacs/files/Bmake.inc-mpich.diff +++ b/math/blacs/files/Bmake.inc-mpich.diff @@ -31,7 +31,7 @@ # Name and location of the MPI library. # ------------------------------------- - MPIdir = /usr/local/mpich -+ MPIdir = @LOCALBASE@/mpich2 ++ MPIdir = @LOCALBASE@ MPILIBdir = $(MPIdir)/lib/ MPIINCdir = $(MPIdir)/include - MPILIB = $(MPILIBdir)/libmpich.a diff --git a/math/blacs/files/pkg-message.in b/math/blacs/files/pkg-message.in index 1c08c8429a88..bd2426b21079 100644 --- a/math/blacs/files/pkg-message.in +++ b/math/blacs/files/pkg-message.in @@ -4,10 +4,10 @@ Example: % cd %%PREFIX%%/share/BLACS/TESTING - % %%LOCALBASE%%/mpich2/bin/mpd & - % %%LOCALBASE%%/mpich2/bin/mpirun -np 4 ./xCbtest_MPI-FreeBSD - % %%LOCALBASE%%/mpich2/bin/mpirun -np 4 ./xFbtest_MPI-FreeBSD - % %%LOCALBASE%%/mpich2/bin/mpdallexit + % %%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 |