svn commit: r376273 - head/net/avahi

[Koop Mast]

Author: kwm
Date: Sun Jan  4 22:08:54 2015
New Revision: 376273
URL: https://svnweb.freebsd.org/changeset/ports/376273
QAT: https://qat.redports.org/buildarchive/r376273/

Log:
  Don't pull in avahi-libdns. It conflicts with mDNSResponder which is now
  a default dependancy of cups (used by gtk).
  
  While here, trim one avahi-app line from the first RUN_DEPENDS, one is enough.
  
  Submitted by:	antione

Modified:
  head/net/avahi/Makefile

Modified: head/net/avahi/Makefile
==============================================================================
--- head/net/avahi/Makefile	Sun Jan  4 22:02:17 2015	(r376272)
+++ head/net/avahi/Makefile	Sun Jan  4 22:08:54 2015	(r376273)
@@ -4,7 +4,7 @@
 
 PORTNAME=	avahi
 PORTVERSION=	0.6.31
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	net dns
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -13,11 +13,10 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome at FreeBSD.org
 COMMENT=	"meta-port" for the Avahi service discovery suite
 
-RUN_DEPENDS=	avahi-resolve:${PORTSDIR}/net/avahi-app \
-		avahi-app>=0.6.31:${PORTSDIR}/net/avahi-app
+RUN_DEPENDS=	avahi-app>=0.6.31:${PORTSDIR}/net/avahi-app
 
-OPTIONS_DEFINE=	AUTOIPD GTK LIBDNS MONO QT4 PYTHON
-OPTIONS_DEFAULT=AUTOIPD GTK LIBDNS
+OPTIONS_DEFINE=	AUTOIPD GTK MONO QT4 PYTHON
+OPTIONS_DEFAULT=AUTOIPD GTK
 AUTOIPD_DESC=	IPv4LL network address configuration daemon
 GTK_DESC=	Gtk+ tools and bindings
 LIBDNS_DESC=	Apple's mDNSResponder compatibility library
@@ -36,9 +35,9 @@ RUN_DEPENDS+=	avahi-autoipd:${PORTSDIR}/
 RUN_DEPENDS+=	avahi-discover-standalone:${PORTSDIR}/net/avahi-gtk
 .endif
 
-.if ${PORT_OPTIONS:MLIBDNS}
-RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
-.endif
+#.if ${PORT_OPTIONS:MLIBDNS}
+#RUN_DEPENDS+=	${LOCALBASE}/libdata/pkgconfig/avahi-compat-libdns_sd.pc:${PORTSDIR}/net/avahi-libdns
+#.endif
 
 .if ${PORT_OPTIONS:MMONO}
 RUN_DEPENDS+=	${LOCALBASE}/lib/mono/avahi-sharp/avahi-sharp.dll:${PORTSDIR}/net/avahi-sharp