From 255b96f79dcbc2739c5071b4ac8a9ed90c14c17a Mon Sep 17 00:00:00 2001 From: Miko <65079739+mikoxyz@users.noreply.github.com> Date: Mon, 15 Nov 2021 08:14:21 +0100 Subject: [PATCH 1/2] mdnsd: Conflicts with mDNSResponder mdnsd and mDNSResponder both provide /usr/bin/mdnsd, so they should be marked as conflicting. Reported-by: MGlolenstine Signed-off-by: Miko <65079739+mikoxyz@users.noreply.github.com> --- srcpkgs/mdnsd/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mdnsd/template b/srcpkgs/mdnsd/template index 53476d355366..c7fd267469ff 100644 --- a/srcpkgs/mdnsd/template +++ b/srcpkgs/mdnsd/template @@ -1,9 +1,10 @@ # Template file for 'mdnsd' pkgname=mdnsd version=0.10 -revision=2 +revision=3 build_style=gnu-configure hostmakedepends="autoconf automake pkg-config libtool" +conflicts="mDNSResponder" short_desc="Embeddable Multicast DNS Daemon" maintainer="Duncaen " license="BSD-3-Clause" From 3ee7fae14d4988b8dfe2c310e1c3992b4b28c36d Mon Sep 17 00:00:00 2001 From: Miko <65079739+mikoxyz@users.noreply.github.com> Date: Mon, 15 Nov 2021 08:21:34 +0100 Subject: [PATCH 2/2] mDNSResponder: Conflicts with mdnsd mdnsd and mDNSResponder both provide /usr/bin/mdnsd, so they should be marked as conflicting. Reported-by: MGlolenstine Signed-off-by: Miko <65079739+mikoxyz@users.noreply.github.com> --- srcpkgs/mDNSResponder/template | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/srcpkgs/mDNSResponder/template b/srcpkgs/mDNSResponder/template index c0425e7b34ee..9e8d7c0d9aba 100644 --- a/srcpkgs/mDNSResponder/template +++ b/srcpkgs/mDNSResponder/template @@ -1,8 +1,9 @@ # Template file for 'mDNSResponder' pkgname=mDNSResponder version=1310.80.1 -revision=1 +revision=2 hostmakedepends="flex byacc" +conflicts="mdnsd" short_desc="Implements the Bonjour/Zeroconf protocol" maintainer="Orphaned " license="Apache-2.0, BSD-3-Clause"