Index: head/dns/openmdns/Makefile
===================================================================
--- head/dns/openmdns/Makefile	(revision 424668)
+++ head/dns/openmdns/Makefile	(revision 424669)
@@ -1,52 +1,54 @@
 # $FreeBSD$
 
 PORTNAME=	openmdns
 DISTVERSION=	0.6-8
 DISTVERSIONSUFFIX=	-g07cf5c1
 PORTREVISION=	1
 CATEGORIES=	dns
 
 MAINTAINER=	jbeich@FreeBSD.org
 COMMENT=	Multicast DNS and Service Discovery daemon
 
 LICENSE=	ISCL
 
 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}"
 MAKE_ARGS=	BINDIR="${PREFIX}/sbin" \
 		MANDIR="${PREFIX}/man/man"
 CFLAGS+=	-D__dead=__dead2
 LDFLAGS+=	-Wl,--as-needed # -lutil
 LIBS+=		-lopenbsd
 SUB_LIST=	COMMENT="${COMMENT}"
 PLIST_FILES=	sbin/mdnsctl \
 		sbin/mdnsd \
 		man/man8/mdnsctl.8.gz \
 		man/man8/mdnsd.8.gz
 PORTDOCS=	*
 
 USERS=		_mdnsd
 GROUPS=		_mdnsd
 
 OPTIONS_DEFINE=	DOCS STATIC
 
 STATIC_BUILD_DEPENDS=	${LOCALBASE}/lib/libevent.a:devel/libevent2 \
 			${LOCALBASE}/lib/libopenbsd.a:devel/libopenbsd
 STATIC_MAKE_ENV=	NO_SHARED=1
 STATIC_LIB_DEPENDS_OFF=	libevent.so:devel/libevent2 \
 			libopenbsd.so:devel/libopenbsd
 
 post-patch:
 # warning: duplicate script for target "maninstall" ignored
 	@${REINPLACE_CMD} '/bsd\.man\.mk/d' ${WRKSRC}/*/Makefile
 
 post-install-DOCS-on:
 	(cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 	${INSTALL_MAN} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/net/mDNSResponder/Makefile
===================================================================
--- head/net/mDNSResponder/Makefile	(revision 424668)
+++ head/net/mDNSResponder/Makefile	(revision 424669)
@@ -1,47 +1,48 @@
 # Created by: Alfred Perlstein <alfred@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	mDNSResponder
 PORTVERSION=	625.41.2
 CATEGORIES=	net dns
 MASTER_SITES=	http://opensource.apple.com/tarballs/${PORTNAME}/
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Bonjour (zero-configuration networking) by Apple
 
 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
 INSTALL_WRKSRC=	${WRKSRC}/mDNSPosix
 MAKE_ARGS=	LDCONFIG=${TRUE} LOCALBASE=${PREFIX} MANPATH=${MANPREFIX}/man os=freebsd
 MAKE_JOBS_UNSAFE=	yes
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	mdnsd mdnsresponderposix
 USES=		cpe gmake
 
 CPE_VENDOR=	apple
 CPE_PRODUCT=	${PORTNAME:tl}
 
 EXTRA_BIN=	mDNSClientPosix mDNSIdentify mDNSNetMonitor mDNSProxyResponderPosix mDNSResponderPosix
 EXTRA_MAN1=	dns-sd.1
 EXTRA_MAN8=	dnsextd.8 mDNSResponderPosix.8
 EXTRA_SBIN=	dnsextd
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|\(#define IPV6_2292_PKTINFO \).*|\1IPV6_PKTINFO|; s|\(#define IPV6_2292_HOPLIMIT \).*|\1IPV6_HOPLIMIT|' ${WRKSRC}/mDNSPosix/mDNSUNP.h
 	@${MV} ${WRKSRC}/mDNSShared/mDNSResponder.8 ${WRKSRC}/mDNSShared/mDNSResponderPosix.8
 
 post-install:
 	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_BIN} ${STAGEDIR}${PREFIX}/bin/
 	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN1} ${STAGEDIR}${PREFIX}/man/man1/
 	cd ${WRKSRC}/mDNSShared/ && ${INSTALL_MAN} ${EXTRA_MAN8} ${STAGEDIR}${PREFIX}/man/man8/
 	cd ${WRKSRC}/mDNSPosix/build/prod/ && ${INSTALL_PROGRAM} ${EXTRA_SBIN} ${STAGEDIR}${PREFIX}/sbin/
 	${CHMOD} u+w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
 	${CHMOD} u-w ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/libdns_sd.so.1 ${STAGEDIR}${PREFIX}/sbin/*
 
 .include <bsd.port.mk>