Update to 2.5.7.

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

10 files changed, 24 insertions, 94 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 4a36c0fe0..aa46b8250 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.5.6
+PORTVERSION=	2.5.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.5
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index fa9c6dedc..24f4b06d6 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.5.6.tar.bz2) = f6967a3956d6d1a00275bb96dc70d90c
-SIZE (gnome2/gnome-applets-2.5.6.tar.bz2) = 4512562
+MD5 (gnome2/gnome-applets-2.5.7.tar.bz2) = a1b053ec93d861dbd07052e66895647b
+SIZE (gnome2/gnome-applets-2.5.7.tar.bz2) = 4453966
diff --git a/x11/gnome-applets/files/patch-stickynotes_Makefile.in b/x11/gnome-applets/files/patch-stickynotes_Makefile.in
index 5ac5380e0..f30b99335 100644
--- a/x11/gnome-applets/files/patch-stickynotes_Makefile.in
+++ b/x11/gnome-applets/files/patch-stickynotes_Makefile.in
@@ -1,11 +1,11 @@
---- stickynotes/Makefile.in.orig	Thu Jan 15 23:34:48 2004
-+++ stickynotes/Makefile.in	Thu Jan 15 23:35:09 2004
-@@ -70,7 +70,7 @@
- CDROM_HOST = @CDROM_HOST@
- CDROM_LIBS = @CDROM_LIBS@
+--- stickynotes/Makefile.in.orig	Wed Mar 10 13:45:05 2004
++++ stickynotes/Makefile.in	Wed Mar 10 13:46:02 2004
+@@ -168,7 +168,7 @@
+ 
+ SUBDIRS = pixmaps docs
  
 -CFLAGS = -Wall -g
 +CFLAGS += -Wall -g
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
+ 
+ INCLUDES = \
+ 	-I. \
diff --git a/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet.c b/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet.c
deleted file mode 100644
index 7e0b6e33f..000000000
--- a/x11/gnome-applets/files/patch-stickynotes_stickynotes_applet.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- stickynotes/stickynotes_applet.c.orig	Sun Feb 22 19:32:18 2004
-+++ stickynotes/stickynotes_applet.c	Sun Feb 22 19:34:42 2004
-@@ -337,20 +337,24 @@
- 
- void stickynotes_applet_update_prefs()
- {
--	gint width = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/width", NULL);
-+    	gint width, height;
-+	gboolean sys_color, sys_font, click_behavior, sticky, force_default;
-+	gchar *font_str;
-+	GdkColor color;
-+
-+	width = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/width", NULL);
- 	width = MAX (width, 1);
--	gint height = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/height", NULL);
-+	height = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/height", NULL);
- 	height = MAX (height, 1);
--	gboolean sys_color = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_color", NULL);
--	gboolean sys_font = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_font", NULL);
--	gint click_behavior = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/settings/click_behavior", NULL);
--	gboolean sticky = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/sticky", NULL);
--	gboolean force_default = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/force_default", NULL);
--	gchar *font_str = gconf_client_get_string(stickynotes->gconf, GCONF_PATH "/defaults/font", NULL);
-+	sys_color = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_color", NULL);
-+	sys_font = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_font", NULL);
-+	click_behavior = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/settings/click_behavior", NULL);
-+	sticky = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/sticky", NULL);
-+	force_default = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/force_default", NULL);
-+	font_str = gconf_client_get_string(stickynotes->gconf, GCONF_PATH "/defaults/font", NULL);
- 	if (!font_str)
- 		font_str = g_strdup ("Sans 10");
- 	
--	GdkColor color;
- 	{
- 		gchar *color_str = gconf_client_get_string(stickynotes->gconf, GCONF_PATH "/defaults/color", NULL);
- 		if (!color_str)
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 661ddedc2..5e0114621 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1231,6 +1231,7 @@ share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index 4a36c0fe0..aa46b8250 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.5.6
+PORTVERSION=	2.5.7
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.5
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index fa9c6dedc..24f4b06d6 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.5.6.tar.bz2) = f6967a3956d6d1a00275bb96dc70d90c
-SIZE (gnome2/gnome-applets-2.5.6.tar.bz2) = 4512562
+MD5 (gnome2/gnome-applets-2.5.7.tar.bz2) = a1b053ec93d861dbd07052e66895647b
+SIZE (gnome2/gnome-applets-2.5.7.tar.bz2) = 4453966
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
index 5ac5380e0..f30b99335 100644
--- a/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
+++ b/x11/gnomeapplets2/files/patch-stickynotes_Makefile.in
@@ -1,11 +1,11 @@
---- stickynotes/Makefile.in.orig	Thu Jan 15 23:34:48 2004
-+++ stickynotes/Makefile.in	Thu Jan 15 23:35:09 2004
-@@ -70,7 +70,7 @@
- CDROM_HOST = @CDROM_HOST@
- CDROM_LIBS = @CDROM_LIBS@
+--- stickynotes/Makefile.in.orig	Wed Mar 10 13:45:05 2004
++++ stickynotes/Makefile.in	Wed Mar 10 13:46:02 2004
+@@ -168,7 +168,7 @@
+ 
+ SUBDIRS = pixmaps docs
  
 -CFLAGS = -Wall -g
 +CFLAGS += -Wall -g
- CPP = @CPP@
- CPPFLAGS = @CPPFLAGS@
- CXX = @CXX@
+ 
+ INCLUDES = \
+ 	-I. \
diff --git a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet.c b/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet.c
deleted file mode 100644
index 7e0b6e33f..000000000
--- a/x11/gnomeapplets2/files/patch-stickynotes_stickynotes_applet.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- stickynotes/stickynotes_applet.c.orig	Sun Feb 22 19:32:18 2004
-+++ stickynotes/stickynotes_applet.c	Sun Feb 22 19:34:42 2004
-@@ -337,20 +337,24 @@
- 
- void stickynotes_applet_update_prefs()
- {
--	gint width = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/width", NULL);
-+    	gint width, height;
-+	gboolean sys_color, sys_font, click_behavior, sticky, force_default;
-+	gchar *font_str;
-+	GdkColor color;
-+
-+	width = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/width", NULL);
- 	width = MAX (width, 1);
--	gint height = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/height", NULL);
-+	height = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/defaults/height", NULL);
- 	height = MAX (height, 1);
--	gboolean sys_color = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_color", NULL);
--	gboolean sys_font = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_font", NULL);
--	gint click_behavior = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/settings/click_behavior", NULL);
--	gboolean sticky = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/sticky", NULL);
--	gboolean force_default = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/force_default", NULL);
--	gchar *font_str = gconf_client_get_string(stickynotes->gconf, GCONF_PATH "/defaults/font", NULL);
-+	sys_color = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_color", NULL);
-+	sys_font = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/use_system_font", NULL);
-+	click_behavior = gconf_client_get_int(stickynotes->gconf, GCONF_PATH "/settings/click_behavior", NULL);
-+	sticky = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/sticky", NULL);
-+	force_default = gconf_client_get_bool(stickynotes->gconf, GCONF_PATH "/settings/force_default", NULL);
-+	font_str = gconf_client_get_string(stickynotes->gconf, GCONF_PATH "/defaults/font", NULL);
- 	if (!font_str)
- 		font_str = g_strdup ("Sans 10");
- 	
--	GdkColor color;
- 	{
- 		gchar *color_str = gconf_client_get_string(stickynotes->gconf, GCONF_PATH "/defaults/color", NULL);
- 		if (!color_str)
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index 661ddedc2..5e0114621 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -1231,6 +1231,7 @@ share/locale/sr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/sv/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ta/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/th/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/tr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo