Update to 2.6.0

* Fix some crashes in atk_bridge_adaptor_cleanup (BGO#684434).
* When the cache is activated, register it on the main D-Bus connection.
* Fix atspi_hyperlink_get_uri (BGO#683182).
* Only initialize the cache when an AT is running.
* Fix various memory leaks (BGO#683979, BGO#684077)
* Removed the gtk 3.0 module (BGO#678315).
* Don't leak a GError when option parsing fails (BGO#679296)
* Rework some inefficient code when removing clients and events (BGO#679295,
  BGO#679297).
* Implement GetLocalizedName for actions (BGO#680598)
* Allow to build out of source directory (BGO#680280).
* No need to include i18n support: There's nothing to translate here.

4 files changed, 15 insertions, 89 deletions

diff --git a/devel/at-spi2-atk/Makefile b/devel/at-spi2-atk/Makefile
index 59eee00f0c9..9fda91d8143 100644
--- a/devel/at-spi2-atk/Makefile
+++ b/devel/at-spi2-atk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2012/09/15 10:04:05 obache Exp $
+# $NetBSD: Makefile,v 1.7 2012/10/08 20:31:27 prlw1 Exp $
 #
 
-DISTNAME=	at-spi2-atk-2.5.4
-PKGREVISION=	1
+DISTNAME=	at-spi2-atk-2.6.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/at-spi2-atk/2.5/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/at-spi2-atk/2.6/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	prlw1@cam.ac.uk
@@ -17,7 +16,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 GNU_CONFIGURE=	yes
 USE_TOOLS+=     gmake intltool msgfmt pkg-config
 USE_LIBTOOL=	yes
-USE_PKGLOCALEDIR=	yes
 
 PKGCONFIG_OVERRIDE+=	atk-bridge-2.0.pc.in
 
diff --git a/devel/at-spi2-atk/PLIST b/devel/at-spi2-atk/PLIST
index 0081db874c8..ee66145222e 100644
--- a/devel/at-spi2-atk/PLIST
+++ b/devel/at-spi2-atk/PLIST
@@ -1,76 +1,6 @@
-@comment $NetBSD: PLIST,v 1.3 2012/07/04 17:45:57 prlw1 Exp $
+@comment $NetBSD: PLIST,v 1.4 2012/10/08 20:31:27 prlw1 Exp $
 include/at-spi2-atk/2.0/atk-bridge.h
 lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
-lib/gtk-3.0/modules/libatk-bridge.la
 lib/libatk-bridge-2.0.la
 lib/pkgconfig/atk-bridge-2.0.pc
 share/glib-2.0/schemas/org.a11y.atspi.gschema.xml
-share/locale/an/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ar/LC_MESSAGES/at-spi2-atk.mo
-share/locale/as/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ast/LC_MESSAGES/at-spi2-atk.mo
-share/locale/be/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bg/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/bn_IN/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ca/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ca@valencia/LC_MESSAGES/at-spi2-atk.mo
-share/locale/cs/LC_MESSAGES/at-spi2-atk.mo
-share/locale/cy/LC_MESSAGES/at-spi2-atk.mo
-share/locale/da/LC_MESSAGES/at-spi2-atk.mo
-share/locale/de/LC_MESSAGES/at-spi2-atk.mo
-share/locale/el/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en@shaw/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en_CA/LC_MESSAGES/at-spi2-atk.mo
-share/locale/en_GB/LC_MESSAGES/at-spi2-atk.mo
-share/locale/eo/LC_MESSAGES/at-spi2-atk.mo
-share/locale/es/LC_MESSAGES/at-spi2-atk.mo
-share/locale/et/LC_MESSAGES/at-spi2-atk.mo
-share/locale/eu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fa/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/fy/LC_MESSAGES/at-spi2-atk.mo
-share/locale/gl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/gu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/he/LC_MESSAGES/at-spi2-atk.mo
-share/locale/hi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/hu/LC_MESSAGES/at-spi2-atk.mo
-share/locale/id/LC_MESSAGES/at-spi2-atk.mo
-share/locale/it/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ja/LC_MESSAGES/at-spi2-atk.mo
-share/locale/km/LC_MESSAGES/at-spi2-atk.mo
-share/locale/kn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ko/LC_MESSAGES/at-spi2-atk.mo
-share/locale/lt/LC_MESSAGES/at-spi2-atk.mo
-share/locale/lv/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ml/LC_MESSAGES/at-spi2-atk.mo
-share/locale/mr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ms/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nb/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/nn/LC_MESSAGES/at-spi2-atk.mo
-share/locale/or/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pa/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pt/LC_MESSAGES/at-spi2-atk.mo
-share/locale/pt_BR/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ro/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ru/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sk/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sl/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sq/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sr@latin/LC_MESSAGES/at-spi2-atk.mo
-share/locale/sv/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ta/LC_MESSAGES/at-spi2-atk.mo
-share/locale/te/LC_MESSAGES/at-spi2-atk.mo
-share/locale/th/LC_MESSAGES/at-spi2-atk.mo
-share/locale/tr/LC_MESSAGES/at-spi2-atk.mo
-share/locale/ug/LC_MESSAGES/at-spi2-atk.mo
-share/locale/uk/LC_MESSAGES/at-spi2-atk.mo
-share/locale/uz@cyrillic/LC_MESSAGES/at-spi2-atk.mo
-share/locale/vi/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_CN/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_HK/LC_MESSAGES/at-spi2-atk.mo
-share/locale/zh_TW/LC_MESSAGES/at-spi2-atk.mo
diff --git a/devel/at-spi2-atk/distinfo b/devel/at-spi2-atk/distinfo
index 905770ca16a..d4beaa4a4e4 100644
--- a/devel/at-spi2-atk/distinfo
+++ b/devel/at-spi2-atk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2012/07/28 18:05:59 prlw1 Exp $
+$NetBSD: distinfo,v 1.5 2012/10/08 20:31:27 prlw1 Exp $
 
-SHA1 (at-spi2-atk-2.5.4.tar.xz) = 0016cb4878cb42d807faeac46a8fb77fe8bf766d
-RMD160 (at-spi2-atk-2.5.4.tar.xz) = 1bdd5be49f10b5af6b6816373ea92a93dfd3bc61
-Size (at-spi2-atk-2.5.4.tar.xz) = 303220 bytes
-SHA1 (patch-atk-adaptor_Makefile.in) = 32d73f99c20eb8fb7ca62910a1a4a5f933733775
+SHA1 (at-spi2-atk-2.6.0.tar.xz) = c582265c2eee0b33aa4c1956773b72843c204c06
+RMD160 (at-spi2-atk-2.6.0.tar.xz) = 108b1b677469530ca47f9733308b3fec188bc261
+Size (at-spi2-atk-2.6.0.tar.xz) = 274760 bytes
+SHA1 (patch-atk-adaptor_Makefile.in) = 91ea0570a8a99dfa8c06005cb8c26b161b93731c
diff --git a/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in b/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
index db0b6473d6d..ef574a0c838 100644
--- a/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
+++ b/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
@@ -1,17 +1,15 @@
-$NetBSD: patch-atk-adaptor_Makefile.in,v 1.2 2012/07/04 17:45:57 prlw1 Exp $
+$NetBSD: patch-atk-adaptor_Makefile.in,v 1.3 2012/10/08 20:31:27 prlw1 Exp $
 
-Don't install lib/gtk-2.0/modules/libatk-bridge.la so that
-we don't conflict with at-spi. (Reasonable to assume that
-at-spi2 goes with gtk3, at-spi with gtk2.)
+Assume that anyone wanting the gtk2 module will use devel/at-spi.
 
---- atk-adaptor/Makefile.in.orig	2012-06-25 23:11:54.000000000 +0000
+--- atk-adaptor/Makefile.in.orig	2012-10-07 14:22:51.000000000 +0000
 +++ atk-adaptor/Makefile.in
-@@ -357,7 +357,7 @@ target_alias = @target_alias@
+@@ -339,7 +339,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--SUBDIRS = adaptors . gtk-2.0 gtk-3.0
-+SUBDIRS = adaptors . gtk-3.0
+-SUBDIRS = adaptors . gtk-2.0
++SUBDIRS = adaptors .
  lib_LTLIBRARIES = libatk-bridge-2.0.la
  libatk_bridge_2_0_la_CFLAGS = \
  	$(DBUS_CFLAGS)    \