Index: Makefile
===================================================================
--- Makefile	(revision 408814)
+++ Makefile	(working copy)
@@ -64,7 +64,7 @@
 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
@@ -72,10 +72,15 @@
 OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
 OPTIONS_RADIO=		ZEROCONF
 OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
-OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS
+OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER
+# See PR190434: the ICONS option pulls in graphics/gtk-update-icon-cache which
+# in turns builds X dependencies even with WITHOUT_X11 set
+.if !defined(WITHOUT_X11)
+OPTIONS_DEFAULT+=	ICONS
 .endif
+.endif
 
-ICONS_DESC=		Desktop icons
+ICONS_DESC=		Desktop icons (pulls in graphics/gtk-update-icon-cache)
 LIBUSB_DESC=		USB support
 WEB_DESC=		Interpreters for web interfaces
 XDG_OPEN_DESC=		Build with XDG_OPEN as browser