update to 2.24.0

This switches to the gnome-2.24 release branch.

3 files changed, 15 insertions, 10 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index 1d9030562e3..fd8ab9184e8 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.77 2008/07/14 12:56:14 joerg Exp $
+# $NetBSD: Makefile,v 1.78 2008/10/16 15:37:51 drochner Exp $
 #
 
-DISTNAME=	metacity-2.22.0
+DISTNAME=	metacity-2.24.0
 CATEGORIES=	wm x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/metacity/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -40,6 +40,7 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
diff --git a/wm/metacity/PLIST b/wm/metacity/PLIST
index 45ee6331d02..ab6e07e64ad 100644
--- a/wm/metacity/PLIST
+++ b/wm/metacity/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2008/04/15 17:53:51 drochner Exp $
+@comment $NetBSD: PLIST,v 1.28 2008/10/16 15:37:51 drochner Exp $
 bin/metacity
 bin/metacity-message
 bin/metacity-theme-viewer
@@ -16,10 +16,11 @@ libexec/metacity-dialog
 man/man1/metacity-theme-viewer.1
 man/man1/metacity-window-demo.1
 man/man1/metacity.1
+share/applications/metacity.desktop
 share/gconf/schemas/metacity.schemas
 share/gnome-control-center/keybindings/50-metacity-desktop-key.xml
 share/gnome-control-center/keybindings/50-metacity-key.xml
-share/gnome/wm-properties/metacity.desktop
+share/gnome/wm-properties/metacity-wm.desktop
 share/locale/am/LC_MESSAGES/metacity.mo
 share/locale/ar/LC_MESSAGES/metacity.mo
 share/locale/as/LC_MESSAGES/metacity.mo
@@ -58,6 +59,7 @@ share/locale/is/LC_MESSAGES/metacity.mo
 share/locale/it/LC_MESSAGES/metacity.mo
 share/locale/ja/LC_MESSAGES/metacity.mo
 share/locale/ka/LC_MESSAGES/metacity.mo
+share/locale/kn/LC_MESSAGES/metacity.mo
 share/locale/ko/LC_MESSAGES/metacity.mo
 share/locale/ku/LC_MESSAGES/metacity.mo
 share/locale/lt/LC_MESSAGES/metacity.mo
@@ -86,7 +88,7 @@ share/locale/sk/LC_MESSAGES/metacity.mo
 share/locale/sl/LC_MESSAGES/metacity.mo
 share/locale/sq/LC_MESSAGES/metacity.mo
 share/locale/sr/LC_MESSAGES/metacity.mo
-share/locale/sr@Latn/LC_MESSAGES/metacity.mo
+share/locale/sr@latin/LC_MESSAGES/metacity.mo
 share/locale/sv/LC_MESSAGES/metacity.mo
 share/locale/ta/LC_MESSAGES/metacity.mo
 share/locale/th/LC_MESSAGES/metacity.mo
@@ -219,6 +221,8 @@ share/themes/Simple/metacity-1/minimize.png
 @dirrm share/metacity/icons
 @dirrm share/metacity
 @comment in gnome2-dirs: @dirrm share/gnome/wm-properties
+@dirrm share/gnome-control-center/keybindings
 @comment in GConf: @dirrm share/gconf/schemas
+@comment in xdg-dirs: @dirrm share/applications
 @dirrm include/metacity-1/metacity-private
 @dirrm include/metacity-1
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 51afb5b5084..7f94a2d1234 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.36 2008/04/15 17:53:51 drochner Exp $
+$NetBSD: distinfo,v 1.37 2008/10/16 15:37:51 drochner Exp $
 
-SHA1 (metacity-2.22.0.tar.bz2) = 18e7761152d033b31b13a455be459d986f55a8ba
-RMD160 (metacity-2.22.0.tar.bz2) = 9432a4a809b70e1088d3eb5a54be1044ee4e5ccc
-Size (metacity-2.22.0.tar.bz2) = 2071931 bytes
+SHA1 (metacity-2.24.0.tar.bz2) = 0b2e37e372498e26a6926fbb68e96556c6db6497
+RMD160 (metacity-2.24.0.tar.bz2) = 758c26e163fdc84dcee1e386ab8cbefc38cdd7a5
+Size (metacity-2.24.0.tar.bz2) = 2160557 bytes