4 files changed, 25 insertions, 75 deletions

diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 1b32e7dfc2d1..1b7ec584ffc1 100644
--- a/net/glib-networking/Makefile
+++ b/net/glib-networking/Makefile
@@ -1,10 +1,9 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $
+#   $MCom: ports/trunk/net/glib-networking/Makefile 19944 2014-10-15 05:33:09Z gusi $
 
 PORTNAME=	glib-networking
-PORTVERSION=	2.36.2
-PORTREVISION=	4
+PORTVERSION=	2.42.0
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -12,35 +11,24 @@ 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
-RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_root_nss
-LIB_DEPENDS=	libgcrypt.so:${PORTSDIR}/security/libgcrypt
-
-GNU_CONFIGURE=	yes
-USES=		gettext gmake libtool:keepla pathfix pkgconfig tar:xz
+BUILD_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
+		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+LIB_DEPENDS=	libgnutls.so:${PORTSDIR}/security/gnutls \
+		libgcrypt.so:${PORTSDIR}/security/libgcrypt \
+		libp11-kit.so:${PORTSDIR}/security/p11-kit \
+		libdbus-1.so:${PORTSDIR}/devel/dbus \
+		libproxy.so:${PORTSDIR}/net/libproxy
+RUN_DEPENDS=	ca_root_nss>=0:${PORTSDIR}/security/ca_root_nss \
+		gsettings-desktop-schemas>=0:${PORTSDIR}/devel/gsettings-desktop-schemas
+
+USES=		gettext gmake libtool pathfix pkgconfig tar:xz
 USE_GNOME=	glib20 intltool
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+LIBS+=		-L${LOCALBASE}/lib
 INSTALL_TARGET=	install-strip
 
-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=	libp11-kit.so:${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 --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index 3e11d608183e..36e47327392d 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-networking-2.36.2.tar.xz) = 2108d55b0af3eea56ce256830bcaf1519d6337e0054ef2eff80f2c0ef0eb23f9
-SIZE (gnome2/glib-networking-2.36.2.tar.xz) = 352284
+SHA256 (gnome2/glib-networking-2.42.0.tar.xz) = 304dd9e4c0ced69094300e0b9e66cd2eaae7161b9fc3186536d11458677d820d
+SIZE (gnome2/glib-networking-2.42.0.tar.xz) = 370188
diff --git a/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c b/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c
deleted file mode 100644
index 728e24401f33..000000000000
--- a/net/glib-networking/files/patch-tls_gnutls_gtlsconnection-gnutls.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-plist b/net/glib-networking/pkg-plist
index d87dee0dfd59..4f01e8702c54 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -1,14 +1,11 @@
-%%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
+lib/gio/modules/libgiognomeproxy.a
+lib/gio/modules/libgiognomeproxy.so
+lib/gio/modules/libgiognutls.a
+lib/gio/modules/libgiognutls.so
+lib/gio/modules/libgiolibproxy.a
+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
@@ -71,29 +68,5 @@ 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
-%%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