Presenting GNOME 2.24 for FreeBSD.

See http://library.gnome.org/misc/release-notes/2.24/ for the general
release notes.  On the FreeBSD front, this release introduces Fuse support
in HAL, adds multi-CPU support to libgtop, WebKit updates, and fixes some
long-standing seahorse and gnome-keyring bugs.  The documentation updates
to the website are forthcoming.

This release features commits by adamw, ahze, kwm, mezz, and myself.  It would
not have been possible without are contributors and testers:

Alexander Loginov
Craig Butler [1]
Dmitry Marakasov [6]
Eric L. Chen
Joseph S. Atkinson
Kris Moore
Lapo Luchini [7]
Nikos Ntarmos
Pawel Worach
Romain Tartiere
TAOKA Fumiyoshi [3]
Yasuda Keisuke
Zyl
aZ [4]
bf [2] [5]
Florent Thoumie
Peter Wemm
pluknet

PR:		125857 [1]
		126993 [2]
		130031 [3]
		127399 [4]
		127661 [5]
		124302 [6]
		129570 [7]
		129936
		123790

6 files changed, 84 insertions, 124 deletions

diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index 7d1f860845cb..8a9822d48f15 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	2007-07-09 18:13:48.000000000 -0400
-+++ configure	2007-07-09 18:14:19.000000000 -0400
-@@ -25117,7 +25117,7 @@ _ACEOF
+--- configure.orig	2008-12-20 14:46:11.000000000 -0500
++++ configure	2008-12-20 14:54:57.000000000 -0500
+@@ -17150,7 +17150,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -9,7 +9,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    GNOMELOCALEDIR="$ac_define_dir"
  
-@@ -27157,8 +27157,8 @@ fi
+@@ -19097,8 +19097,8 @@ fi
  
  	   ;;
         # list of supported OS cores that do not use libapm
@@ -20,16 +20,7 @@
  	       ACPIINC="-I${OS_SYS}"
  	   else
  	       ACPIINC="-I/usr/src/sys"
-@@ -27924,7 +27924,7 @@ echo "${ECHO_T}no" >&6; }
- fi
- 
- 
--  stb="system-tools-backends"
-+  stb="system-tools-backends-2.0"
- 
-   if test x$PKG_CONFIG != xno ; then
-     if $PKG_CONFIG --atleast-pkgconfig-version 0.12 ; then
-@@ -28166,6 +28166,9 @@ if test x$disable_cpufreq = xno; then
+@@ -20023,6 +20023,9 @@ if test x$disable_cpufreq = xno; then
        *linux*)
           build_cpufreq_applet=yes
  	 ;;
@@ -39,7 +30,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;}
-@@ -28684,7 +28687,7 @@ gladedir="${pkgdatadir}/glade"
+@@ -20591,7 +20594,7 @@ builderdir="${pkgdatadir}/builder"
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -48,7 +39,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    GNOME_ICONDIR="$ac_define_dir"
  
-@@ -28697,7 +28700,7 @@ _ACEOF
+@@ -20604,7 +20607,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -57,16 +48,16 @@
    ac_define_dir=`eval echo $ac_define_dir`
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
-@@ -28710,7 +28713,7 @@ _ACEOF
+@@ -20617,7 +20620,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
--  ac_define_dir=`eval echo $"${gladedir}"`
-+  ac_define_dir=`eval echo "${gladedir}"`
+-  ac_define_dir=`eval echo $"${builderdir}"`
++  ac_define_dir=`eval echo "${builderdir}"`
    ac_define_dir=`eval echo $ac_define_dir`
-   GNOME_GLADEDIR="$ac_define_dir"
+   GTK_BUILDERDIR="$ac_define_dir"
  
-@@ -28723,7 +28726,7 @@ _ACEOF
+@@ -20630,7 +20633,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -75,7 +66,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    DATADIR="$ac_define_dir"
  
-@@ -28736,7 +28739,7 @@ _ACEOF
+@@ -20643,7 +20646,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -84,7 +75,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    SYSCONFDIR="$ac_define_dir"
  
-@@ -28749,7 +28752,7 @@ _ACEOF
+@@ -20656,7 +20659,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -93,7 +84,7 @@
    ac_define_dir=`eval echo $ac_define_dir`
    LIBDIR="$ac_define_dir"
  
-@@ -28762,7 +28765,7 @@ _ACEOF
+@@ -20669,7 +20672,7 @@ _ACEOF
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index 734bd6c74cea..5cca16dd4d9c 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -54,52 +54,6 @@
 +G_END_DECLS
 +
 +#endif /* __CPUFREQ_SELECTOR_SYSCTL_H__ */
---- cpufreq/src/cpufreq-selector/main.c.orig	Sat Jun 17 22:13:41 2006
-+++ cpufreq/src/cpufreq-selector/main.c	Sat Jun 24 02:15:02 2006
-@@ -17,6 +17,7 @@
-  *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-  *
-  * Authors : Carlos García Campos <carlosgc@gnome.org>
-+ *           Joe Marcus Clarke <marcus@FreeBSD.org>
-  */
- 
- #ifdef HAVE_CONFIG_H
-@@ -33,6 +34,9 @@
- #ifdef HAVE_LIBCPUFREQ
- #include "cpufreq-selector-libcpufreq.h"
- #endif
-+#ifdef __FreeBSD__
-+#include "cpufreq-selector-sysctl.h"
-+#endif /* __FreeBSD__ */
- 
- static gint    cpu = 0;
- static gchar  *governor = NULL;
-@@ -51,6 +55,9 @@ main (gint argc, gchar **argv)
- 	CPUFreqSelector *selector;
-         GOptionContext  *context;
- 	GError          *error = NULL;
-+#ifdef __FreeBSD__
-+	size_t           len;
-+#endif
- 
-         if (geteuid () != 0) {
-                 g_printerr ("You must be root\n");
-@@ -83,10 +90,15 @@ main (gint argc, gchar **argv)
- #ifdef HAVE_LIBCPUFREQ
- 	selector = cpufreq_selector_libcpufreq_new (cpu);
- #else
-+#ifndef __FreeBSD__
- 	if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
- 		selector = cpufreq_selector_sysfs_new (cpu);
- 	} else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
- 		selector = cpufreq_selector_procfs_new (cpu);
-+#else
-+	if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+		selector = cpufreq_selector_sysctl_new (cpu);
-+#endif /* __FreeBSD__ */
- 	} else {
- 		g_printerr ("No cpufreq support\n");
- 		return 1;
 --- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c.orig	Wed Jul 26 01:34:18 2006
 +++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.c	Wed Jul 26 01:42:00 2006
 @@ -0,0 +1,87 @@
@@ -190,39 +144,75 @@
 +
 +	   return TRUE;
 +}
---- cpufreq/src/cpufreq-selector/Makefile.in.orig	2007-07-30 21:08:35.000000000 -0400
-+++ cpufreq/src/cpufreq-selector/Makefile.in	2007-07-30 21:08:36.000000000 -0400
-@@ -57,13 +57,15 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
- 	cpufreq-selector.h cpufreq-selector-sysfs.c \
- 	cpufreq-selector-sysfs.h cpufreq-selector-procfs.c \
- 	cpufreq-selector-procfs.h cpufreq-selector-libcpufreq.c \
--	cpufreq-selector-libcpufreq.h main.c
-+	cpufreq-selector-libcpufreq.h main.c \
-+	cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
+--- cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c.orig	2008-06-16 14:33:25.000000000 -0400
++++ cpufreq/src/cpufreq-selector/cpufreq-selector-factory.c	2008-06-16 14:35:28.000000000 -0400
+@@ -27,20 +27,32 @@
+ #ifdef HAVE_LIBCPUFREQ
+ #include "cpufreq-selector-libcpufreq.h"
+ #endif
++#ifdef __FreeBSD__
++#include "cpufreq-selector-sysctl.h"
++#endif /* __FreeBSD__ */
+ 
+ CPUFreqSelector *
+ cpufreq_selector_factory_create_selector (guint cpu)
+ {
+ 	CPUFreqSelector *selector = NULL;
++#ifdef __FreeBSD__
++	size_t len;
++#endif
+ 	
+ #ifdef HAVE_LIBCPUFREQ
+ 	selector = cpufreq_selector_libcpufreq_new (cpu);
+ #else
++#ifndef __FreeBSD__
+ 	if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
+ 		selector = cpufreq_selector_sysfs_new (cpu);
+ 	} else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
+ 		selector = cpufreq_selector_procfs_new (cpu);
+ 	}
++#else
++	if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
++		selector = cpufreq_selector_sysctl_new (cpu);
++	}
++#endif /* __FreeBSD__ */
+ #endif /* HAVE_LIBCPUFREQ */
+ 
+ 	return selector;
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	2008-06-16 14:26:07.000000000 -0400
++++ cpufreq/src/cpufreq-selector/Makefile.in	2008-06-16 14:38:15.000000000 -0400
+@@ -65,7 +65,7 @@ am__cpufreq_selector_SOURCES_DIST = cpuf
+ 	cpufreq-selector-libcpufreq.h cpufreq-selector-service.c \
+ 	cpufreq-selector-service.h cpufreq-selector-factory.c \
+ 	cpufreq-selector-factory.h cpufreq-selector-service-glue.h \
+-	main.c
++	main.c cpufreq-selector-sysctl.c cpufreq-selector-sysctl.h
  @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
  @HAVE_LIBCPUFREQ_TRUE@	cpufreq-selector-libcpufreq.$(OBJEXT)
- am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
+ @HAVE_POLKIT_TRUE@am__objects_2 = cpufreq-selector-service.$(OBJEXT)
+@@ -74,7 +74,8 @@ am_cpufreq_selector_OBJECTS = cpufreq-se
  	cpufreq-selector-sysfs.$(OBJEXT) \
  	cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
--	main.$(OBJEXT)
-+	main.$(OBJEXT) \
+ 	$(am__objects_2) cpufreq-selector-factory.$(OBJEXT) \
+-	$(am__objects_3) main.$(OBJEXT)
++	$(am__objects_3) main.$(OBJEXT) \
 +	cpufreq-selector-sysctl.$(OBJEXT)
  cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
  am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-@@ -381,6 +383,7 @@ cpufreq_selector_SOURCES = \
- 	cpufreq-selector.c               cpufreq-selector.h        \
- 	cpufreq-selector-sysfs.c         cpufreq-selector-sysfs.h  \
- 	cpufreq-selector-procfs.c        cpufreq-selector-procfs.h \
-+	cpufreq-selector-sysctl.c        cpufreq-selector-sysctl.h \
- 	$(cpufreq_files)					   \
- 	main.c
- 
-@@ -462,6 +465,7 @@ distclean-compile:
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
+ @HAVE_POLKIT_TRUE@am__DEPENDENCIES_2 = $(am__DEPENDENCIES_1) \
+@@ -371,6 +372,7 @@ cpufreq_selector_SOURCES = \
+ 	cpufreq-selector.c               cpufreq-selector.h        	\
+ 	cpufreq-selector-sysfs.c         cpufreq-selector-sysfs.h  	\
+ 	cpufreq-selector-procfs.c        cpufreq-selector-procfs.h 	\
++	cpufreq-selector-sysctl.c	 cpufreq-selector-sysctl.h 	\
+ 	$(cpufreq_files)					   	\
+ 	$(service_files)						\
+ 	cpufreq-selector-factory.c	 cpufreq-selector-factory.h	\
+@@ -480,6 +482,7 @@ distclean-compile:
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-service.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-sysctl.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector.Po@am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@
+ 
diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
index 0dc24164ec34..7ddb583de639 100644
--- a/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
@@ -1,5 +1,5 @@
---- invest-applet/invest/invest-applet.py.orig	Wed Sep 13 20:42:15 2006
-+++ invest-applet/invest/invest-applet.py	Wed Sep 13 20:42:28 2006
+--- invest-applet/invest/invest-applet.py.orig	2008-03-15 19:39:32.000000000 -0400
++++ invest-applet/invest/invest-applet.py	2008-04-28 13:27:46.000000000 -0400
 @@ -26,8 +26,8 @@ import invest, invest.applet, invest.def
  import gettext, locale
  gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
@@ -8,6 +8,6 @@
 -locale.textdomain(invest.defs.GETTEXT_PACKAGE)
 +#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
 +#locale.textdomain(invest.defs.GETTEXT_PACKAGE)
- gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
- gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE)
+ 
+ from gettext import gettext as _
  
diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
index 2eddc8154089..aa763c16c429 100644
--- a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
@@ -1,5 +1,5 @@
---- invest-applet/invest/invest-chart.orig	Wed Sep 13 20:41:18 2006
-+++ invest-applet/invest/invest-chart	Wed Sep 13 20:41:33 2006
+--- invest-applet/invest/invest-chart.orig	2008-03-15 16:34:50.000000000 -0400
++++ invest-applet/invest/invest-chart	2008-04-28 13:29:13.000000000 -0400
 @@ -6,8 +6,8 @@ import sys, invest.chart, gtk
  import gettext, locale
  gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
@@ -8,6 +8,6 @@
 -locale.textdomain(invest.defs.GETTEXT_PACKAGE)
 +#locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
 +#locale.textdomain(invest.defs.GETTEXT_PACKAGE)
- gtk.glade.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
- gtk.glade.textdomain(invest.defs.GETTEXT_PACKAGE)
  
+ if __name__ == "__main__":
+ 	win = invest.chart.show_chart(sys.argv[1:])
diff --git a/x11/gnome-applets/files/patch-mixer_applet.c b/x11/gnome-applets/files/patch-mixer_applet.c
deleted file mode 100644
index d7c0eb517833..000000000000
--- a/x11/gnome-applets/files/patch-mixer_applet.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mixer/applet.c.orig	Mon Nov  7 09:53:52 2005
-+++ mixer/applet.c	Mon Nov 28 01:16:50 2005
-@@ -953,7 +953,7 @@ gnome_volume_applet_adjust_volume (GstMi
- 
-   volumes = g_new (gint, track->num_channels);
-   for (n = 0; n < track->num_channels; n++)
--    volumes[n] = lrint (volume);
-+    volumes[n] = (int) rint (volume);
-   gst_mixer_set_volume (mixer, track, volumes);
-   g_free (volumes);
- }
diff --git a/x11/gnome-applets/files/patch-modemlights_Makefile.in b/x11/gnome-applets/files/patch-modemlights_Makefile.in
deleted file mode 100644
index 874884722127..000000000000
--- a/x11/gnome-applets/files/patch-modemlights_Makefile.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- modemlights/Makefile.in.orig	Fri Jan 14 00:08:52 2005
-+++ modemlights/Makefile.in	Fri Jan 14 00:09:20 2005
-@@ -319,6 +319,7 @@
- modem_applet_LDADD = \
- 	$(GNOME_APPLETS_LIBS)	\
- 	$(LIBGLADE_LIBS)	\
-+	-lutil			\
- 	$(MODEMLIGHTS_LIBS)
- 
- uidir = $(datadir)/gnome-2.0/ui