From owner-svn-ports-head@freebsd.org  Wed Oct 26 04:08:29 2016
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 8B785C20159;
 Wed, 26 Oct 2016 04:08:29 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 597F3159;
 Wed, 26 Oct 2016 04:08:29 +0000 (UTC)
 (envelope-from jbeich@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u9Q48Smx026204;
 Wed, 26 Oct 2016 04:08:28 GMT (envelope-from jbeich@FreeBSD.org)
Received: (from jbeich@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u9Q48S72026202;
 Wed, 26 Oct 2016 04:08:28 GMT (envelope-from jbeich@FreeBSD.org)
Message-Id: <201610260408.u9Q48S72026202@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: jbeich set sender to
 jbeich@FreeBSD.org using -f
From: Jan Beich <jbeich@FreeBSD.org>
Date: Wed, 26 Oct 2016 04:08:28 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r424669 - in head: dns/openmdns net/mDNSResponder
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 26 Oct 2016 04:08:29 -0000

Author: jbeich
Date: Wed Oct 26 04:08:28 2016
New Revision: 424669
URL: https://svnweb.freebsd.org/changeset/ports/424669

Log:
  dns/openmdns: conflict with net/mDNSResponder

Modified:
  head/dns/openmdns/Makefile   (contents, props changed)
  head/net/mDNSResponder/Makefile   (contents, props changed)

Modified: head/dns/openmdns/Makefile
==============================================================================
--- head/dns/openmdns/Makefile	Wed Oct 26 04:02:05 2016	(r424668)
+++ head/dns/openmdns/Makefile	Wed Oct 26 04:08:28 2016	(r424669)
@@ -15,6 +15,8 @@ USE_GITHUB=	yes
 GH_ACCOUNT=	haesbaert
 GH_PROJECT=	mdnsd
 
+CONFLICTS_INSTALL=	mDNSResponder # sbin/mdnsd
+
 USES=		localbase uidfix
 USE_RC_SUBR=	mdnsd
 MAKE_ENV=	LDADD="${LIBS}"

Modified: head/net/mDNSResponder/Makefile
==============================================================================
--- head/net/mDNSResponder/Makefile	Wed Oct 26 04:02:05 2016	(r424668)
+++ head/net/mDNSResponder/Makefile	Wed Oct 26 04:08:28 2016	(r424669)
@@ -12,7 +12,8 @@ COMMENT=	Bonjour (zero-configuration net
 LICENSE=	APACHE20 BSD3CLAUSE
 LICENSE_COMB=	dual
 
-CONFLICTS=	avahi-libdns-[0-9]*
+# lib/libdns_sd.so.1 sbin/mdnsd
+CONFLICTS_INSTALL=	avahi-libdns openmdns
 
 ALL_TARGET=	all dnsextd
 BUILD_WRKSRC=	${WRKSRC}/mDNSPosix