update to 1.20.1

This switches to the new gnome-2.20 branch.
Also add the Python bindings as a seperate pkg. I don't see where
this is used, but is is a simple addition.

9 files changed, 102 insertions, 24 deletions

diff --git a/devel/at-spi/Makefile b/devel/at-spi/Makefile
index b9959f8c17c..d77bfa45077 100644
--- a/devel/at-spi/Makefile
+++ b/devel/at-spi/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.41 2007/09/21 13:03:33 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/10/31 19:52:34 drochner Exp $
 #
 
-DISTNAME=		at-spi-1.18.1
-PKGREVISION=		1
+DISTNAME=		at-spi-1.20.1
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/at-spi/1.18/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/at-spi/1.20/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
diff --git a/devel/at-spi/PLIST b/devel/at-spi/PLIST
index 35627245610..4db88011aaf 100644
--- a/devel/at-spi/PLIST
+++ b/devel/at-spi/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2007/04/10 18:15:01 drochner Exp $
+@comment $NetBSD: PLIST,v 1.18 2007/10/31 19:52:34 drochner Exp $
 include/at-spi-1.0/cspi/spi-impl.h
 include/at-spi-1.0/cspi/spi-listener.h
 include/at-spi-1.0/cspi/spi-roletypes.h
@@ -9,6 +9,7 @@ include/at-spi-1.0/libspi/accessible.h
 include/at-spi-1.0/libspi/action.h
 include/at-spi-1.0/libspi/application.h
 include/at-spi-1.0/libspi/base.h
+include/at-spi-1.0/libspi/collection.h
 include/at-spi-1.0/libspi/component.h
 include/at-spi-1.0/libspi/devicelistener.h
 include/at-spi-1.0/libspi/document.h
@@ -21,6 +22,7 @@ include/at-spi-1.0/libspi/keymasks.h
 include/at-spi-1.0/libspi/keystrokelistener.h
 include/at-spi-1.0/libspi/libspi.h
 include/at-spi-1.0/libspi/listener.h
+include/at-spi-1.0/libspi/matchrule.h
 include/at-spi-1.0/libspi/relation.h
 include/at-spi-1.0/libspi/remoteobject.h
 include/at-spi-1.0/libspi/selection.h
@@ -50,6 +52,8 @@ share/doc/${PKGNAME}/reference/html/Accessibility__Action_8idl-source.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Action_8idl.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Application_8idl-source.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Application_8idl.html
+share/doc/${PKGNAME}/reference/html/Accessibility__Collection_8idl-source.html
+share/doc/${PKGNAME}/reference/html/Accessibility__Collection_8idl.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Component_8idl-source.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Component_8idl.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Desktop_8idl-source.html
@@ -89,7 +93,7 @@ share/doc/${PKGNAME}/reference/html/Accessibility__Text_8idl.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Value_8idl-source.html
 share/doc/${PKGNAME}/reference/html/Accessibility__Value_8idl.html
 share/doc/${PKGNAME}/reference/html/annotated.html
-share/doc/${PKGNAME}/reference/html/dir_9b9e32c1c6d2edc3317fe4b437371c10.html
+share/doc/${PKGNAME}/reference/html/dir_1921d1e21393553b2653f8c7c21bdc73.html
 share/doc/${PKGNAME}/reference/html/dirs.html
 share/doc/${PKGNAME}/reference/html/doxygen.css
 share/doc/${PKGNAME}/reference/html/doxygen.png
@@ -101,6 +105,7 @@ share/doc/${PKGNAME}/reference/html/functions.html
 share/doc/${PKGNAME}/reference/html/functions_0x63.html
 share/doc/${PKGNAME}/reference/html/functions_0x64.html
 share/doc/${PKGNAME}/reference/html/functions_0x65.html
+share/doc/${PKGNAME}/reference/html/functions_0x66.html
 share/doc/${PKGNAME}/reference/html/functions_0x67.html
 share/doc/${PKGNAME}/reference/html/functions_0x68.html
 share/doc/${PKGNAME}/reference/html/functions_0x69.html
@@ -122,20 +127,6 @@ share/doc/${PKGNAME}/reference/html/functions_eval.html
 share/doc/${PKGNAME}/reference/html/functions_func.html
 share/doc/${PKGNAME}/reference/html/functions_type.html
 share/doc/${PKGNAME}/reference/html/functions_vars.html
-share/doc/${PKGNAME}/reference/html/globals.html
-share/doc/${PKGNAME}/reference/html/globals_0x62.html
-share/doc/${PKGNAME}/reference/html/globals_0x63.html
-share/doc/${PKGNAME}/reference/html/globals_0x64.html
-share/doc/${PKGNAME}/reference/html/globals_0x65.html
-share/doc/${PKGNAME}/reference/html/globals_0x6b.html
-share/doc/${PKGNAME}/reference/html/globals_0x6c.html
-share/doc/${PKGNAME}/reference/html/globals_0x6d.html
-share/doc/${PKGNAME}/reference/html/globals_0x72.html
-share/doc/${PKGNAME}/reference/html/globals_0x73.html
-share/doc/${PKGNAME}/reference/html/globals_0x74.html
-share/doc/${PKGNAME}/reference/html/globals_enum.html
-share/doc/${PKGNAME}/reference/html/globals_eval.html
-share/doc/${PKGNAME}/reference/html/globals_type.html
 share/doc/${PKGNAME}/reference/html/hierarchy.html
 share/doc/${PKGNAME}/reference/html/index.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Accessible.html
@@ -143,6 +134,7 @@ share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Accessible.png
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Action.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Application.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Application.png
+share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Collection.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1CommandListener.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Component.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1ContentStream.html
@@ -159,6 +151,7 @@ share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Hyperlink.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Hypertext.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Image.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1LoginHelper.html
+share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1MatchRule.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Registry.html
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Registry.png
 share/doc/${PKGNAME}/reference/html/interfaceAccessibility_1_1Relation.html
@@ -186,6 +179,7 @@ share/doc/${PKGNAME}/reference/html/namespacemembers_enum.html
 share/doc/${PKGNAME}/reference/html/namespacemembers_eval.html
 share/doc/${PKGNAME}/reference/html/namespacemembers_type.html
 share/doc/${PKGNAME}/reference/html/namespaces.html
+share/doc/${PKGNAME}/reference/html/structAccessibility_1_1AccessibleSetEntry.html
 share/doc/${PKGNAME}/reference/html/structAccessibility_1_1BoundingBox.html
 share/doc/${PKGNAME}/reference/html/structAccessibility_1_1Command.html
 share/doc/${PKGNAME}/reference/html/structAccessibility_1_1DeviceEvent.html
@@ -233,6 +227,7 @@ share/idl/at-spi-1.0/Accessibility.idl
 share/idl/at-spi-1.0/Accessibility_Accessible.idl
 share/idl/at-spi-1.0/Accessibility_Action.idl
 share/idl/at-spi-1.0/Accessibility_Application.idl
+share/idl/at-spi-1.0/Accessibility_Collection.idl
 share/idl/at-spi-1.0/Accessibility_Component.idl
 share/idl/at-spi-1.0/Accessibility_Desktop.idl
 share/idl/at-spi-1.0/Accessibility_Document.idl
@@ -294,6 +289,7 @@ share/locale/nb/LC_MESSAGES/at-spi.mo
 share/locale/ne/LC_MESSAGES/at-spi.mo
 share/locale/nl/LC_MESSAGES/at-spi.mo
 share/locale/nn/LC_MESSAGES/at-spi.mo
+share/locale/oc/LC_MESSAGES/at-spi.mo
 share/locale/or/LC_MESSAGES/at-spi.mo
 share/locale/pa/LC_MESSAGES/at-spi.mo
 share/locale/pl/LC_MESSAGES/at-spi.mo
diff --git a/devel/at-spi/distinfo b/devel/at-spi/distinfo
index 30ca7a64b3c..8e76d224f2a 100644
--- a/devel/at-spi/distinfo
+++ b/devel/at-spi/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.20 2007/04/10 18:15:01 drochner Exp $
+$NetBSD: distinfo,v 1.21 2007/10/31 19:52:34 drochner Exp $
 
-SHA1 (at-spi-1.18.1.tar.bz2) = d8b96202c754636fb47499cd6b80c2ca23960e3b
-RMD160 (at-spi-1.18.1.tar.bz2) = c5e60314414124388d025dc85effb5d9adf5d2b9
-Size (at-spi-1.18.1.tar.bz2) = 780306 bytes
+SHA1 (at-spi-1.20.1.tar.bz2) = 5ad1ecf8c299dcfc82ec4cf3db4c6fd5874676bc
+RMD160 (at-spi-1.20.1.tar.bz2) = b5ea35bbda69de460ec1b846a462a083eff9f9fe
+Size (at-spi-1.20.1.tar.bz2) = 842254 bytes
+SHA1 (patch-aa) = 8f386d6f514786f5ac572937b645d168ffdc521e
diff --git a/devel/at-spi/patches/patch-aa b/devel/at-spi/patches/patch-aa
new file mode 100644
index 00000000000..85abae4c626
--- /dev/null
+++ b/devel/at-spi/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.4 2007/10/31 19:52:35 drochner Exp $
+
+--- Makefile.in.orig	2007-09-27 19:46:14.000000000 +0200
++++ Makefile.in
+@@ -286,7 +286,7 @@ sbindir = @sbindir@
+ sharedstatedir = @sharedstatedir@
+ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+-SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi pyatspi test po
++SUBDIRS = docs idl libspi login-helper registryd atk-bridge cspi test po
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA = libspi-1.0.pc cspi-1.0.pc libloginhelper-1.0.pc
+ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc
diff --git a/devel/py-at-spi/DESCR b/devel/py-at-spi/DESCR
new file mode 100644
index 00000000000..5d6dd25d686
--- /dev/null
+++ b/devel/py-at-spi/DESCR
@@ -0,0 +1,2 @@
+This is the Early Access Release of the Gnome Accessibility Project's
+Assistive Technology Service Provider Interface.
diff --git a/devel/py-at-spi/Makefile b/devel/py-at-spi/Makefile
new file mode 100644
index 00000000000..3e7d751f284
--- /dev/null
+++ b/devel/py-at-spi/Makefile
@@ -0,0 +1,25 @@
+# $NetBSD: Makefile,v 1.1 2007/10/31 19:52:35 drochner Exp $
+#
+
+DISTNAME=		at-spi-1.20.1
+PKGNAME=		${PYPKGPREFIX}-at-spi-1.20.1
+CATEGORIES=		devel
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/at-spi/1.20/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER=		pkgsrc-users@NetBSD.org
+HOMEPAGE=		http://www.gnome.org/
+COMMENT=		Assistive Technology Service Provider Interface
+
+NO_BUILD=	yes
+PY_PATCHPLIST=	yes
+
+PYATSPIDIR=	${PREFIX}/${PYSITELIB}/pyatspi
+do-install:
+	${INSTALL_DATA_DIR} ${PYATSPIDIR}
+	${INSTALL_DATA} ${WRKSRC}/pyatspi/*.py ${PYATSPIDIR}
+	${PYTHONBIN} ${PREFIX}/${PYLIB}/compileall.py ${PYATSPIDIR}
+
+.include "../../lang/python/extension.mk"
+.include "../../devel/at-spi/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-at-spi/PLIST b/devel/py-at-spi/PLIST
new file mode 100644
index 00000000000..4fd5d04e6e6
--- /dev/null
+++ b/devel/py-at-spi/PLIST
@@ -0,0 +1,14 @@
+@comment $NetBSD: PLIST,v 1.1 2007/10/31 19:52:35 drochner Exp $
+${PYSITELIB}/pyatspi/__init__.py
+${PYSITELIB}/pyatspi/__init__.pyc
+${PYSITELIB}/pyatspi/accessible.py
+${PYSITELIB}/pyatspi/accessible.pyc
+${PYSITELIB}/pyatspi/constants.py
+${PYSITELIB}/pyatspi/constants.pyc
+${PYSITELIB}/pyatspi/event.py
+${PYSITELIB}/pyatspi/event.pyc
+${PYSITELIB}/pyatspi/registry.py
+${PYSITELIB}/pyatspi/registry.pyc
+${PYSITELIB}/pyatspi/utils.py
+${PYSITELIB}/pyatspi/utils.pyc
+@dirrm ${PYSITELIB}/pyatspi
diff --git a/devel/py-at-spi/buildlink3.mk b/devel/py-at-spi/buildlink3.mk
new file mode 100644
index 00000000000..c72353ee40b
--- /dev/null
+++ b/devel/py-at-spi/buildlink3.mk
@@ -0,0 +1,23 @@
+# $NetBSD: buildlink3.mk,v 1.1 2007/10/31 19:52:35 drochner Exp $
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
+PY_AT_SPI_BUILDLINK3_MK:=	${PY_AT_SPI_BUILDLINK3_MK}+
+
+.include "../../lang/python/pyversion.mk"
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	py-at-spi
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Npy-at-spi}
+BUILDLINK_PACKAGES+=	py-at-spi
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}py-at-spi
+
+.if ${PY_AT_SPI_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.py-at-spi+=	${PYPKGPREFIX}-at-spi>=1.20.1
+BUILDLINK_PKGSRCDIR.py-at-spi?=		../../devel/py-at-spi
+.endif	# PY_AT_SPI_BUILDLINK3_MK
+
+.include "../../devel/at-spi/buildlink3.mk"
+
+BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/py-at-spi/distinfo b/devel/py-at-spi/distinfo
new file mode 100644
index 00000000000..f46bd735b86
--- /dev/null
+++ b/devel/py-at-spi/distinfo
@@ -0,0 +1,5 @@
+$NetBSD: distinfo,v 1.1 2007/10/31 19:52:36 drochner Exp $
+
+SHA1 (at-spi-1.20.1.tar.bz2) = 5ad1ecf8c299dcfc82ec4cf3db4c6fd5874676bc
+RMD160 (at-spi-1.20.1.tar.bz2) = b5ea35bbda69de460ec1b846a462a083eff9f9fe
+Size (at-spi-1.20.1.tar.bz2) = 842254 bytes