CVS commit: pkgsrc/parallel/mpi-ch

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Thu Jan  4 20:32:19 UTC 2018

Modified Files:
        pkgsrc/parallel/mpi-ch: Makefile

Log Message:
Added CONFLICTS; removed unused lines


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/parallel/mpi-ch/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/parallel/mpi-ch/Makefile
diff -u pkgsrc/parallel/mpi-ch/Makefile:1.83 pkgsrc/parallel/mpi-ch/Makefile:1.84
--- pkgsrc/parallel/mpi-ch/Makefile:1.83        Sat Apr 29 18:18:52 2017
+++ pkgsrc/parallel/mpi-ch/Makefile     Thu Jan  4 20:32:19 2018
@@ -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@localhost
 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"