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]

3 files changed, 82 insertions, 115 deletions

diff --git a/accessibility/py-atspi/Makefile b/accessibility/py-atspi/Makefile
index b8daae1eaa4d..bef29481e713 100644
--- a/accessibility/py-atspi/Makefile
+++ b/accessibility/py-atspi/Makefile
@@ -1,31 +1,26 @@
-# New ports collection makefile for:   at-spi
-# Date Created:			12 April 2002
-# Whom:				Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/accessibility/py-atspi/Makefile,v 1.13 2010/11/16 11:55:55 kwm Exp $
-#
+#   $MCom: ports/trunk/accessibility/py-atspi/Makefile 18610 2013-06-30 16:33:05Z marcus $
 
 PORTNAME=	atspi
-PORTVERSION=	0.4.1
-PORTREVISION=	1
+PORTVERSION=	2.8.0
 CATEGORIES=	accessibility x11-toolkits python
 MASTER_SITES=	GNOME
-MASTER_SITE_SUBDIR=     sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITE_SUBDIR=	sources/pyatspi/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DISTNAME=	pyatspi-${PORTVERSION}
-DIST_SUBDIR=	gnome2
+DIST_SUBDIR=	gnome3
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Python API for the D-BUS based SPI framework
 
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
 RUN_DEPENDS=	${LOCALBASE}/libexec/at-spi2-registryd:${PORTSDIR}/accessibility/at-spi2-core
 
-USE_BZIP2=	yes
-USES=		gettext
-USE_GMAKE=	yes
-USE_GNOME=	gnomehack gnomehier intlhack gtk20 libxml2
+CONFLICTS=	at-spi-1.[0-9]*
+
+USE_XZ=		yes
+USES=		gettext gmake pathfix pkgconfig
+USE_GNOME=	gnomehier intlhack pygobject3
 GNU_CONFIGURE=	yes
 USE_PYTHON=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/accessibility/py-atspi/distinfo b/accessibility/py-atspi/distinfo
index dd82dbd20708..11ce72cb8fdc 100644
--- a/accessibility/py-atspi/distinfo
+++ b/accessibility/py-atspi/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/pyatspi-0.4.1.tar.bz2) = 2d9672e0ca6277c491a0b35421691d96618d9c02e687851ce418811379aa4a2e
-SIZE (gnome2/pyatspi-0.4.1.tar.bz2) = 311019
+SHA256 (gnome3/pyatspi-2.8.0.tar.xz) = f1695670f13c804898f959e3e7fc517db1c7f1079c051d10e22a35889524fd17
+SIZE (gnome3/pyatspi-2.8.0.tar.xz) = 287352
diff --git a/accessibility/py-atspi/pkg-plist b/accessibility/py-atspi/pkg-plist
index d2c66630deb8..07ef9c42e630 100644
--- a/accessibility/py-atspi/pkg-plist
+++ b/accessibility/py-atspi/pkg-plist
@@ -1,98 +1,70 @@
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/Accessibility.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/accessible.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/action.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/appevent.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/application.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/bus.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils/proxy.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/cache.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/collection.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/component.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/constants.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/deviceevent.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/document.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/editabletext.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/enum.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/factory.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hyperlink.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/hypertext.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/image.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/interfaces.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/registry.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/relation.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/role.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/selection.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/state.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/table.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/text.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/utils.pyo
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.py
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyc
-%%PYTHON_SITELIBDIR%%/pyatspi_dbus/value.pyo
-@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus/busutils
-@dirrm %%PYTHON_SITELIBDIR%%/pyatspi_dbus
+%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.py
+%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/Accessibility.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.py
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/__init__.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/action.py
+%%PYTHON_SITELIBDIR%%/pyatspi/action.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/action.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/appevent.py
+%%PYTHON_SITELIBDIR%%/pyatspi/appevent.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/appevent.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/application.py
+%%PYTHON_SITELIBDIR%%/pyatspi/application.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/application.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/collection.py
+%%PYTHON_SITELIBDIR%%/pyatspi/collection.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/collection.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/component.py
+%%PYTHON_SITELIBDIR%%/pyatspi/component.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/component.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.py
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/constants.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.py
+%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/deviceevent.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/document.py
+%%PYTHON_SITELIBDIR%%/pyatspi/document.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/document.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.py
+%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/editabletext.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/enum.py
+%%PYTHON_SITELIBDIR%%/pyatspi/enum.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/enum.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.py
+%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/hypertext.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/image.py
+%%PYTHON_SITELIBDIR%%/pyatspi/image.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/image.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/interface.py
+%%PYTHON_SITELIBDIR%%/pyatspi/interface.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/interface.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.py
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/registry.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/role.py
+%%PYTHON_SITELIBDIR%%/pyatspi/role.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/role.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/selection.py
+%%PYTHON_SITELIBDIR%%/pyatspi/selection.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/selection.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/state.py
+%%PYTHON_SITELIBDIR%%/pyatspi/state.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/state.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/table.py
+%%PYTHON_SITELIBDIR%%/pyatspi/table.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/table.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/text.py
+%%PYTHON_SITELIBDIR%%/pyatspi/text.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/text.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.py
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/utils.pyo
+%%PYTHON_SITELIBDIR%%/pyatspi/value.py
+%%PYTHON_SITELIBDIR%%/pyatspi/value.pyc
+%%PYTHON_SITELIBDIR%%/pyatspi/value.pyo
+@dirrm %%PYTHON_SITELIBDIR%%/pyatspi