Update to 2.11.92.

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

5 files changed, 61 insertions, 36 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 362bf3ef3..71b681770 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.87 2005/07/16 17:08:46 marcus Exp $
+#   $MCom: ports/x11/gnomeapplets2/Makefile,v 1.88 2005/08/07 22:28:35 marcus Exp $
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.11.91
+PORTVERSION=	2.11.92
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-applets/2.11
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index c67954b26..283dddec5 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.11.91.tar.bz2) = 011374d970db4018e1237d395ef45241
-SIZE (gnome2/gnome-applets-2.11.91.tar.bz2) = 3631849
+MD5 (gnome2/gnome-applets-2.11.92.tar.bz2) = 2b78a6c5d59aa889979dbb54a301bf4e
+SIZE (gnome2/gnome-applets-2.11.92.tar.bz2) = 3786655
diff --git a/x11/gnome-applets/files/patch-battstat_battstat_applet.c b/x11/gnome-applets/files/patch-battstat_battstat_applet.c
index 3bee2ecc8..a95b7b569 100644
--- a/x11/gnome-applets/files/patch-battstat_battstat_applet.c
+++ b/x11/gnome-applets/files/patch-battstat_battstat_applet.c
@@ -1,21 +1,21 @@
---- battstat/battstat_applet.c.orig	Sun Jul  3 17:25:06 2005
-+++ battstat/battstat_applet.c	Sun Jul  3 17:25:36 2005
-@@ -446,14 +446,15 @@ battery_full_notify (void)
+--- battstat/battstat_applet.c.orig	Fri Aug 19 22:13:49 2005
++++ battstat/battstat_applet.c	Tue Aug 23 20:37:13 2005
+@@ -430,14 +430,14 @@ battery_full_notify (GtkWidget *applet)
  static void
- battery_full_dialog( void )
+ battery_full_dialog (GtkWidget *applet)
  {
-+  GtkWidget *dialog, *hbox, *image, *label;
-+  GdkPixbuf *pixbuf;
-+  gchar *new_label;
-+
-   /* first attempt to use libnotify */
-   if (battery_full_notify ())
- 	  return;
-   
--  GtkWidget *dialog, *hbox, *image, *label;
--  GdkPixbuf *pixbuf;
+-  /* first attempt to use libnotify */
+-  if (battery_full_notify (applet))
+-	  return;
+-  
+   GtkWidget *dialog, *hbox, *image, *label;
+   GdkPixbuf *pixbuf;
  
--  gchar *new_label;
+   gchar *new_label;
++  /* first attempt to use libnotify */
++  if (battery_full_notify (applet))
++	  return;
++  
    dialog = gtk_dialog_new_with_buttons (
  		_("Battery Notice"),
  		NULL,
diff --git a/x11/gnome-applets/files/patch-drivemount_drive-button.c b/x11/gnome-applets/files/patch-drivemount_drive-button.c
index 98152da4a..f26e3121e 100644
--- a/x11/gnome-applets/files/patch-drivemount_drive-button.c
+++ b/x11/gnome-applets/files/patch-drivemount_drive-button.c
@@ -1,5 +1,5 @@
---- drivemount/drive-button.c.orig	Sun Jul  3 17:18:34 2005
-+++ drivemount/drive-button.c	Sun Jul  3 17:23:33 2005
+--- drivemount/drive-button.c.orig	Tue Aug 23 05:16:27 2005
++++ drivemount/drive-button.c	Tue Aug 23 20:37:43 2005
 @@ -24,6 +24,7 @@
  #  include <config.h>
  #endif
@@ -8,7 +8,7 @@
  #include "drive-button.h"
  #include <glib/gi18n.h>
  #include <gdk/gdkkeysyms.h>
-@@ -641,11 +642,13 @@ run_command (DriveButton *self, const ch
+@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch
  
  	GList *volumes;
  	GnomeVFSVolume *volume;
@@ -24,7 +24,7 @@
  	g_free (uri);
  
  	gnome_vfs_drive_get_display_name (self->drive);
-@@ -725,6 +728,11 @@ drive_button_ensure_popup (DriveButton *
+@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton *
      char *display_name, *tmp, *label;
      int action;
      GtkWidget *item;
@@ -36,18 +36,7 @@
  
      if (self->popup_menu) return;
  
-@@ -762,9 +770,7 @@ drive_button_ensure_popup (DriveButton *
- 	}
-     }
- 
--	GList *volumes;
--	GnomeVFSVolume *volume = NULL;
--	GnomeVFSDeviceType volume_type = device_type;
-+	volume_type = device_type;
- 
- 	volumes = gnome_vfs_drive_get_mounted_volumes (self->drive);
- 	if (volumes != NULL)
-@@ -801,8 +807,7 @@ drive_button_ensure_popup (DriveButton *
+@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton *
      g_free (display_name);
      display_name = tmp;
  
@@ -55,5 +44,5 @@
 -	const char *action_icon = GTK_STOCK_OPEN;
 +	callback = G_CALLBACK (open_drive);
  
- 	switch (volume_type) {
+ 	switch (device_type) {
  	case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD:
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 3a0557f06..09b7cc14d 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -87,47 +87,71 @@ share/gnome/help/accessx-status/es/accessx-status.xml
 %%BATTERY%%share/gnome/help/battstat/C/legal.xml
 share/gnome/help/char-palette/C/char-palette.xml
 share/gnome/help/char-palette/C/legal.xml
+share/gnome/help/char-palette/es/char-palette.xml
 share/gnome/help/char-palette/nl/char-palette.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/legal.xml
+share/gnome/help/command-line/es/command-line.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/es/cpufreq-applet.xml
 share/gnome/help/drivemount/C/drivemount.xml
 share/gnome/help/drivemount/C/legal.xml
+share/gnome/help/drivemount/es/drivemount.xml
 share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
+share/gnome/help/geyes/es/geyes.xml
 share/gnome/help/gswitchit/C/gswitchit.xml
 share/gnome/help/gswitchit/C/legal.xml
+share/gnome/help/gswitchit/es/gswitchit.xml
 share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/C/legal.xml
+share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
 share/gnome/help/gweather/es/gweather.xml
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
+share/gnome/help/mixer_applet2/es/mixer_applet2.xml
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
+share/gnome/help/multiload/es/multiload.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/es/stickynotes_applet.xml
 share/gnome/help/trashapplet/C/legal.xml
 share/gnome/help/trashapplet/C/trashapplet.xml
+share/gnome/help/trashapplet/es/trashapplet.xml
+share/gnome/help/trashapplet/pa/trashapplet.xml
 share/gnome/omf/accessx-status/accessx-status-C.omf
 share/gnome/omf/accessx-status/accessx-status-es.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
 share/gnome/omf/char-palette/char-palette-C.omf
+share/gnome/omf/char-palette/char-palette-es.omf
 share/gnome/omf/char-palette/char-palette-nl.omf
 share/gnome/omf/command-line/command-line-C.omf
+share/gnome/omf/command-line/command-line-es.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
 share/gnome/omf/drivemount/drivemount-C.omf
+share/gnome/omf/drivemount/drivemount-es.omf
 share/gnome/omf/geyes/geyes-C.omf
+share/gnome/omf/geyes/geyes-es.omf
 share/gnome/omf/gswitchit/gswitchit-C.omf
+share/gnome/omf/gswitchit/gswitchit-es.omf
 share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf
+share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf
 share/gnome/omf/gweather/gweather-C.omf
 share/gnome/omf/gweather/gweather-es.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
 share/gnome/omf/multiload/multiload-C.omf
+share/gnome/omf/multiload/multiload-es.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
 share/gnome/omf/trashapplet/trashapplet-C.omf
+share/gnome/omf/trashapplet/trashapplet-es.omf
+share/gnome/omf/trashapplet/trashapplet-pa.omf
 share/gnome/pixmaps/accessx-status-applet/ax-applet.png
 share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
 share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
@@ -366,30 +390,42 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/omf/char-palette
 %%BATTERY%%@dirrm share/gnome/omf/battstat
 @dirrm share/gnome/omf/accessx-status
+@dirrm share/gnome/help/trashapplet/pa
+@dirrm share/gnome/help/trashapplet/es
 @dirrm share/gnome/help/trashapplet/C
 @dirrm share/gnome/help/trashapplet
+@dirrm share/gnome/help/stickynotes_applet/es
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
+@dirrm share/gnome/help/multiload/es
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
+@dirrm share/gnome/help/mixer_applet2/es
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
 @dirrm share/gnome/help/gweather/es
 @dirrm share/gnome/help/gweather/C
 @dirrm share/gnome/help/gweather
+@dirrm share/gnome/help/gtik2_applet2/es
 @dirrm share/gnome/help/gtik2_applet2/C
 @dirrm share/gnome/help/gtik2_applet2
+@dirrm share/gnome/help/gswitchit/es
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
+@dirrm share/gnome/help/geyes/es
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/es
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
+@dirrm share/gnome/help/command-line/es
 @dirrm share/gnome/help/command-line/C
 @dirrm share/gnome/help/command-line
 @dirrm share/gnome/help/char-palette/nl
+@dirrm share/gnome/help/char-palette/es
 @dirrm share/gnome/help/char-palette/C
 @dirrm share/gnome/help/char-palette
 %%BATTERY%%@dirrm share/gnome/help/battstat/C