- Annotate CONFLICTS between audio/musicpd net/mpich2

PR: ports/153194 Submitted by: nivit Approved by: Chris Rees (maintainer of audio/musicpd)
2010-12-16 16:40:15 +00:00
parent aeebaf13a1
commit d7e3fc8d1c
2 changed files with 3 additions and 1 deletions
--- a/audio/musicpd/Makefile
+++ b/audio/musicpd/Makefile
@@ -19,6 +19,8 @@ LIB_DEPENDS+=	mad.2:${PORTSDIR}/audio/libmad \

 LICENSE=	GPLv2

+CONFLICTS_INSTALL=	mpich2-[1-9]*
+
 USE_GMAKE=	yes
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
--- a/net/mpich2/Makefile
+++ b/net/mpich2/Makefile
@@ -52,7 +52,7 @@ MAKE_ENV+=	VERBOSE=1
 .endif
 MAKE_JOBS_UNSAFE=	yes

-CONFLICTS=	lam-7.* mpiexec-0.*
+CONFLICTS=	lam-7.* mpiexec-0.* musicpd-0.*

 USE_FORTRAN=	yes
 FCFLAGS+=	${FFLAGS}