From e9d052b8c6695db13a55ef4f8d715cf1fbe925dc Mon Sep 17 00:00:00 2001
From: is <is>
Date: Thu, 11 Oct 2007 19:03:37 +0000
Subject: Add mcast-tools. Mcast-tools conflicts with pim6sd and pim6dd, as it
 contains (presumably more up to date) versions.

---
 net/Makefile        | 3 ++-
 net/pim6dd/Makefile | 4 +++-
 net/pim6sd/Makefile | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/net/Makefile b/net/Makefile
index 061f4c397cc..1494b7c5bd4 100644
--- a/net/Makefile
+++ b/net/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.682 2007/09/19 23:34:02 wiz Exp $
+# $NetBSD: Makefile,v 1.683 2007/10/11 19:03:37 is Exp $
 #
 
 COMMENT=	Networking tools
@@ -196,6 +196,7 @@ SUBDIR+=	mDNSResponder
 SUBDIR+=	mDNSResponder-nss
 SUBDIR+=	maradns
 SUBDIR+=	mbrowse
+SUBDIR+=	mcast-tools
 SUBDIR+=	md-whois
 SUBDIR+=	microdc2
 SUBDIR+=	miredo
diff --git a/net/pim6dd/Makefile b/net/pim6dd/Makefile
index cd306a3f0d7..de6d5fcd850 100644
--- a/net/pim6dd/Makefile
+++ b/net/pim6dd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2007/03/24 19:21:30 joerg Exp $
+# $NetBSD: Makefile,v 1.13 2007/10/11 19:03:38 is Exp $
 
 DISTNAME=	pim6dd-20031021a
 CATEGORIES=	net
@@ -7,6 +7,8 @@ MASTER_SITES=	ftp://ftp.kame.net/pub/kame/misc/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	IPv6 PIM dense mode daemon
 
+CONFLICTS=	mcast-tools-*
+
 WRKSRC=		${WRKDIR}/${DISTNAME}/pim6dd/
 
 PKG_OPTIONS_VAR=		PKG_OPTIONS.pim6dd
diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile
index f0885d4f31f..242d6358f87 100644
--- a/net/pim6sd/Makefile
+++ b/net/pim6sd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/03/28 13:24:23 joerg Exp $
+# $NetBSD: Makefile,v 1.17 2007/10/11 19:03:38 is Exp $
 
 DISTNAME=	pim6sd-20031021a
 CATEGORIES=	net
@@ -13,6 +13,8 @@ USE_TOOLS+=	lex yacc
 INSTALLATION_DIRS=	sbin ${PKGMANDIR}/cat5 ${PKGMANDIR}/cat8 \
 			${PKGMANDIR}/man1 ${PKGMANDIR}/man5 ${PKGMANDIR}/man8
 
+CONFLICTS=	mcast-tools-*
+
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/pim6stat.1 ${PREFIX}/${PKGMANDIR}/man1
 
-- 
cgit v1.2.3