update to 2.22.0

This switches to the gnome-2.22 release branch.

3 files changed, 13 insertions, 12 deletions

diff --git a/x11/py-gnome2-desktop/Makefile b/x11/py-gnome2-desktop/Makefile
index 25178be9319..30f9585e0fd 100644
--- a/x11/py-gnome2-desktop/Makefile
+++ b/x11/py-gnome2-desktop/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.17 2008/04/12 22:43:15 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2008/04/15 18:02:48 drochner Exp $
 #
 
-DISTNAME=	gnome-python-desktop-2.20.0
+DISTNAME=	gnome-python-desktop-2.22.0
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME:S/-python/2/}
-PKGREVISION=	2
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-python-desktop/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -15,7 +14,7 @@ COMMENT=	Python modules for the GNOME desktop
 GNU_CONFIGURE=	yes
 PY_PATCHPLIST=	yes
 USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config
+USE_TOOLS+=	pkg-config gmake
 
 DEPENDS+=	bug-buddy>=2.16:../../net/bug-buddy
 
@@ -27,9 +26,10 @@ PYTHON_VERSIONS_ACCEPTED=	24
 PLIST_VARS+=	nautilusburn
 #.include "../../sysutils/nautilus-cd-burner/buildlink3.mk"
 
+CONFIGURE_ARGS+=	--disable-evolution
+
 .include "../../graphics/py-cairo/buildlink3.mk"
 .include "../../graphics/librsvg/buildlink3.mk"
-.include "../../multimedia/totem/buildlink3.mk"
 .include "../../multimedia/gnome-media/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gnome-panel/buildlink3.mk"
@@ -45,4 +45,5 @@ PLIST_VARS+=	nautilusburn
 # CONFIGURE_ARGS+=	--enable-metacity
 #.include "../../wm/metacity/buildlink3.mk"
 .include "../../lang/python/extension.mk"
+.include "../../multimedia/totem-pl-parser/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/py-gnome2-desktop/PLIST b/x11/py-gnome2-desktop/PLIST
index 4a0fe9a8dfc..8739be1b502 100644
--- a/x11/py-gnome2-desktop/PLIST
+++ b/x11/py-gnome2-desktop/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/04/15 18:02:48 drochner Exp $
 lib/pkgconfig/gnome-python-desktop-2.0.pc
 ${PYSITELIB}/gtk-2.0/bugbuddy.py
 ${PYSITELIB}/gtk-2.0/bugbuddy.pyc
@@ -58,7 +58,7 @@ share/gtk-doc/html/pygtksourceview/class-gtksourcetag.html
 share/gtk-doc/html/pygtksourceview/class-gtksourcetagstyle.html
 share/gtk-doc/html/pygtksourceview/class-gtksourcetagtable.html
 share/gtk-doc/html/pygtksourceview/class-gtksourceview.html
-share/gtk-doc/html/pygtksourceview/gtksourcesview-class-reference.html
+share/gtk-doc/html/pygtksourceview/gtksourceview-class-reference.html
 share/gtk-doc/html/pygtksourceview/index.html
 share/gtk-doc/html/pygtksourceview/index.sgml
 share/gtk-doc/html/pygtksourceview/pygtksourceview.devhelp
diff --git a/x11/py-gnome2-desktop/distinfo b/x11/py-gnome2-desktop/distinfo
index 98be04c5df7..e2bbe80bd32 100644
--- a/x11/py-gnome2-desktop/distinfo
+++ b/x11/py-gnome2-desktop/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2007/11/05 19:28:50 drochner Exp $
+$NetBSD: distinfo,v 1.5 2008/04/15 18:02:48 drochner Exp $
 
-SHA1 (gnome-python-desktop-2.20.0.tar.bz2) = 9de5c7fb6d08752fbea7cb5fca51f1b709616f75
-RMD160 (gnome-python-desktop-2.20.0.tar.bz2) = 729d9af9107c799843d396708690d89fd821b474
-Size (gnome-python-desktop-2.20.0.tar.bz2) = 440199 bytes
+SHA1 (gnome-python-desktop-2.22.0.tar.bz2) = 6f1a93aacfc256ca878f8f3636a0270580d2354b
+RMD160 (gnome-python-desktop-2.22.0.tar.bz2) = 4a9bc36c379f5fbb6549506c8b8e8bdb63bf0d62
+Size (gnome-python-desktop-2.22.0.tar.bz2) = 571816 bytes
 SHA1 (patch-aa) = c59eb57073649f8914c01be6e39c6f71f726766c