6 files changed, 6 insertions, 76 deletions

diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 9582a7204d59..10c307825914 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.10.1
+PORTVERSION=	2.10.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.10
@@ -41,8 +41,6 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
-	@${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
-		${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
 	@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
 		s|/bin/gzip|/usr/bin/gzip|g' \
 		${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 1c42a8a89858..b834f271fa82 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.10.1.tar.bz2) = d95a5746aa349536dc0f59c61cdaf19f
-SIZE (gnome2/control-center-2.10.1.tar.bz2) = 2648247
+MD5 (gnome2/control-center-2.10.2.tar.bz2) = 36022dcd340dac004903f5dadc8af589
+SIZE (gnome2/control-center-2.10.2.tar.bz2) = 2833639
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
deleted file mode 100644
index 02374b23ac45..000000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 9582a7204d59..10c307825914 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.10.1
+PORTVERSION=	2.10.2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/2.10
@@ -41,8 +41,6 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
-	@${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
-		${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
 	@${REINPLACE_CMD} -e 's|/bin/tar|/usr/bin/tar|g ; \
 		s|/bin/gzip|/usr/bin/gzip|g' \
 		${WRKSRC}/capplets/theme-switcher/gnome-theme-installer.c
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 1c42a8a89858..b834f271fa82 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.10.1.tar.bz2) = d95a5746aa349536dc0f59c61cdaf19f
-SIZE (gnome2/control-center-2.10.1.tar.bz2) = 2648247
+MD5 (gnome2/control-center-2.10.2.tar.bz2) = 36022dcd340dac004903f5dadc8af589
+SIZE (gnome2/control-center-2.10.2.tar.bz2) = 2833639
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
deleted file mode 100644
index 02374b23ac45..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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;