Date: Mon, 12 May 2014 21:51:59 +0300 From: Raivo Hool <raivo.hool@gmail.com> To: ports@FreeBSD.org Subject: FreeBSD Port: print/cups-base - Avahi backend Message-ID: <BDAA2163-6D66-4987-AB98-316FFE27E856@gmail.com>
next in thread | raw e-mail | index | archive | help
--Apple-Mail=_49A5D922-A971-4EE0-8104-9855616F1C2F Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii The cups-base port has been marked as BROKEN if built against Avahi = since version 1.4. (The Makefile even helpfully points the user to = http://www.avahi.org/ticket/303 which states that the problem exists = with CUPS version 1.4 and that a fix is in the making.) Since version = 1.6, however, there exists native Avahi support in CUPS and there is = really no point in marking the port broken and including all kinds of = compatibility headers that are no longer of any use whatsoever. Building = CUPS 1.7 directly against Avahi works well and without any need for the = avahi-compat-libdns_sd headers. I tested the setup on my system and came = up with the following patch that incidentally also checks whether one or = the other mDNS backend was selected and activates the pkg-plist magic = accordingly. (Note how the dependency on avahi-libdns has been replaced = with a dependency on avahi-app, as the configure script checks for the = presence of libavahi-client.so, installed by net/avahi-app.) Raivo --Apple-Mail=_49A5D922-A971-4EE0-8104-9855616F1C2F Content-Disposition: attachment; filename=patch-cups_172_avahi Content-Type: application/octet-stream; name="patch-cups_172_avahi" Content-Transfer-Encoding: 7bit --- Makefile.orig 2014-05-12 21:33:26.558686542 +0300 +++ Makefile 2014-05-12 21:39:09.883656471 +0300 @@ -156,16 +156,14 @@ .endif LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include -PLIST_SUB+= WITH_MDNSRESPONDER="" +PLIST_SUB+= WITH_MDNSRESPONDER="" WITH_AVAHI="@comment " .elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MAVAHI} -CONFIGURE_ARGS+= --enable-dnssd \ - --with-dnssd-libs=${LOCALBASE}/lib/ -LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/avahi-libdns -CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include/avahi-compat-libdns_sd/ -BROKEN= missing function, see http://www.avahi.org/ticket/303 +CONFIGURE_ARGS+= --enable-avahi +LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app +PLIST_SUB+= WITH_AVAHI="" WITH_MDNSRESPONDER="@comment " .else CONFIGURE_ARGS+= --disable-dnssd -PLIST_SUB+= WITH_MDNSRESPONDER="@comment " +PLIST_SUB+= WITH_MDNSRESPONDER="@comment " WITH_AVAHI="@comment " .endif .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM} --- pkg-plist.orig 2014-05-12 21:33:59.371807440 +0300 +++ pkg-plist 2014-05-12 21:33:37.541679761 +0300 @@ -83,6 +83,7 @@ libexec/cups/backend/snmp libexec/cups/backend/socket libexec/cups/backend/usb +%%WITH_AVAHI%%libexec/cups/backend/dnssd %%WITH_MDNSRESPONDER%%libexec/cups/backend/dnssd %%WITH_MDNSRESPONDER%%libexec/cups/backend/mdns libexec/cups/cgi-bin/admin.cgi --Apple-Mail=_49A5D922-A971-4EE0-8104-9855616F1C2F--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?BDAA2163-6D66-4987-AB98-316FFE27E856>