View | Details | Raw Unified | Return to bug 190434 | Differences between
and this patch

Collapse All | Expand All

(-)Makefile (-3 / +12 lines)
Lines 64-70 Link Here
64
CUPS_SUFFIX=	-image
64
CUPS_SUFFIX=	-image
65
LICENSE=	LGPL21
65
LICENSE=	LGPL21
66
.else
66
.else
67
PORTREVISION=	3
67
PORTREVISION=	4
68
CUPS_SUFFIX=	-base
68
CUPS_SUFFIX=	-base
69
# No DOCS option.  Files are needed by web interface.
69
# No DOCS option.  Files are needed by web interface.
70
OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
70
OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
Lines 72-81 Link Here
72
OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
72
OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
73
OPTIONS_RADIO=		ZEROCONF
73
OPTIONS_RADIO=		ZEROCONF
74
OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
74
OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
75
OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS
75
OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER
76
# See PR190434: the ICONS option pulls in graphics/gtk-update-icon-cache which
77
# in turns builds X dependencies even with WITHOUT_X11 set
78
.if !defined(WITHOUT_X11)
79
OPTIONS_DEFAULT+=	ICONS
76
.endif
80
.endif
81
.endif
77
82
78
ICONS_DESC=		Desktop icons
83
84
ICONS_DESC=		Desktop icons (pulls in graphics/gtk-update-icon-cache)
79
LIBUSB_DESC=		USB support
85
LIBUSB_DESC=		USB support
80
WEB_DESC=		Interpreters for web interfaces
86
WEB_DESC=		Interpreters for web interfaces
81
XDG_OPEN_DESC=		Build with XDG_OPEN as browser
87
XDG_OPEN_DESC=		Build with XDG_OPEN as browser
Lines 180-185 Link Here
180
. endif
186
. endif
181
187
182
. if ${PORT_OPTIONS:MICONS}
188
. if ${PORT_OPTIONS:MICONS}
189
.if defined(WITHOUT_X11)
190
.error "the ICONS options cannot be used with WITHOUT_X11"
191
.endif
183
INSTALLS_ICONS=	yes
192
INSTALLS_ICONS=	yes
184
CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
193
CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
185
. endif
194
. endif

Return to bug 190434