Update to 2.27.4.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@12476 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 39 insertions, 44 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index c40232c03..3bf776b71 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.189 2009/03/18 00:23:38 kwm Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.191 2009/07/07 18:47:15 marcus Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.26.0
-PORTREVISION=	1
+PORTVERSION=	2.27.4.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -34,7 +33,6 @@ GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_LDCONFIG=	yes
-CONFIGURE_ARGS=	--enable-gstreamer=0.10
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 4bd79e50c..b1340fe10 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-control-center-2.26.0.tar.bz2) = eed8feccc37712e34d88bd3b20e46962
-SHA256 (gnome2/gnome-control-center-2.26.0.tar.bz2) = 62fb84ea1053971a53c5259b92eb3a282c2f317f72f761ed4dff434ed0e99c05
-SIZE (gnome2/gnome-control-center-2.26.0.tar.bz2) = 2262324
+MD5 (gnome2/gnome-control-center-2.27.4.1.tar.bz2) = fff294342dc0064c8e2b5e25ca0cc9c9
+SHA256 (gnome2/gnome-control-center-2.27.4.1.tar.bz2) = 3e17256022af4c4723290be9644667b6efc07988f9462cc62a58c03848933936
+SIZE (gnome2/gnome-control-center-2.27.4.1.tar.bz2) = 2271175
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 d0e21a6c3..c9b378544 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,11 @@
---- 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 = 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 ()
+--- capplets/common/gnome-theme-info.c.orig	2009-05-03 20:30:56.000000000 +0200
++++ capplets/common/gnome-theme-info.c	2009-07-19 12:54:25.000000000 +0200
+@@ -1876,7 +1876,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);
+     add_top_icon_theme_dir_monitor (top_theme_dir, 1, NULL);
+     g_object_unref (top_theme_dir);
diff --git a/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c b/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c
deleted file mode 100644
index 89a13b00f..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkb.c.orig	2009-07-07 14:41:53.000000000 -0400
-+++ capplets/keyboard/gnome-keyboard-properties-xkb.c	2009-07-07 14:42:12.000000000 -0400
-@@ -155,7 +155,7 @@ setup_xkb_tabs (GladeXML * dialog, GConf
- 
- 	engine = xkl_engine_get_instance (GDK_DISPLAY ());
- 	config_registry = xkl_config_registry_get_instance (engine);
--	xkl_config_registry_load (config_registry);
-+	xkl_config_registry_load (config_registry, TRUE);
- 
- 	gkbd_keyboard_config_init (&initial_config, xkb_gconf_client,
- 				   engine);
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 569150975..59b0ffa7e 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -43,17 +43,10 @@ share/applications/keyboard.desktop
 share/applications/window-properties.desktop
 share/desktop-directories/gnomecc.directory
 %%DATADIR%%/default-apps/gnome-default-applications.xml
-%%DATADIR%%/glade/appearance.glade
-%%DATADIR%%/glade/at-enable-dialog.glade
-%%DATADIR%%/glade/display-capplet.glade
-%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me.glade
-%%ABOUTME%%%%DATADIR%%/glade/gnome-about-me-fingerprint.glade
-%%DATADIR%%/glade/gnome-default-applications-properties.glade
-%%DATADIR%%/glade/gnome-keybinding-properties.glade
+%%DATADIR%%/glade/gnome-about-me-fingerprint.glade
+%%DATADIR%%/glade/gnome-about-me.glade
 %%DATADIR%%/glade/gnome-keyboard-properties.glade
 %%DATADIR%%/glade/gnome-mouse-properties.glade
-%%DATADIR%%/glade/gnome-network-properties.glade
-%%DATADIR%%/glade/gnome-window-properties.glade
 %%DATADIR%%/keybindings/00-multimedia-key.xml
 %%DATADIR%%/keybindings/01-desktop-key.xml
 %%DATADIR%%/pixmaps/at-startup.png
@@ -65,21 +58,38 @@ share/desktop-directories/gnomecc.directory
 %%DATADIR%%/pixmaps/double-click-maybe.png
 %%DATADIR%%/pixmaps/double-click-off.png
 %%DATADIR%%/pixmaps/double-click-on.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%%%DATADIR%%/pixmaps/gnome-about-me-lock.png
 %%DATADIR%%/pixmaps/gtk-theme-thumbnailing.png
 %%DATADIR%%/pixmaps/icon-theme-thumbnailing.png
+%%DATADIR%%/pixmaps/left-index-finger.svg
+%%DATADIR%%/pixmaps/left-little-finger.svg
+%%DATADIR%%/pixmaps/left-middle-finger.svg
+%%DATADIR%%/pixmaps/left-ring-finger.svg
+%%DATADIR%%/pixmaps/left-thumb.svg
 %%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/ocean-stripes.png
+%%DATADIR%%/pixmaps/print_error.svg
+%%DATADIR%%/pixmaps/print_ok.svg
+%%DATADIR%%/pixmaps/right-index-finger.svg
+%%DATADIR%%/pixmaps/right-little-finger.svg
+%%DATADIR%%/pixmaps/right-middle-finger.svg
+%%DATADIR%%/pixmaps/right-ring-finger.svg
+%%DATADIR%%/pixmaps/right-thumb.svg
 %%DATADIR%%/pixmaps/subpixel-bgr.png
 %%DATADIR%%/pixmaps/subpixel-rgb.png
 %%DATADIR%%/pixmaps/subpixel-vbgr.png
 %%DATADIR%%/pixmaps/subpixel-vrgb.png
 %%DATADIR%%/pixmaps/theme-thumbnailing.png
 %%DATADIR%%/pixmaps/window-theme-thumbnailing.png
+%%DATADIR%%/ui/appearance.ui
+%%DATADIR%%/ui/at-enable-dialog.ui
+%%DATADIR%%/ui/display-capplet.ui
+%%DATADIR%%/ui/gnome-default-applications-properties.ui
+%%DATADIR%%/ui/gnome-keybinding-properties.ui
+%%DATADIR%%/ui/gnome-network-properties.ui
+%%DATADIR%%/ui/gnome-window-properties.ui
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -101,6 +111,7 @@ share/gnome/help/control-center/ca/control-center.xml
 share/gnome/help/control-center/ca@valencia/control-center.xml
 share/gnome/help/control-center/cs/control-center.xml
 share/gnome/help/control-center/de/control-center.xml
+share/gnome/help/control-center/el/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
@@ -149,6 +160,7 @@ share/locale/br/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/ca@valencia/LC_MESSAGES/gnome-control-center-2.0.mo
+share/locale/crh/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/cy/LC_MESSAGES/gnome-control-center-2.0.mo
 share/locale/da/LC_MESSAGES/gnome-control-center-2.0.mo
@@ -229,6 +241,7 @@ share/omf/control-center/control-center-ca.omf
 share/omf/control-center/control-center-ca@valencia.omf
 share/omf/control-center/control-center-cs.omf
 share/omf/control-center/control-center-de.omf
+share/omf/control-center/control-center-el.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
@@ -260,6 +273,7 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrm share/gnome/help/control-center/fr
 @dirrm share/gnome/help/control-center/es
 @dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/el
 @dirrm share/gnome/help/control-center/de
 @dirrm share/gnome/help/control-center/cs
 @dirrm share/gnome/help/control-center/ca@valencia
@@ -267,8 +281,9 @@ 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%%/pixmaps
+@dirrm %%DATADIR%%/ui
 @dirrm %%DATADIR%%/glade
+@dirrm %%DATADIR%%/pixmaps
 @dirrm %%DATADIR%%/default-apps
 @dirrmtry share/desktop-directories
 @dirrmtry share/applications
@@ -308,6 +323,8 @@ share/omf/control-center/control-center-zh_CN.omf
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/dz/LC_MESSAGES
 @dirrmtry share/locale/dz
+@dirrmtry share/locale/crh/LC_MESSAGES
+@dirrmtry share/locale/crh
 @dirrmtry share/locale/ca@valencia/LC_MESSAGES
 @dirrmtry share/locale/ca@valencia
 @dirrmtry share/locale/bn_IN/LC_MESSAGES