Attachment 168520 Details for Bug 208223 – v1

[patch] v1

cups_gnutls.diff (text/plain), 2.25 KB, created by Jan Beich on 2016-03-22 23:59:37 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2016-03-22 23:59:37 UTC

Size: 2.25 KB

patch

obsolete

>Index: print/cups/Makefile
>===================================================================
>--- print/cups/Makefile	(revision 411677)
>+++ print/cups/Makefile	(working copy)
>@@ -16,8 +16,6 @@ LICENSE_COMB=	multi
> LICENSE_FILE_GPLv2=	${WRKSRC}/LICENSE.txt
> LICENSE_FILE_LGPL20=	${WRKSRC}/LICENSE.txt
> 
>-LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
>-
> CONFLICTS=	LPRng-[0-9]*
> 
> DESTDIRNAME=	DSTROOT
>@@ -26,7 +24,6 @@ CONFIGURE_ARGS=	--disable-dnssd						\
> 		--disable-gssapi					\
> 		--disable-launchd					\
> 		--disable-systemd					\
>-		--enable-gnutls						\
> 		--with-cups-user=${USERS}				\
> 		--with-cups-group=${GROUPS}				\
> 		--with-system-groups=wheel				\
>@@ -39,6 +36,7 @@ CONFIGURE_ARGS=	--disable-dnssd						\
> 		--with-pam-module="unix"				\
> 		ac_cv_path_JAVA= ac_cv_path_PERL= ac_cv_path_PHPCGI=	\
> 		ac_cv_path_PHP= ac_cv_path_PYTHON=
>+CPPFLAGS+=	-isystem${LOCALBASE}/include # libpaper mainly
> LIBS+=		-L${LOCALBASE}/lib
> USES=		cpe gmake iconv pkgconfig tar:bzip2
> CPE_VENDOR=	apple
>@@ -49,8 +47,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
> GROUPS=		cups
> USERS=		cups
> 
>-OPTIONS_DEFINE=		AVAHI DBUS DOCS IPPTOOL LIBPAPER NLS X11
>-OPTIONS_DEFAULT=	AVAHI DBUS LIBPAPER
>+OPTIONS_DEFINE=		AVAHI DBUS DOCS GNUTLS IPPTOOL LIBPAPER NLS X11
>+OPTIONS_DEFAULT=	AVAHI DBUS GNUTLS LIBPAPER
> OPTIONS_SUB=		yes
> 
> AVAHI_LIB_DEPENDS=	libavahi-client.so:${PORTSDIR}/net/avahi-app
>@@ -63,6 +61,10 @@ DBUS_CONFIGURE_ENABLE=	dbus
> DBUS_SUB_LIST=		DBUS_DAEMON=dbus
> DBUS_SUB_LIST_OFF=	DBUS_DAEMON=
> 
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
>+GNUTLS_CONFIGURE_ON=	--enable-gnutls
>+GNUTLS_CONFIGURE_OFF=	--disable-ssl
>+
> IPPTOOL_DESC=		Internet Printing Protocol testing tool
> 
> LIBPAPER_LIB_DEPENDS=	libpaper.so:${PORTSDIR}/print/libpaper
>Index: print/cups/pkg-plist
>===================================================================
>--- print/cups/pkg-plist	(revision 411677)
>+++ print/cups/pkg-plist	(working copy)
>@@ -62,9 +62,9 @@ lib/libcupsmime.so.1
> lib/libcupsppdc.so
> lib/libcupsppdc.so.1
> libexec/cups/backend/http
>-libexec/cups/backend/https
>+%%GNUTLS%%libexec/cups/backend/https
> libexec/cups/backend/ipp
>-libexec/cups/backend/ipps
>+%%GNUTLS%%libexec/cups/backend/ipps
> libexec/cups/backend/lpd
> libexec/cups/backend/snmp
> libexec/cups/backend/socket

Flags:

tijl: maintainer-approval+

Actions: View | Diff

Attachments on bug 208223: 168520