5 files changed, 39 insertions, 53 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 6cfb7d37ef66..5c04d9169623 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.172 2008/03/10 21:50:24 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.185 2008/09/24 21:51:29 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.22.2.1
-PORTREVISION=	1
+PORTVERSION=	2.24.0.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -16,7 +15,7 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
-LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	canberra-gtk.0:${PORTSDIR}/audio/libcanberra
 BUILD_DEPENDS=	${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
 RUN_DEPENDS=	gnome-eject:${PORTSDIR}/sysutils/gnome-mount \
 		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-settings-daemon
@@ -38,8 +37,7 @@ CONFIGURE_ARGS=	--enable-gstreamer=0.10
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	control-center.schemas \
-		fontilus.schemas themus.schemas
+GCONF_SCHEMAS=	control-center.schemas
 
 .if defined(PACKAGE_BUILDING)
 .undef WITHOUT_GNOME
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 576909a4ab58..b44bbd7bb3d9 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-control-center-2.22.2.1.tar.bz2) = f708092437fff488656c01665cbe6ae9
-SHA256 (gnome2/gnome-control-center-2.22.2.1.tar.bz2) = a13eda3ffc0ec353d1b0414238f70e08155179f24cda2f4afba6d905a601e56a
-SIZE (gnome2/gnome-control-center-2.22.2.1.tar.bz2) = 2110331
+MD5 (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = dcaf6e91fddbb1d57d045a4de34ec25c
+SHA256 (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = fa5d1ba5cb2f88d3c689c8a2bceb57508777a23cff020dcf2de67ad81b0fe57d
+SIZE (gnome2/gnome-control-center-2.24.0.1.tar.bz2) = 2113356
diff --git a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
index ac875d14d9b9..d0e21a6c33b9 100644
--- a/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
+++ b/sysutils/gnome-control-center/files/patch-capplets_common_gnome-theme-info.c
@@ -1,20 +1,20 @@
---- capplets/common/gnome-theme-info.c.orig	2007-10-30 18:58:26.000000000 -0400
-+++ capplets/common/gnome-theme-info.c	2007-11-01 08:43:25.067405773 -0400
-@@ -661,7 +661,7 @@
-     theme_info->thumbnail = gdk_pixbuf_new_from_file (filename, NULL);
-     g_free (filename);
- 
--    theme_info->path = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
-+    theme_info->name = g_build_filename (INSTALL_PREFIX, "share", builtins[i][0], NULL);
-     theme_info->name = g_strdup (theme_info->path);
- 
-     if (!strcmp (theme_info->path, cursor_font))
-@@ -1922,7 +1922,7 @@
-   gnome_vfs_uri_unref (top_theme_dir_uri);
+--- capplets/common/gnome-theme-info.c.orig	2008-05-17 12:46:59.000000000 -0400
++++ capplets/common/gnome-theme-info.c	2008-05-20 18:10:50.000000000 -0400
+@@ -1843,7 +1843,7 @@ gnome_theme_init ()
+   g_object_unref (top_theme_dir);
  
    /* The weird /usr/share/icons */
--  top_theme_dir_uri = gnome_vfs_uri_new ("/usr/share/icons");
-+  top_theme_dir_uri = gnome_vfs_uri_new ("%%LOCALBASE%%/lib/X11/icons");
-   if (!gnome_vfs_uri_exists (top_theme_dir_uri))
-     gnome_vfs_make_directory_for_uri (top_theme_dir_uri, 0775);
-   add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
+-  top_theme_dir = g_file_new_for_path ("/usr/share/icons");
++  top_theme_dir = g_file_new_for_path ("%%LOCALBASE%%/lib/X11/icons");
+   add_top_icon_theme_dir_monitor (top_theme_dir, 2, NULL);
+   g_object_unref (top_theme_dir);
+ 
+@@ -1857,7 +1857,7 @@ gnome_theme_init ()
+ #ifdef XCURSOR_ICONDIR
+   /* if there's a separate xcursors dir, add that as well */
+   if (strcmp (XCURSOR_ICONDIR, top_theme_dir_string) &&
+-      strcmp (XCURSOR_ICONDIR, "/usr/share/icons")) {
++      strcmp (XCURSOR_ICONDIR, "%%LOCALBASE%%/lib/X11/icons")) {
+     top_theme_dir = g_file_new_for_path (XCURSOR_ICONDIR);
+     if (g_file_query_exists (top_theme_dir, NULL))
+       add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL);
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
index 26d4dbe929b2..fba462829c6c 100644
--- a/sysutils/gnome-control-center/pkg-descr
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -1 +1,3 @@
 Configuration tools tightly integrated within the GNOME 2 desktop.
+
+WWW: http://www.gnome.org
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 78f78520bd9d..84ba2af16290 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -6,42 +6,25 @@ 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
-etc/gnome-vfs-2.0/modules/font-method.conf
-etc/gnome-vfs-2.0/modules/theme-method.conf
 etc/xdg/autostart/gnome-at-session.desktop
 etc/xdg/menus/gnomecc.menu
 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.a
-lib/gnome-vfs-2.0/modules/libfont-method.la
-lib/gnome-vfs-2.0/modules/libfont-method.so
-lib/gnome-vfs-2.0/modules/libtheme-method.a
-lib/gnome-vfs-2.0/modules/libtheme-method.la
-lib/gnome-vfs-2.0/modules/libtheme-method.so
 lib/libgnome-window-settings.a
 lib/libgnome-window-settings.la
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
-lib/nautilus/extensions-2.0/libnautilus-fontilus.a
-lib/nautilus/extensions-2.0/libnautilus-fontilus.la
-lib/nautilus/extensions-2.0/libnautilus-fontilus.so
-lib/nautilus/extensions-2.0/libnautilus-themus.a
-lib/nautilus/extensions-2.0/libnautilus-themus.la
-lib/nautilus/extensions-2.0/libnautilus-themus.so
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
+libdata/pkgconfig/gnome-default-applications.pc
 libdata/pkgconfig/gnome-keybindings.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 share/applications/at-properties.desktop
@@ -49,7 +32,6 @@ share/applications/default-applications.desktop
 share/applications/display-properties.desktop
 %%ABOUTME%%share/applications/gnome-about-me.desktop
 share/applications/gnome-appearance-properties.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
@@ -57,14 +39,12 @@ 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
+%%DATADIR%%/default-apps/gnome-default-applications.xml
 %%DATADIR%%/glade/appearance.glade
-%%DATADIR%%/glade/apply-font.glade
 %%DATADIR%%/glade/at-enable-dialog.glade
+%%DATADIR%%/glade/display-capplet.glade
 %%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
 %%DATADIR%%/glade/gnome-default-applications-properties.glade
 %%DATADIR%%/glade/gnome-keybinding-properties.glade
@@ -73,7 +53,6 @@ share/desktop-directories/theme-method.directory
 %%DATADIR%%/glade/gnome-network-preferences.glade
 %%DATADIR%%/glade/gnome-window-properties.glade
 %%DATADIR%%/glade/sound-properties.glade
-%%DATADIR%%/gnome-default-applications.xml
 %%DATADIR%%/keybindings/00-multimedia-key.xml
 %%DATADIR%%/keybindings/01-desktop-key.xml
 %%DATADIR%%/pixmaps/at-startup.png
@@ -99,7 +78,6 @@ share/desktop-directories/theme-method.directory
 %%DATADIR%%/pixmaps/subpixel-vbgr.png
 %%DATADIR%%/pixmaps/subpixel-vrgb.png
 %%DATADIR%%/pixmaps/theme-thumbnailing.png
-%%DATADIR%%/pixmaps/visual-bell.png
 %%DATADIR%%/pixmaps/window-theme-thumbnailing.png
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
@@ -137,17 +115,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
@@ -223,7 +206,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
@@ -278,6 +261,7 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrm share/gnome/cursor-fonts
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/default-apps
 @dirrmtry share/desktop-directories
 @dirrmtry share/applications
 @dirrm lib/window-manager-settings
@@ -295,6 +279,8 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES