Update to 2.7.1.

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

7 files changed, 24 insertions, 148 deletions

diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index ea7bd3dbe..8bef291f7 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.7.0
-PORTREVISION=	2
+PORTVERSION=	2.7.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.7
diff --git a/x11/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index e4c344aee..9e10846d6 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.7.0.tar.bz2) = 18c021d22407ed5942091920cff51b7f
-SIZE (gnome2/gnome-applets-2.7.0.tar.bz2) = 5567294
+MD5 (gnome2/gnome-applets-2.7.1.tar.bz2) = e935de38203a2d21c8a55de34f364ef0
+SIZE (gnome2/gnome-applets-2.7.1.tar.bz2) = 5936084
diff --git a/x11/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index 73b0823ce..458a8552b 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Sun Feb 22 19:22:49 2004
-+++ configure	Sun Feb 22 19:24:33 2004
-@@ -22912,6 +22912,7 @@
+--- configure.orig	Wed Aug  4 00:16:47 2004
++++ configure	Wed Aug  4 00:17:57 2004
+@@ -23969,6 +23969,7 @@
  *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
  *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
  *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
@@ -8,16 +8,16 @@
  *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
  esac
  case "$host" in
-@@ -23034,7 +23035,7 @@
+@@ -24181,7 +24182,7 @@
  
- 	;;
-   # list of supported OS cores that do not use libapm
--  *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+  i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
- 	;;
-   *)
- 	echo "warning: ${host} is not supported by battstat_applet, not building" >&2
-@@ -24905,14 +24906,14 @@
+ 	   ;;
+        # list of supported OS cores that do not use libapm
+-       *-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
++       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+ 	   ;;
+        *)
+ 	   echo "warning: ${host} is not supported by battstat_applet, not building" >&2
+@@ -26261,14 +26262,14 @@
  ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
  
  cat >>confdefs.h <<_ACEOF
diff --git a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c b/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c
deleted file mode 100644
index 6368545f0..000000000
--- a/x11/gnomeapplets2/files/patch-battstat_battstat_applet.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- battstat/battstat_applet.c.orig	Mon Jul 19 18:31:16 2004
-+++ battstat/battstat_applet.c	Mon Jul 19 18:34:41 2004
-@@ -474,7 +474,11 @@
-    ) {
-       /* Warn that battery dropped below red_val */
-       if(battery->lowbattnotification) {
-+#ifdef __FreeBSD__
-+	 new_string = get_remaining (apminfo.ai_batt_time);
-+#else
- 	 new_string = get_remaining (apminfo.battery_time);
-+#endif
- 	 new_label = g_strdup_printf (_("Your battery is running low (%d%%, %s). You should recharge your battery to avoid losing your work."), batt_life, new_string);
- 	 g_free (new_string);
- 	 battery->lowbattnotificationdialog = gtk_dialog_new_with_buttons (
-@@ -733,7 +737,11 @@
-       }
-       
-       if (batt_state != 3)
-+#ifdef __FreeBSD__
-+	      rem_time = get_remaining(apminfo.ai_batt_time);
-+#else
- 	      rem_time = get_remaining(apminfo.battery_time);
-+#endif
-       else
- 	      rem_time = g_strdup(_(status[batt_state]));
-       
diff --git a/x11/gnomeapplets2/files/patch-gweather_gweather-pref.c b/x11/gnomeapplets2/files/patch-gweather_gweather-pref.c
deleted file mode 100644
index b28f30663..000000000
--- a/x11/gnomeapplets2/files/patch-gweather_gweather-pref.c
+++ /dev/null
@@ -1,70 +0,0 @@
---- gweather/gweather-pref.c.orig	Mon Jul 19 18:24:06 2004
-+++ gweather/gweather-pref.c	Mon Jul 19 18:28:39 2004
-@@ -411,13 +411,14 @@
-         }
-     }
-     if (!prefs->temperature_unit || prefs->temperature_unit == TEMP_UNIT_DEFAULT ) {
-+#ifdef _NL_MEASUREMENT_MEASUREMENT
-         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
-         if ( imperial && imperial[0] == 2 )  {
-             /* imperial */
-             prefs->temperature_unit = TEMP_UNIT_FAHRENHEIT;
--        } else {
-+        } else
-+#endif
-             prefs->temperature_unit = TEMP_UNIT_CENTIGRADE;
--        }
-     }
- }
- 
-@@ -446,13 +447,14 @@
-         }
-     }
-     if ( (!prefs->speed_unit) || prefs->speed_unit == SPEED_UNIT_DEFAULT ) {
-+#ifdef _NL_MEASUREMENT_MEASUREMENT
-         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
-         if ( imperial && imperial[0] == 2 )  {
-             /* imperial */
-             prefs->speed_unit = SPEED_UNIT_KNOTS;
--        } else {
-+        } else
-+#endif
-             prefs->speed_unit = SPEED_UNIT_MS;
--        }
-     }
- }
- 
-@@ -483,13 +485,14 @@
-         }
-     }
-     if ( (!prefs->pressure_unit) || prefs->pressure_unit == PRESSURE_UNIT_DEFAULT ) {
-+#ifdef _NL_MEASUREMENT_MEASUREMENT
-         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
-         if ( imperial && imperial[0] == 2 )  {
-             /* imperial */
-             prefs->pressure_unit = PRESSURE_UNIT_INCH_HG;
--        } else {
-+        } else
-+#endif
-             prefs->pressure_unit = PRESSURE_UNIT_HPA;
--        }
-     }	
- }
- 
-@@ -518,13 +521,14 @@
-     }
- 
- 	if ((!prefs->distance_unit) || prefs->distance_unit == DISTANCE_UNIT_DEFAULT ) {
-+#ifdef _NL_MEASUREMENT_MEASUREMENT
-         imperial = nl_langinfo(_NL_MEASUREMENT_MEASUREMENT);
-         if ( imperial && imperial[0] == 2 )  {
-             /* imperial */
-             prefs->distance_unit = DISTANCE_UNIT_MILES;
--        } else {
-+        } else
-+#endif
-             prefs->distance_unit = DISTANCE_UNIT_METERS;
--        }
-     }
- 
-     return;
diff --git a/x11/gnomeapplets2/files/patch-gweather_weather.c b/x11/gnomeapplets2/files/patch-gweather_weather.c
deleted file mode 100644
index 593e86684..000000000
--- a/x11/gnomeapplets2/files/patch-gweather_weather.c
+++ /dev/null
@@ -1,30 +0,0 @@
---- gweather/weather.c.orig	Mon Jul 19 18:29:38 2004
-+++ gweather/weather.c	Mon Jul 19 18:30:13 2004
-@@ -2264,11 +2264,12 @@
- const gchar *weather_info_get_humidity (WeatherInfo *info)
- {
-     static gchar buf[20];
-+    gdouble humidity;
-     g_return_val_if_fail(info != NULL, NULL);
-     if (!info->valid)
-         return "-";
- 
--    gdouble humidity = calc_humidity(info->temp, info->dew);
-+    humidity = calc_humidity(info->temp, info->dew);
-     if (humidity < 0.0)
-         return _("Unknown");
- 
-@@ -2279,11 +2280,12 @@
- 
- const gchar *weather_info_get_apparent (WeatherInfo *info)
- {
-+    gdouble apparent;
-     g_return_val_if_fail(info != NULL, NULL);
-     if (!info->valid)
-         return "-";
- 
--    gdouble apparent = calc_apparent(info);
-+    apparent = calc_apparent(info);
-     if (apparent < -500.0)
-         return _("Unknown");
-     
diff --git a/x11/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index f07b0ab1f..5e82da598 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/pkg-plist
@@ -191,6 +191,7 @@ 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
@@ -575,6 +576,9 @@ share/gnome/help/char-palette/it/figures/charpick_applet.png
 share/gnome/help/char-palette/it/figures/charpick_characters.png
 share/gnome/help/char-palette/it/figures/charpick_chargroup.png
 share/gnome/help/char-palette/it/legal.xml
+share/gnome/help/char-palette/ja/char-palette.xml
+share/gnome/help/char-palette/ja/figures/charpalette_applet.png
+share/gnome/help/char-palette/ja/legal.xml
 share/gnome/help/char-palette/ko/char-palette.xml
 share/gnome/help/char-palette/ko/figures/charpalette_applet.png
 share/gnome/help/char-palette/ko/figures/charpalette_chargroup.png
@@ -933,11 +937,6 @@ share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png
 share/gnome/help/mailcheck/it/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/it/legal.xml
 share/gnome/help/mailcheck/it/mailcheck.xml
-share/gnome/help/mailcheck/ja/figures/charpalette_applet.png
-share/gnome/help/mailcheck/ja/figures/charpalette_chargroup.png
-share/gnome/help/mailcheck/ja/figures/charpick_applet.png
-share/gnome/help/mailcheck/ja/figures/charpick_characters.png
-share/gnome/help/mailcheck/ja/figures/charpick_chargroup.png
 share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
 share/gnome/help/mailcheck/ja/legal.xml
 share/gnome/help/mailcheck/ja/mailcheck.xml
@@ -1235,6 +1234,8 @@ share/gnome/omf/gnome-applets/char-palette-fr.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/char-palette-it.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-it.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/char-palette-ko.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-applets/char-palette-ko.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-applets/char-palette-sv.omf
@@ -1816,7 +1817,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/pixmaps/mixer
 @dirrm share/gnome/pixmaps/mini-commander
 @dirrm share/gnome/pixmaps/mailcheck
-@dirrm share/gnome/pixmaps/gweather
 @dirrm share/gnome/pixmaps/gkb
 @dirrm share/gnome/pixmaps/accessx-status-applet
 @dirrm share/gnome/omf/gnome-applets
@@ -2107,6 +2107,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/char-palette/sv
 @dirrm share/gnome/help/char-palette/ko/figures
 @dirrm share/gnome/help/char-palette/ko
+@dirrm share/gnome/help/char-palette/ja/figures
+@dirrm share/gnome/help/char-palette/ja
 @dirrm share/gnome/help/char-palette/it/figures
 @dirrm share/gnome/help/char-palette/it
 @dirrm share/gnome/help/char-palette/fr/figures
@@ -2218,6 +2220,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-eu.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-fr.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-it.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/char-palette-ko.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-sv.omf 2>/dev/null || /usr/bin/true
 @unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gnome-applets/char-palette-zh_CN.omf 2>/dev/null || /usr/bin/true