Update to 2.9.91

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

12 files changed, 76 insertions, 70 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 9b9ae1d60..e8d7ef833 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.9.4
+PORTVERSION=	2.9.91
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.9
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 8bca5eeeb..00a1bc23c 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.9.4.tar.bz2) = b95677dc4caf09c1143804bc54f1b468
-SIZE (gnome2/control-center-2.9.4.tar.bz2) = 2710848
+MD5 (gnome2/control-center-2.9.91.tar.bz2) = 99a8c387fa207f07c2e393f6c772dcd4
+SIZE (gnome2/control-center-2.9.91.tar.bz2) = 2767450
diff --git a/sysutils/gnome-control-center/files/patch-capplets-gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets-gnome-keyboard-properties-xkbot.c
new file mode 100644
index 000000000..02374b23a
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets-gnome-keyboard-properties-xkbot.c
@@ -0,0 +1,33 @@
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
+@@ -242,21 +242,25 @@
+                                          Bool allowMultipleSelection,
+                                          GladeXML * dialog)
+ {
++  gchar *utfGroupName, *titlemarkup;
++  GtkWidget *expander;
++  GtkWidget *vbox;
++  GtkWidget *align;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+ 
+   current1stLevelId = configItem->name;
+ 
+-  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+-  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++  utfGroupName = xci_desc_to_utf8 (configItem);
++  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+ 
+-  GtkWidget *expander = gtk_expander_new (titlemarkup);
++  expander = gtk_expander_new (titlemarkup);
+   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
+ 
+   g_free (titlemarkup);
+   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
+-  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
++  align = gtk_alignment_new (0, 0, 1, 1);
+   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+-  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
++  vbox = gtk_vbox_new (TRUE, 6);
+   gtk_container_add (GTK_CONTAINER (align), vbox);
+   gtk_container_add (GTK_CONTAINER (expander), align);
+   currentVbox = vbox;
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 3058e0e25..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkb.c.orig	Thu Jan 13 02:47:53 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkb.c	Thu Jan 13 02:48:01 2005
-@@ -137,8 +137,8 @@
- void
- setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
- {
--  xkbGConfClient = gconf_client_get_default ();
-   GObject * peditor;
-+  xkbGConfClient = gconf_client_get_default ();
- 
-   XklInit (GDK_DISPLAY ());
-   XklConfigInit ();
diff --git a/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c b/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c
deleted file mode 100644
index 70d6b8a7f..000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkblt.c.orig	Thu Jan 13 02:49:37 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkblt.c	Thu Jan 13 02:51:22 2005
-@@ -105,11 +105,13 @@
- 
-   if (value->type == GCONF_VALUE_INT)
-     {
--      defaultGroup = gconf_value_get_int (value);
--      GtkWidget* treeView = WID ("xkb_layouts_selected");
--      GtkTreeModel *model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView)));
-+      GtkWidget* treeView;
-+      GtkTreeModel *model;
-       GtkTreeIter iter;
-       int counter = 0;
-+      defaultGroup = gconf_value_get_int (value);
-+      treeView = WID ("xkb_layouts_selected");
-+      model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView)));
-       if (gtk_tree_model_get_iter_first (model, &iter))
-         {
-           do
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index d5064fb82..4ec453005 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -65,6 +65,7 @@ share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
 share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
+share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
 share/gnome/control-center-2.0/interfaces/sound-properties.glade
 share/gnome/control-center-2.0/interfaces/theme-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
@@ -193,6 +194,6 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
-@dirrm share/gnome/control-center-2.0/icons
+@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 9b9ae1d60..e8d7ef833 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.9.4
+PORTVERSION=	2.9.91
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.9
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 8bca5eeeb..00a1bc23c 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.9.4.tar.bz2) = b95677dc4caf09c1143804bc54f1b468
-SIZE (gnome2/control-center-2.9.4.tar.bz2) = 2710848
+MD5 (gnome2/control-center-2.9.91.tar.bz2) = 99a8c387fa207f07c2e393f6c772dcd4
+SIZE (gnome2/control-center-2.9.91.tar.bz2) = 2767450
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets-gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets-gnome-keyboard-properties-xkbot.c
new file mode 100644
index 000000000..02374b23a
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets-gnome-keyboard-properties-xkbot.c
@@ -0,0 +1,33 @@
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
+@@ -242,21 +242,25 @@
+                                          Bool allowMultipleSelection,
+                                          GladeXML * dialog)
+ {
++  gchar *utfGroupName, *titlemarkup;
++  GtkWidget *expander;
++  GtkWidget *vbox;
++  GtkWidget *align;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+ 
+   current1stLevelId = configItem->name;
+ 
+-  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+-  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++  utfGroupName = xci_desc_to_utf8 (configItem);
++  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+ 
+-  GtkWidget *expander = gtk_expander_new (titlemarkup);
++  expander = gtk_expander_new (titlemarkup);
+   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
+ 
+   g_free (titlemarkup);
+   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
+-  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
++  align = gtk_alignment_new (0, 0, 1, 1);
+   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+-  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
++  vbox = gtk_vbox_new (TRUE, 6);
+   gtk_container_add (GTK_CONTAINER (align), vbox);
+   gtk_container_add (GTK_CONTAINER (expander), align);
+   currentVbox = vbox;
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c
deleted file mode 100644
index 3058e0e25..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkb.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkb.c.orig	Thu Jan 13 02:47:53 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkb.c	Thu Jan 13 02:48:01 2005
-@@ -137,8 +137,8 @@
- void
- setup_xkb_tabs (GladeXML * dialog, GConfChangeSet * changeset)
- {
--  xkbGConfClient = gconf_client_get_default ();
-   GObject * peditor;
-+  xkbGConfClient = gconf_client_get_default ();
- 
-   XklInit (GDK_DISPLAY ());
-   XklConfigInit ();
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c
deleted file mode 100644
index 70d6b8a7f..000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_keyboard_gnome-keyboard-properties-xkblt.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- capplets/keyboard/gnome-keyboard-properties-xkblt.c.orig	Thu Jan 13 02:49:37 2005
-+++ capplets/keyboard/gnome-keyboard-properties-xkblt.c	Thu Jan 13 02:51:22 2005
-@@ -105,11 +105,13 @@
- 
-   if (value->type == GCONF_VALUE_INT)
-     {
--      defaultGroup = gconf_value_get_int (value);
--      GtkWidget* treeView = WID ("xkb_layouts_selected");
--      GtkTreeModel *model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView)));
-+      GtkWidget* treeView;
-+      GtkTreeModel *model;
-       GtkTreeIter iter;
-       int counter = 0;
-+      defaultGroup = gconf_value_get_int (value);
-+      treeView = WID ("xkb_layouts_selected");
-+      model = GTK_TREE_MODEL (gtk_tree_view_get_model (GTK_TREE_VIEW (treeView)));
-       if (gtk_tree_model_get_iter_first (model, &iter))
-         {
-           do
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index d5064fb82..4ec453005 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -65,6 +65,7 @@ share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
 share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
+share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
 share/gnome/control-center-2.0/interfaces/sound-properties.glade
 share/gnome/control-center-2.0/interfaces/theme-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
@@ -193,6 +194,6 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
-@dirrm share/gnome/control-center-2.0/icons
+@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0