update to 2.24.0.1

This switches to the gnome-2.24 release branch.

4 files changed, 30 insertions, 49 deletions

diff --git a/x11/gnome-control-center/Makefile b/x11/gnome-control-center/Makefile
index d2ba73f36cf..221db2beb38 100644
--- a/x11/gnome-control-center/Makefile
+++ b/x11/gnome-control-center/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2008/09/06 20:54:34 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2008/10/16 15:24:01 drochner Exp $
 #
 
-DISTNAME=	gnome-control-center-2.22.2.1
-PKGREVISION=	1
+DISTNAME=	gnome-control-center-2.24.0.1
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.22/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gnome-control-center/2.24/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -36,14 +35,8 @@ INSTALL_MAKE_FLAGS+=	autostartdir=${PREFIX}/share/applications
 INSTALLATION_DIRS=	${EGDIR}
 
 GCONF_SCHEMAS+=	control-center.schemas
-GCONF_SCHEMAS+=	themus.schemas
-GCONF_SCHEMAS+=	fontilus.schemas
 
 EGDIR=			${PREFIX}/share/examples/gnome-control-center
-CONF_FILES=		${EGDIR}/theme-method.conf \
-			${PKG_SYSCONFDIR}/gnome-vfs-2.0/modules/theme-method.conf
-CONF_FILES+=		${EGDIR}/font-method.conf \
-			${PKG_SYSCONFDIR}/gnome-vfs-2.0/modules/font-method.conf
 CONF_FILES+=		${EGDIR}/gnomecc.menu \
 			${PKG_SYSCONFDIR}/xdg/menus/gnomecc.menu
 
@@ -63,7 +56,10 @@ CONFIGURE_ARGS+=	--enable-aboutme
 PLIST.evolution=	yes
 .endif
 
+_TOOLS_USE_MSGFMT_SH=	yes
+
 .include "../../audio/esound/buildlink3.mk"
+.include "../../audio/libcanberra/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf/schemas.mk"
 .include "../../devel/glib2/buildlink3.mk"
@@ -102,10 +98,4 @@ PLIST.evolution=	yes
 .include "../../databases/shared-mime-info/mimedb.mk"
 .include "../../sysutils/gnome-settings-daemon/buildlink3.mk"
 
-post-install:
-	${INSTALL_DATA} ${WRKSRC}/vfs-methods/themus/theme-method.conf \
-	    ${DESTDIR}${EGDIR}
-	${INSTALL_DATA} ${WRKSRC}/vfs-methods/fontilus/font-method.conf \
-	    ${DESTDIR}${EGDIR}
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-control-center/PLIST b/x11/gnome-control-center/PLIST
index e33fd8a080e..b89ae15379d 100644
--- a/x11/gnome-control-center/PLIST
+++ b/x11/gnome-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2008/04/24 15:58:31 bjs Exp $
+@comment $NetBSD: PLIST,v 1.8 2008/10/16 15:24:01 drochner Exp $
 ${PLIST.evolution}bin/gnome-about-me
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
@@ -7,24 +7,16 @@ bin/gnome-at-visual
 bin/gnome-control-center
 bin/gnome-default-applications-properties
 bin/gnome-display-properties
-bin/gnome-font-viewer
 bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/gnome-theme-thumbnailer
-bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-window-properties
-bin/themus-theme-applier
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
-lib/gnome-vfs-2.0/modules/libfont-method.la
-lib/gnome-vfs-2.0/modules/libtheme-method.la
 lib/libgnome-window-settings.la
-lib/nautilus/extensions-2.0/libnautilus-fontilus.la
-lib/nautilus/extensions-2.0/libnautilus-themus.la
 lib/pkgconfig/gnome-window-settings-2.0.pc
 lib/window-manager-settings/libmetacity.la
 share/applications/at-properties.desktop
@@ -33,7 +25,6 @@ share/applications/display-properties.desktop
 ${PLIST.evolution}share/applications/gnome-about-me.desktop
 share/applications/gnome-appearance-properties.desktop
 share/applications/gnome-at-session.desktop
-share/applications/gnome-font-viewer.desktop
 share/applications/gnome-network-preferences.desktop
 share/applications/gnome-settings-mouse.desktop
 share/applications/gnome-settings-sound.desktop
@@ -41,20 +32,14 @@ share/applications/gnome-theme-installer.desktop
 share/applications/gnomecc.desktop
 share/applications/keybinding.desktop
 share/applications/keyboard.desktop
-share/applications/themus-theme-applier.desktop
 share/applications/window-properties.desktop
-share/desktop-directories/font-method.directory
 share/desktop-directories/gnomecc.directory
-share/desktop-directories/theme-method.directory
-share/examples/gnome-control-center/font-method.conf
 share/examples/gnome-control-center/gnomecc.menu
-share/examples/gnome-control-center/theme-method.conf
 share/gconf/schemas/control-center.schemas
-share/gconf/schemas/fontilus.schemas
-share/gconf/schemas/themus.schemas
+share/gnome-control-center/default-apps/gnome-default-applications.xml
 share/gnome-control-center/glade/appearance.glade
-share/gnome-control-center/glade/apply-font.glade
 share/gnome-control-center/glade/at-enable-dialog.glade
+share/gnome-control-center/glade/display-capplet.glade
 ${PLIST.evolution}share/gnome-control-center/glade/gnome-about-me.glade
 share/gnome-control-center/glade/gnome-default-applications-properties.glade
 share/gnome-control-center/glade/gnome-keybinding-properties.glade
@@ -63,7 +48,6 @@ share/gnome-control-center/glade/gnome-mouse-properties.glade
 share/gnome-control-center/glade/gnome-network-preferences.glade
 share/gnome-control-center/glade/gnome-window-properties.glade
 share/gnome-control-center/glade/sound-properties.glade
-share/gnome-control-center/gnome-default-applications.xml
 share/gnome-control-center/keybindings/00-multimedia-key.xml
 share/gnome-control-center/keybindings/01-desktop-key.xml
 share/gnome-control-center/pixmaps/at-startup.png
@@ -89,7 +73,6 @@ share/gnome-control-center/pixmaps/subpixel-rgb.png
 share/gnome-control-center/pixmaps/subpixel-vbgr.png
 share/gnome-control-center/pixmaps/subpixel-vrgb.png
 share/gnome-control-center/pixmaps/theme-thumbnailing.png
-share/gnome-control-center/pixmaps/visual-bell.png
 share/gnome-control-center/pixmaps/window-theme-thumbnailing.png
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
@@ -127,17 +110,22 @@ share/gnome/help/control-center/vi/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
 share/icons/hicolor/16x16/apps/gnome-display-properties.png
 share/icons/hicolor/16x16/apps/gnome-network-preferences.png
+share/icons/hicolor/16x16/apps/gnome-settings-default-applications.png
 share/icons/hicolor/16x16/apps/gnome-sound-properties.png
 share/icons/hicolor/22x22/apps/gnome-display-properties.png
 share/icons/hicolor/22x22/apps/gnome-network-preferences.png
+share/icons/hicolor/22x22/apps/gnome-settings-default-applications.png
 share/icons/hicolor/22x22/apps/gnome-sound-properties.png
 share/icons/hicolor/24x24/apps/gnome-display-properties.png
 share/icons/hicolor/24x24/apps/gnome-network-preferences.png
+share/icons/hicolor/24x24/apps/gnome-settings-default-applications.png
 share/icons/hicolor/24x24/apps/gnome-sound-properties.png
 share/icons/hicolor/32x32/apps/gnome-display-properties.png
 share/icons/hicolor/32x32/apps/gnome-network-preferences.png
+share/icons/hicolor/32x32/apps/gnome-settings-default-applications.png
 share/icons/hicolor/32x32/apps/gnome-sound-properties.png
 share/icons/hicolor/48x48/apps/gnome-network-preferences.png
+share/icons/hicolor/48x48/apps/gnome-settings-default-applications.png
 share/icons/hicolor/48x48/apps/gnome-sound-properties.png
 share/icons/hicolor/48x48/apps/typing-monitor.png
 share/icons/hicolor/scalable/apps/gnome-display-properties.svg
@@ -213,7 +201,7 @@ share/locale/sk/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/sl/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/sq/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/sr/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/sr@Latn/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/sr@latin/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -245,6 +233,7 @@ share/omf/control-center/control-center-sv.omf
 share/omf/control-center/control-center-uk.omf
 share/omf/control-center/control-center-vi.omf
 share/omf/control-center/control-center-zh_CN.omf
+share/pkgconfig/gnome-default-applications.pc
 share/pkgconfig/gnome-keybindings.pc
 @dirrm share/omf/control-center
 @comment in rarian: @dirrm share/omf
@@ -277,13 +266,14 @@ share/pkgconfig/gnome-keybindings.pc
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome-control-center/pixmaps
+@dirrm share/gnome-control-center/keybindings
 @dirrm share/gnome-control-center/glade
+@dirrm share/gnome-control-center/default-apps
+@dirrm share/gnome-control-center
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf: @dirrm share/gconf/schemas
 @dirrm share/examples/gnome-control-center
 @comment in xdg-dirs: @dirrm share/desktop-directories
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/window-manager-settings
-@comment in nautilus: @dirrm lib/nautilus
-@comment in gnome-vfs: @dirrm lib/gnome-vfs-2.0/modules
 @dirrm include/gnome-window-settings-2.0
diff --git a/x11/gnome-control-center/distinfo b/x11/gnome-control-center/distinfo
index fbd9d8798a9..e69e82d7b11 100644
--- a/x11/gnome-control-center/distinfo
+++ b/x11/gnome-control-center/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.4 2008/05/29 11:28:46 drochner Exp $
+$NetBSD: distinfo,v 1.5 2008/10/16 15:24:01 drochner Exp $
 
-SHA1 (gnome-control-center-2.22.2.1.tar.bz2) = 686151d59b99fb311481ba365b0dd3fd3680cac6
-RMD160 (gnome-control-center-2.22.2.1.tar.bz2) = 59e27bd24f15cbf4a4cef65aad740945eee40ca0
-Size (gnome-control-center-2.22.2.1.tar.bz2) = 2110331 bytes
+SHA1 (gnome-control-center-2.24.0.1.tar.bz2) = daf737c762d53ef984a55fc5008e6a4e85b88294
+RMD160 (gnome-control-center-2.24.0.1.tar.bz2) = 5f211b12f7260a8af8c602066133d72cb61cc3f6
+Size (gnome-control-center-2.24.0.1.tar.bz2) = 2113356 bytes
 SHA1 (patch-aa) = 377d07ac5071fa19063cd3ecd47c589c53b81b5a
-SHA1 (patch-ab) = c0561975640562546f612e252a9d239d6dbc695b
+SHA1 (patch-ab) = 82e7da7e90d8c30aa061c49f9f26ae270c122462
 SHA1 (patch-ad) = fe6ae649237fe3b07a449b92c35d8a803b4533fb
 SHA1 (patch-ae) = 2a586a333522e967bc513d24ebd8ef907f4919c3
diff --git a/x11/gnome-control-center/patches/patch-ab b/x11/gnome-control-center/patches/patch-ab
index b338225411e..3ec09da9dcf 100644
--- a/x11/gnome-control-center/patches/patch-ab
+++ b/x11/gnome-control-center/patches/patch-ab
@@ -1,16 +1,17 @@
-$NetBSD: patch-ab,v 1.1.1.1 2007/11/05 19:17:29 drochner Exp $
+$NetBSD: patch-ab,v 1.2 2008/10/16 15:24:01 drochner Exp $
 
---- capplets/about-me/gnome-about-me.c.orig	2006-09-24 20:42:14.000000000 +0000
+--- capplets/about-me/gnome-about-me.c.orig	2008-09-24 18:36:23.000000000 +0200
 +++ capplets/about-me/gnome-about-me.c
-@@ -267,16 +267,12 @@ static char *
+@@ -329,17 +329,12 @@ about_me_focus_out (GtkWidget *widget, G
+ static char *
  get_user_login (void)
  {
- 	char buf[LINE_MAX * 4];
+-	char buf[LINE_MAX * 4];
 -	struct passwd pwd, *err;
 +	struct passwd *pwd;
  
 -	int i;
--#if __sun
+-#if defined(__sun) && !defined(_POSIX_PTHREAD_SEMANTICS)
 -	i = getpwuid_r (getuid (), &pwd, buf, sizeof (buf));
 -	return (i != 0) ? g_strdup (pwd.pw_name) : NULL;
 -#else