diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2016-02-13 22:35:49 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-02-13 22:35:49 +0000 |
| commit | 16d6bc5cf44ae6915754d302f54d897452e49bf8 (patch) | |
| tree | e1ffe5ff3b4afe4109ba4df462f8c5ec65308c40 /print | |
| parent | ba6c7d7ced403109a7d40c3bc40c57f289f01ec6 (diff) | |
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
Notes
Notes:
svn path=/head/; revision=408833
Diffstat (limited to 'print')
| -rw-r--r-- | print/cups-base/Makefile | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/print/cups-base/Makefile b/print/cups-base/Makefile index d3a66acbb7be..d3a82c289b31 100644 --- a/print/cups-base/Makefile +++ b/print/cups-base/Makefile @@ -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 |