Attachment 140627 Details for Bug 187277 – glib-networking-2.36.2.patch

[patch] glib-networking-2.36.2.patch

glib-networking-2.36.2.patch (text/plain), 3.70 KB, created by Dmitry Marakasov on 2014-03-05 10:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dmitry Marakasov

Created: 2014-03-05 10:20:01 UTC

Size: 3.70 KB

patch

obsolete

>diff -ruN /usr/ports/net/glib-networking/Makefile ./Makefile
>--- /usr/ports/net/glib-networking/Makefile	2013-09-21 02:10:23.000000000 +0400
>+++ ./Makefile	2014-03-05 14:13:31.758413446 +0400
>@@ -4,6 +4,7 @@
> 
> PORTNAME=	glib-networking
> PORTVERSION=	2.36.2
>+PORTREVISION=	1
> CATEGORIES=	net
> MASTER_SITES=	GNOME
> DIST_SUBDIR=	gnome2
>@@ -11,14 +12,9 @@
> MAINTAINER=	gnome@FreeBSD.org
> COMMENT=	Network-related giomodules for glib
> 
>-BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
>-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
>-LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
>-		gcrypt:${PORTSDIR}/security/libgcrypt \
>-		dbus-1:${PORTSDIR}/devel/dbus \
>-		proxy:${PORTSDIR}/net/libproxy
>-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss \
>-		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
>+BUILD_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
>+LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
>+RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
> 
> USE_XZ=		yes
> GNU_CONFIGURE=	yes
>@@ -28,7 +24,23 @@
> CPPFLAGS+=	-I${LOCALBASE}/include
> LDFLAGS+=	-L${LOCALBASE}/lib
> 
>-NO_STAGE=	yes
>+OPTIONS_DEFINE=	GNUTLS PKCS11 PROXY GNOME_PROXY
>+OPTIONS_DEFAULT=GNUTLS PKCS11 PROXY GNOME_PROXY
>+OPTIONS_SUB=	yes
>+
>+GNUTLS_LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls
>+GNUTLS_CONFIGURE_WITH=	gnutls
>+PKCS11_DESC=		Enable PKCS11 support (requires GNUTLS)
>+PKCS11_LIB_DEPENDS=	p11-kit:${PORTSDIR}/security/p11-kit \
>+			libgnutls.so:${PORTSDIR}/security/gnutls
>+PKCS11_CONFIGURE_WITH=	pkcs11
>+PROXY_LIB_DEPENDS=	libproxy.so:${PORTSDIR}/net/libproxy
>+PROXY_CONFIGURE_WITH=	libproxy
>+GNOME_PROXY_DESC=	Support for GNOME proxy configuration
>+GNOME_PROXY_BUILD_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
>+GNOME_PROXY_RUN_DEPENDS=	gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
>+GNOME_PROXY_CONFIGURE_WITH=	gnome-proxy
>+
> post-patch:
> 	@${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
> 
>diff -ruN /usr/ports/net/glib-networking/pkg-plist ./pkg-plist
>--- /usr/ports/net/glib-networking/pkg-plist	2013-07-31 15:57:45.000000000 +0400
>+++ ./pkg-plist	2014-03-05 14:06:05.017443957 +0400
>@@ -1,14 +1,14 @@
>-lib/gio/modules/libgiognomeproxy.a
>-lib/gio/modules/libgiognomeproxy.la
>-lib/gio/modules/libgiognomeproxy.so
>-lib/gio/modules/libgiognutls.a
>-lib/gio/modules/libgiognutls.la
>-lib/gio/modules/libgiognutls.so
>-lib/gio/modules/libgiolibproxy.a
>-lib/gio/modules/libgiolibproxy.la
>-lib/gio/modules/libgiolibproxy.so
>-libexec/glib-pacrunner
>-share/dbus-1/services/org.gtk.GLib.PACRunner.service
>+%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.a
>+%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.la
>+%%GNOME_PROXY%%lib/gio/modules/libgiognomeproxy.so
>+%%GNUTLS%%lib/gio/modules/libgiognutls.a
>+%%GNUTLS%%lib/gio/modules/libgiognutls.la
>+%%GNUTLS%%lib/gio/modules/libgiognutls.so
>+%%PROXY%%lib/gio/modules/libgiolibproxy.a
>+%%PROXY%%lib/gio/modules/libgiolibproxy.la
>+%%PROXY%%lib/gio/modules/libgiolibproxy.so
>+%%PROXY%%libexec/glib-pacrunner
>+%%PROXY%%share/dbus-1/services/org.gtk.GLib.PACRunner.service
> share/locale/an/LC_MESSAGES/glib-networking.mo
> share/locale/ar/LC_MESSAGES/glib-networking.mo
> share/locale/as/LC_MESSAGES/glib-networking.mo
>@@ -93,5 +93,7 @@
> @dirrmtry share/locale/as
> @dirrmtry share/locale/an/LC_MESSAGES
> @dirrmtry share/locale/an
>+%%PROXY%%@dirrmtry share/dbus-1/services
>+%%PROXY%%@dirrmtry share/dbus-1
> @exec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true
> @unexec %D/bin/gio-querymodules %D/lib/gio/modules 2>/dev/null || /usr/bin/true

Actions: View | Diff

Attachments on bug 187277: 140627