diff options
| author | asau <asau@pkgsrc.org> | 2013-02-28 07:18:15 +0000 |
|---|---|---|
| committer | asau <asau@pkgsrc.org> | 2013-02-28 07:18:15 +0000 |
| commit | 265d5a72fd00ff7bddf98ba37d408006db4c3d6c (patch) | |
| tree | fc1b0e64bd3720bf32f9c9c227900e7f0a8b7cfd /parallel | |
| parent | 4fa0bef14001c658c4888e4f92f13ad83b23786c (diff) | |
| download | pkgsrc-265d5a72fd00ff7bddf98ba37d408006db4c3d6c.tar.gz | |
Drop manual conflict registration, it conflicts with what we intend to do.
Diffstat (limited to 'parallel')
| -rw-r--r-- | parallel/mpi-ch/Makefile | 5 | ||||
| -rw-r--r-- | parallel/openmpi/Makefile | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index 9b1cf7f831e..42b153772bd 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.71 2013/02/26 23:36:17 joerg Exp $ +# $NetBSD: Makefile,v 1.72 2013/02/28 07:18:15 asau Exp $ DISTNAME= mpich2-1.4.1p1 PKGREVISION= 1 @@ -9,9 +9,6 @@ MAINTAINER= asau@inbox.ru HOMEPAGE= http://www.mcs.anl.gov/research/projects/mpich2/ COMMENT= Open source MPI and MPI-2 implementation from Univ. of Chicago -CONFLICTS+= mpich-[0-9]* # installs bin/mpicc & other wrappers -CONFLICTS+= openmpi-[0-9]* # installs bin/mpicc & other wrappers - MAKE_JOBS_SAFE= no DEPENDS+= bash-[0-9]*:../../shells/bash diff --git a/parallel/openmpi/Makefile b/parallel/openmpi/Makefile index 3ac0a03c74f..d83f7030b25 100644 --- a/parallel/openmpi/Makefile +++ b/parallel/openmpi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2013/02/24 01:22:36 asau Exp $ +# $NetBSD: Makefile,v 1.22 2013/02/28 07:18:16 asau Exp $ DISTNAME= openmpi-1.6.4 CATEGORIES= parallel @@ -9,9 +9,6 @@ MAINTAINER= asau@inbox.ru HOMEPAGE= http://www.open-mpi.org/ COMMENT= Open source MPI-2 implementation -CONFLICTS+= mpich-[0-9]* # installs bin/mpicc & other wrappers -CONFLICTS+= mpich2-[0-9]* # installs bin/mpicc & other wrappers - GNU_CONFIGURE= yes USE_LANGUAGES= c c++ fortran77 USE_LIBTOOL= yes |