From owner-svn-ports-all@FreeBSD.ORG Mon May 19 19:09:08 2014 Return-Path: Delivered-To: svn-ports-all@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 DC009122; Mon, 19 May 2014 19:09:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id BCB352BC5; Mon, 19 May 2014 19:09:08 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4JJ98B9061992; Mon, 19 May 2014 19:09:08 GMT (envelope-from pi@svn.freebsd.org) Received: (from pi@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4JJ98WK061989; Mon, 19 May 2014 19:09:08 GMT (envelope-from pi@svn.freebsd.org) Message-Id: <201405191909.s4JJ98WK061989@svn.freebsd.org> From: Kurt Jaeger Date: Mon, 19 May 2014 19:09:08 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354583 - in head/print/cups-base: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 19 May 2014 19:09:09 -0000 Author: pi Date: Mon May 19 19:09:07 2014 New Revision: 354583 URL: http://svnweb.freebsd.org/changeset/ports/354583 QAT: https://qat.redports.org/buildarchive/r354583/ Log: print/cups-base: unbreak AVAHI option and add missing rc script - Add missing rc script for cups-browsed [1] - Enable building CUPS with native Avahi backend [2] - Disable AVAHI if not selected [3] PR: ports/188550 [1], ports/189757 [2], ports/188751 [3] Submitted by: Rafael Ostertag [1], Raivo Hool [2], Dan Lukes [3] Approved by: culot (mentor) Added: head/print/cups-base/files/cups_browsed.in (contents, props changed) Modified: head/print/cups-base/Makefile head/print/cups-base/pkg-plist Modified: head/print/cups-base/Makefile ============================================================================== --- head/print/cups-base/Makefile Mon May 19 19:04:19 2014 (r354582) +++ head/print/cups-base/Makefile Mon May 19 19:09:07 2014 (r354583) @@ -104,7 +104,7 @@ LIB_DEPENDS+= libcups.so:${PORTSDIR}/${P BUILD_DEPENDS+= cups-client${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-client BUILD_DEPENDS+= cups-image${PKGNAMESUFFIX2}>=${PORTVERSION}:${PORTSDIR}/${PKGCATEGORY}/cups-image COMMENT2= Server -USE_RC_SUBR= cupsd +USE_RC_SUBR= cupsd cups_browsed PLIST_SUB+= CACHEDIR="${CUPS_CACHEDIR}" .if ${ARCH} == "ia64" BROKEN= stack-protector not supported on ia64 @@ -156,16 +156,15 @@ IGNORE= You must select one and only o .endif LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include -PLIST_SUB+= WITH_MDNSRESPONDER="" +PLIST_SUB+= MDNSRESPONDER="" DNSSD="@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+= MDNSRESPONDER="@comment " DNSSD="" .else CONFIGURE_ARGS+= --disable-dnssd -PLIST_SUB+= WITH_MDNSRESPONDER="@comment " +CONFIGURE_ARGS+= --disable-avahi +PLIST_SUB+= MDNSRESPONDER="@comment " DNSSD="@comment " .endif .if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM} @@ -289,8 +288,11 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/cups/libcups.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_MAN} ${WRKSRC}/man/cups-config.man ${STAGEDIR}${PREFIX}/man/man1/cups-config.1 .elif defined(CUPS_IMAGE) - ${INSTALL_DATA} ${WRKSRC}/cups/raster.h ${STAGEDIR}${PREFIX}/include/cups + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcupsimage.so.2 .else + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcupscgi.so.1 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcupsppdc.so.1 + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libcupsmime.so.1 .if ${PORT_OPTIONS:MGHOSTSCRIPT} || ${PORT_OPTIONS:MXPDF} ${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${STAGEDIR}${PREFIX}/libexec/cups/filter/ .endif Added: head/print/cups-base/files/cups_browsed.in ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/print/cups-base/files/cups_browsed.in Mon May 19 19:09:07 2014 (r354583) @@ -0,0 +1,29 @@ +#!/bin/sh + +# $FreeBSD$ +# +# PROVIDE: cups_browsed +# REQUIRE: LOGIN +# KEYWORD: shutdown +# +# Add the following to /etc/rc.conf[.local] to enable this service +# +# cups_browsed_enable (bool): Set to NO by default. +# Set it to YES to enable cups_browsed. +# + +. /etc/rc.subr + +name=cups_browsed +rcvar=cups_browsed_enable + +load_rc_config ${name} + + : ${cups_browsed_enable:=NO} + +command=/usr/sbin/daemon +pidfile=/var/run/cups-browsed.pid +command_args="-p ${pidfile} %%PREFIX%%/sbin/cups-browsed" +procname="%%PREFIX%%/sbin/cups-browsed" + +run_rc_command "$1" Modified: head/print/cups-base/pkg-plist ============================================================================== --- head/print/cups-base/pkg-plist Mon May 19 19:04:19 2014 (r354582) +++ head/print/cups-base/pkg-plist Mon May 19 19:09:07 2014 (r354583) @@ -83,8 +83,9 @@ libexec/cups/backend/lpd libexec/cups/backend/snmp libexec/cups/backend/socket libexec/cups/backend/usb -%%WITH_MDNSRESPONDER%%libexec/cups/backend/dnssd -%%WITH_MDNSRESPONDER%%libexec/cups/backend/mdns +%%DNSSD%%libexec/cups/backend/dnssd +%%MDNSRESPONDER%%libexec/cups/backend/dnssd +%%MDNSRESPONDER%%libexec/cups/backend/mdns libexec/cups/cgi-bin/admin.cgi libexec/cups/cgi-bin/classes.cgi libexec/cups/cgi-bin/help.cgi @@ -1020,7 +1021,6 @@ share/locale/ru/cups_ru.po @dirrm libexec/cups/notifier @dirrm libexec/cups/monitor @exec mkdir -p %D/libexec/cups/driver -@dirrmtry include/cups @dirrmtry libexec/cups/driver @dirrmtry libexec/cups/daemon @dirrmtry libexec/cups/cgi-bin