* Update to 2.2.1

* Fix a problem not being able to switch keyboard layouts with gkb

5 files changed, 65 insertions, 12 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 477cccd0c031..3a76836fa0be 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.2.0
-PORTREVISION=	1
+PORTVERSION=	2.2.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.2
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 265e0d7b2cb5..47173f982172 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1 +1 @@
-MD5 (gnome2/gnome-applets-2.2.0.tar.bz2) = 2c5650d11253fd5c4716c96f688729f7
+MD5 (gnome2/gnome-applets-2.2.1.tar.bz2) = ba423595759ae9dd2a2960730d066edc
diff --git a/x11/gnome-applets/files/patch-gkb-new_presets.c b/x11/gnome-applets/files/patch-gkb-new_presets.c
new file mode 100644
index 000000000000..f90708170e00
--- /dev/null
+++ b/x11/gnome-applets/files/patch-gkb-new_presets.c
@@ -0,0 +1,11 @@
+--- gkb-new/preset.c.orig	Fri Mar 14 09:13:44 2003
++++ gkb-new/preset.c	Fri Mar 14 09:13:54 2003
+@@ -42,7 +42,7 @@
+ 
+   /* TODO: user's local presets */
+ 
+-  text = gnome_unconditional_datadir_file ("gnome/gkb/");
++  text = gnome_unconditional_datadir_file ("gkb/");
+   if (!text)
+   	return NULL;
+   dir = opendir (text);
diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c
index 867ca0bb856d..cbeb83833825 100644
--- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c
+++ b/x11/gnome-applets/files/patch-wireless_wireless-applet.c
@@ -1,5 +1,5 @@
---- wireless/wireless-applet.c.orig	Sun Jan 26 12:40:10 2003
-+++ wireless/wireless-applet.c	Mon Feb 17 13:20:21 2003
+--- wireless/wireless-applet.c.orig	Mon Mar 10 12:46:16 2003
++++ wireless/wireless-applet.c	Mon Mar 10 17:24:52 2003
 @@ -30,12 +30,24 @@
  #include <math.h>
  #include <dirent.h>
@@ -190,7 +190,7 @@
  	} while (1);
  
  	if (g_list_length (applet->devices)==1) {
-@@ -446,15 +562,21 @@
+@@ -446,17 +562,23 @@
  	}
  
  	/* rewind the /proc/net/wireless file */
@@ -206,13 +206,15 @@
  {
 +#ifndef __FreeBSD__
  	if (applet->file == NULL) {
+ 		wireless_applet_update_state (applet,
+ 				applet->device, -1, -1, -1);
  		return FALSE;
  	}
 +#endif
  
  	wireless_applet_read_device_state (applet);
  
-@@ -517,6 +639,7 @@
+@@ -522,6 +644,7 @@
  static void
  start_file_read (WirelessApplet *applet)
  {
@@ -220,7 +222,7 @@
  	applet->file = fopen ("/proc/net/wireless", "rt");
  	if (applet->file == NULL) {
  		gtk_tooltips_set_tip (applet->tips,
-@@ -525,6 +648,7 @@
+@@ -530,6 +653,7 @@
  				NULL);
  		show_error_dialog (_("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
  	}
@@ -228,12 +230,13 @@
  }
  
  static void
-@@ -766,7 +890,9 @@
+@@ -775,8 +899,10 @@
  		applet->prefs = NULL;
  	}
  
 +#ifndef __FreeBSD__
- 	fclose (applet->file);
+ 	if (applet->file)
+ 		fclose (applet->file);
 +#endif
  }
  
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 759100e439d0..59a5081198c6 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -219,6 +219,11 @@ share/gnome/gweather/Locations
 %%BATTERY%%share/gnome/help/battstat/C/figures/battstat-general.png
 %%BATTERY%%share/gnome/help/battstat/C/legal.xml
 %%BATTERY%%share/gnome/help/battstat/C/topic.dat
+%%BATTERY%%share/gnome/help/battstat/ja/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-apperance.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/ja/figures/battstat-general.png
+%%BATTERY%%share/gnome/help/battstat/ja/legal.xml
 share/gnome/help/cdplayer/C/cdplayer.xml
 share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
 share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
@@ -229,11 +234,26 @@ share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png
 share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png
 share/gnome/help/cdplayer/C/legal.xml
 share/gnome/help/cdplayer/C/topic.dat
+share/gnome/help/cdplayer/ja/cdplayer.xml
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png
+share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png
+share/gnome/help/cdplayer/ja/legal.xml
+share/gnome/help/cdplayer/ja/topic.dat
 share/gnome/help/char-palette/C/char-palette.xml
 share/gnome/help/char-palette/C/figures/charpick_applet.png
 share/gnome/help/char-palette/C/figures/charpick_characters.png
 share/gnome/help/char-palette/C/figures/charpick_chargroup.png
 share/gnome/help/char-palette/C/legal.xml
+share/gnome/help/char-palette/ja/char-palette.xml
+share/gnome/help/char-palette/ja/figures/charpick_applet.png
+share/gnome/help/char-palette/ja/figures/charpick_characters.png
+share/gnome/help/char-palette/ja/figures/charpick_chargroup.png
+share/gnome/help/char-palette/ja/legal.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/figures/command-line.png
 share/gnome/help/command-line/C/legal.xml
@@ -262,11 +282,17 @@ share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
 share/gnome/help/mixer_applet2/C/topic.dat
 %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
-@exec scrollkeeper-install -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%share/gnome/omf/gnome-applets/battstat-ja.omf
+%%BATTERY%%@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/cdplayer-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/cdplayer-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/cdplayer-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/char-palette-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
+share/gnome/omf/gnome-applets/char-palette-ja.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/command-line-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/drivemount-C.omf
@@ -480,6 +506,7 @@ share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/et/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/eu/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/fa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/fi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/fr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ga/LC_MESSAGES/gnome-applets-2.0.mo
@@ -492,6 +519,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/mn/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
@@ -539,10 +567,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/command-line
 @dirrm share/gnome/help/char-palette/C/figures
 @dirrm share/gnome/help/char-palette/C
+@dirrm share/gnome/help/char-palette/ja/figures
+@dirrm share/gnome/help/char-palette/ja
 @dirrm share/gnome/help/char-palette
 @dirrm share/gnome/help/cdplayer/C/figures
 @dirrm share/gnome/help/cdplayer/C
+@dirrm share/gnome/help/cdplayer/ja/figures
+@dirrm share/gnome/help/cdplayer/ja
 @dirrm share/gnome/help/cdplayer
+%%BATTERY%%@dirrm share/gnome/help/battstat/C/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/C
+%%BATTERY%%@dirrm share/gnome/help/battstat/ja/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/ja
+%%BATTERY%%@dirrm share/gnome/help/battstat
 @dirrm share/gnome/gweather
 @dirrm share/gnome/gkb
 @dirrm share/gnome/gen_util
@@ -570,9 +607,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/cdplayer-applet
 %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet/prefs
 %%BATTERY%%@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/battstat-applet
-@unexec scrollkeeper-uninstall -q %D/%%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-C.omf 2>/dev/null || /usr/bin/true
+%%BATTERY%%@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/battstat-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/cdplayer-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-C.omf 2>/dev/null || /usr/bin/true
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-ja.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/command-line-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/drivemount-C.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/geyes-C.omf 2>/dev/null || /usr/bin/true