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

Collapse All | Expand All

(-)./Makefile (-92 / +67 lines)
Lines 46-84 Link Here
46
46
47
CUPSSYSGRP=	wheel
47
CUPSSYSGRP=	wheel
48
# GROUPS/USERS does not work here
48
# GROUPS/USERS does not work here
49
GROUPS=	cups
49
GROUPS=		cups
50
USERS=		cups
50
USERS=		cups
51
51
52
# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
52
# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
53
.if defined(CUPS_CLIENT)
53
54
PORTREVISION=	2
55
LICENSE=	LGPL21
56
CUPS_SUFFIX=	-client
57
OPTIONS_SINGLE=		SSL
54
OPTIONS_SINGLE=		SSL
58
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
55
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
59
OPTIONS_DEFAULT=	OPENSSL
56
OPTIONS_DEFAULT=	OPENSSL
60
OPTIONS_SUB=		yes
57
OPTIONS_SUB=		yes
58
59
.if defined(CUPS_CLIENT)
60
PORTREVISION=		2
61
LICENSE=		LGPL21
62
CUPS_SUFFIX=		-client
61
.elif defined(CUPS_IMAGE)
63
.elif defined(CUPS_IMAGE)
62
PORTREVISION=	1
64
PORTREVISION=		1
63
CUPS_SUFFIX=	-image
65
CUPS_SUFFIX=		-image
64
LICENSE=	LGPL21
66
LICENSE=		LGPL21
65
OPTIONS_SINGLE=		SSL
66
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
67
OPTIONS_DEFAULT=	OPENSSL
68
OPTIONS_SUB=		yes
69
.else
67
.else
70
PORTREVISION=	2
68
PORTREVISION=		2
71
CUPS_SUFFIX=	-base
69
CUPS_SUFFIX=		-base
72
# No DOCS option.  Files are needed by web interface.
70
# No DOCS option.  Files are needed by web interface.
73
OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
71
OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
74
OPTIONS_GROUP=		WEB
72
OPTIONS_GROUP=		WEB
75
OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
73
OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
76
OPTIONS_SINGLE=		SSL
77
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
78
OPTIONS_RADIO=		ZEROCONF
74
OPTIONS_RADIO=		ZEROCONF
79
OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
75
OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
80
OPTIONS_DEFAULT=	LIBPAPER MDNSRESPONDER OPENSSL ICONS
76
OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS
81
OPTIONS_SUB=		yes
82
.endif
77
.endif
83
78
84
ICONS_DESC=		Desktop icons
79
ICONS_DESC=		Desktop icons
Lines 87-93 Link Here
87
XDG_OPEN_DESC=		Build with XDG_OPEN as browser
82
XDG_OPEN_DESC=		Build with XDG_OPEN as browser
88
ZEROCONF_DESC=		Zeroconf support
83
ZEROCONF_DESC=		Zeroconf support
89
84
90
.include <bsd.port.options.mk>
85
GNUTLS_CONFIGURE_ARGS=	--disable-openssl --enable-gnutls
86
GNUTLS_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt\
87
			libgnutls.so:${PORTSDIR}/security/gnutls
88
OPENSSL_USE=		OPENSSL=yes
89
OPENSSL_CONFIGURE_ARGS=	--disable-gnutls --enable-openssl
90
91
DBUS_CONFIGURE_ENABLE=	dbus
92
DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
93
PYTHON_CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}
94
PYTHON_USE=		python=yes
95
LIBPAPER_CONFIGURE_ARGS=--enable-libpaper
96
LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
97
PAM_CONFIGURE_ENABLE=	pam
91
98
92
.if defined(CUPS_CLIENT)
99
.if defined(CUPS_CLIENT)
93
COMMENT2=	Library cups
100
COMMENT2=	Library cups
Lines 131-227 Link Here
131
CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
138
CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
132
.endif
139
.endif
133
140
134
.if ${PORT_OPTIONS:MGNUTLS}
135
CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
136
LIB_DEPENDS+=		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
137
			libgnutls.so:${PORTSDIR}/security/gnutls
138
.endif
139
140
.if ${PORT_OPTIONS:MOPENSSL}
141
USE_OPENSSL=		yes
142
CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
143
.endif
144
145
# Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it
141
# Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it
146
# will set the path of the interpreter to "no" and set it's existence to TRUE.
142
# will set the path of the interpreter to "no" and set it's existence to TRUE.
147
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MJAVA}
143
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
148
CONFIGURE_ARGS+=	--with-java=${JAVA}
144
JAVA_CONFIGURE_ARGS=		--with-java=${JAVA}
149
USE_JAVA=		yes
145
JAVA_USE=			JAVA=yes
150
.endif
146
PERL_CONFIGURE_ARGS=		--with-perl=${PERL}
151
147
PERL_USE=			perl5=yes
152
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPERL}
148
PYTHON_CONFIGURE_ARGS=		--with-python=${PYTHON_CMD}
153
CONFIGURE_ARGS+=	--with-perl=${PERL}
149
PYTHON_USE=			python=yes
154
USES+=			perl5
150
LIBPAPER_CONFIGURE_ARGS=	--enable-libpaper
155
.endif
151
LIBPAPER_LIB_DEPENDS=		libpaper.so:${PORTSDIR}/print/libpaper
156
152
XDG_OPEN_RUN_DEPENDS=		xdg-open:${PORTSDIR}/devel/xdg-utils
157
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPHP}
153
LIBUSB_CONFIGURE_ENABLE=	libusb
158
CONFIGURE_ARGS+=	--with-php=${LOCALBASE}/bin/php-cgi
154
ICONS_CONFIGURE_ARGS=		--with-icondir=${PREFIX}/share/icons
159
USE_PHP=		yes
155
SUB_FILES+=			ulpt-cupsd.conf ulpt-cupsd.sh
160
USE_PHP_BUILD=		yes
161
WANT_PHP_CGI=		yes
162
.endif
163
156
164
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPYTHON}
157
.include <bsd.port.options.mk>
165
CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
166
USES+=			python
167
.endif
168
169
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBPAPER}
170
CONFIGURE_ARGS+=	--enable-libpaper
171
LIB_DEPENDS+=		libpaper.so:${PORTSDIR}/print/libpaper
172
.endif
173
174
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}
175
LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
176
CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include
177
CONFIGURE_ARGS+=	--disable-avahi
178
SUB_LIST+=		ZEROCONF="mdnsd"
179
.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MAVAHI}
180
CONFIGURE_ARGS+=	--enable-avahi
181
LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
182
SUB_LIST+=		ZEROCONF="avahi_daemon"
183
.else
184
CONFIGURE_ARGS+=	--disable-dnssd
185
CONFIGURE_ARGS+=	--disable-avahi
186
SUB_LIST+=		ZEROCONF=""
187
.endif
188
158
189
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM}
159
.if ${PORT_OPTIONS:MPHP}
190
CONFIGURE_ARGS+=	--enable-pam
160
CONFIGURE_ARGS+=		--with-php=${LOCALBASE}/bin/php-cgi
191
.else
161
USE_PHP=			yes
192
CONFIGURE_ARGS+=	--disable-pam
162
USE_PHP_BUILD=			yes
163
WANT_PHP_CGI=			yes
193
.endif
164
.endif
194
165
195
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MDBUS}
166
.if ${PORT_OPTIONS:MMDNSRESPONDER}
196
LIB_DEPENDS+=		libdbus-1.so:${PORTSDIR}/devel/dbus
167
LIB_DEPENDS+=			libdns_sd.so:${PORTSDIR}/net/mDNSResponder
197
CONFIGURE_ARGS+=	--enable-dbus
168
CONFIGURE_ARGS+=		--with-dnssd-includes=${LOCALBASE}/include\
169
				--disable-avahi
170
SUB_LIST=			ZEROCONF="mdnsd"
171
.elif ${PORT_OPTIONS:MAVAHI}
172
CONFIGURE_ARGS+=		--enable-avahi
173
LIB_DEPENDS+=			libavahi-client.so:${PORTSDIR}/net/avahi-app
174
_SUB_LIST+=			ZEROCONF="avahi_daemon"
198
.else
175
.else
199
CONFIGURE_ARGS+=	--disable-dbus
176
CONFIGURE_ARGS+=		--disable-dnssd --disable-avahi
177
SUB_LIST+=			ZEROCONF=""
200
.endif
178
.endif
201
179
202
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXDG_OPEN}
180
.if ${PORT_OPTIONS:MICONS}
203
RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
181
INSTALLS_ICONS=			yes	# gnome icons
204
.endif
182
.endif
205
183
206
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB}
207
CONFIGURE_ARGS+=	--enable-libusb
208
.else
209
CONFIGURE_ARGS+=	--disable-libusb
210
.endif
184
.endif
211
185
212
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MICONS}
186
.include <bsd.port.pre.mk>
213
INSTALLS_ICONS=	yes
214
CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
215
.endif
216
187
217
.if ${OSVERSION} < 1000036 && ${ARCH} == i386
188
.if ${OSVERSION} < 1000036 && ${ARCH} == i386
218
LIBS+=		-lssp_nonshared
189
LIBS+=		-lssp_nonshared
219
.endif
190
.endif
220
191
221
.if ! defined(CUPS_CLIENT) && ! defined(CUPS_IMAGE)
222
SUB_FILES+=	ulpt-cupsd.conf ulpt-cupsd.sh
223
.endif
224
225
post-patch:
192
post-patch:
226
.if ${ARCH} == "amd64"
193
.if ${ARCH} == "amd64"
227
	@${REINPLACE_CMD} -e 's|@PIEFLAGS@||' ${WRKSRC}/Makedefs.in
194
	@${REINPLACE_CMD} -e 's|@PIEFLAGS@||' ${WRKSRC}/Makedefs.in
Lines 239-244 Link Here
239
		-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
206
		-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
240
		-e 's|-D_LARGEFILE64_SOURCE||g' \
207
		-e 's|-D_LARGEFILE64_SOURCE||g' \
241
		${WRKSRC}/${CONFIGURE_SCRIPT}
208
		${WRKSRC}/${CONFIGURE_SCRIPT}
209
	@${REINPLACE_CMD} -e 's|\.default|.sample|'\
210
		${WRKSRC}/cgi-bin/admin.c\
211
		${WRKSRC}/CHANGES-1.3.txt\
212
		${WRKSRC}/conf/Makefile\
213
		${WRKSRC}/packaging/cups.list.in\
214
		${WRKSRC}/packaging/cups.spec\
215
		${WRKSRC}/packaging/cups.spec.in
216
242
.if defined(CUPS_CLIENT)
217
.if defined(CUPS_CLIENT)
243
	@${REINPLACE_CMD} \
218
	@${REINPLACE_CMD} \
244
		-e 's|cups test|cups|' \
219
		-e 's|cups test|cups|' \
(-)./pkg-plist (-4 / +1 lines)
Lines 13-21 Link Here
13
@sample %%ETCDIR%%/mime.convs.sample
13
@sample %%ETCDIR%%/mime.convs.sample
14
@sample %%ETCDIR%%/mime.types.sample
14
@sample %%ETCDIR%%/mime.types.sample
15
@sample %%ETCDIR%%/snmp.conf.sample
15
@sample %%ETCDIR%%/snmp.conf.sample
16
%%PAM%%@unexec if cmp -s %D/etc/pam.d/cups.default %D/etc/pam.d/cups; then rm -f %D/etc/pam.d/cups ; fi
16
%%PAM%%@sample etc/pam.d/cups.sample
17
%%PAM%%etc/pam.d/cups.default
18
%%PAM%%@exec if [ ! -f %D/etc/pam.d/cups ] ; then cp -p %D/%F %B/cups; fi
19
bin/cancel
17
bin/cancel
20
bin/cupstestdsc
18
bin/cupstestdsc
21
bin/cupstestppd
19
bin/cupstestppd
Lines 34-40 Link Here
34
bin/ppdi
32
bin/ppdi
35
bin/ppdmerge
33
bin/ppdmerge
36
bin/ppdpo
34
bin/ppdpo
37
etc/cups/cupsd.conf.default
38
include/cups/cgi.h
35
include/cups/cgi.h
39
include/cups/help-index.h
36
include/cups/help-index.h
40
include/cups/mime.h
37
include/cups/mime.h

Return to bug 194854