Index: Makefile
===================================================================
--- Makefile	(revision 408814)
+++ Makefile	(working copy)
@@ -64,18 +64,18 @@
 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 @@
 PLIST_SUB+=		LIBUSB="@comment "
 . endif
 
-. if ${PORT_OPTIONS:MICONS}
+. if ${PORT_OPTIONS:MX11}
 INSTALLS_ICONS=	yes
 CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
 . endif