Update atk to 2.2.0.

Based on PR#45738 by Patrick Welche.

Changes in version 2.2.0:
=========================
*
* Updated Gujarati, Oriya, Assamese, Danish, Portuguese, Czech and
*  Catalan (Valencian) translations

Changes in version 2.1.92:
==========================
*
* Updated Visual Studio files due AtkWindow addition
* Bug 649577: atk_add_global_event_listener should only accept ATK events
* Minor documentation updates
* Updated German, Basque, Japanese, Serbian, Catalan, Tamil, Punjabi,
*  Asturian, Italian, Polish, British English, Brazilian Portuguese,
*  Korean, Telugu and Kannada Translation

Changes in version 2.1.5:
=========================
*
* Bug 638924: Add AtkWindow
* Fixing out of tree compilation on Win32
* Update README.txt
* Fixing release number of the new ATK roles added
* Updated Traditional Chinese, Indonesian, Bulgarian, French,
*  Hungarian and Swedish translations

Changes in version 2.1.0:
=========================
*
* Bug 654767: shlib downgrade at update atk-1.32.0 to atk-2.0.1
* Bug 651343: New ATK Roles
* Added Leon Fan as maintainer
* Improved Visual C++ 2010 infrastructure
* Updated Russian, Slovenian, Persian, Hebrew, Lithuanian, Latvian,
*  Norwegian, Galician, and Spanish translations

5 files changed, 11 insertions, 80 deletions

diff --git a/devel/atk/Makefile b/devel/atk/Makefile
index 4c98a235dda..8ee304ff38c 100644
--- a/devel/atk/Makefile
+++ b/devel/atk/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.78 2011/07/18 12:02:02 tron Exp $
+# $NetBSD: Makefile,v 1.79 2012/01/31 02:21:56 obache Exp $
 
-DISTNAME=		atk-2.0.1
-PKGREVISION=		2
+DISTNAME=		atk-2.2.0
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atk/2.0/}
-EXTRACT_SUFX=		.tar.bz2
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/atk/2.2/}
+EXTRACT_SUFX=		.tar.xz
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://developer.gnome.org/atk/
@@ -17,23 +16,13 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 USE_TOOLS+=		gmake pkg-config msgfmt
 GNU_CONFIGURE=		yes
 USE_PKGLOCALEDIR=	yes
-USE_LANGUAGES+=		c99
+USE_LANGUAGES=		c99
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE=	atk.pc.in
 
 # glib-mkenums overflows a 2048kb stack on atkobject.h
 UNLIMIT_RESOURCES=	stacksize
 
-SUBST_CLASSES+=		loc
-SUBST_STAGE.loc=	pre-configure
-SUBST_MESSAGE.loc=	Fixing invalid use of AM_GLIB_DEFINE_LOCALEDIR.
-SUBST_FILES.loc=	configure
-SUBST_SED.loc=		-e 's,^\(\#define ATK_LOCALEDIR\).*,\1 "${PREFIX}/${PKGLOCALEDIR}/locale",'
-
-# Workaround for Upstream Bug#562310.
-# for more detail, see also PR#41475.
-TOOLS_NOOP+=	gtkdoc-rebase
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.5.7
 .include "../../devel/glib2/buildlink3.mk"
diff --git a/devel/atk/PLIST b/devel/atk/PLIST
index 10009e1bbf2..92b433f8a68 100644
--- a/devel/atk/PLIST
+++ b/devel/atk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2011/07/15 13:08:15 abs Exp $
+@comment $NetBSD: PLIST,v 1.35 2012/01/31 02:21:56 obache Exp $
 include/atk-1.0/atk/atk-enum-types.h
 include/atk-1.0/atk/atk.h
 include/atk-1.0/atk/atkaction.h
@@ -29,6 +29,7 @@ include/atk-1.0/atk/atktable.h
 include/atk-1.0/atk/atktext.h
 include/atk-1.0/atk/atkutil.h
 include/atk-1.0/atk/atkvalue.h
+include/atk-1.0/atk/atkwindow.h
 lib/libatk-1.0.la
 lib/pkgconfig/atk.pc
 share/gtk-doc/html/atk/AtkAction.html
diff --git a/devel/atk/distinfo b/devel/atk/distinfo
index d5c12723edb..dd085f47f71 100644
--- a/devel/atk/distinfo
+++ b/devel/atk/distinfo
@@ -1,7 +1,5 @@
-$NetBSD: distinfo,v 1.40 2011/07/18 12:02:02 tron Exp $
+$NetBSD: distinfo,v 1.41 2012/01/31 02:21:56 obache Exp $
 
-SHA1 (atk-2.0.1.tar.bz2) = f830ff27590e4dd486ebe6538e2b03484faee10a
-RMD160 (atk-2.0.1.tar.bz2) = 8161a41614bcd13d82b90ae654b24437a165d2c9
-Size (atk-2.0.1.tar.bz2) = 734314 bytes
-SHA1 (patch-aa) = 87889d513b380b8475e8e2190ff9a2fb6a2e59cb
-SHA1 (patch-ab) = 3b58e35cc51a8d49dd7cfc044547add33611183e
+SHA1 (atk-2.2.0.tar.xz) = b9808b77c7905eb46fc2b64587ef93beab37470a
+RMD160 (atk-2.2.0.tar.xz) = 7bec73703ed64a8dbfb21b5fa0181b757a2d69ee
+Size (atk-2.2.0.tar.xz) = 600140 bytes
diff --git a/devel/atk/patches/patch-aa b/devel/atk/patches/patch-aa
deleted file mode 100644
index 9760e15dede..00000000000
--- a/devel/atk/patches/patch-aa
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-aa,v 1.7 2011/07/18 12:02:02 tron Exp $
-
-Fix broken shared library version number. Patch taken from here:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654767
-
---- configure.ac.orig	2011-06-13 17:18:30.000000000 +0100
-+++ configure.ac	2011-07-18 12:43:20.000000000 +0100
-@@ -21,17 +21,18 @@
- m4_define([atk_version],
-           [atk_major_version.atk_minor_version.atk_micro_version])
- 
--dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 2.
-+dnl The X.Y in -latk-X.Y line. This is expected to stay 1.0 until Atk 3.
- m4_define([atk_api_version], [1.0])
- 
- dnl Number of releases since we've added interfaces
- m4_define([atk_interface_age], [1])
- 
-+dnl binary_age includes major version as ATK 2 is still fully API and ABI compatible
- m4_define([atk_binary_age],
--          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version)])
-+          [m4_eval(10000 * atk_major_version + 100 * atk_minor_version + 10 + atk_micro_version)])
- 
- m4_define([lt_current],
--          [m4_eval(100 * atk_minor_version + 10 + atk_micro_version - atk_interface_age)])
-+          [m4_eval(10000 * atk_major_version + 100 * atk_minor_version + 10 + atk_micro_version - atk_interface_age)])
- m4_define([lt_revision], [atk_interface_age])
- m4_define([lt_age], [m4_eval(atk_binary_age - atk_interface_age)])
- m4_define([lt_version_info], [lt_current:lt_revision:lt_age])
diff --git a/devel/atk/patches/patch-ab b/devel/atk/patches/patch-ab
deleted file mode 100644
index 316889ce9db..00000000000
--- a/devel/atk/patches/patch-ab
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.6 2011/07/18 12:02:02 tron Exp $
-
-Fix broken shared library version number. Create with "autoreconf" after
-applying "patch-aa". Please look here for more details:
-
-https://bugzilla.gnome.org/show_bug.cgi?id=654767
-
---- configure.orig	2011-06-13 17:34:43.000000000 +0100
-+++ configure	2011-07-18 12:44:14.000000000 +0100
-@@ -2961,7 +2961,7 @@
- ATK_VERSION=2.0.1
- ATK_API_VERSION=1.0
- ATK_INTERFACE_AGE=1
--ATK_BINARY_AGE=11
-+ATK_BINARY_AGE=20011
- 
- 
- 
-@@ -2971,7 +2971,7 @@
- 
- 
- 
--LT_VERSION_INFO=10:1:10
-+LT_VERSION_INFO=20010:1:20010
- LT_CURRENT_MINUS_AGE=0
- 
-