atk 2.2.0 update queries

[Patrick Welche <prlw1%cam.ac.uk@localhost>]

The attached patch updates atk to 2.2.0 (patch-aa and patch-ab are no longer
necessary - how do you include "remove files" in a patch - I tried -N?).

Following notes in PR#41475 of the form
 Workaround for PR#41475 is not required anymore.
regarding other packages, I removed the gtkdoc-rebase workaround - it works
for me, but I haven't tried on MacOS - the gnome bug is closed though.

AFAICT the ABI hasn't changed "and won't until atk 3.0" - so I didn't change
it in buildlink3.mk - is that right?

# pkglint -Wall
NOTE: Makefile:3: The update request to 2.2.0 from doc/TODO has been done.
WARN: Makefile:19: Permission [a] requested for USE_LANGUAGES, but only [s] is 
allowed.
0 errors and 1 warnings found.

I don't understand the implications of the WARN...

Cheers,

Patrick

Index: Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/atk/Makefile,v
retrieving revision 1.78
diff -u -r1.78 Makefile
--- Makefile    18 Jul 2011 12:02:02 -0000      1.78
+++ Makefile    25 Nov 2011 11:27:47 -0000
@@ -1,10 +1,9 @@
 # $NetBSD: Makefile,v 1.78 2011/07/18 12:02:02 tron 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@localhost
 HOMEPAGE=              http://developer.gnome.org/atk/
@@ -14,7 +13,7 @@
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
 
-USE_TOOLS+=            gmake pkg-config msgfmt
+USE_TOOLS+=            gmake msgfmt pkg-config
 GNU_CONFIGURE=         yes
 USE_PKGLOCALEDIR=      yes
 USE_LANGUAGES+=                c99
@@ -24,16 +23,6 @@
 # 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"
Index: PLIST
===================================================================
RCS file: /cvsroot/pkgsrc/devel/atk/PLIST,v
retrieving revision 1.34
diff -u -r1.34 PLIST
--- PLIST       15 Jul 2011 13:08:15 -0000      1.34
+++ PLIST       25 Nov 2011 11:27:47 -0000
@@ -29,6 +29,7 @@
 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
Index: buildlink3.mk
===================================================================
RCS file: /cvsroot/pkgsrc/devel/atk/buildlink3.mk,v
retrieving revision 1.15
diff -u -r1.15 buildlink3.mk
--- buildlink3.mk       22 Apr 2011 13:41:59 -0000      1.15
+++ buildlink3.mk       25 Nov 2011 11:27:47 -0000
@@ -6,7 +6,7 @@
 ATK_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.atk+=            atk>=1.11.4
-BUILDLINK_ABI_DEPENDS.atk+=    atk>=1.32.0nb1
+BUILDLINK_ABI_DEPENDS.atk+=    atk>=2.2.0
 BUILDLINK_PKGSRCDIR.atk?=      ../../devel/atk
 
 .include "../../devel/gettext-lib/buildlink3.mk"
Index: distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/atk/distinfo,v
retrieving revision 1.40
diff -u -r1.40 distinfo
--- distinfo    18 Jul 2011 12:02:02 -0000      1.40
+++ distinfo    25 Nov 2011 11:27:47 -0000
@@ -1,7 +1,5 @@
 $NetBSD: distinfo,v 1.40 2011/07/18 12:02:02 tron 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