update to 2.24.0

This switches to the gnome-2.24 release branch.

21 files changed, 252 insertions, 101 deletions

diff --git a/graphics/eog/Makefile b/graphics/eog/Makefile
index 17f2a2da978..446e831b4f5 100644
--- a/graphics/eog/Makefile
+++ b/graphics/eog/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2008/07/15 11:20:12 drochner Exp $
+# $NetBSD: Makefile,v 1.36 2008/10/16 18:14:13 drochner Exp $
 #
 
-DISTNAME=	eog-2.22.3
+DISTNAME=	eog-2.24.0
 CATEGORIES=	graphics gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/eog/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/graphics/eog/PLIST b/graphics/eog/PLIST
index c5a1c6e4b96..4830c6f91c6 100644
--- a/graphics/eog/PLIST
+++ b/graphics/eog/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/15 18:34:32 drochner Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/10/16 18:14:13 drochner Exp $
 bin/eog
 include/eog-2.20/eog/eog-application.h
 include/eog-2.20/eog/eog-debug.h
@@ -21,6 +21,12 @@ include/eog-2.20/eog/eog-thumb-view.h
 include/eog-2.20/eog/eog-thumbnail.h
 include/eog-2.20/eog/eog-transform.h
 include/eog-2.20/eog/eog-window.h
+lib/eog/plugins/fullscreen.eog-plugin
+lib/eog/plugins/libfullscreen.la
+lib/eog/plugins/libreload.la
+lib/eog/plugins/libstatusbar-date.la
+lib/eog/plugins/reload.eog-plugin
+lib/eog/plugins/statusbar-date.eog-plugin
 lib/pkgconfig/eog.pc
 share/applications/eog.desktop
 share/eog/eog-image-properties-dialog.glade
@@ -31,13 +37,19 @@ share/eog/eog-ui.xml
 share/eog/gtkrc
 share/eog/icons/hicolor/16x16/actions/eog-image-collection.png
 share/eog/icons/hicolor/16x16/actions/eog-plugin.png
+share/eog/icons/hicolor/16x16/actions/slideshow-play.png
 share/eog/icons/hicolor/22x22/actions/eog-image-collection.png
 share/eog/icons/hicolor/22x22/actions/eog-plugin.png
+share/eog/icons/hicolor/22x22/actions/slideshow-play.png
 share/eog/icons/hicolor/24x24/actions/eog-image-collection.png
+share/eog/icons/hicolor/24x24/actions/slideshow-play.png
 share/eog/icons/hicolor/32x32/actions/eog-image-collection.png
 share/eog/icons/hicolor/32x32/actions/eog-plugin.png
+share/eog/icons/hicolor/32x32/actions/slideshow-play.png
+share/eog/icons/hicolor/48x48/actions/slideshow-play.png
 share/eog/icons/hicolor/scalable/actions/eog-image-collection.svg
 share/eog/icons/hicolor/scalable/actions/eog-plugin.svg
+share/eog/icons/hicolor/scalable/actions/slideshow-play.svg
 share/eog/pixmaps/thumbnail-frame.png
 share/gconf/schemas/eog.schemas
 share/gnome/help/eog/C/eog.xml
@@ -45,6 +57,10 @@ share/gnome/help/eog/C/figures/eog_save_as_window.png
 share/gnome/help/eog/C/figures/eog_start_window.png
 share/gnome/help/eog/C/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/C/legal.xml
+share/gnome/help/eog/ca/eog.xml
+share/gnome/help/eog/ca/figures/eog_save_as_window.png
+share/gnome/help/eog/ca/figures/eog_start_window.png
+share/gnome/help/eog/ca/figures/eog_toolbar_editor_window.png
 share/gnome/help/eog/da/eog.xml
 share/gnome/help/eog/da/figures/eog_save_as_window.png
 share/gnome/help/eog/da/figures/eog_start_window.png
@@ -113,6 +129,63 @@ share/gnome/help/eog/zh_TW/eog.xml
 share/gnome/help/eog/zh_TW/figures/eog_save_as_window.png
 share/gnome/help/eog/zh_TW/figures/eog_start_window.png
 share/gnome/help/eog/zh_TW/figures/eog_toolbar_editor_window.png
+share/gtk-doc/html/eog/EogApplication.html
+share/gtk-doc/html/eog/EogDialog.html
+share/gtk-doc/html/eog/EogExifDetails.html
+share/gtk-doc/html/eog/EogFileChooser.html
+share/gtk-doc/html/eog/EogImage.html
+share/gtk-doc/html/eog/EogImageSaveInfo.html
+share/gtk-doc/html/eog/EogJobSaveAs.html
+share/gtk-doc/html/eog/EogListStore.html
+share/gtk-doc/html/eog/EogMessageArea.html
+share/gtk-doc/html/eog/EogMetadataReaderJpg.html
+share/gtk-doc/html/eog/EogMetadataReaderPng.html
+share/gtk-doc/html/eog/EogPixbufCellRenderer.html
+share/gtk-doc/html/eog/EogPlugin.html
+share/gtk-doc/html/eog/EogPluginManager.html
+share/gtk-doc/html/eog/EogPreferencesDialog.html
+share/gtk-doc/html/eog/EogPrintImageSetup.html
+share/gtk-doc/html/eog/EogPrintPreview.html
+share/gtk-doc/html/eog/EogPropertiesDialog.html
+share/gtk-doc/html/eog/EogScrollView.html
+share/gtk-doc/html/eog/EogSidebar.html
+share/gtk-doc/html/eog/EogStatusbar.html
+share/gtk-doc/html/eog/EogThumbNav.html
+share/gtk-doc/html/eog/EogThumbView.html
+share/gtk-doc/html/eog/EogTransform.html
+share/gtk-doc/html/eog/EogURIConverter.html
+share/gtk-doc/html/eog/EogWindow.html
+share/gtk-doc/html/eog/ch01.html
+share/gtk-doc/html/eog/ch02.html
+share/gtk-doc/html/eog/ch03.html
+share/gtk-doc/html/eog/ch04.html
+share/gtk-doc/html/eog/ch05.html
+share/gtk-doc/html/eog/ch06.html
+share/gtk-doc/html/eog/ch07.html
+share/gtk-doc/html/eog/eog-eog-config-keys.html
+share/gtk-doc/html/eog/eog-eog-debug.html
+share/gtk-doc/html/eog/eog-eog-error-message-area.html
+share/gtk-doc/html/eog/eog-eog-exif-util.html
+share/gtk-doc/html/eog/eog-eog-job-queue.html
+share/gtk-doc/html/eog/eog-eog-metadata-reader.html
+share/gtk-doc/html/eog/eog-eog-pixbuf-util.html
+share/gtk-doc/html/eog/eog-eog-plugin-engine.html
+share/gtk-doc/html/eog/eog-eog-print.html
+share/gtk-doc/html/eog/eog-eog-save-as-dialog-helper.html
+share/gtk-doc/html/eog/eog-eog-session.html
+share/gtk-doc/html/eog/eog-eog-thumbnail.html
+share/gtk-doc/html/eog/eog-eog-util.html
+share/gtk-doc/html/eog/eog-uta.html
+share/gtk-doc/html/eog/eog-zoom.html
+share/gtk-doc/html/eog/eog.devhelp
+share/gtk-doc/html/eog/eog.devhelp2
+share/gtk-doc/html/eog/home.png
+share/gtk-doc/html/eog/index.html
+share/gtk-doc/html/eog/index.sgml
+share/gtk-doc/html/eog/left.png
+share/gtk-doc/html/eog/right.png
+share/gtk-doc/html/eog/style.css
+share/gtk-doc/html/eog/up.png
 share/icons/hicolor/16x16/apps/eog.png
 share/icons/hicolor/22x22/apps/eog.png
 share/icons/hicolor/24x24/apps/eog.png
@@ -144,6 +217,7 @@ share/locale/eu/LC_MESSAGES/eog.mo
 share/locale/fa/LC_MESSAGES/eog.mo
 share/locale/fi/LC_MESSAGES/eog.mo
 share/locale/fr/LC_MESSAGES/eog.mo
+share/locale/fur/LC_MESSAGES/eog.mo
 share/locale/ga/LC_MESSAGES/eog.mo
 share/locale/gl/LC_MESSAGES/eog.mo
 share/locale/gu/LC_MESSAGES/eog.mo
@@ -158,6 +232,7 @@ share/locale/ja/LC_MESSAGES/eog.mo
 share/locale/ka/LC_MESSAGES/eog.mo
 share/locale/kn/LC_MESSAGES/eog.mo
 share/locale/ko/LC_MESSAGES/eog.mo
+share/locale/ks/LC_MESSAGES/eog.mo
 share/locale/ku/LC_MESSAGES/eog.mo
 share/locale/lt/LC_MESSAGES/eog.mo
 share/locale/lv/LC_MESSAGES/eog.mo
@@ -176,6 +251,7 @@ share/locale/oc/LC_MESSAGES/eog.mo
 share/locale/or/LC_MESSAGES/eog.mo
 share/locale/pa/LC_MESSAGES/eog.mo
 share/locale/pl/LC_MESSAGES/eog.mo
+share/locale/ps/LC_MESSAGES/eog.mo
 share/locale/pt/LC_MESSAGES/eog.mo
 share/locale/pt_BR/LC_MESSAGES/eog.mo
 share/locale/ro/LC_MESSAGES/eog.mo
@@ -186,7 +262,7 @@ share/locale/sk/LC_MESSAGES/eog.mo
 share/locale/sl/LC_MESSAGES/eog.mo
 share/locale/sq/LC_MESSAGES/eog.mo
 share/locale/sr/LC_MESSAGES/eog.mo
-share/locale/sr@Latn/LC_MESSAGES/eog.mo
+share/locale/sr@latin/LC_MESSAGES/eog.mo
 share/locale/sv/LC_MESSAGES/eog.mo
 share/locale/ta/LC_MESSAGES/eog.mo
 share/locale/te/LC_MESSAGES/eog.mo
@@ -203,6 +279,7 @@ share/locale/zh_HK/LC_MESSAGES/eog.mo
 share/locale/zh_TW/LC_MESSAGES/eog.mo
 share/locale/zu/LC_MESSAGES/eog.mo
 share/omf/eog/eog-C.omf
+share/omf/eog/eog-ca.omf
 share/omf/eog/eog-da.omf
 share/omf/eog/eog-de.omf
 share/omf/eog/eog-en_GB.omf
@@ -221,13 +298,13 @@ share/omf/eog/eog-uk.omf
 share/omf/eog/eog-zh_CN.omf
 share/omf/eog/eog-zh_TW.omf
 @dirrm share/omf/eog
-@comment in rarian: @dirrm share/omf
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
+@dirrm share/gtk-doc/html/eog
 @dirrm share/gnome/help/eog/zh_TW/figures
 @dirrm share/gnome/help/eog/zh_TW
 @dirrm share/gnome/help/eog/zh_CN/figures
@@ -262,14 +339,17 @@ share/omf/eog/eog-zh_TW.omf
 @dirrm share/gnome/help/eog/de
 @dirrm share/gnome/help/eog/da/figures
 @dirrm share/gnome/help/eog/da
+@dirrm share/gnome/help/eog/ca/figures
+@dirrm share/gnome/help/eog/ca
 @dirrm share/gnome/help/eog/C/figures
 @dirrm share/gnome/help/eog/C
 @dirrm share/gnome/help/eog
-@comment in gnome2-dirs: @dirrm share/gnome/help
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/eog/pixmaps
 @dirrm share/eog/icons/hicolor/scalable/actions
 @dirrm share/eog/icons/hicolor/scalable
+@dirrm share/eog/icons/hicolor/48x48/actions
+@dirrm share/eog/icons/hicolor/48x48
 @dirrm share/eog/icons/hicolor/32x32/actions
 @dirrm share/eog/icons/hicolor/32x32
 @dirrm share/eog/icons/hicolor/24x24/actions
@@ -282,5 +362,6 @@ share/omf/eog/eog-zh_TW.omf
 @dirrm share/eog/icons
 @dirrm share/eog
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/eog/plugins
 @dirrm include/eog-2.20/eog
 @dirrm include/eog-2.20
diff --git a/graphics/eog/distinfo b/graphics/eog/distinfo
index 947469224b0..aa046dabdb0 100644
--- a/graphics/eog/distinfo
+++ b/graphics/eog/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.10 2008/07/15 11:20:12 drochner Exp $
+$NetBSD: distinfo,v 1.11 2008/10/16 18:14:13 drochner Exp $
 
-SHA1 (eog-2.22.3.tar.bz2) = 4edc6eefddaad78a0e266eb800aa1d926abf56de
-RMD160 (eog-2.22.3.tar.bz2) = 36f6620c17d4e56addcaee93563721368d9c29eb
-Size (eog-2.22.3.tar.bz2) = 1894695 bytes
+SHA1 (eog-2.24.0.tar.bz2) = a36bcd101e19046f8b04b4f87dfa6a468c385b92
+RMD160 (eog-2.24.0.tar.bz2) = b05a46d96980c758dcd814c48af116e70135b811
+Size (eog-2.24.0.tar.bz2) = 2142455 bytes
diff --git a/sysutils/gnome-menus/Makefile b/sysutils/gnome-menus/Makefile
index 479c3d2bbb9..e4336bc11b5 100644
--- a/sysutils/gnome-menus/Makefile
+++ b/sysutils/gnome-menus/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.40 2008/06/20 01:09:35 joerg Exp $
+# $NetBSD: Makefile,v 1.41 2008/10/16 18:19:10 drochner Exp $
 #
 
-DISTNAME=	gnome-menus-2.22.2
+DISTNAME=	gnome-menus-2.24.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-menus/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -28,8 +28,6 @@ EXAMPLEDIR=		${PREFIX}/share/examples/gnome-menus/xdg/menus
 OWN_DIRS=		${PKG_SYSCONFDIR}/xdg/menus
 CONF_FILES=		${EXAMPLEDIR}/applications.menu \
 			${PKG_SYSCONFDIR}/xdg/menus/applications.menu
-CONF_FILES+=		${EXAMPLEDIR}/preferences.menu \
-			${PKG_SYSCONFDIR}/xdg/menus/preferences.menu
 CONF_FILES+=		${EXAMPLEDIR}/settings.menu \
 			${PKG_SYSCONFDIR}/xdg/menus/settings.menu
 
diff --git a/sysutils/gnome-menus/PLIST b/sysutils/gnome-menus/PLIST
index d3bda64446b..c3d3d63b6be 100644
--- a/sysutils/gnome-menus/PLIST
+++ b/sysutils/gnome-menus/PLIST
@@ -1,31 +1,28 @@
-@comment $NetBSD: PLIST,v 1.16 2008/04/15 17:33:21 drochner Exp $
+@comment $NetBSD: PLIST,v 1.17 2008/10/16 18:19:10 drochner Exp $
 include/gnome-menus/gmenu-tree.h
 lib/libgnome-menu.la
 lib/pkgconfig/libgnome-menu.pc
-share/desktop-directories/Accessibility.directory
-share/desktop-directories/Accessories.directory
-share/desktop-directories/Applications.directory
-share/desktop-directories/Desktop.directory
+share/desktop-directories/AudioVideo.directory
 share/desktop-directories/Development.directory
 share/desktop-directories/Education.directory
-share/desktop-directories/Games.directory
+share/desktop-directories/Game.directory
 share/desktop-directories/Graphics.directory
 share/desktop-directories/Hardware.directory
-share/desktop-directories/Internet.directory
 share/desktop-directories/InternetAndNetwork.directory
 share/desktop-directories/LookAndFeel.directory
-share/desktop-directories/Multimedia.directory
+share/desktop-directories/Network.directory
 share/desktop-directories/Office.directory
-share/desktop-directories/Other.directory
 share/desktop-directories/Personal.directory
-share/desktop-directories/Preferences.directory
-share/desktop-directories/Settings-Accessibility.directory
+share/desktop-directories/Settings-System.directory
 share/desktop-directories/Settings.directory
-share/desktop-directories/System-Settings.directory
 share/desktop-directories/System-Tools.directory
 share/desktop-directories/System.directory
+share/desktop-directories/Utility-Accessibility.directory
+share/desktop-directories/Utility.directory
+share/desktop-directories/X-GNOME-Menu-Applications.directory
+share/desktop-directories/X-GNOME-Menu-System.directory
+share/desktop-directories/X-GNOME-Other.directory
 share/examples/gnome-menus/xdg/menus/applications.menu
-share/examples/gnome-menus/xdg/menus/preferences.menu
 share/examples/gnome-menus/xdg/menus/settings.menu
 share/locale/af/LC_MESSAGES/gnome-menus.mo
 share/locale/ar/LC_MESSAGES/gnome-menus.mo
@@ -59,10 +56,12 @@ share/locale/gn/LC_MESSAGES/gnome-menus.mo
 share/locale/gu/LC_MESSAGES/gnome-menus.mo
 share/locale/he/LC_MESSAGES/gnome-menus.mo
 share/locale/hi/LC_MESSAGES/gnome-menus.mo
+share/locale/hr/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/is/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
@@ -87,6 +86,7 @@ share/locale/oc/LC_MESSAGES/gnome-menus.mo
 share/locale/or/LC_MESSAGES/gnome-menus.mo
 share/locale/pa/LC_MESSAGES/gnome-menus.mo
 share/locale/pl/LC_MESSAGES/gnome-menus.mo
+share/locale/ps/LC_MESSAGES/gnome-menus.mo
 share/locale/pt/LC_MESSAGES/gnome-menus.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
 share/locale/ro/LC_MESSAGES/gnome-menus.mo
@@ -97,7 +97,7 @@ share/locale/sk/LC_MESSAGES/gnome-menus.mo
 share/locale/sl/LC_MESSAGES/gnome-menus.mo
 share/locale/sq/LC_MESSAGES/gnome-menus.mo
 share/locale/sr/LC_MESSAGES/gnome-menus.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-menus.mo
 share/locale/sv/LC_MESSAGES/gnome-menus.mo
 share/locale/ta/LC_MESSAGES/gnome-menus.mo
 share/locale/te/LC_MESSAGES/gnome-menus.mo
diff --git a/sysutils/gnome-menus/distinfo b/sysutils/gnome-menus/distinfo
index b8bfccf8101..33634446be5 100644
--- a/sysutils/gnome-menus/distinfo
+++ b/sysutils/gnome-menus/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2008/05/29 11:08:52 drochner Exp $
+$NetBSD: distinfo,v 1.17 2008/10/16 18:19:10 drochner Exp $
 
-SHA1 (gnome-menus-2.22.2.tar.bz2) = 48d2557cd33265a760e43402b4f87faf6a8990db
-RMD160 (gnome-menus-2.22.2.tar.bz2) = a14afa2b5d9647ee2fd4a840c335c710e607ecc3
-Size (gnome-menus-2.22.2.tar.bz2) = 465566 bytes
+SHA1 (gnome-menus-2.24.0.tar.bz2) = 29c55f48a576216489ce139aa9c1bedf43394de1
+RMD160 (gnome-menus-2.24.0.tar.bz2) = a1996a50861cf3011667635d8c87779c6c7ca3fb
+Size (gnome-menus-2.24.0.tar.bz2) = 450204 bytes
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index a1fc779ca59..4cd5344e431 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.102 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.103 2008/10/16 18:17:30 drochner Exp $
 #
 
-DISTNAME=		gnome-session-2.22.3
-PKGREVISION=		1
+DISTNAME=		gnome-session-2.24.0
 CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.22/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-session/2.24/}
 SITES.gnome-splash-2.16.0.png=	${MASTER_SITE_LOCAL:=gnome-splash/}
 EXTRACT_SUFX=		.tar.bz2
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX} gnome-splash-2.16.0.png
diff --git a/x11/gnome-session/PLIST b/x11/gnome-session/PLIST
index 7b89ad0864f..b6f6f3895f9 100644
--- a/x11/gnome-session/PLIST
+++ b/x11/gnome-session/PLIST
@@ -1,9 +1,12 @@
-@comment $NetBSD: PLIST,v 1.21 2008/04/25 04:02:23 bjs Exp $
+@comment $NetBSD: PLIST,v 1.22 2008/10/16 18:17:30 drochner Exp $
 bin/gnome-session
 bin/gnome-session-properties
-bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-wm
+lib/gnome-session/helpers/at-spi-registryd-wrapper
+lib/gnome-session/helpers/gnome-keyring-daemon-wrapper
+lib/gnome-session/helpers/gnome-session-splash
+lib/gnome-session/helpers/gnome-settings-daemon-helper
 man/man1/gnome-session-save.1
 man/man1/gnome-session.1
 man/man1/gnome-wm.1
@@ -11,7 +14,12 @@ man/man1/session-properties.1
 man/man5/default.session.5
 share/applications/session-properties.desktop
 share/gconf/schemas/gnome-session.schemas
-share/gnome/default.session
+share/gnome-session/gsm-inhibit-dialog.glade
+share/gnome-session/session-properties.glade
+share/gnome/autostart/at-spi-registryd-wrapper.desktop
+share/gnome/autostart/gnome-keyring-daemon-wrapper.desktop
+share/gnome/autostart/gnome-session-splash.desktop
+share/gnome/autostart/gnome-settings-daemon-helper.desktop
 share/icons/hicolor/16x16/apps/session-properties.png
 share/icons/hicolor/22x22/apps/session-properties.png
 share/icons/hicolor/24x24/apps/session-properties.png
@@ -88,7 +96,7 @@ share/locale/sk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-session-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/te/LC_MESSAGES/gnome-session-2.0.mo
@@ -113,6 +121,9 @@ share/pixmaps/splash/gnome-splash.png
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@comment in gnome2-dirs: @dirrm share/gnome
+@dirrm share/gnome/autostart
+@dirrm share/gnome-session
 @comment in GConf: @dirrm share/gconf/schemas
 @comment in xdg-dirs: @dirrm share/applications
+@dirrm lib/gnome-session/helpers
+@dirrm lib/gnome-session
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 3288ccb15e8..d5736d19e45 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,12 +1,13 @@
-$NetBSD: distinfo,v 1.40 2008/07/15 10:43:38 drochner Exp $
+$NetBSD: distinfo,v 1.41 2008/10/16 18:17:30 drochner Exp $
 
-SHA1 (gnome-session-2.22.3.tar.bz2) = 817e007009e6e43cd2f1980e6d90546e7117cc9d
-RMD160 (gnome-session-2.22.3.tar.bz2) = a35065aa665ada5081f3fe19abc70950f8588e34
-Size (gnome-session-2.22.3.tar.bz2) = 773853 bytes
+SHA1 (gnome-session-2.24.0.tar.bz2) = 5a4b329db62ae3518029982ae86fb1b138500c3e
+RMD160 (gnome-session-2.24.0.tar.bz2) = e0430e566ba61a2fe4a1390f0cfb5cf32eec437b
+Size (gnome-session-2.24.0.tar.bz2) = 797656 bytes
 SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d
 RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96
 Size (gnome-splash-2.16.0.png) = 36601 bytes
-SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec
-SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
-SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95
-SHA1 (patch-ad) = c737a11ec9ab7c74e498644f81377ffb3c65ee94
+SHA1 (patch-aa) = 9a385124467efd98a71a41ec8e123c6e51316d40
+SHA1 (patch-ac) = f3a74bd3942269f44fab2d52262c2fedb3fd2848
+SHA1 (patch-ad) = fe18ad5dbb6851b81bf23a4dcb2eec2d32981730
+SHA1 (patch-ae) = 31759f8ee3f4415c43feb9ce5e93cba549de06a3
+SHA1 (patch-af) = b307190d2c0f8cc2e5aef8fec00868eaf5ddf8b9
diff --git a/x11/gnome-session/patches/patch-aa b/x11/gnome-session/patches/patch-aa
index cf44f63560b..cbde3f5a091 100644
--- a/x11/gnome-session/patches/patch-aa
+++ b/x11/gnome-session/patches/patch-aa
@@ -1,13 +1,13 @@
-$NetBSD: patch-aa,v 1.10 2008/04/15 18:06:15 drochner Exp $
+$NetBSD: patch-aa,v 1.11 2008/10/16 18:17:30 drochner Exp $
 
---- gnome-session/Makefile.in.orig	2008-03-10 22:01:44.000000000 +0100
+--- gnome-session/Makefile.in.orig	2008-09-22 23:30:18.000000000 +0200
 +++ gnome-session/Makefile.in
-@@ -301,7 +301,7 @@ INCLUDES = \
- 	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    \
- 	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""	\
- 	-DRSH_COMMAND=\""$(RSH_COMMAND)\""		\
--	-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""		\
-+	-DGCONFTOOL_CMD=\""$(REAL_GCONFTOOL)\""		\
- 	-DDEFAULTDIR="\"$(defaultdir)\""		\
- 	-DAT_SPI_REGISTRYD_DIR="\"$(AT_SPI_REGISTRYD_DIR)\""	\
- 	-DTIME_UTILITY="\"$(TIME_UTILITY)\""		\
+@@ -312,7 +312,7 @@ INCLUDES = \
+ 	-DLIBEXECDIR=\"$(libexecdir)\"		\
+ 	-DGLADEDIR=\""$(pkgdatadir)"\"		\
+ 	-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\" \
+-	-DGCONFTOOL_CMD=\"$(GCONFTOOL)\"
++	-DGCONFTOOL_CMD=\"$(REAL_GCONFTOOL)\"
+ 
+ test_inhibit_SOURCES = \
+ 	test-inhibit.c	\
diff --git a/x11/gnome-session/patches/patch-ab b/x11/gnome-session/patches/patch-ab
deleted file mode 100644
index a82b0127bdc..00000000000
--- a/x11/gnome-session/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2007/04/11 20:25:38 drochner Exp $
-
---- configure.orig	2007-03-12 19:59:01.000000000 +0100
-+++ configure
-@@ -26374,6 +26374,7 @@ case "$GNOME_SESSION_LIBS" in
- 		GNOME_HAVE_SM=no
- 		;;
- esac
-+GNOME_HAVE_SM=yes
- { echo "$as_me:$LINENO: result: $GNOME_HAVE_SM" >&5
- echo "${ECHO_T}$GNOME_HAVE_SM" >&6; }
- if test "$GNOME_HAVE_SM" = no ; then
diff --git a/x11/gnome-session/patches/patch-ac b/x11/gnome-session/patches/patch-ac
index b7cc6307208..9495ceee043 100644
--- a/x11/gnome-session/patches/patch-ac
+++ b/x11/gnome-session/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.11 2008/04/25 04:02:23 bjs Exp $
+$NetBSD: patch-ac,v 1.12 2008/10/16 18:17:30 drochner Exp $
 
---- data/Makefile.in.orig	2008-04-10 10:34:02.000000000 -0400
+--- data/Makefile.in.orig	2008-09-22 23:30:16.000000000 +0200
 +++ data/Makefile.in
-@@ -628,8 +628,8 @@ info: info-recursive
+@@ -683,8 +683,8 @@ info: info-recursive
  info-am:
  
- install-data-am: install-data-local install-defaultDATA \
+ install-data-am: install-data-local install-gladeDATA \
 -	install-pixmapDATA install-schemasDATA install-settingsDATA \
 -	install-xsessionDATA
 +	install-pixmapDATA install-schemasDATA install-settingsDATA
diff --git a/x11/gnome-session/patches/patch-ad b/x11/gnome-session/patches/patch-ad
index 0614cf5e3be..0f17effdd4a 100644
--- a/x11/gnome-session/patches/patch-ad
+++ b/x11/gnome-session/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.6 2008/05/12 12:58:03 jmcneill Exp $
+$NetBSD: patch-ad,v 1.7 2008/10/16 18:17:30 drochner Exp $
 
---- gnome-session/gnome-wm.orig	2008-04-10 10:32:20.000000000 -0400
-+++ gnome-session/gnome-wm	2008-05-12 08:50:00.000000000 -0400
-@@ -119,15 +119,21 @@
+--- data/gnome-wm.orig	2008-09-22 23:21:08.000000000 +0200
++++ data/gnome-wm
+@@ -131,15 +131,21 @@ fi
  case `basename $WINDOW_MANAGER` in
    compiz)
      export LIBGL_ALWAYS_INDIRECT=1
diff --git a/x11/gnome-session/patches/patch-ae b/x11/gnome-session/patches/patch-ae
new file mode 100644
index 00000000000..17ee2a9d36b
--- /dev/null
+++ b/x11/gnome-session/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.6 2008/10/16 18:17:30 drochner Exp $
+
+--- gnome-session/gsm-autostart-app.c.orig	2008-10-15 19:38:53.000000000 +0200
++++ gnome-session/gsm-autostart-app.c
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <sys/wait.h>
+ #include <errno.h>
++#include <signal.h>
+ 
+ #include <glib.h>
+ #include <gio/gio.h>
diff --git a/x11/gnome-session/patches/patch-af b/x11/gnome-session/patches/patch-af
new file mode 100644
index 00000000000..84ae5aaed3f
--- /dev/null
+++ b/x11/gnome-session/patches/patch-af
@@ -0,0 +1,28 @@
+$NetBSD: patch-af,v 1.1 2008/10/16 18:17:30 drochner Exp $
+
+--- gnome-session/gdm-signal-handler.c.orig	2008-10-15 19:43:48.000000000 +0200
++++ gnome-session/gdm-signal-handler.c
+@@ -27,7 +27,6 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <signal.h>
+-#include <execinfo.h>
+ #include <syslog.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+@@ -160,6 +159,7 @@ signal_io_watch (GIOChannel       *ioc,
+ static void
+ fallback_get_backtrace (void)
+ {
++#if 0
+         void *  frames[64];
+         size_t  size;
+         char ** strings;
+@@ -176,6 +176,7 @@ fallback_get_backtrace (void)
+         } else {
+                 g_warning ("GDM crashed, but symbols couldn't be retrieved.");
+         }
++#endif
+ }
+ 
+ 
diff --git a/x11/libgnomekbd/Makefile b/x11/libgnomekbd/Makefile
index 960d1c7766f..2388f3f76e4 100644
--- a/x11/libgnomekbd/Makefile
+++ b/x11/libgnomekbd/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.11 2008/07/14 12:56:18 joerg Exp $
+# $NetBSD: Makefile,v 1.12 2008/10/16 18:20:25 drochner Exp $
 #
 
-DISTNAME=	libgnomekbd-2.22.0
+DISTNAME=	libgnomekbd-2.24.0
 CATEGORIES=	x11
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomekbd/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/libgnomekbd/PLIST b/x11/libgnomekbd/PLIST
index cac749cce56..a30b812f454 100644
--- a/x11/libgnomekbd/PLIST
+++ b/x11/libgnomekbd/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/04/15 17:57:15 drochner Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/10/16 18:20:25 drochner Exp $
 bin/gkbd-indicator-plugins-capplet
 include/libgnomekbd/gkbd-desktop-config.h
 include/libgnomekbd/gkbd-indicator-config.h
@@ -33,6 +33,7 @@ share/locale/fr/LC_MESSAGES/libgnomekbd.mo
 share/locale/gl/LC_MESSAGES/libgnomekbd.mo
 share/locale/gu/LC_MESSAGES/libgnomekbd.mo
 share/locale/he/LC_MESSAGES/libgnomekbd.mo
+share/locale/hi/LC_MESSAGES/libgnomekbd.mo
 share/locale/hu/LC_MESSAGES/libgnomekbd.mo
 share/locale/it/LC_MESSAGES/libgnomekbd.mo
 share/locale/ja/LC_MESSAGES/libgnomekbd.mo
@@ -56,9 +57,10 @@ share/locale/si/LC_MESSAGES/libgnomekbd.mo
 share/locale/sl/LC_MESSAGES/libgnomekbd.mo
 share/locale/sq/LC_MESSAGES/libgnomekbd.mo
 share/locale/sr/LC_MESSAGES/libgnomekbd.mo
-share/locale/sr@Latn/LC_MESSAGES/libgnomekbd.mo
+share/locale/sr@latin/LC_MESSAGES/libgnomekbd.mo
 share/locale/sv/LC_MESSAGES/libgnomekbd.mo
 share/locale/ta/LC_MESSAGES/libgnomekbd.mo
+share/locale/te/LC_MESSAGES/libgnomekbd.mo
 share/locale/th/LC_MESSAGES/libgnomekbd.mo
 share/locale/tr/LC_MESSAGES/libgnomekbd.mo
 share/locale/uk/LC_MESSAGES/libgnomekbd.mo
diff --git a/x11/libgnomekbd/distinfo b/x11/libgnomekbd/distinfo
index 83b35f5186e..b9a148ec352 100644
--- a/x11/libgnomekbd/distinfo
+++ b/x11/libgnomekbd/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/06/02 16:42:21 drochner Exp $
+$NetBSD: distinfo,v 1.6 2008/10/16 18:20:25 drochner Exp $
 
-SHA1 (libgnomekbd-2.22.0.tar.bz2) = 62a11b227d4bcbc3df64fbdfc7e075e9366140da
-RMD160 (libgnomekbd-2.22.0.tar.bz2) = 23cabca07aaf18325fc6ca6d4daade4b86044ad0
-Size (libgnomekbd-2.22.0.tar.bz2) = 406083 bytes
+SHA1 (libgnomekbd-2.24.0.tar.bz2) = 3e81ade6050930a9d1e3443b89981cf36821032a
+RMD160 (libgnomekbd-2.24.0.tar.bz2) = 8ca98404615c405705fd82c917acb7b4b55b334e
+Size (libgnomekbd-2.24.0.tar.bz2) = 411322 bytes
 SHA1 (patch-aa) = 7be6e43e63a4701b38052e08a06129a064094cde
 SHA1 (patch-ab) = cc148a31666c05a80edc2baf608d72a1a0ccec98
 SHA1 (patch-ac) = 7c22964c48779006509aebb703983d47f47fd593
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 362ceb59efb..ad6786b697c 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.52 2008/07/14 12:56:20 joerg Exp $
+# $NetBSD: Makefile,v 1.53 2008/10/16 18:15:14 drochner Exp $
 #
 
-DISTNAME=	zenity-2.22.1
+DISTNAME=	zenity-2.24.0
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/zenity/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/x11/zenity/PLIST b/x11/zenity/PLIST
index 7140cd2f77a..4696757d70e 100644
--- a/x11/zenity/PLIST
+++ b/x11/zenity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.20 2008/04/15 18:10:12 drochner Exp $
+@comment $NetBSD: PLIST,v 1.21 2008/10/16 18:15:14 drochner Exp $
 bin/gdialog
 bin/zenity
 man/man1/zenity.1
@@ -27,6 +27,18 @@ share/gnome/help/zenity/bg/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/bg/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/bg/zenity.xml
+share/gnome/help/zenity/de/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/de/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/de/zenity.xml
 share/gnome/help/zenity/en_GB/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/en_GB/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/en_GB/figures/zenity-error-screenshot.png
@@ -51,6 +63,18 @@ share/gnome/help/zenity/es/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-text-screenshot.png
 share/gnome/help/zenity/es/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/es/zenity.xml
+share/gnome/help/zenity/fi/figures/zenity-calendar-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-entry-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-error-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-fileselection-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-information-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-notification-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-progress-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-question-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-text-screenshot.png
+share/gnome/help/zenity/fi/figures/zenity-warning-screenshot.png
+share/gnome/help/zenity/fi/zenity.xml
 share/gnome/help/zenity/fr/figures/zenity-calendar-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-entry-screenshot.png
 share/gnome/help/zenity/fr/figures/zenity-error-screenshot.png
@@ -173,11 +197,12 @@ share/locale/pt_BR/LC_MESSAGES/zenity.mo
 share/locale/ro/LC_MESSAGES/zenity.mo
 share/locale/ru/LC_MESSAGES/zenity.mo
 share/locale/rw/LC_MESSAGES/zenity.mo
+share/locale/si/LC_MESSAGES/zenity.mo
 share/locale/sk/LC_MESSAGES/zenity.mo
 share/locale/sl/LC_MESSAGES/zenity.mo
 share/locale/sq/LC_MESSAGES/zenity.mo
 share/locale/sr/LC_MESSAGES/zenity.mo
-share/locale/sr@Latn/LC_MESSAGES/zenity.mo
+share/locale/sr@latin/LC_MESSAGES/zenity.mo
 share/locale/sv/LC_MESSAGES/zenity.mo
 share/locale/ta/LC_MESSAGES/zenity.mo
 share/locale/te/LC_MESSAGES/zenity.mo
@@ -192,8 +217,10 @@ share/locale/zh_HK/LC_MESSAGES/zenity.mo
 share/locale/zh_TW/LC_MESSAGES/zenity.mo
 share/omf/zenity/zenity-C.omf
 share/omf/zenity/zenity-bg.omf
+share/omf/zenity/zenity-de.omf
 share/omf/zenity/zenity-en_GB.omf
 share/omf/zenity/zenity-es.omf
+share/omf/zenity/zenity-fi.omf
 share/omf/zenity/zenity-fr.omf
 share/omf/zenity/zenity-oc.omf
 share/omf/zenity/zenity-ru.omf
@@ -217,7 +244,7 @@ share/zenity/zenity.png
 @dirrm share/zenity/clothes
 @dirrm share/zenity
 @dirrm share/omf/zenity
-@comment in scrollkeeper: @dirrm share/omf
+@comment in rarian: @dirrm share/omf
 @dirrm share/gnome/help/zenity/uk/figures
 @dirrm share/gnome/help/zenity/uk
 @dirrm share/gnome/help/zenity/sv/figures
@@ -228,10 +255,14 @@ share/zenity/zenity.png
 @dirrm share/gnome/help/zenity/oc
 @dirrm share/gnome/help/zenity/fr/figures
 @dirrm share/gnome/help/zenity/fr
+@dirrm share/gnome/help/zenity/fi/figures
+@dirrm share/gnome/help/zenity/fi
 @dirrm share/gnome/help/zenity/es/figures
 @dirrm share/gnome/help/zenity/es
 @dirrm share/gnome/help/zenity/en_GB/figures
 @dirrm share/gnome/help/zenity/en_GB
+@dirrm share/gnome/help/zenity/de/figures
+@dirrm share/gnome/help/zenity/de
 @dirrm share/gnome/help/zenity/bg/figures
 @dirrm share/gnome/help/zenity/bg
 @dirrm share/gnome/help/zenity/C/figures
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 225aa56f256..042ec0c8945 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.24 2008/04/15 18:10:12 drochner Exp $
+$NetBSD: distinfo,v 1.25 2008/10/16 18:15:14 drochner Exp $
 
-SHA1 (zenity-2.22.1.tar.bz2) = 776c5c84ad07bb87ba2f796ace8268aa298b0819
-RMD160 (zenity-2.22.1.tar.bz2) = 8ee3d5a42bad85860832ad35af44b343455357e6
-Size (zenity-2.22.1.tar.bz2) = 1845688 bytes
+SHA1 (zenity-2.24.0.tar.bz2) = f0e7239e8934de89f9722fbbb2b1e7fb636afd0d
+RMD160 (zenity-2.24.0.tar.bz2) = 5d7c9312bc7ed8be32286e4aeb30eeb283f21af4
+Size (zenity-2.24.0.tar.bz2) = 2236118 bytes