The FreeBSD GNOME team presents a Glib and Gtk+ 3 update.

This update updates Glib20 to 2.36 and Gtk+ 3.8

* The gio-fam-backend port that used gamin for the GFileMonitor API is gone.
  It is replaced by a GIO kqueue implementation developed as part of a NetBSD
  GSoC 2011 project by Dimitry Matveev.
* Fix a bug in the glib20 Makefile so it includes -lintl in the glib-2.0
  pkgconfig file [1]. This broke static linking and newer binutils.
* Add introspection USE_GNOME component which sets GI_SCANNER_DISABLE_CACHE to
  prevent creation of /  root/.cache dir. Defaults to build & run depend,
  but :build and :run switches available.
* New x11-toolkits/pangox-compat port and companion USE_GNOME component for
  pangox support which was removed from the pango port. Add it to ports still
  using pangox API.

Exp-run by:	bapt@
PR:		ports/178958 [1]
Submitted by:	emaste@ [1]

4 files changed, 14 insertions, 9 deletions

diff --git a/net/glib-networking/Makefile b/net/glib-networking/Makefile
index 233d17e9d334..6b0a5cef401d 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/net/glib-networking/Makefile,v 1.20 2012/12/10 11:17:13 kwm Exp $
+#   $MCom: ports/trunk/net/glib-networking/Makefile 18537 2013-06-16 20:08:30Z kwm $
 
 PORTNAME=	glib-networking
-PORTVERSION=	2.34.2
-PORTREVISION=	1
+PORTVERSION=	2.36.2
 CATEGORIES=	net
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -24,9 +23,7 @@ RUN_DEPENDS=	${LOCALBASE}/share/certs/ca-root-nss.crt:${PORTSDIR}/security/ca_ro
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	gnomehack glib20 intltool
-USES=		gettext
-USE_GMAKE=	yes
-MAKE_JOBS_SAFE=	yes
+USES=		gettext gmake
 CONFIGURE_ARGS=	--with-ca-certificates=${LOCALBASE}/share/certs/ca-root-nss.crt
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/net/glib-networking/distinfo b/net/glib-networking/distinfo
index c1f8b8ccd4e6..3e11d608183e 100644
--- a/net/glib-networking/distinfo
+++ b/net/glib-networking/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-networking-2.34.2.tar.xz) = 00a92ec7b31f03a2fc1eeff568c0f1664e109b3add8c7042d2d420953f49dfde
-SIZE (gnome2/glib-networking-2.34.2.tar.xz) = 346828
+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/pkg-plist b/net/glib-networking/pkg-plist
index 37fc07295423..ee319a7ba6f9 100644
--- a/net/glib-networking/pkg-plist
+++ b/net/glib-networking/pkg-plist
@@ -9,6 +9,7 @@ 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
@@ -29,6 +30,7 @@ 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
@@ -60,6 +62,7 @@ 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
@@ -80,11 +83,15 @@ share/locale/zh_TW/LC_MESSAGES/glib-networking.mo
 @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
diff --git a/net/mtr/Makefile b/net/mtr/Makefile
index f67af5599627..9b4cc567ed75 100644
--- a/net/mtr/Makefile
+++ b/net/mtr/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	mtr
 PORTVERSION=	0.85
+PORTREVISION=	1
 CATEGORIES=	net
 MASTER_SITES=	ftp://ftp.bitwizard.nl/mtr/ \
 		LOCAL/sunpoet
@@ -27,7 +28,7 @@ PLIST_FILES=	sbin/mtr
 
 .if ${PORT_OPTIONS:MGLIB}
 CONFIGURE_ARGS+=--with-glib
-USE_GNOME=	_glib20
+USE_GNOME=	glib20
 .else
 CONFIGURE_ARGS+=--without-glib
 .endif