From e14d590170370162dec668c5e5444ad886991401 Mon Sep 17 00:00:00 2001 From: alepulver Date: Fri, 9 Feb 2007 14:53:32 +0000 Subject: - Add CONFLICTS between net/mpd and lang/mpd. Reported by: "Daniel O'Connor" --- lang/mpd/Makefile | 1 + net/mpd/Makefile | 3 +++ 2 files changed, 4 insertions(+) diff --git a/lang/mpd/Makefile b/lang/mpd/Makefile index e92f5ab23c1..b343a3fc9ea 100644 --- a/lang/mpd/Makefile +++ b/lang/mpd/Makefile @@ -20,6 +20,7 @@ ONLY_FOR_ARCHS= alpha i386 ONLY_FOR_ARCHS_REASON= uses assembly code for the target machine # net/mpd +CONFLICTS= mpd-[^1]* NO_LATEST_LINK= yes USE_GMAKE= yes diff --git a/net/mpd/Makefile b/net/mpd/Makefile index 1c81374b949..ac67af504d9 100644 --- a/net/mpd/Makefile +++ b/net/mpd/Makefile @@ -16,6 +16,9 @@ DIST_SUBDIR= mpd MAINTAINER= ports@FreeBSD.org COMMENT= Multi-link PPP daemon based on netgraph(4) +# lang/mpd +CONFLICTS= mpd-[^3]* + MTREE_FILE= ${FILESDIR}/mpd.mtree MAN8= mpd.8 MANCOMPRESSED= maybe -- cgit