Date: Sat, 13 Feb 2016 22:35:49 +0000 (UTC) From: Kurt Jaeger <pi@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r408833 - head/print/cups-base Message-ID: <201602132235.u1DMZndp089087@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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 <t@tobik.me> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201602132235.u1DMZndp089087>