diff options
| author | jbeich <jbeich@FreeBSD.org> | 2016-10-26 12:08:28 +0800 |
|---|---|---|
| committer | jbeich <jbeich@FreeBSD.org> | 2016-10-26 12:08:28 +0800 |
| commit | db2725dd8a9ab9bc021549d60b4b3d53cb9b54c9 (patch) | |
| tree | 4921c02aa60cfe367371b118b1b4d7d28ba159f1 | |
| parent | c310a436f7b22bf73296d5b6fe351d6e0e35dac9 (diff) | |
| download | freebsd-ports-gnome-db2725dd8a9ab9bc021549d60b4b3d53cb9b54c9.tar.gz freebsd-ports-gnome-db2725dd8a9ab9bc021549d60b4b3d53cb9b54c9.tar.zst freebsd-ports-gnome-db2725dd8a9ab9bc021549d60b4b3d53cb9b54c9.zip | |
dns/openmdns: conflict with net/mDNSResponder
| -rw-r--r-- | dns/openmdns/Makefile | 2 | ||||
| -rw-r--r-- | net/mDNSResponder/Makefile | 3 |
2 files changed, 4 insertions, 1 deletions
diff --git a/dns/openmdns/Makefile b/dns/openmdns/Makefile index 57f2a63c21ac..b892642c7d06 100644 --- a/dns/openmdns/Makefile +++ b/dns/openmdns/Makefile @@ -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}" diff --git a/net/mDNSResponder/Makefile b/net/mDNSResponder/Makefile index 007aaaec274f..0eea43c7d333 100644 --- a/net/mDNSResponder/Makefile +++ b/net/mDNSResponder/Makefile @@ -12,7 +12,8 @@ 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 |