Update to 2.36.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18537 df743ca5-7f9a-e211-a948-0013205c9059

6 files changed, 177 insertions, 0 deletions

diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
new file mode 100644
index 000000000..b1348d958
--- /dev/null
+++ b/net/glib-networking/Makefile
@@ -0,0 +1,36 @@
+# Created by: Koop Mast <kwm@FreeBSD.org>
+# $FreeBSD$
+#   $MCom$
+
+PORTNAME=	glib-networking
+PORTVERSION=	2.36.2
+CATEGORIES=	net
+MASTER_SITES=	GNOME
+DIST_SUBDIR=	gnome2
+
+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
+
+USE_XZ=		yes
+GNU_CONFIGURE=	yes
+USE_GNOME=	gnomehack glib20 intltool
+USES=		gettext
+USE_GMAKE=	yes
+MAKE_JOBS_SAFE=	yes
+CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
+
+post-patch:
+	@${REINPLACE_CMD} -e' s|-Wmissing-include-dirs||g' ${WRKSRC}/configure
+
+.include <bsd.port.mk>
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
new file mode 100644
index 000000000..3e11d6081
--- /dev/null
+++ b/net/glib-networking/distinfo
@@ -0,0 +1,2 @@
+SHA256 (gnome2/glib-networking-2.36.2.tar.xz) = 2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9
+SIZE (gnome2/glib-networking-2.36.2.tar.xz) = 352284
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
new file mode 100644
index 000000000..1e8f45fb0
--- /dev/null
+++ b/net/glib-networking/files/patch-tls_gnutls_gtlsclientconnection-gnutls.c
@@ -0,0 +1,21 @@
+--- tls/gnutls/gtlsclientconnection-gnutls.c.orig	2012-03-04 18:47:23.000000000 -0500
++++ tls/gnutls/gtlsclientconnection-gnutls.c	2012-03-04 18:50:26.000000000 -0500
+@@ -349,7 +349,8 @@ g_tls_client_connection_gnutls_finish_ha
+ {
+   GTlsClientConnectionGnutls *gnutls = G_TLS_CLIENT_CONNECTION_GNUTLS (conn);
+ 
+-  if (g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
++  if (inout_error &&
++      g_error_matches (*inout_error, G_TLS_ERROR, G_TLS_ERROR_NOT_TLS) &&
+       gnutls->priv->cert_requested)
+     {
+       g_clear_error (inout_error);
+@@ -361,7 +362,7 @@ g_tls_client_connection_gnutls_finish_ha
+     {
+       gnutls_datum session_data;
+ 
+-      if (!*inout_error &&
++      if (inout_error && !*inout_error &&
+ 	  gnutls_session_get_data2 (g_tls_connection_gnutls_get_session (conn),
+ 				    &session_data) == 0)
+ 	{
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c
new file mode 100644
index 000000000..728e24401
--- /dev/null
+++ b/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c
@@ -0,0 +1,11 @@
+--- tls/gnutls/gtlsconnection-gnutls.c.orig	2012-12-09 01:05:02.000000000 +0000
++++ tls/gnutls/gtlsconnection-gnutls.c	2012-12-09 01:14:46.000000000 +0000
+@@ -752,7 +752,7 @@
+   if (error)
+     {
+       g_set_error (error, G_TLS_ERROR, G_TLS_ERROR_MISC,
+-                   errmsg, gnutls_strerror (status));
++                   "%s, %s", errmsg, gnutls_strerror (status));
+     }
+   return status;
+ }
diff --git a/net/glib-networking/pkg-descr b/net/glib-networking/pkg-descr
new file mode 100644
index 000000000..550492c7b
--- /dev/null
+++ b/net/glib-networking/pkg-descr
@@ -0,0 +1,10 @@
+Network-related giomodules for glib.
+
+Glib-networking contains the implementations of certain GLib networking
+features that cannot be implemented directly in GLib itself because of their
+dependencies.
+
+Currently it contains a GNUTLS-based implementation of GTlsBackend,
+a libproxy-based implementation of GProxyResolver, and a GNOME GProxyResolver
+that uses the proxy information from the GSettings schemas in
+gsettings-desktop-schemas.
diff --git a/net/glib-networking/pkg-plist b/net/glib-networking/pkg-plist
new file mode 100644
index 000000000..ee319a7ba
--- /dev/null
+++ b/net/glib-networking/pkg-plist
@@ -0,0 +1,97 @@
+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
+share/locale/an/LC_MESSAGES/glib-networking.mo
+share/locale/ar/LC_MESSAGES/glib-networking.mo
+share/locale/as/LC_MESSAGES/glib-networking.mo
+share/locale/be/LC_MESSAGES/glib-networking.mo
+share/locale/bg/LC_MESSAGES/glib-networking.mo
+share/locale/bn_IN/LC_MESSAGES/glib-networking.mo
+share/locale/ca/LC_MESSAGES/glib-networking.mo
+share/locale/ca@valencia/LC_MESSAGES/glib-networking.mo
+share/locale/cs/LC_MESSAGES/glib-networking.mo
+share/locale/da/LC_MESSAGES/glib-networking.mo
+share/locale/de/LC_MESSAGES/glib-networking.mo
+share/locale/el/LC_MESSAGES/glib-networking.mo
+share/locale/en_CA/LC_MESSAGES/glib-networking.mo
+share/locale/en_GB/LC_MESSAGES/glib-networking.mo
+share/locale/eo/LC_MESSAGES/glib-networking.mo
+share/locale/es/LC_MESSAGES/glib-networking.mo
+share/locale/et/LC_MESSAGES/glib-networking.mo
+share/locale/eu/LC_MESSAGES/glib-networking.mo
+share/locale/fa/LC_MESSAGES/glib-networking.mo
+share/locale/fi/LC_MESSAGES/glib-networking.mo
+share/locale/fr/LC_MESSAGES/glib-networking.mo
+share/locale/fur/LC_MESSAGES/glib-networking.mo
+share/locale/gl/LC_MESSAGES/glib-networking.mo
+share/locale/gu/LC_MESSAGES/glib-networking.mo
+share/locale/he/LC_MESSAGES/glib-networking.mo
+share/locale/hi/LC_MESSAGES/glib-networking.mo
+share/locale/hu/LC_MESSAGES/glib-networking.mo
+share/locale/id/LC_MESSAGES/glib-networking.mo
+share/locale/it/LC_MESSAGES/glib-networking.mo
+share/locale/ja/LC_MESSAGES/glib-networking.mo
+share/locale/km/LC_MESSAGES/glib-networking.mo
+share/locale/kn/LC_MESSAGES/glib-networking.mo
+share/locale/ko/LC_MESSAGES/glib-networking.mo
+share/locale/lt/LC_MESSAGES/glib-networking.mo
+share/locale/lv/LC_MESSAGES/glib-networking.mo
+share/locale/ml/LC_MESSAGES/glib-networking.mo
+share/locale/mr/LC_MESSAGES/glib-networking.mo
+share/locale/nb/LC_MESSAGES/glib-networking.mo
+share/locale/nl/LC_MESSAGES/glib-networking.mo
+share/locale/or/LC_MESSAGES/glib-networking.mo
+share/locale/pa/LC_MESSAGES/glib-networking.mo
+share/locale/pl/LC_MESSAGES/glib-networking.mo
+share/locale/pt/LC_MESSAGES/glib-networking.mo
+share/locale/pt_BR/LC_MESSAGES/glib-networking.mo
+share/locale/ro/LC_MESSAGES/glib-networking.mo
+share/locale/ru/LC_MESSAGES/glib-networking.mo
+share/locale/sk/LC_MESSAGES/glib-networking.mo
+share/locale/sl/LC_MESSAGES/glib-networking.mo
+share/locale/sr/LC_MESSAGES/glib-networking.mo
+share/locale/sr@latin/LC_MESSAGES/glib-networking.mo
+share/locale/sv/LC_MESSAGES/glib-networking.mo
+share/locale/ta/LC_MESSAGES/glib-networking.mo
+share/locale/te/LC_MESSAGES/glib-networking.mo
+share/locale/tg/LC_MESSAGES/glib-networking.mo
+share/locale/th/LC_MESSAGES/glib-networking.mo
+share/locale/tr/LC_MESSAGES/glib-networking.mo
+share/locale/ug/LC_MESSAGES/glib-networking.mo
+share/locale/uk/LC_MESSAGES/glib-networking.mo
+share/locale/vi/LC_MESSAGES/glib-networking.mo
+share/locale/zh_CN/LC_MESSAGES/glib-networking.mo
+share/locale/zh_HK/LC_MESSAGES/glib-networking.mo
+share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
+@dirrmtry share/locale/fur/LC_MESSAGES
+@dirrmtry share/locale/fur
+@dirrmtry share/locale/ca@valencia/LC_MESSAGES
+@dirrmtry share/locale/ca@valencia
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as
+@dirrmtry share/locale/an/LC_MESSAGES
+@dirrmtry share/locale/an
+@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