Update to 2.3.2.

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

8 files changed, 6 insertions, 110 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 89cab6c23..a9984cb56 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.3
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 09d809acf..b02d3a82d 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.3.1.tar.bz2) = 352591b231ef390eea4eb3caed073bcf
+MD5 (gnome2/gnome-applets-2.3.2.tar.bz2) = 8f4997e909dbc62926f4da3e9de7dc81
diff --git a/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c
deleted file mode 100644
index 7ed7fffde..000000000
--- a/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet_callbacks.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- stickynotes/stickynotes_applet_callbacks.c.orig	Sat Apr 12 17:17:50 2003
-+++ stickynotes/stickynotes_applet_callbacks.c	Sat Apr 12 17:19:37 2003
-@@ -168,19 +168,26 @@
- /* Menu Callback : Configure preferences */
- void menu_preferences_cb(BonoboUIComponent *uic, StickyNotesApplet *stickynotes, const gchar *verbname)
- {
-+    	GtkWidget *preferences_dialog;
-+	GtkAdjustment *width_adjust;
-+	GtkAdjustment *height_adjust;
-+	GtkWidget *sticky_check;
-+	GtkWidget *note_color;
-+	GtkWidget *click_behavior_menu;
-+
- 	if (stickynotes->prefs != NULL) {
- 		gdk_window_raise(glade_xml_get_widget(stickynotes->prefs, "preferences_dialog")->window);
- 		return;
- 	}
- 	
- 	stickynotes->prefs = glade_xml_new(GLADE_PATH, "preferences_dialog", NULL);
--	GtkWidget *preferences_dialog = glade_xml_get_widget(stickynotes->prefs, "preferences_dialog");
-+	preferences_dialog = glade_xml_get_widget(stickynotes->prefs, "preferences_dialog");
- 	
--	GtkAdjustment *width_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "width_spin")));
--	GtkAdjustment *height_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "height_spin")));
--	GtkWidget *sticky_check = glade_xml_get_widget(stickynotes->prefs, "sticky_check");
--	GtkWidget *note_color = glade_xml_get_widget(stickynotes->prefs, "note_color");
--	GtkWidget *click_behavior_menu = glade_xml_get_widget(stickynotes->prefs, "click_behavior_menu");
-+	width_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "width_spin")));
-+	height_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "height_spin")));
-+	sticky_check = glade_xml_get_widget(stickynotes->prefs, "sticky_check");
-+	note_color = glade_xml_get_widget(stickynotes->prefs, "note_color");
-+	click_behavior_menu = glade_xml_get_widget(stickynotes->prefs, "click_behavior_menu");
- 
- 	{
- 		GtkSizeGroup *size= gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-@@ -232,13 +239,15 @@
- /* Menu Callback : Display About window */
- void menu_about_cb(BonoboUIComponent *uic, StickyNotesApplet *stickynotes, const gchar *verbname)
- {
-+    	GtkWidget *about_dialog;
-+
- 	if (stickynotes->about != NULL) {
- 		gdk_window_raise(glade_xml_get_widget(stickynotes->about, "about_dialog")->window);
- 		return;
- 	}
- 	
- 	stickynotes->about = glade_xml_new(GLADE_PATH, "about_dialog", NULL);
--	GtkWidget *about_dialog = glade_xml_get_widget(stickynotes->about, "about_dialog");
-+	about_dialog = glade_xml_get_widget(stickynotes->about, "about_dialog");
- 
- 	g_signal_connect(G_OBJECT(about_dialog), "response", G_CALLBACK(about_response_cb), stickynotes);
- 
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 9e477e761..5468329f6 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -183,7 +183,6 @@ share/gnome/gkb/SE_Swedish.keyprop
 share/gnome/gkb/SE_Swedish_x.keyprop
 share/gnome/gkb/SI_Slovenian.keyprop
 share/gnome/gkb/SI_Slovenian_x.keyprop
-share/gnome/gkb/SK__x.keyprop
 share/gnome/gkb/SR_Dutch.keyprop
 share/gnome/gkb/Slovak.keyprop
 share/gnome/gkb/Slovene.keyprop
@@ -1058,6 +1057,7 @@ share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 89cab6c23..a9984cb56 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.3.1
+PORTVERSION=	2.3.2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.3
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 09d809acf..b02d3a82d 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.3.1.tar.bz2) = 352591b231ef390eea4eb3caed073bcf
+MD5 (gnome2/gnome-applets-2.3.2.tar.bz2) = 8f4997e909dbc62926f4da3e9de7dc81
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c
deleted file mode 100644
index 7ed7fffde..000000000
--- a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet_callbacks.c
+++ /dev/null
@@ -1,52 +0,0 @@
---- stickynotes/stickynotes_applet_callbacks.c.orig	Sat Apr 12 17:17:50 2003
-+++ stickynotes/stickynotes_applet_callbacks.c	Sat Apr 12 17:19:37 2003
-@@ -168,19 +168,26 @@
- /* Menu Callback : Configure preferences */
- void menu_preferences_cb(BonoboUIComponent *uic, StickyNotesApplet *stickynotes, const gchar *verbname)
- {
-+    	GtkWidget *preferences_dialog;
-+	GtkAdjustment *width_adjust;
-+	GtkAdjustment *height_adjust;
-+	GtkWidget *sticky_check;
-+	GtkWidget *note_color;
-+	GtkWidget *click_behavior_menu;
-+
- 	if (stickynotes->prefs != NULL) {
- 		gdk_window_raise(glade_xml_get_widget(stickynotes->prefs, "preferences_dialog")->window);
- 		return;
- 	}
- 	
- 	stickynotes->prefs = glade_xml_new(GLADE_PATH, "preferences_dialog", NULL);
--	GtkWidget *preferences_dialog = glade_xml_get_widget(stickynotes->prefs, "preferences_dialog");
-+	preferences_dialog = glade_xml_get_widget(stickynotes->prefs, "preferences_dialog");
- 	
--	GtkAdjustment *width_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "width_spin")));
--	GtkAdjustment *height_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "height_spin")));
--	GtkWidget *sticky_check = glade_xml_get_widget(stickynotes->prefs, "sticky_check");
--	GtkWidget *note_color = glade_xml_get_widget(stickynotes->prefs, "note_color");
--	GtkWidget *click_behavior_menu = glade_xml_get_widget(stickynotes->prefs, "click_behavior_menu");
-+	width_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "width_spin")));
-+	height_adjust = gtk_spin_button_get_adjustment(GTK_SPIN_BUTTON(glade_xml_get_widget(stickynotes->prefs, "height_spin")));
-+	sticky_check = glade_xml_get_widget(stickynotes->prefs, "sticky_check");
-+	note_color = glade_xml_get_widget(stickynotes->prefs, "note_color");
-+	click_behavior_menu = glade_xml_get_widget(stickynotes->prefs, "click_behavior_menu");
- 
- 	{
- 		GtkSizeGroup *size= gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL);
-@@ -232,13 +239,15 @@
- /* Menu Callback : Display About window */
- void menu_about_cb(BonoboUIComponent *uic, StickyNotesApplet *stickynotes, const gchar *verbname)
- {
-+    	GtkWidget *about_dialog;
-+
- 	if (stickynotes->about != NULL) {
- 		gdk_window_raise(glade_xml_get_widget(stickynotes->about, "about_dialog")->window);
- 		return;
- 	}
- 	
- 	stickynotes->about = glade_xml_new(GLADE_PATH, "about_dialog", NULL);
--	GtkWidget *about_dialog = glade_xml_get_widget(stickynotes->about, "about_dialog");
-+	about_dialog = glade_xml_get_widget(stickynotes->about, "about_dialog");
- 
- 	g_signal_connect(G_OBJECT(about_dialog), "response", G_CALLBACK(about_response_cb), stickynotes);
- 
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 9e477e761..5468329f6 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -183,7 +183,6 @@ share/gnome/gkb/SE_Swedish.keyprop
 share/gnome/gkb/SE_Swedish_x.keyprop
 share/gnome/gkb/SI_Slovenian.keyprop
 share/gnome/gkb/SI_Slovenian_x.keyprop
-share/gnome/gkb/SK__x.keyprop
 share/gnome/gkb/SR_Dutch.keyprop
 share/gnome/gkb/Slovak.keyprop
 share/gnome/gkb/Slovene.keyprop
@@ -1058,6 +1057,7 @@ share/locale/ja/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ko/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lt/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/lv/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ml/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/mn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo