Update to 2.11.6.

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

8 files changed, 34 insertions, 10 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 1ed33116e..5f1c2cab0 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.77 2005/07/05 18:35:54 marcus Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.78 2005/07/05 18:40:24 marcus Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.11.5
+PORTVERSION=	2.11.6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.11
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 2145b23ae..334bf5c92 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.11.5.tar.bz2) = 2e6f3a42b2ccf1cf57fa8a49841e919c
-SIZE (gnome2/control-center-2.11.5.tar.bz2) = 2735971
+MD5 (gnome2/control-center-2.11.6.tar.bz2) = adf6804249cff2e4d2ed1b3e87035c3d
+SIZE (gnome2/control-center-2.11.6.tar.bz2) = 2758398
diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
new file mode 100644
index 000000000..69d390449
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,13 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Thu Jul 14 16:27:10 2005
++++ capplets/mouse/gnome-mouse-properties.c	Thu Jul 14 16:27:36 2005
+@@ -470,8 +470,9 @@ cursor_theme_changed (GConfClient *clien
+ 	GtkTreeModel    * smodel    = gtk_tree_view_get_model(view);
+ 	GtkTreeModel    * model     = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(smodel));
+ 	gchar           * theme     = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL);
++	gint size;
+ 	gtk_tree_model_get_iter_root(model, &iter);
+-	gint              size      = gconf_client_get_int (client, CURSOR_SIZE_KEY, NULL);
++	size      = gconf_client_get_int (client, CURSOR_SIZE_KEY, NULL);
+ 	gtk_tree_model_get_iter_root(model, &iter);
+ 
+ 	do {
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 8a9b0b40f..3a3d7a9a5 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -89,7 +89,6 @@ share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 1ed33116e..5f1c2cab0 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.77 2005/07/05 18:35:54 marcus Exp $
+#   $MCom: ports/sysutils/gnomecontrolcenter2/Makefile,v 1.78 2005/07/05 18:40:24 marcus Exp $
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.11.5
+PORTVERSION=	2.11.6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.11
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 2145b23ae..334bf5c92 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.11.5.tar.bz2) = 2e6f3a42b2ccf1cf57fa8a49841e919c
-SIZE (gnome2/control-center-2.11.5.tar.bz2) = 2735971
+MD5 (gnome2/control-center-2.11.6.tar.bz2) = adf6804249cff2e4d2ed1b3e87035c3d
+SIZE (gnome2/control-center-2.11.6.tar.bz2) = 2758398
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
new file mode 100644
index 000000000..69d390449
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
@@ -0,0 +1,13 @@
+--- capplets/mouse/gnome-mouse-properties.c.orig	Thu Jul 14 16:27:10 2005
++++ capplets/mouse/gnome-mouse-properties.c	Thu Jul 14 16:27:36 2005
+@@ -470,8 +470,9 @@ cursor_theme_changed (GConfClient *clien
+ 	GtkTreeModel    * smodel    = gtk_tree_view_get_model(view);
+ 	GtkTreeModel    * model     = gtk_tree_model_sort_get_model(GTK_TREE_MODEL_SORT(smodel));
+ 	gchar           * theme     = gconf_client_get_string (client, CURSOR_THEME_KEY, NULL);
++	gint size;
+ 	gtk_tree_model_get_iter_root(model, &iter);
+-	gint              size      = gconf_client_get_int (client, CURSOR_SIZE_KEY, NULL);
++	size      = gconf_client_get_int (client, CURSOR_SIZE_KEY, NULL);
+ 	gtk_tree_model_get_iter_root(model, &iter);
+ 
+ 	do {
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 8a9b0b40f..3a3d7a9a5 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -89,7 +89,6 @@ share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-off.png
 %%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-bulb-on.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png