Update at-spi2-atk from 2.3.5 -> 2.5.2 with extra patch to avoid conflict

with at-spi-atk. It makes the assumption that at-spi2-atk is used with
gtk3 only.

2.5.2:
* Fix for bug 677211 - The collection interface's MATCH_ANY fails for states

2.3.91:
* Have GetIndexInParent() return a signed int, per the spec.
* Send a DoAction reply message before invoking atk (works around
  atk_action_do_action potentially not returning right away for gtk).

2.3.90:
* Have GrabFocus return a bool, per the spec, rather than a uint32.
* Fix a potential crash when emitting a signal if the ATK implementor
  misbehaves.

New/updated Khmer, Malayalam, Norwegian Nynorsk, Hindi translations

4 files changed, 29 insertions, 12 deletions

diff --git a/devel/at-spi2-atk/Makefile b/devel/at-spi2-atk/Makefile
index 04e0c0a7b54..f6954719f2b 100644
--- a/devel/at-spi2-atk/Makefile
+++ b/devel/at-spi2-atk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2012/03/03 00:12:53 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2012/06/13 11:49:37 prlw1 Exp $
 #
 
-DISTNAME=	at-spi2-atk-2.3.5
-PKGREVISION=	1
+DISTNAME=	at-spi2-atk-2.5.2
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/at-spi2-atk/2.3/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/at-spi2-atk/2.5/}
 EXTRACT_SUFX=	.tar.xz
 
 MAINTAINER=	prlw1@cam.ac.uk
@@ -19,8 +18,6 @@ USE_TOOLS+=     gmake intltool msgfmt pkg-config
 USE_LIBTOOL=	yes
 USE_PKGLOCALEDIR=	yes
 
-CONFLICTS=	at-spi-[0-9]*
-
 BUILDLINK_API_DEPENDS.atk+=	atk>=2.1.5
 .include "../../devel/atk/buildlink3.mk"
 .include "../../devel/at-spi2-core/buildlink3.mk"
diff --git a/devel/at-spi2-atk/PLIST b/devel/at-spi2-atk/PLIST
index 2cc70de7032..b5869e9521f 100644
--- a/devel/at-spi2-atk/PLIST
+++ b/devel/at-spi2-atk/PLIST
@@ -1,6 +1,5 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/02/10 17:28:16 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/06/13 11:49:37 prlw1 Exp $
 lib/gnome-settings-daemon-3.0/gtk-modules/at-spi2-atk.desktop
-lib/gtk-2.0/modules/libatk-bridge.la
 lib/gtk-3.0/modules/libatk-bridge.la
 share/glib-2.0/schemas/org.a11y.atspi.gschema.xml
 share/locale/an/LC_MESSAGES/at-spi2-atk.mo
@@ -37,10 +36,12 @@ 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
@@ -65,6 +66,7 @@ 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
diff --git a/devel/at-spi2-atk/distinfo b/devel/at-spi2-atk/distinfo
index 9445dfd1e28..58375eab37b 100644
--- a/devel/at-spi2-atk/distinfo
+++ b/devel/at-spi2-atk/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/02/10 17:28:16 drochner Exp $
+$NetBSD: distinfo,v 1.2 2012/06/13 11:49:37 prlw1 Exp $
 
-SHA1 (at-spi2-atk-2.3.5.tar.xz) = 66348ce7a5af71a4efc175f1b0168c4461702776
-RMD160 (at-spi2-atk-2.3.5.tar.xz) = 1954b8bec7095c755cb823946d5922ea8f6397e2
-Size (at-spi2-atk-2.3.5.tar.xz) = 303588 bytes
+SHA1 (at-spi2-atk-2.5.2.tar.xz) = cea7e3c48acc266c5718a2af8c717790ae804d18
+RMD160 (at-spi2-atk-2.5.2.tar.xz) = 8c7bab12059637492b092c4c1efa14f8316cf2ff
+Size (at-spi2-atk-2.5.2.tar.xz) = 304452 bytes
+SHA1 (patch-atk-adaptor_Makefile.in) = 521de1429b942a8967b838221b41b4b251b5bf04
diff --git a/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in b/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
new file mode 100644
index 00000000000..768e9d74f4a
--- /dev/null
+++ b/devel/at-spi2-atk/patches/patch-atk-adaptor_Makefile.in
@@ -0,0 +1,17 @@
+$NetBSD: patch-atk-adaptor_Makefile.in,v 1.1 2012/06/13 11:49:37 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.)
+
+--- atk-adaptor/Makefile.in.orig	2012-02-06 23:09:55.000000000 +0000
++++ atk-adaptor/Makefile.in
+@@ -252,7 +252,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
+ EXTRA_DIST = Makefile.include
+ all: all-recursive
+