4 files changed, 21 insertions, 148 deletions

diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 48b84e4569f6..a5233ffe0e9d 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Sat Jul 16 12:55:48 2005
-+++ configure	Sat Jul 16 13:04:33 2005
-@@ -23272,8 +23272,7 @@
+--- configure.orig	Sun Feb 12 14:11:21 2006
++++ configure	Sun Feb 12 14:12:00 2006
+@@ -23361,8 +23361,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,44 +10,35 @@
    GNOMELOCALEDIR="$ac_define_dir"
  
  
-@@ -25126,7 +25125,7 @@
+@@ -25392,7 +25391,7 @@
  
  	   ;;
         # list of supported OS cores that do not use libapm
--       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
-+       i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*)
+-       i386-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
++       i386-*-freebsd*|amd64-*-freebsd*|*-*-netbsd*|*-*-openbsd*|*-*kfreebsd*-gnu)
            if  -n "${OS_SYS}" ; then
  	       ACPIINC="-I${OS_SYS}"
  	   else
-@@ -25406,7 +25405,7 @@
-   APPLET_MIXER_FALSE=
- fi
- 
--if test x"$P_MIXER" == x"mixer"; then
-+if test x"$P_MIXER" = x"mixer"; then
- 	echo "$as_me:$LINENO: result: yes" >&5
- echo "${ECHO_T}yes" >&6
- else
-@@ -25983,7 +25982,7 @@
+@@ -26469,7 +26468,7 @@
  fi
  
  
 -if test "x$SU_TOOL" == "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
 +if test "x$SU_TOOL" = "x" -o "x$HAVE_LIBUTIL" != "xtrue" -o "x$P_MODEMLIGHTS" != "xmodemlights"; then
-   { echo "$as_me:$LINENO: WARNING: *** \`modemlights' applet will not be built ***" >&5
- echo "$as_me: WARNING: *** \`modemlights' applet will not be built ***" >&2;}
+   { echo "$as_me:$LINENO: WARNING: *** modemlights applet will not be built ***" >&5
+ echo "$as_me: WARNING: *** modemlights applet will not be built ***" >&2;}
  else
-@@ -26119,6 +26118,9 @@
- echo "${ECHO_T}yes" >&6
+@@ -26633,6 +26632,9 @@
+       *linux*)
           build_cpufreq_applet=yes
  	 ;;
 +      i386-*-freebsd*|amd64-*-freebsd*)
 +         build_cpufreq_applet=yes
 +	 ;;
        *)
-          echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
- 	 build_cpufreq_applet=no
-@@ -26409,7 +26411,7 @@
+          { echo "$as_me:$LINENO: WARNING: ${host} is not supported by cpufreq applet, not building" >&5
+ echo "$as_me: WARNING: ${host} is not supported by cpufreq applet, not building" >&2;}
+@@ -27109,7 +27111,7 @@
  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
  
  
@@ -56,7 +47,7 @@
  
  pixmapsdir="${datadir}/pixmaps"
  
-@@ -26423,8 +26425,7 @@
+@@ -27123,8 +27125,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -66,7 +57,7 @@
    GNOME_ICONDIR="$ac_define_dir"
  
  
-@@ -26436,8 +26437,7 @@
+@@ -27136,8 +27137,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -76,7 +67,7 @@
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
  
-@@ -26449,8 +26449,7 @@
+@@ -27149,8 +27149,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -86,7 +77,7 @@
    GNOME_GLADEDIR="$ac_define_dir"
  
  
-@@ -26462,8 +26461,7 @@
+@@ -27162,8 +27161,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -96,7 +87,7 @@
    DATADIR="$ac_define_dir"
  
  
-@@ -26475,8 +26473,7 @@
+@@ -27175,8 +27173,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -106,7 +97,7 @@
    SYSCONFDIR="$ac_define_dir"
  
  
-@@ -26488,8 +26485,7 @@
+@@ -27188,8 +27185,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -116,7 +107,7 @@
    LIBDIR="$ac_define_dir"
  
  
-@@ -26501,8 +26497,7 @@
+@@ -27201,8 +27197,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnome-applets/files/patch-drivemount_drive-button.c b/x11/gnome-applets/files/patch-drivemount_drive-button.c
deleted file mode 100644
index f26e3121ee4b..000000000000
--- a/x11/gnome-applets/files/patch-drivemount_drive-button.c
+++ /dev/null
@@ -1,48 +0,0 @@
---- 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
- 
-+#include <string.h>
- #include "drive-button.h"
- #include <glib/gi18n.h>
- #include <gdk/gdkkeysyms.h>
-@@ -710,11 +711,13 @@ run_command (DriveButton *self, const ch
- 
- 	GList *volumes;
- 	GnomeVFSVolume *volume;
-+	char *uri;
-+	char *mount_path;
- 
- 	volumes = gnome_vfs_drive_get_mounted_volumes (self->drive);
- 	volume = GNOME_VFS_VOLUME (volumes->data);
--	char *uri = gnome_vfs_volume_get_activation_uri (volume);
--	char *mount_path = gnome_vfs_get_local_path_from_uri (uri);
-+	uri = gnome_vfs_volume_get_activation_uri (volume);
-+	mount_path = gnome_vfs_get_local_path_from_uri (uri);
- 	g_free (uri);
- 
- 	gnome_vfs_drive_get_display_name (self->drive);
-@@ -794,6 +797,11 @@ drive_button_ensure_popup (DriveButton *
-     char *display_name, *tmp, *label;
-     int action;
-     GtkWidget *item;
-+    GList *volumes;
-+    GnomeVFSVolume *volume = NULL;
-+    GnomeVFSDeviceType volume_type;
-+    GCallback callback;
-+    const char *action_icon = GTK_STOCK_OPEN;
- 
-     if (self->popup_menu) return;
- 
-@@ -869,8 +877,7 @@ drive_button_ensure_popup (DriveButton *
-     g_free (display_name);
-     display_name = tmp;
- 
--	GCallback callback = G_CALLBACK (open_drive);
--	const char *action_icon = GTK_STOCK_OPEN;
-+	callback = G_CALLBACK (open_drive);
- 
- 	switch (device_type) {
- 	case GNOME_VFS_DEVICE_TYPE_VIDEO_DVD:
diff --git a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c b/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c
deleted file mode 100644
index 5abf18032f00..000000000000
--- a/x11/gnome-applets/files/patch-gswitchit_gswitchit-applet.c
+++ /dev/null
@@ -1,61 +0,0 @@
---- gswitchit/gswitchit-applet.c.orig	Sun Aug  7 18:07:33 2005
-+++ gswitchit/gswitchit-applet.c	Sun Aug  7 18:10:07 2005
-@@ -331,6 +331,10 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- 		XklConfigItem configItem;
- 		GtkWidget *align, *label;
- 		static GHashTable *shortDescrs = NULL;
-+		gpointer pcounter = NULL; 
-+		char *prevLayoutName = NULL;
-+		char *labelTitle = NULL;
-+		int counter = 0;
- 		if (group == 0)
- 			shortDescrs = g_hash_table_new_full (g_str_hash, g_str_equal,
- 							     g_free, NULL);
-@@ -363,10 +367,6 @@ GSwitchItAppletPrepareDrawing (GSwitchIt
- 		if (layoutName == NULL)
- 			layoutName = g_strdup ("?");
- 
--		gpointer pcounter = NULL; 
--		char *prevLayoutName = NULL;
--		char *labelTitle = NULL;
--		int counter = 0;
- 		if (g_hash_table_lookup_extended (shortDescrs, layoutName, 
- 						  (gpointer*)&prevLayoutName, &pcounter))
- 		{
-@@ -599,6 +599,13 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- 		groupsLevels, groupsLevels + 1, groupsLevels + 2, groupsLevels + 3 };
- 	XklState *xklState = XklGetCurrentState ();
- 	gpointer p = g_hash_table_lookup (globals.previewDialogs, GINT_TO_POINTER (xklState->group));
-+#ifdef HAVE_XKB
-+	GladeXML *gladeData;
-+	GtkWidget *dialog;
-+	GtkWidget *kbdraw;
-+	XkbComponentNamesRec componentNames;
-+	XklConfigRec xklData;
-+#endif
- 	if (p != NULL)
- 	{
- 		/* existing window */
-@@ -606,11 +613,10 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- 		return;
- 	}
- #ifdef HAVE_XKB
--	GladeXML *gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
--        GtkWidget *dialog =
-+	gladeData = glade_xml_new (GNOME_GLADEDIR "/gswitchit.glade", "gswitchit_layout_view", NULL);
-+        dialog =
-         	glade_xml_get_widget (gladeData, "gswitchit_layout_view");
--	GtkWidget *kbdraw = keyboard_drawing_new ();
--	XkbComponentNamesRec componentNames;
-+	kbdraw = keyboard_drawing_new ();
- 
- 	if (xklState->group >= 0 && 
- 	    xklState->group < g_slist_length (globals.groupNames))
-@@ -624,7 +630,6 @@ GSwitchItAppletCmdPreview (BonoboUICompo
- 
-   	keyboard_drawing_set_groups_levels (KEYBOARD_DRAWING (kbdraw), pGroupsLevels);
- 
--	XklConfigRec xklData;
- 	XklConfigRecInit (&xklData);
-       	if (XklConfigGetFromServer (&xklData))
- 	{
diff --git a/x11/gnome-applets/files/patch-gweather_weather-iwin.c b/x11/gnome-applets/files/patch-gweather_weather-iwin.c
deleted file mode 100644
index 14c0190b2eed..000000000000
--- a/x11/gnome-applets/files/patch-gweather_weather-iwin.c
+++ /dev/null
@@ -1,9 +0,0 @@
---- gweather/weather-iwin.c.orig	Tue Dec 21 18:42:38 2004
-+++ gweather/weather-iwin.c	Tue Dec 21 18:42:47 2004
-@@ -1,5 +1,6 @@
- /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */
- 
-+#include <sys/types.h>
- #include <regex.h>
- #include <gnome.h>
- #include "weather.h"