update to 2.24.0

This switches to the gnome-2.24 release branch.

3 files changed, 21 insertions, 23 deletions

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