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

Collapse All | Expand All

(-)Makefile (-6 / +6 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=	4
67
PORTREVISION=	5
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 LIBPAPER LIBUSB PAM X11 XDG_OPEN
70
OPTIONS_DEFINE=		DBUS LIBPAPER LIBUSB PAM X11 XDG_OPEN
Lines 72-84 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 X11
75
OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER X11 XDG_OPEN
76
.endif
76
.endif
77
77
78
X11_DESC=		Desktop icons
78
X11_DESC=		Desktop icons
79
LIBUSB_DESC=		USB support
79
LIBUSB_DESC=		USB support
80
WEB_DESC=		Interpreters for web interfaces
80
WEB_DESC=		Interpreters for web interfaces
81
XDG_OPEN_DESC=		Build with XDG_OPEN as browser
81
XDG_OPEN_DESC=		Use xdg-open as browser
82
ZEROCONF_DESC=		Zeroconf support
82
ZEROCONF_DESC=		Zeroconf support
83
83
84
.include <bsd.port.options.mk>
84
.include <bsd.port.options.mk>
Lines 168-173 Link Here
168
. endif
168
. endif
169
169
170
. if ${PORT_OPTIONS:MXDG_OPEN}
170
. if ${PORT_OPTIONS:MXDG_OPEN}
171
# Declare a build dependency on xdg-open so that CUPS' configure
172
# script can find it.
173
BUILD_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
171
RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
174
RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
172
. endif
175
. endif
173
176
Lines 224-232 Link Here
224
	@${REINPLACE_CMD} -e 's|Darwin|FreeBSD|' \
227
	@${REINPLACE_CMD} -e 's|Darwin|FreeBSD|' \
225
		${WRKSRC}/backend/Makefile
228
		${WRKSRC}/backend/Makefile
226
.endif
229
.endif
227
.if  ${PORT_OPTIONS:MXDG_OPEN}
228
	@${REINPLACE_CMD} -e 's|htmlview|xdg-open|' ${WRKSRC}/desktop/cups.desktop.in
229
.endif
230
	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
230
	@${REINPLACE_CMD} -e '/SILENT/d' ${WRKSRC}/Makedefs.in
231
	@${REINPLACE_CMD} -e 's|/etc/cups|${LOCALBASE}/etc/cups|g' ${WRKSRC}/man/*.man*
231
	@${REINPLACE_CMD} -e 's|/etc/cups|${LOCALBASE}/etc/cups|g' ${WRKSRC}/man/*.man*
232
	@${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
232
	@${REINPLACE_CMD} -e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
(-)pkg-plist (-4 / +4 lines)
Lines 640-649 Link Here
640
%%DOCSDIR%%/ru/index.html
640
%%DOCSDIR%%/ru/index.html
641
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ulpt-cupsd.conf
641
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/ulpt-cupsd.conf
642
share/applications/cups.desktop
642
share/applications/cups.desktop
643
%%ICONS%%share/icons/hicolor/128x128/apps/cups.png
643
%%X11%%/icons/hicolor/128x128/apps/cups.png
644
%%ICONS%%share/icons/hicolor/16x16/apps/cups.png
644
%%X11%%share/icons/hicolor/16x16/apps/cups.png
645
%%ICONS%%share/icons/hicolor/32x32/apps/cups.png
645
%%X11%%share/icons/hicolor/32x32/apps/cups.png
646
%%ICONS%%share/icons/hicolor/64x64/apps/cups.png
646
%%X11%%share/icons/hicolor/64x64/apps/cups.png
647
share/locale/ca/cups_ca.po
647
share/locale/ca/cups_ca.po
648
share/locale/cs/cups_cs.po
648
share/locale/cs/cups_cs.po
649
share/locale/de/cups_de.po
649
share/locale/de/cups_de.po

Return to bug 198777