Attachment 149579 Details for Bug 194854 – cups-base.patch3

[patch] cups-base.patch3

cups-base.patch3 (text/plain), 7.59 KB, created by takefu on 2014-11-19 05:29:24 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-11-19 05:29:24 UTC

Size: 7.59 KB

patch

obsolete

>diff -ruN /usr/ports/print/cups-base/Makefile ./Makefile
>--- /usr/ports/print/cups-base/Makefile	2014-11-07 22:03:09.000000000 +0900
>+++ ./Makefile	2014-11-19 14:15:47.000000000 +0900
>@@ -46,39 +46,34 @@
> 
> CUPSSYSGRP=	wheel
> # GROUPS/USERS does not work here
>-GROUPS=	cups
>+GROUPS=		cups
> 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
>+PORTREVISION=		1
>+CUPS_SUFFIX=		-image
>+LICENSE=		LGPL21
> .else
>-PORTREVISION=	2
>-CUPS_SUFFIX=	-base
>+PORTREVISION=		2
>+CUPS_SUFFIX=		-base
> # No DOCS option.  Files are needed by web interface.
> 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 OPENSSL ICONS
>-OPTIONS_SUB=		yes
>+OPTIONS_DEFAULT+=	LIBPAPER MDNSRESPONDER ICONS
> .endif
> 
> ICONS_DESC=		Desktop icons
>@@ -87,7 +82,19 @@
> XDG_OPEN_DESC=		Build with XDG_OPEN as browser
> ZEROCONF_DESC=		Zeroconf support
> 
>-.include <bsd.port.options.mk>
>+GNUTLS_CONFIGURE_ARGS=	--disable-openssl --enable-gnutls
>+GNUTLS_LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt\
>+			libgnutls.so:${PORTSDIR}/security/gnutls
>+OPENSSL_USE=		OPENSSL=yes
>+OPENSSL_CONFIGURE_ARGS=	--disable-gnutls --enable-openssl
>+
>+DBUS_CONFIGURE_ENABLE=	dbus
>+DBUS_LIB_DEPENDS=	libdbus-1.so:${PORTSDIR}/devel/dbus
>+PYTHON_CONFIGURE_ARGS=	--with-python=${PYTHON_CMD}
>+PYTHON_USE=		python=yes
>+LIBPAPER_CONFIGURE_ARGS=--enable-libpaper
>+LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
>+PAM_CONFIGURE_ENABLE=	pam
> 
> .if defined(CUPS_CLIENT)
> COMMENT2=	Library cups
>@@ -131,97 +138,57 @@
> CONFIGURE_ARGS+=	--with-printcap=${PREFIX}/etc/printcap
> .endif
> 
>-.if ${PORT_OPTIONS:MGNUTLS}
>-CONFIGURE_ARGS+=	--disable-openssl --enable-gnutls
>-LIB_DEPENDS+=		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
>-			libgnutls.so:${PORTSDIR}/security/gnutls
>-.endif
>-
>-.if ${PORT_OPTIONS:MOPENSSL}
>-USE_OPENSSL=		yes
>-CONFIGURE_ARGS+=	--disable-gnutls --enable-openssl
>-.endif
>-
> # 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) && ${PORT_OPTIONS:MJAVA}
>-CONFIGURE_ARGS+=	--with-java=${JAVA}
>-USE_JAVA=		yes
>-.endif
>-
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPERL}
>-CONFIGURE_ARGS+=	--with-perl=${PERL}
>-USES+=			perl5
>-.endif
>-
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPHP}
>-CONFIGURE_ARGS+=	--with-php=${LOCALBASE}/bin/php-cgi
>-USE_PHP=		yes
>-USE_PHP_BUILD=		yes
>-WANT_PHP_CGI=		yes
>-.endif
>+.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE)
>+JAVA_CONFIGURE_ARGS=		--with-java=${JAVA}
>+JAVA_USE=			JAVA=yes
>+PERL_CONFIGURE_ARGS=		--with-perl=${PERL}
>+PERL_USE=			perl5=yes
>+PYTHON_CONFIGURE_ARGS=		--with-python=${PYTHON_CMD}
>+PYTHON_USE=			python=yes
>+LIBPAPER_CONFIGURE_ARGS=	--enable-libpaper
>+LIBPAPER_LIB_DEPENDS=		libpaper.so:${PORTSDIR}/print/libpaper
>+XDG_OPEN_RUN_DEPENDS=		xdg-open:${PORTSDIR}/devel/xdg-utils
>+LIBUSB_CONFIGURE_ENABLE=	libusb
>+ICONS_CONFIGURE_ARGS=		--with-icondir=${PREFIX}/share/icons
>+SUB_FILES+=			ulpt-cupsd.conf ulpt-cupsd.sh
> 
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPYTHON}
>-CONFIGURE_ARGS+=	--with-python=${PYTHON_CMD}
>-USES+=			python
>-.endif
>-
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBPAPER}
>-CONFIGURE_ARGS+=	--enable-libpaper
>-LIB_DEPENDS+=		libpaper.so:${PORTSDIR}/print/libpaper
>-.endif
>-
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${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 !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${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
>+.include <bsd.port.options.mk>
> 
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MPAM}
>-CONFIGURE_ARGS+=	--enable-pam
>-.else
>-CONFIGURE_ARGS+=	--disable-pam
>+.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 !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MDBUS}
>-LIB_DEPENDS+=		libdbus-1.so:${PORTSDIR}/devel/dbus
>-CONFIGURE_ARGS+=	--enable-dbus
>+.if ${PORT_OPTIONS:MMDNSRESPONDER}
>+LIB_DEPENDS+=			libdns_sd.so:${PORTSDIR}/net/mDNSResponder
>+CONFIGURE_ARGS+=		--with-dnssd-includes=${LOCALBASE}/include\
>+				--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-dbus
>+CONFIGURE_ARGS+=		--disable-dnssd --disable-avahi
>+SUB_LIST+=			ZEROCONF=""
> .endif
> 
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MXDG_OPEN}
>-RUN_DEPENDS+=		xdg-open:${PORTSDIR}/devel/xdg-utils
>+.if ${PORT_OPTIONS:MICONS}
>+INSTALLS_ICONS=			yes	# gnome icons
> .endif
> 
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MLIBUSB}
>-CONFIGURE_ARGS+=	--enable-libusb
>-.else
>-CONFIGURE_ARGS+=	--disable-libusb
> .endif
> 
>-.if !defined(CUPS_CLIENT) && !defined(CUPS_IMAGE) && ${PORT_OPTIONS:MICONS}
>-INSTALLS_ICONS=	yes
>-CONFIGURE_ARGS+=	--with-icondir=${PREFIX}/share/icons
>-.endif
>+.include <bsd.port.pre.mk>
> 
> .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
>@@ -239,6 +206,14 @@
> 		-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|' \
>diff -ruN /usr/ports/print/cups-base/pkg-plist ./pkg-plist
>--- /usr/ports/print/cups-base/pkg-plist	2014-11-13 16:41:17.000000000 +0900
>+++ ./pkg-plist	2014-11-19 10:58:15.000000000 +0900
>@@ -13,9 +13,7 @@
> @sample %%ETCDIR%%/mime.convs.sample
> @sample %%ETCDIR%%/mime.types.sample
> @sample %%ETCDIR%%/snmp.conf.sample
>-%%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
>-%%PAM%%etc/pam.d/cups.default
>-%%PAM%%@exec if [ ! -f %D/etc/pam.d/cups ] ; then cp -p %D/%F %B/cups; fi
>+%%PAM%%@sample etc/pam.d/cups.sample
> bin/cancel
> bin/cupstestdsc
> bin/cupstestppd
>@@ -34,7 +32,6 @@
> bin/ppdi
> bin/ppdmerge
> bin/ppdpo
>-etc/cups/cupsd.conf.default
> include/cups/cgi.h
> include/cups/help-index.h
> include/cups/mime.h

Actions: View | Diff

Attachments on bug 194854: 149110 | 149276 | 149579 | 149663 | 149923