From owner-freebsd-ports@FreeBSD.ORG Mon May 12 18:52:08 2014 Return-Path: Delivered-To: ports@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B419320F for ; Mon, 12 May 2014 18:52:08 +0000 (UTC) Received: from mail-ee0-x22a.google.com (mail-ee0-x22a.google.com [IPv6:2a00:1450:4013:c00::22a]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 45B3B23EC for ; Mon, 12 May 2014 18:52:08 +0000 (UTC) Received: by mail-ee0-f42.google.com with SMTP id d49so4998224eek.1 for ; Mon, 12 May 2014 11:52:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:content-type:subject:message-id:date:to:mime-version; bh=u0G0dYGhzma79cms+cvVWetyiYIzbKVORDfadi1w3Ag=; b=zi6iLfumlz2iUPRN686ErNJq26uVQnOH9cg6cOVQTvEhGNdfn1MZWdRdoC5qKRMXsR ICxrfEZa1mxYWkvFbnuFFI0PJBFS8q5lXG/LpJNKFScSuEzeLMOF8VErXB0iO6Y3vBfr Uqb3+pfe6eLvrYftplUszu3Lze8HllFlH0tYYntlqQnoLy0kvM1PMzaMkm01/4G19Au5 zdQtwWoIJ1GQQJRnXHtg9R18pEBxGFNfWRdJUdx1SrdUkK9pY9/Thqickk+nbCD0mwFg LWJ14dHkG1MgnmNKd5CyWG/XUonyqkbirpUjc/DH+WrQOSqZE1jjwkuZTjV6PhRMz0Bi xcnw== X-Received: by 10.14.225.73 with SMTP id y49mr34424676eep.43.1399920726489; Mon, 12 May 2014 11:52:06 -0700 (PDT) Received: from hullu.lehma.com (232.9.196.88.dyn.estpak.ee. [88.196.9.232]) by mx.google.com with ESMTPSA id x45sm34698744eee.37.2014.05.12.11.52.05 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 12 May 2014 11:52:06 -0700 (PDT) Received: from igiliikur.lan (Igiliikur.local [192.168.199.65]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) (Authenticated sender: raivo) by hullu.lehma.com (Postfix) with ESMTPSA id 76401309E for ; Mon, 12 May 2014 21:52:01 +0300 (EEST) From: Raivo Hool Content-Type: multipart/mixed; boundary="Apple-Mail=_49A5D922-A971-4EE0-8104-9855616F1C2F" Subject: FreeBSD Port: print/cups-base - Avahi backend Message-Id: Date: Mon, 12 May 2014 21:51:59 +0300 To: ports@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 7.2 \(1874\)) X-Mailer: Apple Mail (2.1874) X-BeenThere: freebsd-ports@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Porting software to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2014 18:52:08 -0000 --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--