5 files changed, 39 insertions, 86 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 2dc0a9354a1a..7bf9d14fcc39 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,20 +3,22 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.157 2007/10/15 17:48:45 mezz Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.172 2008/03/10 21:50:24 mezz Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.20.3
+PORTVERSION=	2.22.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
-LIB_DEPENDS=	xklavier.11:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier.12:${PORTSDIR}/x11/libxklavier
+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
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
@@ -35,11 +37,7 @@ CONFIGURE_ARGS=	--enable-gstreamer=0.10
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
-GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
-		apps_gnome_settings_daemon_keybindings.schemas \
-		apps_gnome_settings_daemon_screensaver.schemas \
-		control-center.schemas \
-		desktop_gnome_font_rendering.schemas \
+GCONF_SCHEMAS=	control-center.schemas \
 		fontilus.schemas themus.schemas
 
 .if defined(PACKAGE_BUILDING)
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index ddca27e93d27..ee7861862154 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-control-center-2.20.3.tar.bz2) = cd44c6b870d09ea5a049aa11385c97a6
-SHA256 (gnome2/gnome-control-center-2.20.3.tar.bz2) = e3abed47de5f41511af95663d1adb3d35a575dc662b8611e959f2f5d205ab07f
-SIZE (gnome2/gnome-control-center-2.20.3.tar.bz2) = 2259976
+MD5 (gnome2/gnome-control-center-2.22.0.tar.bz2) = e6730ac4ee8b14a577978dee6c1cb88f
+SHA256 (gnome2/gnome-control-center-2.22.0.tar.bz2) = 13e5cc7181b4c380921984a327ec2f8a48077a4f15319bbe6cf6985f44ff3af0
+SIZE (gnome2/gnome-control-center-2.22.0.tar.bz2) = 2176730
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 5f5eb4bc15a5..ac875d14d9b9 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,15 +1,15 @@
---- capplets/common/gnome-theme-info.c.orig	2007-08-27 04:09:06.000000000 -0400
-+++ capplets/common/gnome-theme-info.c	2007-09-20 15:24:56.000000000 -0400
-@@ -1845,7 +1845,7 @@ read_cursor_fonts (void)
+--- 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->name = g_build_filename (GNOMECC_DATA_DIR, builtins[i][0], NULL);
+-    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->path = g_strdup (theme_info->name);
+     theme_info->name = g_strdup (theme_info->path);
  
      if (!strcmp (theme_info->path, cursor_font))
-@@ -1974,7 +1974,7 @@ gnome_theme_init (gboolean *monitor_not_
+@@ -1922,7 +1922,7 @@
    gnome_vfs_uri_unref (top_theme_dir_uri);
  
    /* The weird /usr/share/icons */
@@ -17,4 +17,4 @@
 +  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);
-   result = add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
+   add_top_icon_theme_dir_monitor (top_theme_dir_uri, &real_monitor_not_added, 2, NULL);
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
deleted file mode 100644
index 2664fcf8ee6b..000000000000
--- a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	2007-09-18 05:32:43.000000000 -0400
-+++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	2007-10-28 13:45:28.000000000 -0400
-@@ -610,8 +610,11 @@
- 	if ((command != NULL) && (strcmp (command, "") != 0))
- 		execute (acme, command, FALSE, FALSE);
- 	else
-+#if __FreeBSD__
-+		execute (acme, "cdcontrol eject", FALSE, FALSE);
-+#else
- 		execute (acme, "eject -T", FALSE, FALSE);
--
-+#endif
- 	g_free (command);
- }
- 
-@@ -708,7 +711,7 @@
- 		do_mail_action (acme);
- 		break;
- 	case SLEEP_KEY:
--		do_sleep_action ("apm", "xset dpms force off");
-+		do_sleep_action ("zzz", "xset dpms force off");
- 		break;
- 	case SCREENSAVER_KEY:
- 		if ((cmd = g_find_program_in_path ("gnome-screensaver-command")))
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index f444122a9d09..94006da59a29 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -1,5 +1,4 @@
 %%ABOUTME%%bin/gnome-about-me
-bin/gnome-accessibility-keyboard-properties
 bin/gnome-appearance-properties
 bin/gnome-at-mobility
 bin/gnome-at-properties
@@ -20,8 +19,8 @@ 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-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 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
@@ -34,20 +33,17 @@ lib/libgnome-window-settings.a
 lib/libgnome-window-settings.la
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
-lib/nautilus/extensions-1.0/libnautilus-fontilus.a
-lib/nautilus/extensions-1.0/libnautilus-fontilus.la
-lib/nautilus/extensions-1.0/libnautilus-fontilus.so
-lib/nautilus/extensions-1.0/libnautilus-themus.a
-lib/nautilus/extensions-1.0/libnautilus-themus.la
-lib/nautilus/extensions-1.0/libnautilus-themus.so
+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-keybindings.pc
-libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
-libexec/gnome-settings-daemon
-share/applications/accessibility-keyboard.desktop
 share/applications/at-properties.desktop
 share/applications/default-applications.desktop
 share/applications/display-properties.desktop
@@ -63,33 +59,23 @@ share/applications/keybinding.desktop
 share/applications/keyboard.desktop
 share/applications/themus-theme-applier.desktop
 share/applications/window-properties.desktop
-share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/desktop-directories/font-method.directory
 share/desktop-directories/gnomecc.directory
 share/desktop-directories/theme-method.directory
-%%DATADIR%%/glade/acme.glade
 %%DATADIR%%/glade/appearance.glade
 %%DATADIR%%/glade/apply-font.glade
 %%DATADIR%%/glade/at-enable-dialog.glade
 %%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
-%%DATADIR%%/glade/gnome-accessibility-keyboard-properties.glade
 %%DATADIR%%/glade/gnome-default-applications-properties.glade
 %%DATADIR%%/glade/gnome-keybinding-properties.glade
 %%DATADIR%%/glade/gnome-keyboard-properties.glade
 %%DATADIR%%/glade/gnome-mouse-properties.glade
 %%DATADIR%%/glade/gnome-network-preferences.glade
 %%DATADIR%%/glade/gnome-window-properties.glade
-%%DATADIR%%/glade/modmap-dialog.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/accessibility-keyboard-bouncekey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-mousekey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-slowkey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-stickykey.png
-%%DATADIR%%/pixmaps/accessibility-keyboard-togglekey.png
-%%DATADIR%%/pixmaps/acme-eject.png
 %%DATADIR%%/pixmaps/at-startup.png
 %%DATADIR%%/pixmaps/at-support.png
 %%DATADIR%%/pixmaps/bar-disabled.png
@@ -103,16 +89,10 @@ share/desktop-directories/theme-method.directory
 %%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
 %%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
 %%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
-%%DATADIR%%/pixmaps/keyboard-bell.png
-%%DATADIR%%/pixmaps/keyboard-cursor.png
-%%DATADIR%%/pixmaps/keyboard-repeat.png
-%%DATADIR%%/pixmaps/keyboard-volume.png
 %%DATADIR%%/pixmaps/mouse-cursor-normal-large.png
 %%DATADIR%%/pixmaps/mouse-cursor-normal.png
 %%DATADIR%%/pixmaps/mouse-cursor-white-large.png
 %%DATADIR%%/pixmaps/mouse-cursor-white.png
-%%DATADIR%%/pixmaps/mouse-left.png
-%%DATADIR%%/pixmaps/mouse-right.png
 %%DATADIR%%/pixmaps/ocean-stripes.png
 %%DATADIR%%/pixmaps/stop.png
 %%DATADIR%%/pixmaps/subpixel-bgr.png
@@ -122,13 +102,6 @@ share/desktop-directories/theme-method.directory
 %%DATADIR%%/pixmaps/theme-thumbnailing.png
 %%DATADIR%%/pixmaps/visual-bell.png
 %%DATADIR%%/pixmaps/window-theme-thumbnailing.png
-%%DATADIR%%/xrdb/Editres.ad
-%%DATADIR%%/xrdb/Emacs.ad
-%%DATADIR%%/xrdb/General.ad
-%%DATADIR%%/xrdb/Motif.ad
-%%DATADIR%%/xrdb/Tk.ad
-%%DATADIR%%/xrdb/Xaw.ad
-share/gnome/autostart/gnome-at-session.desktop
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -151,9 +124,11 @@ share/gnome/help/control-center/ca/control-center.xml
 share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/it/control-center.xml
 share/gnome/help/control-center/ja/control-center.xml
 share/gnome/help/control-center/oc/control-center.xml
 share/gnome/help/control-center/pa/control-center.xml
+share/gnome/help/control-center/pl/control-center.xml
 share/gnome/help/control-center/pt/control-center.xml
 share/gnome/help/control-center/pt_BR/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
@@ -173,6 +148,8 @@ 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-sound-properties.png
+share/icons/hicolor/48x48/apps/gnome-network-preferences.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
 share/icons/hicolor/scalable/apps/gnome-network-preferences.svg
@@ -181,6 +158,7 @@ share/icons/hicolor/scalable/apps/typing-monitor.svg
 share/locale/af/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/as/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/be@latin/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -216,6 +194,7 @@ share/locale/is/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/it/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ja/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ka/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/kn/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ku/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -252,8 +231,6 @@ share/locale/te/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/th/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/uz/LC_MESSAGES/gnome-control-center-2.0.mo
-share/locale/uz@cyrillic/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/xh/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -268,9 +245,11 @@ share/omf/control-center/control-center-ca.omf
 share/omf/control-center/control-center-en_GB.omf
 share/omf/control-center/control-center-es.omf
 share/omf/control-center/control-center-fr.omf
+share/omf/control-center/control-center-it.omf
 share/omf/control-center/control-center-ja.omf
 share/omf/control-center/control-center-oc.omf
 share/omf/control-center/control-center-pa.omf
+share/omf/control-center/control-center-pl.omf
 share/omf/control-center/control-center-pt.omf
 share/omf/control-center/control-center-pt_BR.omf
 share/omf/control-center/control-center-ru.omf
@@ -286,9 +265,11 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrm share/gnome/help/control-center/ru
 @dirrm share/gnome/help/control-center/pt_BR
 @dirrm share/gnome/help/control-center/pt
+@dirrm share/gnome/help/control-center/pl
 @dirrm share/gnome/help/control-center/pa
 @dirrm share/gnome/help/control-center/oc
 @dirrm share/gnome/help/control-center/ja
+@dirrm share/gnome/help/control-center/it
 @dirrm share/gnome/help/control-center/fr
 @dirrm share/gnome/help/control-center/es
 @dirrm share/gnome/help/control-center/en_GB
@@ -296,14 +277,13 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @dirrm share/gnome/cursor-fonts
-@dirrm %%DATADIR%%/xrdb
 @dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/glade
 @dirrmtry share/desktop-directories
+@dirrmtry share/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
+@dirrmtry etc/xdg/autostart
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -314,8 +294,6 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/xh/LC_MESSAGES
 @dirrmtry share/locale/xh
-@dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
-@dirrmtry share/locale/uz@cyrillic
 @dirrmtry share/locale/te/LC_MESSAGES
 @dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
@@ -338,4 +316,5 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
-@dirrmtry share/applications
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as