From owner-svn-ports-head@freebsd.org Sat Feb 13 22:35:50 2016 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6FB64AA7682; Sat, 13 Feb 2016 22:35:50 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::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 43F921EFA; Sat, 13 Feb 2016 22:35:50 +0000 (UTC) (envelope-from pi@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u1DMZnWk089088; Sat, 13 Feb 2016 22:35:49 GMT (envelope-from pi@FreeBSD.org) Received: (from pi@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u1DMZndp089087; Sat, 13 Feb 2016 22:35:49 GMT (envelope-from pi@FreeBSD.org) Message-Id: <201602132235.u1DMZndp089087@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: pi set sender to pi@FreeBSD.org using -f From: Kurt Jaeger Date: Sat, 13 Feb 2016 22:35:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408833 - head/print/cups-base X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 13 Feb 2016 22:35:50 -0000 Author: pi Date: Sat Feb 13 22:35:49 2016 New Revision: 408833 URL: https://svnweb.freebsd.org/changeset/ports/408833 Log: print/cups-base: rename ICONS option to X11 Why this change ? - When compiling print/cups-base, if WITHOUT_X11=yes is present in /etc/make.conf, CUPS still tries to update the "Icons cache". - For this, it tries to build graphics/gtk-update-icon-cache, which in turns requires graphics/cairo, but Cairo builds without X11 support as requested, and graphics/gtk-update-icon-cache fails to build because it needs X11. PR: 190434 Submitted by: Tobias Kortkamp Reported by: hjf@hjf.com.ar Modified: head/print/cups-base/Makefile Modified: head/print/cups-base/Makefile ============================================================================== --- head/print/cups-base/Makefile Sat Feb 13 22:33:53 2016 (r408832) +++ head/print/cups-base/Makefile Sat Feb 13 22:35:49 2016 (r408833) @@ -64,18 +64,18 @@ PORTREVISION= 2 CUPS_SUFFIX= -image LICENSE= LGPL21 .else -PORTREVISION= 3 +PORTREVISION= 4 CUPS_SUFFIX= -base # No DOCS option. Files are needed by web interface. -OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN +OPTIONS_DEFINE= DBUS LIBPAPER LIBUSB PAM X11 XDG_OPEN OPTIONS_GROUP= WEB OPTIONS_GROUP_WEB= JAVA PERL PHP PYTHON OPTIONS_RADIO= ZEROCONF OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER -OPTIONS_DEFAULT+= LIBPAPER MDNSRESPONDER ICONS +OPTIONS_DEFAULT+= LIBPAPER MDNSRESPONDER X11 .endif -ICONS_DESC= Desktop icons +X11_DESC= Desktop icons LIBUSB_DESC= USB support WEB_DESC= Interpreters for web interfaces XDG_OPEN_DESC= Build with XDG_OPEN as browser @@ -179,7 +179,7 @@ CONFIGURE_ARGS+= --disable-libusb PLIST_SUB+= LIBUSB="@comment " . endif -. if ${PORT_OPTIONS:MICONS} +. if ${PORT_OPTIONS:MX11} INSTALLS_ICONS= yes CONFIGURE_ARGS+= --with-icondir=${PREFIX}/share/icons . endif