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

Collapse All | Expand All

(-)./Makefile (-7 / +9 lines)
Lines 7-23 Link Here
7
CATEGORIES=	print
7
CATEGORIES=	print
8
MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
8
MASTER_SITES=	EASYSW/${PORTNAME}/${DISTVERSION}
9
PKGNAMESUFFIX=	${CUPS_SUFFIX}${PKGNAMESUFFIX2}
9
PKGNAMESUFFIX=	${CUPS_SUFFIX}${PKGNAMESUFFIX2}
10
UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
11
10
12
MAINTAINER=	ports@FreeBSD.org
11
MAINTAINER=	ports@FreeBSD.org
13
COMMENT=	Common UNIX Printing System: ${COMMENT2}
12
COMMENT=	Common UNIX Printing System: ${COMMENT2}
14
13
15
LICENSE=	GPLv2
14
LICENSE=	GPLv2
15
16
UNIQUENAME=	${PORTNAME}${PKGNAMESUFFIX}
16
CONFLICTS=	LPRng-[0-9]*
17
CONFLICTS=	LPRng-[0-9]*
17
18
18
USE_BZIP2=	yes
19
USE_BZIP2=	yes
19
USE_GMAKE=	yes
20
USE_GMAKE=	yes
20
GNU_CONFIGURE=	yes
21
GNU_CONFIGURE=	yes
22
INSTALLS_ICONS=	yes
23
USE_LDCONFIG=	yes
21
CFLAGS+=	${PTHREAD_CFLAGS}
24
CFLAGS+=	${PTHREAD_CFLAGS}
22
CPPFLAGS+=	-I${LOCALBASE}/include
25
CPPFLAGS+=	-I${LOCALBASE}/include
23
LDFLAGS+=	-L${LOCALBASE}/lib
26
LDFLAGS+=	-L${LOCALBASE}/lib
Lines 66-72 Link Here
66
.else
69
.else
67
PORTREVISION=	0
70
PORTREVISION=	0
68
CUPS_SUFFIX=	-base
71
CUPS_SUFFIX=	-base
69
CONFLICTS+=	cupsddk-*
70
OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM LDAP DBUS LIBUSB XDG_OPEN GHOSTSCRIPT XPDF AVAHI MDNSRESPONDER
72
OPTIONS_DEFINE=	GNUTLS LIBPAPER PHP PYTHON PAM LDAP DBUS LIBUSB XDG_OPEN GHOSTSCRIPT XPDF AVAHI MDNSRESPONDER
71
OPTIONS_DEFAULT=	LIBPAPER GHOSTSCRIPT
73
OPTIONS_DEFAULT=	LIBPAPER GHOSTSCRIPT
72
NO_OPTIONS_SORT=	yes
74
NO_OPTIONS_SORT=	yes
Lines 122-128 Link Here
122
PLIST_SUB+=		OVERWRITE="@comment "
124
PLIST_SUB+=		OVERWRITE="@comment "
123
CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
125
CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
124
.endif
126
.endif
125
 
127
126
.if ${PORT_OPTIONS:MGNUTLS}
128
.if ${PORT_OPTIONS:MGNUTLS}
127
CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
129
CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
128
LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
130
LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
Lines 146-152 Link Here
146
148
147
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MGHOSTSCRIPT}
149
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MGHOSTSCRIPT}
148
.if ${PORT_OPTIONS:MXPDF}
150
.if ${PORT_OPTIONS:MXPDF}
149
IGNORE=			You must select one and only one option to build pdftops
151
IGNORE=			you must select one and only one option to build pdftops
150
.endif
152
.endif
151
USE_GHOSTSCRIPT=	yes
153
USE_GHOSTSCRIPT=	yes
152
CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/bin/gs
154
CONFIGURE_ARGS+=	--enable-pdftops --with-pdftops=${LOCALBASE}/bin/gs
Lines 173-179 Link Here
173
175
174
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}
176
.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MMDNSRESPONDER}
175
.if ${PORT_OPTIONS:MAVAHI}
177
.if ${PORT_OPTIONS:MAVAHI}
176
IGNORE=			You must select one and only one option to build for Zeroconf
178
IGNORE=			you must select one and only one option to build for Zeroconf
177
.endif
179
.endif
178
LIB_DEPENDS+=		dns_sd:${PORTSDIR}/net/mDNSResponder
180
LIB_DEPENDS+=		dns_sd:${PORTSDIR}/net/mDNSResponder
179
CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include
181
CONFIGURE_ARGS+=	--with-dnssd-includes=${LOCALBASE}/include
Lines 233-239 Link Here
233
MAN1=	cups-config.1
235
MAN1=	cups-config.1
234
.elif defined(CUPS_IMAGE)
236
.elif defined(CUPS_IMAGE)
235
.else
237
.else
236
MAN1=	cancel.1 \
238
MAN1+=	cancel.1 \
237
	cupstestdsc.1 \
239
	cupstestdsc.1 \
238
	cupstestppd.1 \
240
	cupstestppd.1 \
239
	ipptool.1 \
241
	ipptool.1 \
Lines 389-395 Link Here
389
.if  ${PORT_OPTIONS:MGHOSTSCRIPT} || ${PORT_OPTIONS:MXPDF}
391
.if  ${PORT_OPTIONS:MGHOSTSCRIPT} || ${PORT_OPTIONS:MXPDF}
390
	${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${PREFIX}/libexec/cups/filter/
392
	${INSTALL_PROGRAM} ${WRKSRC}/filter/pdftops ${PREFIX}/libexec/cups/filter/
391
.endif
393
.endif
392
	${LN} -s ${PREFIX}/bin/lpr ${PREFIX}/bin/lpr-cups
394
	${LN} -sf ${PREFIX}/bin/lpr ${PREFIX}/bin/lpr-cups
393
	${INSTALL} -d ${CUPS_ETCDIR}/
395
	${INSTALL} -d ${CUPS_ETCDIR}/
394
	${CP} -p ${WRKSRC}/conf/snmp.conf ${WRKSRC}/conf/snmp.conf.N
396
	${CP} -p ${WRKSRC}/conf/snmp.conf ${WRKSRC}/conf/snmp.conf.N
395
.for f in cupsd.conf mime.convs mime.types snmp.conf
397
.for f in cupsd.conf mime.convs mime.types snmp.conf

Return to bug 174815