diff options
| author | Koop Mast <kwm@FreeBSD.org> | 2015-01-04 22:08:54 +0000 |
|---|---|---|
| committer | Koop Mast <kwm@FreeBSD.org> | 2015-01-04 22:08:54 +0000 |
| commit | ca97932b5a30ad829f297f32383855e039b73f2b (patch) | |
| tree | ceca0cf6909d4a604906aec05edc743856fa9fe9 /net/avahi | |
| parent | 961770db55b92808042c6229c89dc8841605b0a0 (diff) | |
| download | ports-ca97932b5a30ad829f297f32383855e039b73f2b.tar.gz ports-ca97932b5a30ad829f297f32383855e039b73f2b.zip | |
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
Notes
Notes:
svn path=/head/; revision=376273
Diffstat (limited to 'net/avahi')
| -rw-r--r-- | net/avahi/Makefile | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/net/avahi/Makefile b/net/avahi/Makefile index 5349dff917b2..2150f683a049 100644 --- a/net/avahi/Makefile +++ b/net/avahi/Makefile @@ -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@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}/net/avahi-autoipd 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 |