update to 2.22.1

This switches to the gnome-2.22 release branch.

14 files changed, 48 insertions, 50 deletions

diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 7df7b337dd7..548fba3dd67 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.38 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: Makefile,v 1.39 2008/04/15 17:34:51 drochner Exp $
 
-DISTNAME=	eel-2.20.0
-PKGREVISION=	1
+DISTNAME=	eel-2.22.1
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eel/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eel/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -20,7 +19,6 @@ PKGCONFIG_OVERRIDE=	eel-2.0.pc.in
 CONFLICTS+=		eel2-[0-9]*
 
 BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.6.0
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.9.1
 BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.9.4
 
 .include "../../devel/GConf/buildlink3.mk"
@@ -33,7 +31,6 @@ BUILDLINK_API_DEPENDS.gtk2+=		gtk2+>=2.9.4
 .include "../../devel/pango/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/eel/PLIST b/devel/eel/PLIST
index e247175d983..fd8113500cc 100644
--- a/devel/eel/PLIST
+++ b/devel/eel/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.7 2007/11/05 20:19:02 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/04/15 17:34:51 drochner Exp $
 include/eel-2/eel/eel-accessibility.h
 include/eel-2/eel/eel-alert-dialog.h
+include/eel-2/eel/eel-app-launch-context.h
 include/eel-2/eel/eel-art-extensions.h
 include/eel-2/eel/eel-art-gtk-extensions.h
 include/eel-2/eel/eel-background-box.h
@@ -8,7 +9,6 @@ include/eel-2/eel/eel-background.h
 include/eel-2/eel/eel-canvas-rect-ellipse.h
 include/eel-2/eel/eel-canvas-util.h
 include/eel-2/eel/eel-canvas.h
-include/eel-2/eel/eel-dateedit-extensions.h
 include/eel-2/eel/eel-debug-drawing.h
 include/eel-2/eel/eel-debug.h
 include/eel-2/eel/eel-editable-label.h
@@ -27,15 +27,12 @@ include/eel-2/eel/eel-i18n.h
 include/eel-2/eel/eel-image-table.h
 include/eel-2/eel/eel-labeled-image.h
 include/eel-2/eel/eel-marshal.h
-include/eel-2/eel/eel-mime-application-chooser.h
-include/eel-2/eel/eel-mime-extensions.h
-include/eel-2/eel/eel-open-with-dialog.h
+include/eel-2/eel/eel-mount-operation.h
 include/eel-2/eel/eel-pango-extensions.h
 include/eel-2/eel/eel-preferences-glade.h
 include/eel-2/eel/eel-preferences.h
 include/eel-2/eel/eel-self-checks.h
 include/eel-2/eel/eel-stock-dialogs.h
-include/eel-2/eel/eel-string-list.h
 include/eel-2/eel/eel-string.h
 include/eel-2/eel/eel-type-builtins.h
 include/eel-2/eel/eel-types.h
@@ -48,6 +45,7 @@ lib/pkgconfig/eel-2.0.pc
 share/locale/am/LC_MESSAGES/eel-2.0.mo
 share/locale/ang/LC_MESSAGES/eel-2.0.mo
 share/locale/ar/LC_MESSAGES/eel-2.0.mo
+share/locale/as/LC_MESSAGES/eel-2.0.mo
 share/locale/az/LC_MESSAGES/eel-2.0.mo
 share/locale/be/LC_MESSAGES/eel-2.0.mo
 share/locale/bg/LC_MESSAGES/eel-2.0.mo
diff --git a/devel/eel/buildlink3.mk b/devel/eel/buildlink3.mk
index b255be69045..9116407ceee 100644
--- a/devel/eel/buildlink3.mk
+++ b/devel/eel/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2008/03/06 14:53:49 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2008/04/15 17:34:51 drochner Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 EEL_BUILDLINK3_MK:=	${EEL_BUILDLINK3_MK}+
@@ -26,7 +26,6 @@ BUILDLINK_PKGSRCDIR.eel?=	../../devel/eel
 .include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../graphics/libart/buildlink3.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/devel/eel/distinfo b/devel/eel/distinfo
index cf6c3757380..38ea10b0b5e 100644
--- a/devel/eel/distinfo
+++ b/devel/eel/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2008/04/01 22:47:24 drochner Exp $
+$NetBSD: distinfo,v 1.11 2008/04/15 17:34:51 drochner Exp $
 
-SHA1 (eel-2.20.0.tar.bz2) = 642348e57d02aba46a8f84240745b91577f3e4aa
-RMD160 (eel-2.20.0.tar.bz2) = 1b608e17b60f7949eb8b6ad8f77b9c7f73d93f5e
-Size (eel-2.20.0.tar.bz2) = 647919 bytes
+SHA1 (eel-2.22.1.tar.bz2) = a0180db9f175d7a316fcdb054bec3ca098607bef
+RMD160 (eel-2.22.1.tar.bz2) = fc7f1516d39fa535c036f9e46b2523e117d9eefc
+Size (eel-2.22.1.tar.bz2) = 612389 bytes
 SHA1 (patch-aa) = 9c3e5cdcc3b5688985c8145d0aa7482a39d692f9
diff --git a/devel/libwnck/Makefile b/devel/libwnck/Makefile
index 4d421d47d9f..c29e14b69d7 100644
--- a/devel/libwnck/Makefile
+++ b/devel/libwnck/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.54 2008/01/11 12:47:43 drochner Exp $
+# $NetBSD: Makefile,v 1.55 2008/04/15 17:36:00 drochner Exp $
 #
 
-DISTNAME=	libwnck-2.20.3
+DISTNAME=	libwnck-2.22.1
 CATEGORIES=	devel x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libwnck/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libwnck/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/devel/libwnck/PLIST b/devel/libwnck/PLIST
index f302c887684..7252f90adca 100644
--- a/devel/libwnck/PLIST
+++ b/devel/libwnck/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2007/11/03 15:45:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/04/15 17:36:00 drochner Exp $
 bin/wnckprop
 include/libwnck-1.0/libwnck/application.h
 include/libwnck-1.0/libwnck/class-group.h
@@ -39,6 +39,7 @@ share/gtk-doc/html/libwnck/ix08.html
 share/gtk-doc/html/libwnck/ix09.html
 share/gtk-doc/html/libwnck/ix10.html
 share/gtk-doc/html/libwnck/ix11.html
+share/gtk-doc/html/libwnck/ix12.html
 share/gtk-doc/html/libwnck/left.png
 share/gtk-doc/html/libwnck/libwnck-Miscellaneous-Functions.html
 share/gtk-doc/html/libwnck/libwnck-Resource-Usage-of-X-Clients.html
diff --git a/devel/libwnck/distinfo b/devel/libwnck/distinfo
index 5ccfe3aba3e..37f7fa8bb44 100644
--- a/devel/libwnck/distinfo
+++ b/devel/libwnck/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.30 2008/01/11 12:47:43 drochner Exp $
+$NetBSD: distinfo,v 1.31 2008/04/15 17:36:00 drochner Exp $
 
-SHA1 (libwnck-2.20.3.tar.bz2) = 21a710e5ac221b73ce40616867ac2fba3a105647
-RMD160 (libwnck-2.20.3.tar.bz2) = d7b198f5194ff442d2840cc05a73d23b3d819df2
-Size (libwnck-2.20.3.tar.bz2) = 637507 bytes
+SHA1 (libwnck-2.22.1.tar.bz2) = f04a0b77644ac47b5330dd49a28596a0c2019fe0
+RMD160 (libwnck-2.22.1.tar.bz2) = 4b8768f953448c7961dcb7fb9209f5b1ce773e40
+Size (libwnck-2.22.1.tar.bz2) = 687716 bytes
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index c6b6472b734..f52aeccbee3 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: Makefile,v 1.37 2008/04/15 17:33:21 drochner Exp $
 #
 
-DISTNAME=	gnome-menus-2.20.3
-PKGREVISION=	1
+DISTNAME=	gnome-menus-2.22.1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.20/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.22/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -40,10 +39,8 @@ SUBST_SED.paths=	-e 's|/usr/|${PREFIX}/|g'
 SUBST_SED.paths+=	-e 's|/etc/X11/applnk|${PREFIX}/share/kde/applnk/|g'
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.6.0
-BUILDLINK_API_DEPENDS.gnome-vfs+=	gnome-vfs>=2.10.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 .include "../../mk/fam.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/gnome-menus/PLIST b/sysutils/gnome-menus/PLIST
index d67848a2c33..d3bda64446b 100644
--- a/sysutils/gnome-menus/PLIST
+++ b/sysutils/gnome-menus/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2008/01/11 13:00:10 drochner Exp $
-bin/gnome-menu-spec-test
+@comment $NetBSD: PLIST,v 1.16 2008/04/15 17:33:21 drochner Exp $
 include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.la
 lib/pkgconfig/libgnome-menu.pc
@@ -53,6 +52,7 @@ share/locale/eu/LC_MESSAGES/gnome-menus.mo
 share/locale/fa/LC_MESSAGES/gnome-menus.mo
 share/locale/fi/LC_MESSAGES/gnome-menus.mo
 share/locale/fr/LC_MESSAGES/gnome-menus.mo
+share/locale/fur/LC_MESSAGES/gnome-menus.mo
 share/locale/ga/LC_MESSAGES/gnome-menus.mo
 share/locale/gl/LC_MESSAGES/gnome-menus.mo
 share/locale/gn/LC_MESSAGES/gnome-menus.mo
@@ -62,6 +62,7 @@ share/locale/hi/LC_MESSAGES/gnome-menus.mo
 share/locale/hu/LC_MESSAGES/gnome-menus.mo
 share/locale/hy/LC_MESSAGES/gnome-menus.mo
 share/locale/id/LC_MESSAGES/gnome-menus.mo
+share/locale/io/LC_MESSAGES/gnome-menus.mo
 share/locale/it/LC_MESSAGES/gnome-menus.mo
 share/locale/ja/LC_MESSAGES/gnome-menus.mo
 share/locale/ka/LC_MESSAGES/gnome-menus.mo
@@ -71,6 +72,7 @@ share/locale/ku/LC_MESSAGES/gnome-menus.mo
 share/locale/ky/LC_MESSAGES/gnome-menus.mo
 share/locale/lt/LC_MESSAGES/gnome-menus.mo
 share/locale/lv/LC_MESSAGES/gnome-menus.mo
+share/locale/mai/LC_MESSAGES/gnome-menus.mo
 share/locale/mg/LC_MESSAGES/gnome-menus.mo
 share/locale/mk/LC_MESSAGES/gnome-menus.mo
 share/locale/ml/LC_MESSAGES/gnome-menus.mo
diff --git a/sysutils/gnome-menus/buildlink3.mk b/sysutils/gnome-menus/buildlink3.mk
index 09e87ac2909..894ebc03497 100644
--- a/sysutils/gnome-menus/buildlink3.mk
+++ b/sysutils/gnome-menus/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2008/03/06 14:53:54 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2008/04/15 17:33:21 drochner Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 GNOME_MENUS_BUILDLINK3_MK:=	${GNOME_MENUS_BUILDLINK3_MK}+
@@ -18,6 +18,5 @@ BUILDLINK_PKGSRCDIR.gnome-menus?=	../../sysutils/gnome-menus
 .endif	# GNOME_MENUS_BUILDLINK3_MK
 
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../sysutils/gnome-vfs/buildlink3.mk"
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH:S/+$//}
diff --git a/sysutils/gnome-menus/distinfo b/sysutils/gnome-menus/distinfo
index 04382504472..89511dd3260 100644
--- a/sysutils/gnome-menus/distinfo
+++ b/sysutils/gnome-menus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2008/01/11 13:00:10 drochner Exp $
+$NetBSD: distinfo,v 1.15 2008/04/15 17:33:21 drochner Exp $
 
-SHA1 (gnome-menus-2.20.3.tar.bz2) = 25c8161f1bb4ecd4a868cbf1b59edcfb06adaa51
-RMD160 (gnome-menus-2.20.3.tar.bz2) = eb1ff84b161d8354b1ee30364cefec91a43ff57d
-Size (gnome-menus-2.20.3.tar.bz2) = 446966 bytes
+SHA1 (gnome-menus-2.22.1.tar.bz2) = a943facc7d279145b683fe8b13aff0abe8c102c5
+RMD160 (gnome-menus-2.22.1.tar.bz2) = 7875afc047c8c8592133058c62e084e7708f90de
+Size (gnome-menus-2.22.1.tar.bz2) = 461978 bytes
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index 67188668d30..dd4f2b2b038 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.76 2008/03/06 14:53:56 wiz Exp $
+# $NetBSD: Makefile,v 1.77 2008/04/15 17:30:10 drochner Exp $
 #
 
-DISTNAME=		gnome-desktop-2.20.3
-PKGREVISION=		1
+DISTNAME=		gnome-desktop-2.22.1
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.20/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-desktop/2.22/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		drochner@NetBSD.org
@@ -37,5 +36,9 @@ post-install:
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
-
+# gnome-about needs py-gnome2-desktop at runtime, which needs us, so
+# we have a circular dependency. To work around this, just depend on
+# Python and hope that py-gnome2-desktop gets the same version.
+CONFIGURE_ENV+=	PYTHON=${PYTHONBIN}
+.include "../../lang/python/application.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-desktop/PLIST b/x11/gnome-desktop/PLIST
index 1576df2aca6..92c1dfb8663 100644
--- a/x11/gnome-desktop/PLIST
+++ b/x11/gnome-desktop/PLIST
@@ -1,6 +1,7 @@
-@comment $NetBSD: PLIST,v 1.29 2007/11/29 20:28:56 drochner Exp $
+@comment $NetBSD: PLIST,v 1.30 2008/04/15 17:30:10 drochner Exp $
 bin/gnome-about
 include/gnome-desktop-2.0/libgnome/gnome-desktop-item.h
+include/gnome-desktop-2.0/libgnomeui/gnome-bg.h
 include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
 include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
 lib/libgnome-desktop-2.la
@@ -97,6 +98,7 @@ share/locale/eu/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fa/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/fur/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/gl/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/gu/LC_MESSAGES/gnome-desktop-2.0.mo
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index bda38241190..d86265e93d8 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.33 2008/01/11 13:16:03 drochner Exp $
+$NetBSD: distinfo,v 1.34 2008/04/15 17:30:10 drochner Exp $
 
-SHA1 (gnome-desktop-2.20.3.tar.bz2) = 6d88e63686acea78e0e64efa9f213271a7ddf32e
-RMD160 (gnome-desktop-2.20.3.tar.bz2) = 4c01a18cad9dd4965abe1202bccc9bf414e04287
-Size (gnome-desktop-2.20.3.tar.bz2) = 1362861 bytes
+SHA1 (gnome-desktop-2.22.1.tar.bz2) = f805edeaef5f419fbea9c5533f0bc3fcd497ce75
+RMD160 (gnome-desktop-2.22.1.tar.bz2) = 28c85584f9b06c76b530beb8a66eebde28d76e81
+Size (gnome-desktop-2.22.1.tar.bz2) = 1443150 bytes