From d16552e11be7b589fb24c33f5bb1dcc8da66309a Mon Sep 17 00:00:00 2001 From: Edwin Groothuis Date: Sat, 24 May 2008 00:33:50 +0000 Subject: [PATCH] net/mDNSResponder and net/avahi-libdns install files in the same place net/mDNSResponder and net/avahi-libdns install files in the same place. /usr/ports/net/mDNSResponder/Makefile contains CONFLICTS= avahi+libdns-[0-9]*, but the package name is avahi-libdns-0.6.22. /usr/ports/net/avahi-libdns/Makefile does not contain any CONFLICTS section. PR: ports/121434 Submitted by: Anatoly Borodin Approved by: various maintainer timeouts --- net/avahi-libdns/Makefile | 2 ++ net/mDNSResponder/Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/net/avahi-libdns/Makefile b/net/avahi-libdns/Makefile index 17dc77c81dab..b7121c4016c8 100644 --- a/net/avahi-libdns/Makefile +++ b/net/avahi-libdns/Makefile @@ -23,4 +23,6 @@ PLIST= ${.CURDIR}/pkg-plist AVAHI_SLAVE= libdns AVAHI_PKGCONFIG=avahi-compat-libdns_sd.pc +CONFLICTS= mDNSResponder-[0-9]* + .include "${MASTERDIR}/Makefile" diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index bb79a79551b3..daddb1f96e90 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -33,7 +33,7 @@ EXTRAMAN8= dnsextd.8 mDNSResponderPosix.8 MAN8= mdnsd.8 ${EXTRAMAN8} -CONFLICTS= avahi+libdns-[0-9]* +CONFLICTS= avahi-libdns-[0-9]* .include