Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 26 Oct 2016 04:08:28 +0000 (UTC)
From:      Jan Beich <jbeich@FreeBSD.org>
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
Message-ID:  <201610260408.u9Q48S72026202@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201610260408.u9Q48S72026202>