From 58a0fd3362da0df309600f8c370ad762177ab5dd Mon Sep 17 00:00:00 2001
From: adam <adam@pkgsrc.org>
Date: Thu, 4 Jan 2018 20:32:19 +0000
Subject: Added CONFLICTS; removed unused lines

---
 parallel/mpi-ch/Makefile | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'parallel')

diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile
index 00af913a281..8f65467a927 100644
--- a/parallel/mpi-ch/Makefile
+++ b/parallel/mpi-ch/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.83 2017/04/29 18:18:52 adam Exp $
+# $NetBSD: Makefile,v 1.84 2018/01/04 20:32:19 adam Exp $
 
 DISTNAME=	mpich-3.2
 CATEGORIES=	parallel
@@ -8,6 +8,7 @@ MAINTAINER=	asau@inbox.ru
 HOMEPAGE=	http://www.mpich.org/
 COMMENT=	Open source MPI, MPI-2, and MPI-3 implementation from Univ. of Chicago
 
+CONFLICTS+=	openmpi-[0-9]*
 DEPENDS+=	bash-[0-9]*:../../shells/bash
 
 #MPI_SUBPREFIX=		mpich
@@ -39,13 +40,6 @@ PKG_SYSCONFSUBDIR=	mpich
 
 BUILDLINK_PASSTHRU_RPATHDIRS+=	${MPI_PREFIX}/lib
 
-#CONF_FILES+=		share/${PKGBASE}/examples/mpicc.conf \
-			${PKG_SYSCONFDIR}/mpicc.conf
-#CONF_FILES+=		share/${PKGBASE}/examples/mpicxx.conf \
-			${PKG_SYSCONFDIR}/mpicxx.conf
-#CONF_FILES+=		share/${PKGBASE}/examples/mpif77.conf \
-			${PKG_SYSCONFDIR}/mpif77.conf
-
 # FreeBSD 6 hack:
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "FreeBSD" || ${OPSYS} == "DragonFly"
-- 
cgit v1.2.3