Attachment #149923 for bug #194854




USERS=		cups

# UNIQUENAME must be set before bsd.port.pre.mk so OPTIONSFILE can be included
.if defined(CUPS_CLIENT)
PORTREVISION=	2
LICENSE=	LGPL21
CUPS_SUFFIX=	-client
OPTIONS_SINGLE=		SSL
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
OPTIONS_DEFAULT=	OPENSSL
OPTIONS_SUB=		yes
.if defined(CUPS_CLIENT)
PORTREVISION=	2
LICENSE=	LGPL21
CUPS_SUFFIX=	-client
.elif defined(CUPS_IMAGE)
PORTREVISION=	1
CUPS_SUFFIX=	-image
LICENSE=	LGPL21
OPTIONS_SINGLE=		SSL
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
OPTIONS_DEFAULT=	OPENSSL
OPTIONS_SUB=		yes
.else
PORTREVISION=	2
CUPS_SUFFIX=	-base

OPTIONS_DEFINE=		DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
OPTIONS_GROUP=		WEB
OPTIONS_GROUP_WEB=	JAVA PERL PHP PYTHON
OPTIONS_SINGLE=		SSL
OPTIONS_SINGLE_SSL=	GNUTLS OPENSSL
OPTIONS_RADIO=		ZEROCONF
OPTIONS_RADIO_ZEROCONF=	AVAHI MDNSRESPONDER
OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS
OPTIONS_SUB=		yes
.endif

ICONS_DESC=		Desktop icons


# Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it
# will set the path of the interpreter to "no" and set it's existence to TRUE.
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
. if ${PORT_OPTIONS:MJAVA}
CONFIGURE_ARGS+=	--with-java=${JAVA}
USE_JAVA=		yes
. endif

. if ${PORT_OPTIONS:MPERL}
CONFIGURE_ARGS+=	--with-perl=${PERL}
USES+=			perl5
. endif

. if ${PORT_OPTIONS:MPHP}
CONFIGURE_ARGS+=	--with-php=${LOCALBASE}/bin/php-cgi
USE_PHP=		yes
USE_PHP_BUILD=		yes
WANT_PHP_CGI=		yes
. endif

. if ${PORT_OPTIONS:MPYTHON}
CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
USES+=			python
. endif

. if ${PORT_OPTIONS:MLIBPAPER}
CONFIGURE_ARGS+=	--enable-libpaper
LIB_DEPENDS+=		libpaper.so:${PORTSDIR}/print/libpaper
. endif

. if ${PORT_OPTIONS:MMDNSRESPONDER}
LIB_DEPENDS+=		libdns_sd.so:${PORTSDIR}/net/mDNSResponder
CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include
CONFIGURE_ARGS+=	--disable-avahi
SUB_LIST+=		ZEROCONF="mdnsd"
. elif ${PORT_OPTIONS:MAVAHI}
CONFIGURE_ARGS+=	--enable-avahi
LIB_DEPENDS+=		libavahi-client.so:${PORTSDIR}/net/avahi-app
SUB_LIST+=		ZEROCONF="avahi_daemon"
. else
CONFIGURE_ARGS+=	--disable-dnssd
CONFIGURE_ARGS+=	--disable-avahi
SUB_LIST+=		ZEROCONF=""
. endif

. if ${PORT_OPTIONS:MPAM}
CONFIGURE_ARGS+=	--enable-pam
. else
CONFIGURE_ARGS+=	--disable-pam
. endif

. if ${PORT_OPTIONS:MDBUS}
LIB_DEPENDS+=		libdbus-1.so:${PORTSDIR}/devel/dbus
CONFIGURE_ARGS+=	--enable-dbus
. else
CONFIGURE_ARGS+=	--disable-dbus
. endif

. if ${PORT_OPTIONS:MXDG_OPEN}
RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
. endif

. if ${PORT_OPTIONS:MLIBUSB}
CONFIGURE_ARGS+=	--enable-libusb
. else
CONFIGURE_ARGS+=	--disable-libusb
. endif

. if ${PORT_OPTIONS:MICONS}
INSTALLS_ICONS=	yes
CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
. endif

SUB_FILES+=	ulpt-cupsd.conf ulpt-cupsd.sh
.endif

.if ${OSVERSION} < 1000036 && ${ARCH} == i386
LIBS+=		-lssp_nonshared
.endif

.if ! defined(CUPS_CLIENT) && ! defined(CUPS_IMAGE)
SUB_FILES+=	ulpt-cupsd.conf ulpt-cupsd.sh
.endif

post-patch:
.if ${ARCH} == "amd64"
	@${REINPLACE_CMD} -e 's|@PIEFLAGS@||' ${WRKSRC}/Makedefs.in

		-e 's|/private/etc/pam.d|${LOCALBASE}/etc/pam.d|' \
		-e 's|-D_LARGEFILE64_SOURCE||g' \
		${WRKSRC}/${CONFIGURE_SCRIPT}
	@${REINPLACE_CMD} -e 's|\.default|.sample|'\
		${WRKSRC}/cgi-bin/admin.c\
		${WRKSRC}/CHANGES-1.3.txt\
		${WRKSRC}/conf/Makefile\
		${WRKSRC}/packaging/cups.list.in\
		${WRKSRC}/packaging/cups.spec\
		${WRKSRC}/packaging/cups.spec.in
.if defined(CUPS_CLIENT)
	@${REINPLACE_CMD} \
		-e 's|cups test|cups|' \

.else
	@${REINPLACE_CMD} \
		-e 's|filter backend|backend|' \
		-e 's|/etc/pam.d|${LOCALBASE}/etc/pam.d|'\
		${WRKSRC}/Makedefs
.endif





@sample %%ETCDIR%%/mime.convs.sample
@sample %%ETCDIR%%/mime.types.sample
@sample %%ETCDIR%%/snmp.conf.sample
%%PAM%%@sample etc/pam.d/cups.sample
%%PAM%%etc/pam.d/cups.default
%%PAM%%@exec if [ ! -f %D/etc/pam.d/cups ] ; then cp -p %D/%F %B/cups; fi
bin/cancel
bin/cupstestdsc
bin/cupstestppd

bin/ppdi
bin/ppdmerge
bin/ppdpo
etc/cups/cupsd.conf.default
include/cups/cgi.h
include/cups/help-index.h
include/cups/mime.h

@dir etc/cups/interfaces
@dir etc/cups/ppd
@dir etc/cups/ssl
@dir etc/pam.d
@dir(,cups,) etc/cups
@dir libexec/cups/driver
@dir %%DATADIR%%/model

Return to bug 194854

Lines 50-71 Link Here

(-)./Makefile (-42 / +43 lines)
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)
54	PORTREVISION= 2
55	LICENSE= LGPL21
56	CUPS_SUFFIX= -client
57	OPTIONS_SINGLE= SSL	53	OPTIONS_SINGLE= SSL
58	OPTIONS_SINGLE_SSL= GNUTLS OPENSSL	54	OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
59	OPTIONS_DEFAULT= OPENSSL	55	OPTIONS_DEFAULT= OPENSSL
60	OPTIONS_SUB= yes	56	OPTIONS_SUB= yes
		57	.if defined(CUPS_CLIENT)
		58	PORTREVISION= 2
		59	LICENSE= LGPL21
		60	CUPS_SUFFIX= -client
61	.elif defined(CUPS_IMAGE)	61	.elif defined(CUPS_IMAGE)
62	PORTREVISION= 1	62	PORTREVISION= 1
63	CUPS_SUFFIX= -image	63	CUPS_SUFFIX= -image
64	LICENSE= LGPL21	64	LICENSE= LGPL21
65	OPTIONS_SINGLE= SSL
66	OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
67	OPTIONS_DEFAULT= OPENSSL
68	OPTIONS_SUB= yes
69	.else	65	.else
70	PORTREVISION= 2	66	PORTREVISION= 2
71	CUPS_SUFFIX= -base	67	CUPS_SUFFIX= -base
Lines 73-84 Link Here
73	OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN	69	OPTIONS_DEFINE= DBUS ICONS LIBPAPER LIBUSB PAM XDG_OPEN
74	OPTIONS_GROUP= WEB	70	OPTIONS_GROUP= WEB
75	OPTIONS_GROUP_WEB= JAVA PERL PHP PYTHON	71	OPTIONS_GROUP_WEB= JAVA PERL PHP PYTHON
76	OPTIONS_SINGLE= SSL
77	OPTIONS_SINGLE_SSL= GNUTLS OPENSSL
78	OPTIONS_RADIO= ZEROCONF	72	OPTIONS_RADIO= ZEROCONF
79	OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER	73	OPTIONS_RADIO_ZEROCONF= AVAHI MDNSRESPONDER
80	OPTIONS_DEFAULT= LIBPAPER MDNSRESPONDER OPENSSL ICONS	74	OPTIONS_DEFAULT+= LIBPAPER MDNSRESPONDER ICONS
81	OPTIONS_SUB= yes
82	.endif	75	.endif
83		76
84	ICONS_DESC= Desktop icons	77	ICONS_DESC= Desktop icons
Lines 144-227 Link Here
144		137
145	# Don't use CONFIGURE_ARGS+=--without-* to disable web interpreters because it	138	# 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.	139	# 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}	140	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
		141	. if ${PORT_OPTIONS:MJAVA}
148	CONFIGURE_ARGS+= --with-java=${JAVA}	142	CONFIGURE_ARGS+= --with-java=${JAVA}
149	USE_JAVA= yes	143	USE_JAVA= yes
150	.endif	144	. endif
151		145
152	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPERL}	146	. if ${PORT_OPTIONS:MPERL}
153	CONFIGURE_ARGS+= --with-perl=${PERL}	147	CONFIGURE_ARGS+= --with-perl=${PERL}
154	USES+= perl5	148	USES+= perl5
155	.endif	149	. endif
156		150
157	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPHP}	151	. if ${PORT_OPTIONS:MPHP}
158	CONFIGURE_ARGS+= --with-php=${LOCALBASE}/bin/php-cgi	152	CONFIGURE_ARGS+= --with-php=${LOCALBASE}/bin/php-cgi
159	USE_PHP= yes	153	USE_PHP= yes
160	USE_PHP_BUILD= yes	154	USE_PHP_BUILD= yes
161	WANT_PHP_CGI= yes	155	WANT_PHP_CGI= yes
162	.endif	156	. endif
163		157
164	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPYTHON}	158	. if ${PORT_OPTIONS:MPYTHON}
165	CONFIGURE_ARGS+= --with-python=${PYTHON_CMD}	159	CONFIGURE_ARGS+= --with-python=${PYTHON_CMD}
166	USES+= python	160	USES+= python
167	.endif	161	. endif
168		162
169	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBPAPER}	163	. if ${PORT_OPTIONS:MLIBPAPER}
170	CONFIGURE_ARGS+= --enable-libpaper	164	CONFIGURE_ARGS+= --enable-libpaper
171	LIB_DEPENDS+= libpaper.so:${PORTSDIR}/print/libpaper	165	LIB_DEPENDS+= libpaper.so:${PORTSDIR}/print/libpaper
172	.endif	166	. endif
173		167
174	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}	168	. if ${PORT_OPTIONS:MMDNSRESPONDER}
175	LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder	169	LIB_DEPENDS+= libdns_sd.so:${PORTSDIR}/net/mDNSResponder
176	CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include	170	CONFIGURE_ARGS+= --with-dnssd-includes=${LOCALBASE}/include
177	CONFIGURE_ARGS+= --disable-avahi	171	CONFIGURE_ARGS+= --disable-avahi
178	SUB_LIST+= ZEROCONF="mdnsd"	172	SUB_LIST+= ZEROCONF="mdnsd"
179	.elif !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MAVAHI}	173	. elif ${PORT_OPTIONS:MAVAHI}
180	CONFIGURE_ARGS+= --enable-avahi	174	CONFIGURE_ARGS+= --enable-avahi
181	LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app	175	LIB_DEPENDS+= libavahi-client.so:${PORTSDIR}/net/avahi-app
182	SUB_LIST+= ZEROCONF="avahi_daemon"	176	SUB_LIST+= ZEROCONF="avahi_daemon"
183	.else	177	. else
184	CONFIGURE_ARGS+= --disable-dnssd	178	CONFIGURE_ARGS+= --disable-dnssd
185	CONFIGURE_ARGS+= --disable-avahi	179	CONFIGURE_ARGS+= --disable-avahi
186	SUB_LIST+= ZEROCONF=""	180	SUB_LIST+= ZEROCONF=""
187	.endif	181	. endif
188		182
189	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM}	183	. if ${PORT_OPTIONS:MPAM}
190	CONFIGURE_ARGS+= --enable-pam	184	CONFIGURE_ARGS+= --enable-pam
191	.else	185	. else
192	CONFIGURE_ARGS+= --disable-pam	186	CONFIGURE_ARGS+= --disable-pam
193	.endif	187	. endif
194		188
195	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MDBUS}	189	. if ${PORT_OPTIONS:MDBUS}
196	LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus	190	LIB_DEPENDS+= libdbus-1.so:${PORTSDIR}/devel/dbus
197	CONFIGURE_ARGS+= --enable-dbus	191	CONFIGURE_ARGS+= --enable-dbus
198	.else	192	. else
199	CONFIGURE_ARGS+= --disable-dbus	193	CONFIGURE_ARGS+= --disable-dbus
200	.endif	194	. endif
201		195
202	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXDG_OPEN}	196	. if ${PORT_OPTIONS:MXDG_OPEN}
203	RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils	197	RUN_DEPENDS+= xdg-open:${PORTSDIR}/devel/xdg-utils
204	.endif	198	. endif
205		199
206	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB}	200	. if ${PORT_OPTIONS:MLIBUSB}
207	CONFIGURE_ARGS+= --enable-libusb	201	CONFIGURE_ARGS+= --enable-libusb
208	.else	202	. else
209	CONFIGURE_ARGS+= --disable-libusb	203	CONFIGURE_ARGS+= --disable-libusb
210	.endif	204	. endif
211		205
212	.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MICONS}	206	. if ${PORT_OPTIONS:MICONS}
213	INSTALLS_ICONS= yes	207	INSTALLS_ICONS= yes
214	CONFIGURE_ARGS+= --with-icondir=${PREFIX}/share/icons	208	CONFIGURE_ARGS+= --with-icondir=${PREFIX}/share/icons
		209	. endif
		210
		211	SUB_FILES+= ulpt-cupsd.conf ulpt-cupsd.sh
215	.endif	212	.endif
216		213
217	.if ${OSVERSION} < 1000036 && ${ARCH} == i386	214	.if ${OSVERSION} < 1000036 && ${ARCH} == i386
218	LIBS+= -lssp_nonshared	215	LIBS+= -lssp_nonshared
219	.endif	216	.endif
220		217
221	.if ! defined(CUPS_CLIENT) && ! defined(CUPS_IMAGE)
222	SUB_FILES+= ulpt-cupsd.conf ulpt-cupsd.sh
223	.endif
224
225	post-patch:	218	post-patch:
226	.if ${ARCH} == "amd64"	219	.if ${ARCH} == "amd64"
227	@${REINPLACE_CMD} -e 's\|@PIEFLAGS@\|\|' ${WRKSRC}/Makedefs.in	220	@${REINPLACE_CMD} -e 's\|@PIEFLAGS@\|\|' ${WRKSRC}/Makedefs.in
Lines 239-244 Link Here
239	-e 's\|/private/etc/pam.d\|${LOCALBASE}/etc/pam.d\|' \	232	-e 's\|/private/etc/pam.d\|${LOCALBASE}/etc/pam.d\|' \
240	-e 's\|-D_LARGEFILE64_SOURCE\|\|g' \	233	-e 's\|-D_LARGEFILE64_SOURCE\|\|g' \
241	${WRKSRC}/${CONFIGURE_SCRIPT}	234	${WRKSRC}/${CONFIGURE_SCRIPT}
		235	@${REINPLACE_CMD} -e 's\|\.default\|.sample\|'\
		236	${WRKSRC}/cgi-bin/admin.c\
		237	${WRKSRC}/CHANGES-1.3.txt\
		238	${WRKSRC}/conf/Makefile\
		239	${WRKSRC}/packaging/cups.list.in\
		240	${WRKSRC}/packaging/cups.spec\
		241	${WRKSRC}/packaging/cups.spec.in
242	.if defined(CUPS_CLIENT)	242	.if defined(CUPS_CLIENT)
243	@${REINPLACE_CMD} \	243	@${REINPLACE_CMD} \
244	-e 's\|cups test\|cups\|' \	244	-e 's\|cups test\|cups\|' \
Lines 277-282 Link Here
277	.else	277	.else
278	@${REINPLACE_CMD} \	278	@${REINPLACE_CMD} \
279	-e 's\|filter backend\|backend\|' \	279	-e 's\|filter backend\|backend\|' \
		280	-e 's\|/etc/pam.d\|${LOCALBASE}/etc/pam.d\|'\
280	${WRKSRC}/Makedefs	281	${WRKSRC}/Makedefs
281	.endif	282	.endif
282		283

Lines 13-21 Link Here

(-)./pkg-plist (-4 / +2 lines)
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
Lines 1014-1019 Link Here
1014	@dir etc/cups/interfaces	1011	@dir etc/cups/interfaces
1015	@dir etc/cups/ppd	1012	@dir etc/cups/ppd
1016	@dir etc/cups/ssl	1013	@dir etc/cups/ssl
		1014	@dir etc/pam.d
1017	@dir(,cups,) etc/cups	1015	@dir(,cups,) etc/cups
1018	@dir libexec/cups/driver	1016	@dir libexec/cups/driver
1019	@dir %%DATADIR%%/model	1017	@dir %%DATADIR%%/model