Presenting GNOME 2.16.1 for FreeBSD. This release represents a massive

amount of work by the FreeBSD GNOME Team and our testers. On top of the usual GNOME update, we have taken this opportunity to move GNOME from X11BASE to LOCALBASE. This means roughly 600 ports NOT part of the GNOME Desktop also need to be changed. The bulk of the move was carried out by ahze, mezz, and pav, but it would not have been possible without cooperation from the FreeBSD KDE team who worked with us to make sure GNOME and KDE can still coexist happily. We would also like to send a shout out to kris and pointyhat for putting up with multiple test runs until we got something that was solid. Back to GNOME 2.16. This release brings a huge amount of new functionality to FreeBSD. The standard release notes can be read at http://www.gnome.org/start/2.16/ . But on top of what you will read there, jylefort and marcus have completed work on a port of HAL to FreeBSD. This will allow FreeBSD to take advantage of closer hardware interaction such as auto-mounting CD-ROMs, USB drives, and music players; auto-playing audio CDs; and managing laptop power consumption. But where would this all be without our loyal testers and contributors? Therefore, the FreeBSD GNOME team would like to thank the following users: Phillip Neumann <pneumann@gmail.com> tmclaugh mux Yuri Pankov <yuri.pankov@gmail.com> chinsan Thomas <freebsdlists@bsdunix.ch> Brian Gruber <knightbg@yahoo.com> Franz Klammer <klammer@webonaut.com> Dominique Goncalves <dominique.goncalves@gmail.com> Pascal Hofstee <caelian@gmail.com> Yasuda Keisuke <kysd@po.harenet.ne.jp> backyard <backyard1454-bsd@yahoo.com> Andris Raugulis <endrju@null.lv> <endrju@null.lv> Eric L. Chen <d9364104@mail.nchu.edu.tw> Pawel Worach <pawel.worach@gmail.com> QuiRK on #freebsd-gnome Shane Bell <decept0@gmail.com> luigi sajd on #freebsd-gnome sat Chris Coleman <chrisc@vmunix.com> kaeru on #freebsd-gnome crsd_ via irc.freenode.org/#FreeBSD-GNOME Joel Diaz <joeldiaz@mac.com> Enjoy! Approved by: portmgr (implicit, kris)
author: marcus <marcus@FreeBSD.org> 2006-10-14 16:35:50 +0800
committer: marcus <marcus@FreeBSD.org> 2006-10-14 16:35:50 +0800
commit: 9b9c902909a87b589432804ec4e8a7fa23943ff4 (patch)
tree: aa2e443568b953ce772558b2be74a8451e38ec3d /x11/gnome-applets
parent: f5a682ff4e0a5d73ce8bffeb88c799eb8ef0e816 (diff)
download: freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.gz
freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.zst
freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.zip
8 files changed, 774 insertions, 681 deletions
diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index 8dd7d5f2a72d..c658d8fe2cd3 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -3,44 +3,48 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/x11/gnome-applets/Makefile,v 1.141 2006/10/08 02:12:50 marcus Exp $
 #
 
 PORTNAME=	gnome-applets
-PORTVERSION=	2.14.2
-PORTREVISION=	1
+PORTVERSION=	2.16.1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Applets components for the Gnome 2 Desktop Environment
+COMMENT=	Applets components for the GNOME 2 Desktop Environment
 
-BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnome-system-tools
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools \
+    		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
-		xklavier.10:${PORTSDIR}/x11/libxklavier \
-		gucharmap.4:${PORTSDIR}/deskutils/gucharmap
-RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools
+		xklavier.11:${PORTSDIR}/x11/libxklavier \
+		gucharmap.5:${PORTSDIR}/deskutils/gucharmap
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnome-system-tools \
+    		${LOCALBASE}/libexec/gnome-settings-daemon:${PORTSDIR}/sysutils/gnome-control-center
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
+USE_XLIB=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
-INSTALLS_SHLIB=	yes
+USE_LDCONFIG=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
 		gail gnomedocutils
+WANT_GNOME=	yes
 USE_GSTREAMER=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--with-gstreamer=0.10
+CONFIGURE_ARGS=	--with-gstreamer=0.10 \
+		--enable-stickynotes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}" \
 		FREEBSD_SYS=${FREEBSD_SYS}
 
 GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
-		gswitchit.schemas gtik.schemas gweather.schemas \
+		gswitchit.schemas gweather.schemas \
 		mixer.schemas multiload.schemas \
 		stickynotes.schemas
 
@@ -48,10 +52,15 @@ OPTIONS=	MINI_COMMANDER "Enable mini-commander applet" off
 
 FREEBSD_SYS?=	/usr/src/sys
 
+.if defined(PACKAGE_BUILDING)
+.undef WITHOUT_GNOME
+WITH_GNOME=	yes
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/libdata/pkgconfig/libnotify.pc) || \
-	defined(WITH_NOTIFY)
+	!defined(WITHOUT_LIBNOTIFY)
 LIB_DEPENDS+=	notify:${PORTSDIR}/devel/libnotify
 .endif
 
@@ -78,8 +87,23 @@ PLIST_SUB+=	COMMANDER=""
 PLIST_SUB+=	COMMANDER="@comment "
 .endif
 
+.if ( exists(${pygnomedesktop_DETECT}) && exists(${pygnomeextras_DETECT}) ) || \
+	( ( ${HAVE_GNOME:Mpygnomedesktop}!="" && \
+	${HAVE_GNOME:Mpygnomeextras}!="" ) && ${ARCH}!="sparc64" )
+USE_PYTHON=	yes
+.include "${PORTSDIR}/Mk/bsd.python.mk"
+USE_GNOME+=	pygnomedesktop pygnomeextras
+PLIST_SUB+=	PYTHON=""
+.else
+PLIST_SUB+=	PYTHON="@comment "
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
 		${WRKSRC}/libgweather/weather-met.c
+.if !defined(USE_PYTHON)
+	@${REINPLACE_CMD} -e 's|HAVE_PYGTK="yes"|HAVE_PYGTK="no"|' \
+		${WRKSRC}/configure
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 271f8ddad68a..ddfe5f865d50 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-applets-2.14.2.tar.bz2) = e6da539e78da1256b9a9bee1301fd44f
-SHA256 (gnome2/gnome-applets-2.14.2.tar.bz2) = 4bdd52b47649cfa6dc5d065201124ae02d3da593531cd0defa1a9cf7a761f1df
-SIZE (gnome2/gnome-applets-2.14.2.tar.bz2) = 6601120
+MD5 (gnome2/gnome-applets-2.16.1.tar.bz2) = 0ceb0411c86304be2661bd4072662ecb
+SHA256 (gnome2/gnome-applets-2.16.1.tar.bz2) = a4d30677f946a770dc7fec2022b95fef2e3823aa1b82bee36d36f7390734fd85
+SIZE (gnome2/gnome-applets-2.16.1.tar.bz2) = 6888716
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index df27577202ce..2e1c62bde21d 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,6 +1,6 @@
---- configure.orig	Sat May  6 14:08:13 2006
-+++ configure	Sat May  6 14:13:34 2006
-@@ -23361,8 +23361,7 @@ _ACEOF
+--- configure.orig	Wed Jul 26 16:38:04 2006
++++ configure	Wed Jul 26 16:38:04 2006
+@@ -24860,8 +24860,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -10,7 +10,7 @@
    GNOMELOCALEDIR="$ac_define_dir"
  
  
-@@ -25392,8 +25391,8 @@ fi
+@@ -27066,8 +27065,8 @@
  
  	   ;;
         # list of supported OS cores that do not use libapm
@@ -21,16 +21,7 @@
  	       ACPIINC="-I${OS_SYS}"
  	   else
  	       ACPIINC="-I/usr/src/sys"
-@@ -26469,7 +26468,7 @@ else
- 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;}
- else
-@@ -26633,6 +26632,9 @@ if test x$disable_cpufreq = xno; then
+@@ -28145,6 +28144,9 @@
        *linux*)
           build_cpufreq_applet=yes
  	 ;;
@@ -40,7 +31,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 @@ fi
+@@ -28752,7 +28754,7 @@
  ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
  
  
@@ -49,7 +40,7 @@
  
  pixmapsdir="${datadir}/pixmaps"
  
-@@ -27123,8 +27125,7 @@ gladedir="${pkgdatadir}/glade"
+@@ -28764,8 +28766,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -59,7 +50,7 @@
    GNOME_ICONDIR="$ac_define_dir"
  
  
-@@ -27136,8 +27137,7 @@ _ACEOF
+@@ -28777,8 +28778,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -69,7 +60,7 @@
    GNOME_PIXMAPSDIR="$ac_define_dir"
  
  
-@@ -27149,8 +27149,7 @@ _ACEOF
+@@ -28790,8 +28790,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -79,7 +70,7 @@
    GNOME_GLADEDIR="$ac_define_dir"
  
  
-@@ -27162,8 +27161,7 @@ _ACEOF
+@@ -28803,8 +28802,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -89,7 +80,7 @@
    DATADIR="$ac_define_dir"
  
  
-@@ -27175,8 +27173,7 @@ _ACEOF
+@@ -28816,8 +28814,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -99,7 +90,7 @@
    SYSCONFDIR="$ac_define_dir"
  
  
-@@ -27188,8 +27185,7 @@ _ACEOF
+@@ -28829,8 +28826,7 @@
  
    test "x$prefix" = xNONE && prefix="$ac_default_prefix"
    test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
@@ -109,7 +100,7 @@
    LIBDIR="$ac_define_dir"
  
  
-@@ -27201,8 +27197,7 @@ _ACEOF
+@@ -28842,8 +28838,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-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
index 4bed0298db89..53841b6d7346 100644
--- a/x11/gnome-applets/files/patch-cpufreq-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -1,6 +1,117 @@
---- cpufreq/src/cpufreq-monitor-sysctl.h.orig	Sun Feb 13 01:00:25 2005
-+++ cpufreq/src/cpufreq-monitor-sysctl.h	Sat Feb 12 20:25:21 2005
-@@ -0,0 +1,48 @@
+--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig	Thu Jun 15 01:01:54 2006
++++ cpufreq/src/cpufreq-monitor-cpuinfo.c	Sat Jun 17 13:48:19 2006
+@@ -22,6 +22,10 @@
+ #include <glib.h>
+ #include <glib/gi18n.h>
+ 
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif /* __FreeBSD__ */
+ #include <string.h>
+ #include <stdio.h>
+ 
+@@ -59,15 +63,20 @@ cpufreq_monitor_cpuinfo_new (guint cpu)
+ static gboolean
+ cpufreq_monitor_cpuinfo_run (CPUFreqMonitor *monitor)
+ {
++#ifndef __FreeBSD__
+         gchar *file;
+         gchar                   **lines;
+         gchar *buffer = NULL;
+         gchar                    *p;
++#else
++	size_t len;
++#endif /* __FreeBSD__ */
+         gint                      cpu, i;
+         gint cur_freq, max_freq;
+         gchar *governor;
+         GError *error = NULL;
+ 
++#ifndef __FreeBSD__
+         file = g_strdup ("/proc/cpuinfo");
+         if (!g_file_get_contents (file, &buffer, NULL, &error)) {
+                 g_warning (error->message);
+@@ -112,6 +121,12 @@ cpufreq_monitor_cpuinfo_run (CPUFreqMoni
+ 
+         g_strfreev (lines);
+         g_free (buffer);
++#else
++	len = sizeof (cpu);
++
++	if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1)
++		return FALSE;
++#endif /* __FreeBSD__ */
+            
+         governor = g_strdup (_("Frequency Scaling Unsupported"));
+         cur_freq = cpu * 1000;
+--- cpufreq/src/cpufreq-applet.c.orig	Thu Jun 15 01:01:53 2006
++++ cpufreq/src/cpufreq-applet.c	Sat Jun 17 13:42:50 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
+@@ -519,6 +524,7 @@ cpufreq_applet_about_cb (BonoboUICompone
+ {
+         static const gchar *const authors[] = {
+                 "Carlos Garcia Campos <carlosgc@gnome.org>",
++		"Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
+                 NULL
+         };
+         static const gchar *const documenters[] = {
+--- cpufreq/src/Makefile.in.orig	Sat Jun 17 13:42:50 2006
++++ cpufreq/src/Makefile.in	Sat Jun 17 14:03:45 2006
+@@ -62,7 +62,8 @@ am__cpufreq_applet_SOURCES_DIST = cpufre
+ 	cpufreq-monitor-procfs.h cpufreq-monitor-sysfs.c \
+ 	cpufreq-monitor-sysfs.h cpufreq-monitor-libcpufreq.c \
+ 	cpufreq-monitor-libcpufreq.h cpufreq-monitor-cpuinfo.c \
+-	cpufreq-monitor-cpuinfo.h
++	cpufreq-monitor-cpuinfo.h cpufreq-monitor-sysctl.c \
++	cpufreq-monitor-sysctl.h
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
+ @HAVE_LIBCPUFREQ_TRUE@	cpufreq-monitor-libcpufreq.$(OBJEXT)
+ am_cpufreq_applet_OBJECTS = cpufreq-applet.$(OBJEXT) \
+@@ -71,7 +72,8 @@ am_cpufreq_applet_OBJECTS = cpufreq-appl
+ 	cpufreq-monitor-factory.$(OBJEXT) \
+ 	cpufreq-monitor-procfs.$(OBJEXT) \
+ 	cpufreq-monitor-sysfs.$(OBJEXT) $(am__objects_1) \
+-	cpufreq-monitor-cpuinfo.$(OBJEXT)
++	cpufreq-monitor-cpuinfo.$(OBJEXT) \
++	cpufreq-monitor-sysctl.$(OBJEXT)
+ cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_applet_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -85,6 +87,7 @@ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-prefs.Po \
+@@ -397,6 +400,7 @@ cpufreq_applet_SOURCES = \
+ 	cpufreq-monitor.c       	cpufreq-monitor.h	      	\
+ 	cpufreq-monitor-factory.c	cpufreq-monitor-factory.h	\
+ 	cpufreq-monitor-procfs.c	cpufreq-monitor-procfs.h	\
++	cpufreq-monitor-sysctl.c	cpufreq-monitor-sysctl.h	\
+ 	cpufreq-monitor-sysfs.c	        cpufreq-monitor-sysfs.h	        \
+ 	$(cpufreq_files)						\
+ 	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
+@@ -482,6 +486,7 @@ distclean-compile:
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-libcpufreq.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
+--- cpufreq/src/cpufreq-monitor-sysctl.h.orig	Sat Jun 17 14:05:37 2006
++++ cpufreq/src/cpufreq-monitor-sysctl.h	Sat Jun 17 14:14:13 2006
+@@ -0,0 +1,49 @@
 +/*
 + * Copyright (C) 2001, 2002 Free Software Foundation
 + *
@@ -25,6 +136,7 @@
 +#define __CPUFREQ_MONITOR_SYSCTL_H__
 +
 +#include <glib-object.h>
++
 +#include "cpufreq-monitor.h"
 +
 +#define TYPE_CPUFREQ_MONITOR_SYSCTL            (cpufreq_monitor_sysctl_get_type ())
@@ -45,13 +157,13 @@
 +	   CPUFreqMonitorClass parent_class;
 +};
 +
-+GType           cpufreq_monitor_sysctl_get_type ();
++GType           cpufreq_monitor_sysctl_get_type (void) G_GNUC_CONST;
 +CPUFreqMonitor *cpufreq_monitor_sysctl_new      (guint cpu);
 +
 +#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */
---- cpufreq/src/cpufreq-monitor-sysctl.c.orig	Sun Feb 13 03:52:42 2005
-+++ cpufreq/src/cpufreq-monitor-sysctl.c	Mon Feb 14 00:42:07 2005
-@@ -0,0 +1,269 @@
+--- cpufreq/src/cpufreq-monitor-sysctl.c.orig	Sat Jun 17 14:15:55 2006
++++ cpufreq/src/cpufreq-monitor-sysctl.c	Sat Jun 24 01:45:23 2006
+@@ -0,0 +1,161 @@
 +/*
 + * Copyright (C) 2001, 2002 Free Software Foundation
 + *
@@ -82,70 +194,32 @@
 +#include <sys/sysctl.h>
 +
 +#include "cpufreq-monitor-sysctl.h"
-+#include "cpufreq-monitor-protected.h"
 +
 +#define PARENT_TYPE TYPE_CPUFREQ_MONITOR
 +
 +#define CPUFREQ_MONITOR_GET_PROTECTED(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), PARENT_TYPE, CPUFreqMonitorProtected))
 +
 +static void     cpufreq_monitor_sysctl_class_init                (CPUFreqMonitorSysctlClass *klass);
-+static void     cpufreq_monitor_sysctl_finalize                  (GObject *object);
 +
-+static void     cpufreq_monitor_sysctl_run                       (CPUFreqMonitor *monitor);
++static gboolean     cpufreq_monitor_sysctl_run                       (CPUFreqMonitor *monitor);
 +static GList   *cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor);
 +
 +static gboolean cpufreq_monitor_sysctl_get                       (gpointer gdata);
 +
-+
-+static CPUFreqMonitorClass *parent_class = NULL;
-+
-+typedef struct _CPUFreqMonitorProtected CPUFreqMonitorProtected;
-+
-+GType cpufreq_monitor_sysctl_get_type ()
-+{
-+	   static GType type = 0;
-+
-+	   if (!type) {
-+			 static const GTypeInfo info = {
-+				    sizeof (CPUFreqMonitorSysctlClass),
-+				    (GBaseInitFunc) NULL,
-+				    (GBaseFinalizeFunc) NULL,
-+				    (GClassInitFunc) cpufreq_monitor_sysctl_class_init,
-+				    NULL,
-+				    NULL,
-+				    sizeof (CPUFreqMonitorSysctl),
-+				    0,
-+				    NULL
-+			 };
-+
-+			 type = g_type_register_static (PARENT_TYPE, "CPUFreqMonitorSysctl",
-+									  &info, 0);
-+	   }
-+
-+	   return type;
-+}
++G_DEFINE_TYPE (CPUFreqMonitorSysctl, cpufreq_monitor_sysctl, CPUFREQ_TYPE_MONITOR)
 +
 +static void
-+cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass)
++cpufreq_monitor_sysctl_init (CPUFreqMonitorSysctl *monitor)
 +{
-+	   GObjectClass        *object_class = G_OBJECT_CLASS (klass);
-+	   CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass);
-+
-+	   parent_class = g_type_class_peek_parent (klass);
-+
-+	   monitor_class->run = cpufreq_monitor_sysctl_run;
-+	   monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies;
-+	   
-+	   object_class->finalize = cpufreq_monitor_sysctl_finalize;
 +}
 +
 +static void
-+cpufreq_monitor_sysctl_finalize (GObject *object)
++cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass)
 +{
-+	   g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (object));
++	CPUFreqMonitorClass *monitor_class = CPUFREQ_MONITOR_CLASS (klass);
 +
-+	   if (G_OBJECT_CLASS (parent_class)->finalize)
-+			 (* G_OBJECT_CLASS (parent_class)->finalize) (object);
++	monitor_class->run = cpufreq_monitor_sysctl_run;
++	monitor_class->get_available_frequencies = cpufreq_monitor_sysctl_get_available_frequencies;
 +}
 +
 +CPUFreqMonitor *
@@ -159,29 +233,23 @@
 +}
 +
 +static gboolean
-+cpufreq_monitor_sysctl_get (gpointer gdata)
++cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor)
 +{
 +	   gint                     fmax, fmin, ifreq;
-+	   gchar                   *freq, *perc, *unit, *governor;
-+	   gboolean                 changed;
++	   gchar                   *governor;
 +	   size_t                   len;
 +	   gchar                   *freq_oid;
-+	   CPUFreqMonitorSysctl    *monitor;
-+	   CPUFreqMonitorProtected *private;
++	   guint                    mon_cpu;
++	   GList                   *list;
 +
-+	   monitor = (CPUFreqMonitorSysctl *) gdata;
-+	   private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
++	   list = cpufreq_monitor_get_available_frequencies (CPUFREQ_MONITOR (monitor));
 +
-+	   if (private->available_freqs == NULL) {
-+	   		 if (!cpufreq_monitor_sysctl_get_available_frequencies (CPUFREQ_MONITOR (monitor)))
-+	       					return FALSE;
-+	   }
-+	   
-+	   fmax = atoi ((gchar *) private->available_freqs->data);
-+	   fmin = atoi ((gchar *) g_list_nth_data (private->available_freqs, (g_list_length (private->available_freqs) - 1)));
++	   fmax = atoi ((gchar *) list->data);
++	   fmin = atoi ((gchar *) g_list_nth_data (list, (g_list_length (list) - 1)));
 +
++	   g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL);
 +	   len = sizeof (ifreq);
-+	   freq_oid = g_strdup_printf ("dev.cpu.%d.freq", private->cpu);
++	   freq_oid = g_strdup_printf ("dev.cpu.%d.freq", mon_cpu);
 +
 +	   if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) {
 +	       		 g_free (freq_oid);
@@ -189,7 +257,7 @@
 +	   }
 +
 +	   ifreq *= 1000;
-+	   
++
 +	   if (ifreq == fmax)
 +	       		 governor = g_strdup ("performance");
 +	   else if (ifreq == fmin)
@@ -197,93 +265,29 @@
 +	   else
 +	       		 governor = g_strdup ("other");
 +
-+	   freq = parent_class->get_human_readable_freq (ifreq);
-+	   perc = parent_class->get_human_readable_perc (fmax, ifreq);
-+	   unit = parent_class->get_human_readable_unit (ifreq);
-+
-+	   changed = FALSE;
-+	   
-+	   if (!private->governor || (g_ascii_strcasecmp (governor, private->governor) != 0)) {
-+			 changed = TRUE;
-+	   }
-+
-+	   if (!private->freq || (g_ascii_strcasecmp (freq, private->freq) != 0)) {
-+			 changed = TRUE;
-+	   }
-+
-+	   if (!private->perc || (g_ascii_strcasecmp (perc, private->perc) != 0)) {
-+			 changed = TRUE;
-+	   }
-+
-+	   if (!private->unit || (g_ascii_strcasecmp (unit, private->unit) != 0)) {
-+			 changed = TRUE;
-+	   }
-+
-+	   parent_class->free_data (CPUFREQ_MONITOR (monitor));
-+
-+	   private->governor = governor;
-+	   private->freq = freq;
-+	   private->perc = perc;
-+	   private->unit = unit;
-+
-+	   if (private->governor == NULL)
-+			 return FALSE;
-+	   if (private->freq == NULL)
-+			 return FALSE;
-+	   if (private->perc == NULL)
-+			 return FALSE;
-+	   if (private->unit == NULL)
-+			 return FALSE;
-+
-+	   if (changed)
-+			 g_signal_emit (CPUFREQ_MONITOR (monitor), parent_class->signals[CHANGED], 0);
++	   g_object_set (G_OBJECT (monitor),
++			 "governor", governor,
++			 "frequency", ifreq,
++			 "max-frequency", fmax,
++			 NULL);
 +
 +	   return TRUE;
 +}
 +
-+static void
-+cpufreq_monitor_sysctl_run (CPUFreqMonitor *monitor)
-+{
-+	   CPUFreqMonitorProtected *private;
-+	   
-+	   g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor));
-+
-+	   private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-+
-+	   if (private->timeout_handler > 0)
-+			 g_source_remove (private->timeout_handler);
-+
-+	   private->timeout_handler = g_timeout_add (1000, cpufreq_monitor_sysctl_get, (gpointer) monitor);
-+}
-+
-+static void
-+free_string (gpointer str, gpointer gdata)
-+{
-+	   if (str) g_free (str);
-+}
-+
 +static GList *
 +cpufreq_monitor_sysctl_get_available_frequencies (CPUFreqMonitor *monitor)
 +{
-+	   CPUFreqMonitorProtected *private;
 +	   gchar *levels_oid, *levels;
 +	   gchar **levelsp, **l;
++	   GList *list = NULL;
 +	   gint mib[4];
++	   guint mon_cpu;
 +	   size_t len;
 +
-+	   g_return_val_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (monitor), NULL);
-+
-+	   private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-+
-+	   if (private->available_freqs) {
-+			 g_list_foreach (private->available_freqs,
-+						  free_string, NULL);
-+			 g_list_free (private->available_freqs);
-+			 private->available_freqs = NULL;
-+	   }
++	   g_object_get (G_OBJECT (monitor), "cpu", &mon_cpu, NULL);
 +
 +	   levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels",
-+	   	private->cpu);
++	   	mon_cpu);
 +	   len = 4;
 +	   sysctlnametomib (levels_oid, mib, &len);
 +	   len = sizeof (levels);
@@ -295,7 +299,7 @@
 +	   levels = g_malloc (len);
 +	   if (sysctl (mib, 4, levels, &len, NULL, 0) == -1)
 +	       		 return NULL;
-+	   
++
 +	   levelsp = g_strsplit (levels, " ", 0);
 +	   g_free (levels);
 +
@@ -310,219 +314,116 @@
 +					 * mW.
 +					 */
 +			     		int freq = atoi (frpr[0]);
-+		   	 		private->available_freqs =
-+						g_list_append (private->available_freqs, g_strdup_printf ("%d", freq * 1000));
++					list =
++						g_list_append (list, g_strdup_printf ("%d", freq * 1000));
 +			 }
 +			 g_strfreev (frpr);
 +	   }
 +
 +	   g_strfreev (levelsp);
 +
-+	   return private->available_freqs;
++	   return (list);
 +}
 +#endif /* __FreeBSD__ */
---- cpufreq/src/cpufreq-monitor-factory.c.orig	Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-monitor-factory.c	Sun Jul  3 17:09:15 2005
-@@ -17,13 +17,21 @@
+--- cpufreq/src/cpufreq-monitor-factory.c.orig	Sat Jun 17 06:28:02 2006
++++ cpufreq/src/cpufreq-monitor-factory.c	Sat Jun 24 01:45:54 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
+@@ -25,11 +26,18 @@
+ 
  #include <glib.h>
+ #include <glib/gi18n.h>
 +#ifdef __FreeBSD__
 +#include <sys/types.h>
 +#include <sys/sysctl.h>
 +#endif /* __FreeBSD__ */
  
  #include "cpufreq-applet.h"
+ #include "cpufreq-utils.h"
  #include "cpufreq-monitor-sysfs.h"
  #include "cpufreq-monitor-procfs.h"
 +#ifdef __FreeBSD__
 +#include "cpufreq-monitor-sysctl.h"
 +#endif /* __FreeBSD__ */
  #include "cpufreq-monitor-cpuinfo.h"
- #include "cpufreq-monitor-factory.h"
- 
-@@ -31,6 +39,7 @@ CPUFreqMonitor *
+ #ifdef HAVE_LIBCPUFREQ
+ #include "cpufreq-monitor-libcpufreq.h"
+@@ -40,6 +48,7 @@ CPUFreqMonitor *
  cpufreq_monitor_factory_create_monitor (guint cpu)
  {
  	   CPUFreqMonitor *monitor = NULL;
 +#ifndef __FreeBSD__
  
- 	   if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
- 			 monitor = cpufreq_monitor_sysfs_new (cpu);
-@@ -49,6 +58,20 @@ cpufreq_monitor_factory_create_monitor (
- 			 
- 			 monitor = cpufreq_monitor_cpuinfo_new (cpu);
+ #ifdef HAVE_LIBCPUFREQ
+ 	   monitor = cpufreq_monitor_libcpufreq_new (cpu);
+@@ -63,6 +72,19 @@ cpufreq_monitor_factory_create_monitor (
+ 		   
+ 		   monitor = cpufreq_monitor_cpuinfo_new (cpu);
  	   }
 +#else
 +	   size_t len;
 +
 +	   if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+	       		 monitor = cpufreq_monitor_sysctl_new (cpu);
++		   monitor = cpufreq_monitor_sysctl_new (cpu);
 +	   } else {
-+			 cpufreq_applet_display_error (_("CPU frequency scaling unsupported"),
-+									 _("You will not be able to modify the frequency of your machine.  "
-+									   "Your machine may be misconfigured or not have hardware support "
-+									   "for CPU frequency scaling."));
-+			 
-+			 monitor = cpufreq_monitor_cpuinfo_new (cpu);
++		   cpufreq_utils_display_error (_("CPU frequency scaling unsupported"),
++				   		_("You will not be able to modify the frequency of your machine.  "
++						"Your machine may be misconfigured or not have hardware support "
++						"for CPU frequency scaling."));
++		   monitor = cpufreq_monitor_cpuinfo_new (cpu);
 +	   }
 +#endif /* __FreeBSD__ */
- 
+ 	   
  	   return monitor;
  }
---- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig	Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-monitor-cpuinfo.c	Sun Jul  3 17:07:16 2005
-@@ -23,6 +23,10 @@
- #include <glib/gi18n.h>
- #include <libgnomevfs/gnome-vfs.h>
- 
+--- cpufreq/src/cpufreq-utils.c.orig	Sat Aug 12 21:26:50 2006
++++ cpufreq/src/cpufreq-utils.c	Tue Aug 22 11:07:32 2006
+@@ -22,6 +22,9 @@
+ #include <glib.h>
+ #include <gtk/gtkmessagedialog.h>
+ #include <sys/types.h>
 +#ifdef __FreeBSD__
-+#include <sys/types.h>
 +#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
- #include <string.h>
- #include <stdio.h>
- 
-@@ -104,6 +108,7 @@ cpufreq_monitor_cpuinfo_new (guint cpu)
- static gboolean
- cpufreq_monitor_cpuinfo_get (gpointer gdata)
- {
-+#ifndef __FreeBSD__
-         GnomeVFSHandle           *handle;
-         GnomeVFSFileSize          bytes_read;
-         GnomeVFSResult            result;
-@@ -111,6 +116,9 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
-         gchar                   **lines;
-         gchar                     buffer[256];
-         gchar                    *p;
-+#else
-+	size_t                    len;
-+#endif /* __FreeBSD__ */
-         gchar                    *freq, *perc, *unit, *governor;
-         gint                      cpu, i;
-         CPUFreqMonitorCPUInfo    *monitor;
-@@ -120,6 +128,7 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
- 
-         private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
-            
-+#ifndef __FreeBSD__
-         uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo");
++#endif
+ #include <sys/stat.h>
+ #include <fcntl.h>
+ #include <unistd.h>
+@@ -30,6 +33,24 @@
  
-         result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
-@@ -180,6 +189,12 @@ cpufreq_monitor_cpuinfo_get (gpointer gd
+ #include "cpufreq-utils.h"
  
-         g_strfreev (lines);
-         g_free (file);
-+#else
-+	len = sizeof (cpu);
-+
-+	if (sysctlbyname ("hw.clockrate", &cpu, &len, NULL, 0) == -1)
-+		return FALSE;
-+#endif /* __FreeBSD__ */
-            
-         governor = g_strdup (_("Frequency Scaling Unsupported"));
-         freq = parent_class->get_human_readable_freq (cpu * 1000); /* kHz are expected*/
---- cpufreq/src/cpufreq-applet.c.orig	Thu Apr 14 12:11:06 2005
-+++ cpufreq/src/cpufreq-applet.c	Sun Jul  3 17:28:43 2005
-@@ -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>
-  */
- 
- #include <config.h>
-@@ -26,6 +27,10 @@
- #include <panel-applet-gconf.h>
- #include <glade/glade.h>
- #include <glib/gi18n.h>
 +#ifdef __FreeBSD__
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#endif /* __FreeBSD__ */
- #include <string.h>
- 
- #include "cpufreq-applet.h"
-@@ -193,6 +198,7 @@ cpufreq_applet_about_cb (BonoboUICompone
- {
-         static const gchar *authors[] = {
-                 "Carlos Garcia Campos <carlosgc@gnome.org>",
-+		"Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
-                 NULL
-         };
-         static const gchar *documenters[] = {
-@@ -233,6 +239,7 @@ static gint
- cpufreq_applet_get_max_cpu (void)
- {
-         gint   mcpu = -1;
-+#ifndef __FreeBSD__
-         gchar *file = NULL;
- 
-         do {
-@@ -242,11 +249,20 @@ cpufreq_applet_get_max_cpu (void)
-         } while (g_file_test (file, G_FILE_TEST_EXISTS));
-         g_free (file);
-         mcpu --;
-+#else
++guint
++cpufreq_utils_get_n_cpus (void)
++{
 +	size_t len;
++	static guint n_cpus = 0;
++
++	if (n_cpus > 0)
++		return n_cpus;
 +
-+	len = sizeof (mcpu);
++	len = sizeof (n_cpus);
++	if (sysctlbyname ("hw.ncpu", &n_cpus, &len, NULL, 0) == -1) {
++		return 1;
++	}
 +
-+	sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0);
-+	mcpu --;
++	return n_cpus;
++}
++#else
+ guint
+ cpufreq_utils_get_n_cpus (void)
+ {
+@@ -72,6 +93,7 @@ cpufreq_utils_get_n_cpus (void)
+ 	
+ 	return 1;
+ }
 +#endif /* __FreeBSD__ */
  
-         if (mcpu >= 0)
-                 return mcpu;
- 
-         mcpu = -1;
-+#ifndef __FreeBSD__
-         file = NULL;
-         do {
-                 if (file) g_free (file);
-@@ -255,6 +271,7 @@ cpufreq_applet_get_max_cpu (void)
-         } while (g_file_test (file, G_FILE_TEST_EXISTS));
-         g_free (file);
-         mcpu --;
-+#endif
- 
-         if (mcpu >= 0)
-                 return mcpu;
---- cpufreq/src/Makefile.in.orig	Tue Oct  4 00:11:26 2005
-+++ cpufreq/src/Makefile.in	Tue Oct  4 00:20:37 2005
-@@ -57,6 +57,7 @@
- 	cpufreq-prefs.$(OBJEXT) cpufreq-popup.$(OBJEXT) \
- 	cpufreq-monitor.$(OBJEXT) cpufreq-monitor-factory.$(OBJEXT) \
- 	cpufreq-monitor-procfs.$(OBJEXT) \
-+	cpufreq-monitor-sysctl.$(OBJEXT) \
- 	cpufreq-monitor-sysfs.$(OBJEXT) \
- 	cpufreq-monitor-cpuinfo.$(OBJEXT)
- cpufreq_applet_OBJECTS = $(am_cpufreq_applet_OBJECTS)
-@@ -71,6 +72,7 @@
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-factory.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-prefs.Po
-@@ -358,6 +360,7 @@
- 					cpufreq-monitor-protected.h	\
- 	cpufreq-monitor-factory.c	cpufreq-monitor-factory.h	\
- 	cpufreq-monitor-procfs.c	cpufreq-monitor-procfs.h	\
-+	cpufreq-monitor-sysctl.c	cpufreq-monitor-sysctl.h	\
- 	cpufreq-monitor-sysfs.c	        cpufreq-monitor-sysfs.h	        \
- 	cpufreq-monitor-cpuinfo.c       cpufreq-monitor-cpuinfo.h
- 
-@@ -441,6 +444,7 @@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-factory.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-monitor.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-popup.Po@am__quote@
+ void
+ cpufreq_utils_display_error (const gchar *message,
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
index d25df35e2b5d..8a7ea857c103 100644
--- a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -1,6 +1,50 @@
---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.h.orig	Mon Feb 14 00:38:57 2005
-+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.h	Mon Feb 14 00:21:39 2005
-@@ -0,0 +1,51 @@
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	Sat Jun 24 01:52:35 2006
++++ cpufreq/src/cpufreq-selector/Makefile.in	Sat Jun 24 02:14:08 2006
+@@ -58,13 +58,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
+ @HAVE_LIBCPUFREQ_TRUE@am__objects_1 =  \
+ @HAVE_LIBCPUFREQ_TRUE@	cpufreq-selector-libcpufreq.$(OBJEXT)
+ am_cpufreq_selector_OBJECTS = cpufreq-selector.$(OBJEXT) \
+ 	cpufreq-selector-sysfs.$(OBJEXT) \
+ 	cpufreq-selector-procfs.$(OBJEXT) $(am__objects_1) \
+-	main.$(OBJEXT)
++	main.$(OBJEXT) \
++	cpufreq-selector-sysctl.$(OBJEXT)
+ cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
+ am__DEPENDENCIES_1 =
+ cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -74,6 +76,7 @@ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-selector-libcpufreq.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-procfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector-sysfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-selector.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/main.Po
+@@ -371,6 +374,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
+ 
+@@ -451,6 +455,7 @@ distclean-compile:
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-selector-libcpufreq.Po@am__quote@
+ @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-sysfs.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@
+--- cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h.orig	Sat Jun 24 01:52:35 2006
++++ cpufreq/src/cpufreq-selector/cpufreq-selector-sysctl.h	Sat Jun 24 02:13:05 2006
+@@ -0,0 +1,53 @@
 +/*
 + * Copyright (C) 2001, 2002 Free Software Foundation
 + *
@@ -21,40 +65,88 @@
 + * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
 + */
 +
-+#ifndef __CPUFREQ_SYSCTL_H__
-+#define __CPUFREQ_SYSCTL_H__
++#ifndef __CPUFREQ_SELECTOR_SYSCTL_H__
++#define __CPUFREQ_SELECTOR_SYSCTL_H__
 +
 +#include <glib-object.h>
 +
-+#include "cpufreq.h"
++#include "cpufreq-selector.h"
++
++G_BEGIN_DECLS
 +
-+#define TYPE_CPUFREQ_SYSCTL            (cpufreq_sysctl_get_type ())
-+#define CPUFREQ_SYSCTL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctl))
-+#define CPUFREQ_SYSCTL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass))
-+#define IS_CPUFREQ_SYSCTL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_SYSCTL))
-+#define IS_CPUFREQ_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_SYSCTL))
-+#define CPUFREQ_SYSCTL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlClass))
++#define CPUFREQ_TYPE_SELECTOR_SYSCTL            (cpufreq_selector_sysctl_get_type ())
++#define CPUFREQ_SELECTOR_SYSCTL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfs))
++#define CPUFREQ_SELECTOR_SYSCTL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass))
++#define CPUFREQ_IS_SELECTOR_SYSCTL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL))
++#define CPUFREQ_IS_SELECTOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), CPUFREQ_TYPE_SELECTOR_SYSCTL))
++#define CPUFREQ_SELECTOR_SYSCTL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), CPUFREQ_TYPE_SELECTOR_SYSCTL, CPUFreqSelectorProcfsClass))
 +
-+typedef struct _CPUFreqSysctl      CPUFreqSysctl;
-+typedef struct _CPUFreqSysctlClass CPUFreqSysctlClass;
-+typedef struct _CPUFreqSysctlPriv  CPUFreqSysctlPriv;
++typedef struct _CPUFreqSelectorSysctl		CPUFreqSelectorSysctl;
++typedef struct _CPUFreqSelectorSysctlClass	CPUFreqSelectorSysctlClass;
 +
-+struct _CPUFreqSysctl {
-+	   CPUFreq parent;
++struct _CPUFreqSelectorSysctl {
++	CPUFreqSelector parent;
 +};
 +
-+struct _CPUFreqSysctlClass {
-+	   CPUFreqClass parent_class;
++struct _CPUFreqSelectorSysctlClass {
++	CPUFreqSelectorClass parent_class;
 +};
 +
++GType		cpufreq_selector_sysctl_get_type (void) G_GNUC_CONST;
++CPUFreqSelector	*cpufreq_selector_sysctl_new     (guint cpu);
 +
-+GType          cpufreq_sysctl_get_type ();
-+CPUFreqSysctl *cpufreq_sysctl_new      ();
++G_END_DECLS
 +
-+#endif /* __CPUFREQ_SYSCTL_H__ */
---- cpufreq/src/cpufreq-selector/cpufreq-sysctl.c.orig	Mon Feb 14 00:38:52 2005
-+++ cpufreq/src/cpufreq-selector/cpufreq-sysctl.c	Mon Feb 14 00:44:43 2005
-@@ -0,0 +1,235 @@
++#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 @@
 +/*
 + * Copyright (C) 2001, 2002 Free Software Foundation
 + *
@@ -84,290 +176,61 @@
 +#include <sys/sysctl.h>
 +#endif /* __FreeBSD__ */
 +
-+#include "cpufreq-sysctl.h"
-+
-+#define PARENT_TYPE TYPE_CPUFREQ
-+
-+#define CPUFREQ_SYSCTL_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE((obj), TYPE_CPUFREQ_SYSCTL, CPUFreqSysctlPrivate))
-+
-+static void cpufreq_sysctl_init           (CPUFreqSysctl *cfq);
-+static void cpufreq_sysctl_class_init     (CPUFreqSysctlClass *klass);
-+static void cpufreq_sysctl_finalize       (GObject *object);
-+
-+static void  cpufreq_sysctl_set_governor  (CPUFreq *cfq, const gchar *governor);
-+static void  cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency);
-+
-+static void  cpufreq_sysctl_setup         (CPUFreqSysctl *cfq);
-+
-+static GObjectClass *parent_class = NULL;
-+
-+typedef struct _CPUFreqSysctlPrivate CPUFreqSysctlPrivate;
-+
-+struct _CPUFreqSysctlPrivate
-+{
-+	   gint pmax;
-+};
-+
-+GType cpufreq_sysctl_get_type ()
-+{
-+	   static GType type = 0;
++#include "cpufreq-selector-sysctl.h"
 +
-+	   if (!type) {
-+			 static const GTypeInfo info = {
-+				    sizeof (CPUFreqSysctlClass),
-+				    (GBaseInitFunc) NULL,
-+				    (GBaseFinalizeFunc) NULL,
-+				    (GClassInitFunc) cpufreq_sysctl_class_init,
-+				    NULL,
-+				    NULL,
-+				    sizeof (CPUFreqSysctl),
-+				    0,
-+				    (GInstanceInitFunc) cpufreq_sysctl_init
-+			 };
++static void cpufreq_selector_sysctl_init	(CPUFreqSelectorSysctl *selector);
++static void cpufreq_selector_sysctl_class_init	(CPUFreqSelectorSysctlClass *klass);
 +
-+			 type = g_type_register_static (PARENT_TYPE, "CPUFreqSysctl",
-+									  &info, 0);
-+	   }
++static gboolean cpufreq_selector_sysctl_set_frequency	(CPUFreqSelector *selector, guint frequency, GError **error);
++static gboolean cpufreq_selector_sysctl_set_governor	(CPUFreqSelector *selector, const gchar *governor, GError **error);
 +
-+	   return type;
-+}
++G_DEFINE_TYPE (CPUFreqSelectorSysctl, cpufreq_selector_sysctl, CPUFREQ_TYPE_SELECTOR)
 +
 +static void
-+cpufreq_sysctl_init (CPUFreqSysctl *cfq)
++cpufreq_selector_sysctl_init (CPUFreqSelectorSysctl *selector)
 +{
-+	   CPUFreqSysctlPrivate *private;
-+	   
-+	   g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+	   private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq);
 +}
 +
 +static void
-+cpufreq_sysctl_class_init (CPUFreqSysctlClass *klass)
++cpufreq_selector_sysctl_class_init (CPUFreqSelectorSysctlClass *klass)
 +{
-+	   GObjectClass *object_class = G_OBJECT_CLASS (klass);
-+	   CPUFreqClass *cfq_class = CPUFREQ_CLASS (klass);
-+
-+	   parent_class = g_type_class_peek_parent (klass);
-+
-+	   g_type_class_add_private (klass, sizeof (CPUFreqSysctlPrivate));
-+
-+	   cfq_class->set_governor = cpufreq_sysctl_set_governor;
-+	   cfq_class->set_frequency = cpufreq_sysctl_set_frequency;
++	CPUFreqSelectorClass *selector_class = CPUFREQ_SELECTOR_CLASS (klass);
 +
-+	   object_class->finalize = cpufreq_sysctl_finalize;
++	selector_class->set_frequency = cpufreq_selector_sysctl_set_frequency;
++	selector_class->set_governor = cpufreq_selector_sysctl_set_governor;
 +}
 +
-+static void
-+cpufreq_sysctl_finalize (GObject *object)
-+{
-+	   if (G_OBJECT_CLASS (parent_class)->finalize)
-+			 (* G_OBJECT_CLASS (parent_class)->finalize) (object);
-+}
-+
-+CPUFreqSysctl *
-+cpufreq_sysctl_new ()
++CPUFreqSelector *
++cpufreq_selector_sysctl_new (guint cpu)
 +{
-+	   CPUFreqSysctl *cfq;
-+
-+	   cfq = g_object_new (TYPE_CPUFREQ_SYSCTL, NULL);
++	CPUFreqSelector *selector;
 +
-+	   cpufreq_sysctl_setup (cfq);
++	selector = CPUFREQ_SELECTOR (g_object_new (CPUFREQ_TYPE_SELECTOR_SYSCTL,
++				                   "cpu", cpu, NULL));
 +
-+	   return cfq;
++	return selector;
 +}
 +
-+static void
-+cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor)
++static gboolean
++cpufreq_selector_sysctl_set_governor (CPUFreqSelector *selector, const gchar *governor, GError **error)
 +{
-+    /* Not implemented. */
++	return TRUE;
 +}
 +
-+static void
-+cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency)
++static gboolean
++cpufreq_selector_sysctl_set_frequency (CPUFreqSelector *selector, guint frequency, GError **error)
 +{
-+	   gint                  cpu, i;
++	   guint                 cpu, i;
 +	   size_t                len;
 +	   gchar                *freq_oid;
 +
-+	   g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+	   g_object_get (G_OBJECT (cfq), "n_cpu", &cpu, NULL);
-+
-+	   frequency = (gint) ((gdouble) frequency / 1000); /* Convert back to MHz*/
-+
-+	   for (i = 0; i < cpu; i++) {
-+   			 freq_oid = g_strdup_printf ("dev.cpu.%d.freq", i);
-+
-+	   		 sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency));
-+	   		 g_free (freq_oid);
-+	   }
-+}
-+	
-+
-+static void
-+cpufreq_sysctl_setup (CPUFreqSysctl *cfq)
-+{
-+	   guint                 cpu;
-+	   gint                  fmax, fmin;
-+	   gint                  pmax;
-+	   gint                  ifreq;
-+	   gint                  mib[4];
-+	   gchar                *governor, *levels;
-+	   gchar               **levelsp, **frpr, **l;
-+	   size_t                len;
-+	   CPUFreqSysctlPrivate *private;
-+
-+	   g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
-+
-+	   private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq);
++	   g_object_get (G_OBJECT (selector), "cpu", &cpu, NULL);
 +
-+	   pmax = 100;
-+	   fmax = 0;
-+	   fmin = 0;
-+	   ifreq = 0;
++	   frequency = (guint) ((gdouble) frequency / 1000); /* Convert back to MHz*/
++           freq_oid = g_strdup_printf ("dev.cpu.%d.freq", (gint) cpu);
 +
-+	   private->pmax = pmax;
++           sysctlbyname (freq_oid, NULL, &len, &frequency, sizeof (frequency));
++           g_free (freq_oid);
 +
-+	   len = sizeof (cpu);
-+
-+	   if (sysctlbyname ("hw.ncpu", &cpu, &len, NULL, 0) == -1)
-+	       		 cpu = 1;
-+	   
-+	   len = 4;
-+	   sysctlnametomib ("dev.cpu.0.freq_levels", mib, &len);
-+	   len = sizeof (levels);
-+
-+	   if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1) {
-+	       		 g_warning ("Failed to fetch dev.cpu.0.freq_levels");
-+			 return;
-+	   }
-+
-+	   levels = g_malloc (len);
-+	   if (sysctl (mib, 4, levels, &len, NULL, 0) == -1) {
-+	       		 g_warning ("Failed to fetch data for dev.cpu.0.freq_levels");
-+			 return;
-+	   }
-+
-+	   levelsp = g_strsplit (levels, " ", 0);
-+	   g_free (levels);
-+
-+	   frpr = g_strsplit (levelsp[0], "/", 0); /* MAX */
-+	   if (frpr && frpr[0] != NULL)
-+	       		 fmax = atoi (frpr[0]);
-+	   g_strfreev (frpr);
-+
-+	   for (l = levelsp; l && *l; l++) /* Walk to the last frequency */
-+	       		 ;
-+
-+	   l --;
-+	   frpr = g_strsplit (*l, "/", 0);
-+	   if (frpr && frpr[0] != NULL)
-+	       		 fmin = atoi (frpr[0]);
-+	   
-+	   g_strfreev (frpr);
-+	   g_strfreev (levelsp);
-+
-+	   len = sizeof (ifreq);
-+	   if (sysctlbyname ("dev.cpu.0.freq", &ifreq, &len, NULL, 0) == -1) {
-+	       		 g_warning ("Failed to fetch data for dev.cpu.0.freq");
-+			 return;
-+	   }
-+
-+	   if (ifreq == fmax)
-+	       		 governor = g_strdup ("performance");
-+	   else if (ifreq == fmin)
-+	       		 governor = g_strdup ("economy");
-+	   else
-+	       		 governor = g_strdup ("other");
-+	   
-+	   fmax *= 1000;
-+	   fmin *= 1000;
-+
-+	   g_object_set (G_OBJECT (cfq), "n_cpu", cpu, 
-+	   		 "sc_max", fmax, "sc_min", fmin,
-+			 "governor", governor, NULL);
-+
-+	   g_free (governor);
++	   return TRUE;
 +}
---- cpufreq/src/cpufreq-selector/main.c.orig	Sun Apr  3 12:03:13 2005
-+++ cpufreq/src/cpufreq-selector/main.c	Sun Jul  3 17:16:19 2005
-@@ -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>
-  */
- 
- #include <glib-object.h>
-@@ -26,6 +27,9 @@
- #include "cpufreq.h"
- #include "cpufreq-sysfs.h"
- #include "cpufreq-procfs.h"
-+#ifdef __FreeBSD__
-+#include "cpufreq-sysctl.h"
-+#endif /* __FreeBSD__ */
- 
- gint
- main (gint argc, gchar **argv)
-@@ -34,6 +38,9 @@ main (gint argc, gchar **argv)
-         static gint     cpu = 0;
-         static gchar   *governor = NULL;
-         static gulong   frequency = 0;
-+#ifdef __FreeBSD__
-+	size_t          len;
-+#endif /* __FreeBSD__ */
- 	GError         *error = NULL;
-         CPUFreq        *cfq;
- 
-@@ -71,10 +78,15 @@ main (gint argc, gchar **argv)
- 	
- 	g_option_context_free (context);
- 	
-+#ifndef __FreeBSD__
-         if (g_file_test ("/sys/devices/system/cpu/cpu0/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.6 kernel */
-                 cfq = CPUFREQ (cpufreq_sysfs_new ());
-         } else if (g_file_test ("/proc/cpufreq", G_FILE_TEST_EXISTS)) { /* 2.4 kernel */
-                 cfq = CPUFREQ (cpufreq_procfs_new ());
-+#else
-+	if (sysctlbyname ("dev.cpu.0.freq", NULL, &len, NULL, 0) == 0) {
-+		cfq = CPUFREQ (cpufreq_sysctl_new ());
-+#endif /* __FreeBSD__ */
-         } else {
-                 g_print ("No cpufreq support\n");
-                 return 1;
---- cpufreq/src/cpufreq-selector/Makefile.in.orig	Tue Oct  4 00:21:25 2005
-+++ cpufreq/src/cpufreq-selector/Makefile.in	Tue Oct  4 00:27:54 2005
-@@ -55,7 +55,7 @@
- PROGRAMS = $(bin_PROGRAMS)
- am_cpufreq_selector_OBJECTS = cpufreq.$(OBJEXT) \
- 	cpufreq-sysfs.$(OBJEXT) cpufreq-procfs.$(OBJEXT) \
--	main.$(OBJEXT)
-+	cpufreq-sysctl.$(OBJEXT) main.$(OBJEXT)
- cpufreq_selector_OBJECTS = $(am_cpufreq_selector_OBJECTS)
- am__DEPENDENCIES_1 =
- cpufreq_selector_DEPENDENCIES = $(am__DEPENDENCIES_1)
-@@ -64,6 +64,7 @@
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysfs.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysctl.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
- 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
-@@ -332,6 +333,7 @@
- 	cpufreq.c               cpufreq.h        \
- 	cpufreq-sysfs.c         cpufreq-sysfs.h  \
- 	cpufreq-procfs.c        cpufreq-procfs.h \
-+	cpufreq-sysctl.c        cpufreq-sysctl.h \
- 	main.c
- 
- cpufreq_selector_LDADD = $(CPUFREQ_SELECTOR_LIBS) -lpopt
-@@ -407,6 +409,7 @@
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-procfs.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysctl.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq-sysfs.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cpufreq.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
new file mode 100644
index 000000000000..0dc24164ec34
--- /dev/null
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-applet.py
@@ -0,0 +1,13 @@
+--- 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
+@@ -26,8 +26,8 @@ import invest, invest.applet, invest.def
+ import gettext, locale
+ gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+ gettext.textdomain(invest.defs.GETTEXT_PACKAGE)
+-locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+-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)
+ 
diff --git a/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
new file mode 100644
index 000000000000..2eddc8154089
--- /dev/null
+++ b/x11/gnome-applets/files/patch-invest-applet_invest_invest-chart
@@ -0,0 +1,13 @@
+--- 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
+@@ -6,8 +6,8 @@ import sys, invest.chart, gtk
+ import gettext, locale
+ gettext.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+ gettext.textdomain(invest.defs.GETTEXT_PACKAGE)
+-locale.bindtextdomain(invest.defs.GETTEXT_PACKAGE, invest.defs.GNOMELOCALEDIR)
+-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)
+ 
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index 2cf9c24b329f..28938b5e5944 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,8 +1,13 @@
 %%CPUFREQ%%bin/cpufreq-selector
 bin/gswitchit-plugins-capplet
+%%PYTHON%%bin/invest-chart
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
-include/libgswitchit/gswitchit_config.h
-include/libgswitchit/gswitchit_plugin.h
+include/libgswitchit/gnome-kbd-indicator.h
+include/libgswitchit/gswitchit-config-private.h
+include/libgswitchit/gswitchit-config.h
+include/libgswitchit/gswitchit-plugin.h
+include/libgswitchit/keyboard-config-registry-client.h
+include/libgswitchit/keyboard-config-registry.h
 include/libgweather/gweather-gconf.h
 include/libgweather/gweather-prefs.h
 include/libgweather/weather.h
@@ -10,6 +15,30 @@ lib/libgweather.a
 lib/libgweather.la
 lib/libgweather.so
 lib/libgweather.so.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/__init__.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/about.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/applet.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/chart.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/defs.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/preferences.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/quotes.pyo
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.py
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/invest/widgets.pyo
 libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
 %%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
 libdata/bonobo/servers/GNOME_CDPlayerApplet.server
@@ -29,6 +58,7 @@ libdata/bonobo/servers/GNOME_NullApplet_Factory.server
 libdata/bonobo/servers/GNOME_Panel_TrashApplet.server
 libdata/bonobo/servers/GNOME_Panel_WirelessApplet.server
 libdata/bonobo/servers/GNOME_StickyNotesApplet.server
+%%PYTHON%%libdata/bonobo/servers/Invest_Applet.server
 libdata/pkgconfig/gswitchit.pc
 libdata/pkgconfig/gweather.pc
 libexec/accessx-status-applet
@@ -39,8 +69,8 @@ libexec/drivemount_applet2
 libexec/geyes_applet2
 %%COMMANDER%%libexec/gnome-applets/mc-install-default-macros
 libexec/gnome-keyboard-applet
-libexec/gtik2_applet2
 libexec/gweather-applet-2
+%%PYTHON%%libexec/invest-applet
 %%COMMANDER%%libexec/mini_commander_applet
 libexec/mixer_applet2
 libexec/modem_applet
@@ -48,6 +78,8 @@ libexec/multiload-applet-2
 libexec/null_applet
 libexec/stickynotes_applet
 libexec/trashapplet
+share/gnome/applications/gswitchit-plugins.desktop
+%%PYTHON%%share/gnome/applications/invest-chart.desktop
 share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
 %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
 %%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
@@ -56,13 +88,13 @@ share/gnome/gnome-2.0/ui/GNOME_DriveMountApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_GSwitchItApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_GWeatherApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_GeyesApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_GtikApplet.xml
 %%COMMANDER%%share/gnome/gnome-2.0/ui/GNOME_MiniCommanderApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_MixerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_ModemLights.xml
 share/gnome/gnome-2.0/ui/GNOME_MultiloadApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_StickyNotesApplet.xml
+%%PYTHON%%share/gnome/gnome-2.0/ui/Invest_Applet.xml
 share/gnome/gnome-applets/geyes/Bizarre/Bizarre-eye.png
 share/gnome/gnome-applets/geyes/Bizarre/Bizarre-pupil.png
 share/gnome/gnome-applets/geyes/Bizarre/config
@@ -78,16 +110,24 @@ share/gnome/gnome-applets/geyes/Default/config
 share/gnome/gnome-applets/geyes/Horrid/config
 share/gnome/gnome-applets/geyes/Horrid/horrid_eye.png
 share/gnome/gnome-applets/geyes/Horrid/horrid_pupil.png
+share/gnome/gnome-applets/geyes/Tango/config
+share/gnome/gnome-applets/geyes/Tango/tango-eye.png
+share/gnome/gnome-applets/geyes/Tango/tango-pupil.png
 %%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
 %%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
+%%PYTHON%%share/gnome/gnome-applets/glade/financialchart.glade
 share/gnome/gnome-applets/glade/gswitchit-plugins.glade
 share/gnome/gnome-applets/glade/gswitchit.glade
 %%COMMANDER%%share/gnome/gnome-applets/glade/mini-commander.glade
 share/gnome/gnome-applets/glade/modemlights.glade
+%%PYTHON%%share/gnome/gnome-applets/glade/prefs-dialog.glade
 share/gnome/gnome-applets/glade/stickynotes.glade
 share/gnome/gnome-applets/glade/trashapplet.glade
 share/gnome/gnome-applets/gweather/Locations.xml
 share/gnome/gnome-applets/gweather/locations.dtd
+%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-16.png
+%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest-button.png
+%%PYTHON%%share/gnome/gnome-applets/invest-applet/invest.svg
 share/gnome/help/accessx-status/C/accessx-status.xml
 share/gnome/help/accessx-status/C/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/C/figures/accessx-status-disabled.png
@@ -149,6 +189,30 @@ share/gnome/help/accessx-status/it/figures/accessx_sticky-keys.png
 share/gnome/help/accessx-status/it/figures/accessx_sticky-meta-key.png
 share/gnome/help/accessx-status/it/figures/accessx_sticky-shift-key.png
 share/gnome/help/accessx-status/it/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/nl/accessx-status.xml
+share/gnome/help/accessx-status/nl/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/nl/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/nl/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/nl/figures/accessx_sticky-windows-key.png
+share/gnome/help/accessx-status/sv/accessx-status.xml
+share/gnome/help/accessx-status/sv/figures/accessx-status-applet.png
+share/gnome/help/accessx-status/sv/figures/accessx-status-disabled.png
+share/gnome/help/accessx-status/sv/figures/accessx_bounce-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_mouse-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_slow-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-altGr-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-ctrl-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-keys.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-meta-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-shift-key.png
+share/gnome/help/accessx-status/sv/figures/accessx_sticky-windows-key.png
 share/gnome/help/accessx-status/uk/accessx-status.xml
 share/gnome/help/accessx-status/uk/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/uk/figures/accessx-status-disabled.png
@@ -186,6 +250,12 @@ share/gnome/help/accessx-status/uk/figures/accessx_sticky-windows-key.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-credits-hal.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/fr/figures/context-menu.png
+%%BATTERY%%share/gnome/help/battstat/sv/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet-expanded.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-applet.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-credits-hal.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/battstat-preferences.png
+%%BATTERY%%share/gnome/help/battstat/sv/figures/context-menu.png
 %%BATTERY%%share/gnome/help/battstat/uk/battstat.xml
 %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet-expanded.png
 %%BATTERY%%share/gnome/help/battstat/uk/figures/battstat-applet.png
@@ -228,6 +298,11 @@ share/gnome/help/char-palette/pt_BR/figures/charpalette_applet.png
 share/gnome/help/char-palette/pt_BR/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/pt_BR/figures/charpick-preferences.png
 share/gnome/help/char-palette/pt_BR/figures/charpick_characters.png
+share/gnome/help/char-palette/sv/char-palette.xml
+share/gnome/help/char-palette/sv/figures/charpalette_applet.png
+share/gnome/help/char-palette/sv/figures/charpalette_chargroup.png
+share/gnome/help/char-palette/sv/figures/charpick-preferences.png
+share/gnome/help/char-palette/sv/figures/charpick_characters.png
 share/gnome/help/char-palette/uk/char-palette.xml
 share/gnome/help/char-palette/uk/figures/charpalette_applet.png
 share/gnome/help/char-palette/uk/figures/charpalette_chargroup.png
@@ -250,6 +325,10 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/command-line.png
 %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs-macros.png
 %%COMMANDER%%share/gnome/help/command-line/pt_BR/figures/prefs.png
+%%COMMANDER%%share/gnome/help/command-line/sv/command-line.xml
+%%COMMANDER%%share/gnome/help/command-line/sv/figures/command-line.png
+%%COMMANDER%%share/gnome/help/command-line/sv/figures/prefs-macros.png
+%%COMMANDER%%share/gnome/help/command-line/sv/figures/prefs.png
 %%COMMANDER%%share/gnome/help/command-line/uk/command-line.xml
 %%COMMANDER%%share/gnome/help/command-line/uk/figures/command-line.png
 %%COMMANDER%%share/gnome/help/command-line/uk/figures/prefs-macros.png
@@ -275,6 +354,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector-both.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/es/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/fr/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-100.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-25.png
@@ -285,6 +374,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector-both.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/nl/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/sv/figures/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/cpufreq-applet.xml
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-100.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-25.png
@@ -295,6 +394,16 @@ share/gnome/help/char-palette/uk/figures/charpick_characters.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector-both.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet-selector.png
 %%CPUFREQ%%share/gnome/help/cpufreq-applet/uk/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences-smp.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector-both.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/zh_CN/figures/cpufreq-applet.png
 share/gnome/help/drivemount/C/drivemount.xml
 share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/C/figures/drivemount-applet_example.png
@@ -326,12 +435,24 @@ share/gnome/help/drivemount/pa/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/pa/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/sv/drivemount.xml
+share/gnome/help/drivemount/sv/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/sv/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/uk/drivemount.xml
 share/gnome/help/drivemount/uk/figures/drivemount-applet_eject.png
 share/gnome/help/drivemount/uk/figures/drivemount-applet_example.png
 share/gnome/help/drivemount/uk/figures/drivemount-applet_mount.png
 share/gnome/help/drivemount/uk/figures/drivemount-applet_open.png
 share/gnome/help/drivemount/uk/figures/drivemount-applet_status.png
+share/gnome/help/drivemount/zh_CN/drivemount.xml
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/zh_CN/figures/drivemount-applet_status.png
 share/gnome/help/geyes/C/figures/geyes_applet.png
 share/gnome/help/geyes/C/geyes.xml
 share/gnome/help/geyes/C/legal.xml
@@ -345,22 +466,16 @@ share/gnome/help/geyes/it/figures/geyes_applet.png
 share/gnome/help/geyes/it/geyes.xml
 share/gnome/help/geyes/ru/figures/geyes_applet.png
 share/gnome/help/geyes/ru/geyes.xml
+share/gnome/help/geyes/sv/figures/geyes_applet.png
+share/gnome/help/geyes/sv/geyes.xml
 share/gnome/help/geyes/uk/figures/geyes_applet.png
 share/gnome/help/geyes/uk/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/gswitchit/fr/gswitchit.xml
+share/gnome/help/gswitchit/sv/gswitchit.xml
 share/gnome/help/gswitchit/uk/gswitchit.xml
-share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/C/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/C/legal.xml
-share/gnome/help/gtik2_applet2/es/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/es/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/fr/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/fr/gtik2_applet2.xml
-share/gnome/help/gtik2_applet2/uk/figures/gtik_applet.png
-share/gnome/help/gtik2_applet2/uk/gtik2_applet2.xml
 share/gnome/help/gweather/C/figures/gweather-details.png
 share/gnome/help/gweather/C/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/C/figures/gweather-prefs-general.png
@@ -422,6 +537,21 @@ share/gnome/help/gweather/nl/figures/stock_weather-snow.png
 share/gnome/help/gweather/nl/figures/stock_weather-storm.png
 share/gnome/help/gweather/nl/figures/stock_weather-sunny.png
 share/gnome/help/gweather/nl/gweather.xml
+share/gnome/help/gweather/sv/figures/gweather-details.png
+share/gnome/help/gweather/sv/figures/gweather-menu-prefs.png
+share/gnome/help/gweather/sv/figures/gweather-prefs-general.png
+share/gnome/help/gweather/sv/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/sv/figures/gweather_applet.png
+share/gnome/help/gweather/sv/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/sv/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/sv/figures/stock_weather-fog.png
+share/gnome/help/gweather/sv/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/sv/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/sv/figures/stock_weather-showers.png
+share/gnome/help/gweather/sv/figures/stock_weather-snow.png
+share/gnome/help/gweather/sv/figures/stock_weather-storm.png
+share/gnome/help/gweather/sv/figures/stock_weather-sunny.png
+share/gnome/help/gweather/sv/gweather.xml
 share/gnome/help/gweather/uk/figures/gweather-details.png
 share/gnome/help/gweather/uk/figures/gweather-menu-prefs.png
 share/gnome/help/gweather/uk/figures/gweather-prefs-general.png
@@ -446,6 +576,8 @@ share/gnome/help/mixer_applet2/fr/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/fr/mixer_applet2.xml
 share/gnome/help/mixer_applet2/it/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/it/mixer_applet2.xml
+share/gnome/help/mixer_applet2/sv/figures/volumecontrol_applet.png
+share/gnome/help/mixer_applet2/sv/mixer_applet2.xml
 share/gnome/help/mixer_applet2/uk/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/uk/mixer_applet2.xml
 share/gnome/help/multiload/C/figures/multiload-preferences.png
@@ -461,6 +593,10 @@ share/gnome/help/multiload/fr/figures/multiload-preferences.png
 share/gnome/help/multiload/fr/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/fr/figures/system_monitor.png
 share/gnome/help/multiload/fr/multiload.xml
+share/gnome/help/multiload/sv/figures/multiload-preferences.png
+share/gnome/help/multiload/sv/figures/system-monitor-applet_window.png
+share/gnome/help/multiload/sv/figures/system_monitor.png
+share/gnome/help/multiload/sv/multiload.xml
 share/gnome/help/multiload/uk/figures/multiload-preferences.png
 share/gnome/help/multiload/uk/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/uk/figures/system_monitor.png
@@ -484,6 +620,12 @@ share/gnome/help/stickynotes_applet/fr/figures/stickynotes-note-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes-prefs.png
 share/gnome/help/stickynotes_applet/fr/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/fr/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-lock.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynote-right-menu-new.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/sv/figures/stickynotes_applet.png
+share/gnome/help/stickynotes_applet/sv/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-lock.png
 share/gnome/help/stickynotes_applet/uk/figures/stickynote-right-menu-new.png
 share/gnome/help/stickynotes_applet/uk/figures/stickynotes-note-prefs.png
@@ -505,6 +647,8 @@ share/gnome/help/trashapplet/pa/figures/trash-applet.png
 share/gnome/help/trashapplet/pa/trashapplet.xml
 share/gnome/help/trashapplet/ru/figures/trash-applet.png
 share/gnome/help/trashapplet/ru/trashapplet.xml
+share/gnome/help/trashapplet/sv/figures/trash-applet.png
+share/gnome/help/trashapplet/sv/trashapplet.xml
 share/gnome/help/trashapplet/uk/figures/trash-applet.png
 share/gnome/help/trashapplet/uk/trashapplet.xml
 share/gnome/omf/accessx-status/accessx-status-C.omf
@@ -512,11 +656,14 @@ share/gnome/omf/accessx-status/accessx-status-bg.omf
 share/gnome/omf/accessx-status/accessx-status-es.omf
 share/gnome/omf/accessx-status/accessx-status-fr.omf
 share/gnome/omf/accessx-status/accessx-status-it.omf
+share/gnome/omf/accessx-status/accessx-status-nl.omf
+share/gnome/omf/accessx-status/accessx-status-sv.omf
 share/gnome/omf/accessx-status/accessx-status-uk.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-C.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-bg.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-es.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-fr.omf
+%%BATTERY%%share/gnome/omf/battstat/battstat-sv.omf
 %%BATTERY%%share/gnome/omf/battstat/battstat-uk.omf
 share/gnome/omf/char-palette/char-palette-C.omf
 share/gnome/omf/char-palette/char-palette-bg.omf
@@ -525,54 +672,63 @@ share/gnome/omf/char-palette/char-palette-fr.omf
 share/gnome/omf/char-palette/char-palette-it.omf
 share/gnome/omf/char-palette/char-palette-nl.omf
 share/gnome/omf/char-palette/char-palette-pt_BR.omf
+share/gnome/omf/char-palette/char-palette-sv.omf
 share/gnome/omf/char-palette/char-palette-uk.omf
 %%COMMANDER%%share/gnome/omf/command-line/command-line-C.omf
 %%COMMANDER%%share/gnome/omf/command-line/command-line-es.omf
 %%COMMANDER%%share/gnome/omf/command-line/command-line-fr.omf
 %%COMMANDER%%share/gnome/omf/command-line/command-line-pt_BR.omf
+%%COMMANDER%%share/gnome/omf/command-line/command-line-sv.omf
 %%COMMANDER%%share/gnome/omf/command-line/command-line-uk.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-C.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-es.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-fr.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-nl.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-sv.omf
 %%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-uk.omf
+%%CPUFREQ%%share/gnome/omf/cpufreq-applet/cpufreq-applet-zh_CN.omf
 share/gnome/omf/drivemount/drivemount-C.omf
 share/gnome/omf/drivemount/drivemount-es.omf
 share/gnome/omf/drivemount/drivemount-fr.omf
 share/gnome/omf/drivemount/drivemount-it.omf
 share/gnome/omf/drivemount/drivemount-pa.omf
+share/gnome/omf/drivemount/drivemount-sv.omf
 share/gnome/omf/drivemount/drivemount-uk.omf
+share/gnome/omf/drivemount/drivemount-zh_CN.omf
 share/gnome/omf/geyes/geyes-C.omf
 share/gnome/omf/geyes/geyes-bg.omf
 share/gnome/omf/geyes/geyes-es.omf
 share/gnome/omf/geyes/geyes-fr.omf
 share/gnome/omf/geyes/geyes-it.omf
 share/gnome/omf/geyes/geyes-ru.omf
+share/gnome/omf/geyes/geyes-sv.omf
 share/gnome/omf/geyes/geyes-uk.omf
 share/gnome/omf/gswitchit/gswitchit-C.omf
 share/gnome/omf/gswitchit/gswitchit-es.omf
 share/gnome/omf/gswitchit/gswitchit-fr.omf
+share/gnome/omf/gswitchit/gswitchit-sv.omf
 share/gnome/omf/gswitchit/gswitchit-uk.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-C.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-es.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-fr.omf
-share/gnome/omf/gtik2_applet2/gtik2_applet2-uk.omf
 share/gnome/omf/gweather/gweather-C.omf
 share/gnome/omf/gweather/gweather-es.omf
 share/gnome/omf/gweather/gweather-fr.omf
 share/gnome/omf/gweather/gweather-nl.omf
+share/gnome/omf/gweather/gweather-sv.omf
 share/gnome/omf/gweather/gweather-uk.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-C.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-es.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-fr.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-it.omf
+share/gnome/omf/mixer_applet2/mixer_applet2-sv.omf
 share/gnome/omf/mixer_applet2/mixer_applet2-uk.omf
 share/gnome/omf/multiload/multiload-C.omf
 share/gnome/omf/multiload/multiload-es.omf
 share/gnome/omf/multiload/multiload-fr.omf
+share/gnome/omf/multiload/multiload-sv.omf
 share/gnome/omf/multiload/multiload-uk.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-C.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-es.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-fr.omf
+share/gnome/omf/stickynotes_applet/stickynotes_applet-sv.omf
 share/gnome/omf/stickynotes_applet/stickynotes_applet-uk.omf
 share/gnome/omf/trashapplet/trashapplet-C.omf
 share/gnome/omf/trashapplet/trashapplet-es.omf
@@ -581,6 +737,7 @@ share/gnome/omf/trashapplet/trashapplet-it.omf
 share/gnome/omf/trashapplet/trashapplet-nl.omf
 share/gnome/omf/trashapplet/trashapplet-pa.omf
 share/gnome/omf/trashapplet/trashapplet-ru.omf
+share/gnome/omf/trashapplet/trashapplet-sv.omf
 share/gnome/omf/trashapplet/trashapplet-uk.omf
 share/gnome/pixmaps/accessx-status-applet/ax-applet.png
 share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
@@ -622,14 +779,12 @@ share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png
 %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-25.png
 %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-50.png
 %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-75.png
-%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-applet.png
 %%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-na.png
+%%PYTHON%%share/gnome/pixmaps/invest-big.png
 share/gnome/pixmaps/stickynotes/close.png
 share/gnome/pixmaps/stickynotes/locked.png
 share/gnome/pixmaps/stickynotes/resize_se.png
 share/gnome/pixmaps/stickynotes/resize_sw.png
-share/gnome/pixmaps/stickynotes/stickynotes.png
-share/gnome/pixmaps/stickynotes/stickynotes_prelight.png
 share/gnome/pixmaps/stickynotes/unlocked.png
 share/gnome/xmodmap/base.xml
 share/gnome/xmodmap/xmodmap.am
@@ -717,22 +872,38 @@ share/gnome/xmodmap/xmodmap.us.old
 share/gnome/xmodmap/xmodmap.us101A_x86
 share/gnome/xmodmap/xmodmap.us_intl
 share/gnome/xmodmap/xmodmap.yu
+share/icons/hicolor/16x16/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/16x16/apps/gnome-eyes-applet.png
+share/icons/hicolor/16x16/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/16x16/apps/gnome-sticky-notes-applet.png
+share/icons/hicolor/22x22/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/22x22/apps/gnome-eyes-applet.png
+share/icons/hicolor/22x22/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/22x22/apps/gnome-sticky-notes-applet.png
+share/icons/hicolor/24x24/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/24x24/apps/gnome-eyes-applet.png
+share/icons/hicolor/24x24/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/24x24/apps/gnome-sticky-notes-applet.png
+share/icons/hicolor/32x32/apps/gnome-cpu-frequency-applet.png
+share/icons/hicolor/32x32/apps/gnome-eyes-applet.png
+share/icons/hicolor/32x32/apps/gnome-modem-monitor-applet.png
+share/icons/hicolor/32x32/apps/gnome-sticky-notes-applet.png
 share/icons/hicolor/48x48/apps/ax-applet.png
 share/icons/hicolor/48x48/apps/charpick.png
-share/icons/hicolor/48x48/apps/gnome-cpu.png
-share/icons/hicolor/48x48/apps/gnome-eyes.png
 %%COMMANDER%%share/icons/hicolor/48x48/apps/gnome-mini-commander.png
-share/icons/hicolor/48x48/apps/gnome-modem.png
-share/icons/hicolor/48x48/apps/gnome-money.png
 share/icons/hicolor/48x48/apps/gswitchit-applet.png
 share/icons/hicolor/48x48/apps/gswitchit-properties-capplet.png
+share/icons/hicolor/svgxsvg/apps/gnome-cpu-frequency-applet
+share/icons/hicolor/svgxsvg/apps/gnome-eyes-applet
+share/icons/hicolor/svgxsvg/apps/gnome-modem-monitor-applet
+share/icons/hicolor/svgxsvg/apps/gnome-sticky-notes-applet
 share/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/az/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/be/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/br/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/bs/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ca/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/cs/LC_MESSAGES/gnome-applets-2.0.mo
@@ -744,6 +915,23 @@ share/locale/el/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/en_CA/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/en_GB/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/es/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_AR/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_CL/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_CO/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_CR/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_DO/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_EC/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_ES/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_GT/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_HN/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_MX/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_NI/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_PA/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_PE/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_PR/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_SV/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_UY/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/es_VE/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
@@ -767,15 +955,17 @@ share/locale/ku/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ky/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/mg/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/mk/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ml/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/mr/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/ne/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-applets-2.0.mo
-share/locale/no/LC_MESSAGES/gnome-applets-2.0.mo
+share/locale/or/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-applets-2.0.mo
@@ -800,24 +990,8 @@ share/locale/xh/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@dirrmtry share/locale/zh_HK/LC_MESSAGES
-@dirrmtry share/locale/zh_HK
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/te/LC_MESSAGES
-@dirrmtry share/locale/te
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ky/LC_MESSAGES
-@dirrmtry share/locale/ky
-@dirrmtry share/locale/ku/LC_MESSAGES
-@dirrmtry share/locale/ku
-@dirrmtry share/locale/hy/LC_MESSAGES
-@dirrmtry share/locale/hy
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/br/LC_MESSAGES
-@dirrmtry share/locale/br
+@dirrmtry share/icons/hicolor/svgxsvg/apps
+@dirrmtry share/icons/hicolor/svgxsvg
 @dirrmtry share/icons/hicolor/48x48/apps
 @dirrmtry share/icons/hicolor/48x48
 @dirrmtry share/icons/hicolor
@@ -829,18 +1003,19 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/omf/stickynotes_applet
 @dirrm share/gnome/omf/multiload
 @dirrm share/gnome/omf/mixer_applet2
-%%COMMANDER%%@dirrm share/gnome/omf/command-line
 @dirrm share/gnome/omf/gweather
-@dirrm share/gnome/omf/gtik2_applet2
 @dirrm share/gnome/omf/gswitchit
 @dirrm share/gnome/omf/geyes
 @dirrm share/gnome/omf/drivemount
 %%CPUFREQ%%@dirrm share/gnome/omf/cpufreq-applet
+%%COMMANDER%%@dirrm share/gnome/omf/command-line
 @dirrm share/gnome/omf/char-palette
 %%BATTERY%%@dirrm share/gnome/omf/battstat
 @dirrm share/gnome/omf/accessx-status
 @dirrm share/gnome/help/trashapplet/uk/figures
 @dirrm share/gnome/help/trashapplet/uk
+@dirrm share/gnome/help/trashapplet/sv/figures
+@dirrm share/gnome/help/trashapplet/sv
 @dirrm share/gnome/help/trashapplet/ru/figures
 @dirrm share/gnome/help/trashapplet/ru
 @dirrm share/gnome/help/trashapplet/pa/figures
@@ -858,6 +1033,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/trashapplet
 @dirrm share/gnome/help/stickynotes_applet/uk/figures
 @dirrm share/gnome/help/stickynotes_applet/uk
+@dirrm share/gnome/help/stickynotes_applet/sv/figures
+@dirrm share/gnome/help/stickynotes_applet/sv
 @dirrm share/gnome/help/stickynotes_applet/fr/figures
 @dirrm share/gnome/help/stickynotes_applet/fr
 @dirrm share/gnome/help/stickynotes_applet/es/figures
@@ -867,6 +1044,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/stickynotes_applet
 @dirrm share/gnome/help/multiload/uk/figures
 @dirrm share/gnome/help/multiload/uk
+@dirrm share/gnome/help/multiload/sv/figures
+@dirrm share/gnome/help/multiload/sv
 @dirrm share/gnome/help/multiload/fr/figures
 @dirrm share/gnome/help/multiload/fr
 @dirrm share/gnome/help/multiload/es/figures
@@ -876,6 +1055,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/multiload
 @dirrm share/gnome/help/mixer_applet2/uk/figures
 @dirrm share/gnome/help/mixer_applet2/uk
+@dirrm share/gnome/help/mixer_applet2/sv/figures
+@dirrm share/gnome/help/mixer_applet2/sv
 @dirrm share/gnome/help/mixer_applet2/it/figures
 @dirrm share/gnome/help/mixer_applet2/it
 @dirrm share/gnome/help/mixer_applet2/fr/figures
@@ -887,6 +1068,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/mixer_applet2
 @dirrm share/gnome/help/gweather/uk/figures
 @dirrm share/gnome/help/gweather/uk
+@dirrm share/gnome/help/gweather/sv/figures
+@dirrm share/gnome/help/gweather/sv
 @dirrm share/gnome/help/gweather/nl/figures
 @dirrm share/gnome/help/gweather/nl
 @dirrm share/gnome/help/gweather/fr/figures
@@ -896,22 +1079,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gweather/C/figures
 @dirrm share/gnome/help/gweather/C
 @dirrm share/gnome/help/gweather
-@dirrm share/gnome/help/gtik2_applet2/uk/figures
-@dirrm share/gnome/help/gtik2_applet2/uk
-@dirrm share/gnome/help/gtik2_applet2/fr/figures
-@dirrm share/gnome/help/gtik2_applet2/fr
-@dirrm share/gnome/help/gtik2_applet2/es/figures
-@dirrm share/gnome/help/gtik2_applet2/es
-@dirrm share/gnome/help/gtik2_applet2/C/figures
-@dirrm share/gnome/help/gtik2_applet2/C
-@dirrm share/gnome/help/gtik2_applet2
 @dirrm share/gnome/help/gswitchit/uk
+@dirrm share/gnome/help/gswitchit/sv
 @dirrm share/gnome/help/gswitchit/fr
 @dirrm share/gnome/help/gswitchit/es
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
 @dirrm share/gnome/help/geyes/uk/figures
 @dirrm share/gnome/help/geyes/uk
+@dirrm share/gnome/help/geyes/sv/figures
+@dirrm share/gnome/help/geyes/sv
 @dirrm share/gnome/help/geyes/ru/figures
 @dirrm share/gnome/help/geyes/ru
 @dirrm share/gnome/help/geyes/it/figures
@@ -925,8 +1102,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/geyes/C/figures
 @dirrm share/gnome/help/geyes/C
 @dirrm share/gnome/help/geyes
+@dirrm share/gnome/help/drivemount/zh_CN/figures
+@dirrm share/gnome/help/drivemount/zh_CN
 @dirrm share/gnome/help/drivemount/uk/figures
 @dirrm share/gnome/help/drivemount/uk
+@dirrm share/gnome/help/drivemount/sv/figures
+@dirrm share/gnome/help/drivemount/sv
 @dirrm share/gnome/help/drivemount/pa/figures
 @dirrm share/gnome/help/drivemount/pa
 @dirrm share/gnome/help/drivemount/it/figures
@@ -938,10 +1119,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/drivemount/C/figures
 @dirrm share/gnome/help/drivemount/C
 @dirrm share/gnome/help/drivemount
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/zh_CN
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/uk
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/sv
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/nl
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/fr
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es/figures
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/es
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C/figures
@@ -949,6 +1136,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
 %%COMMANDER%%@dirrm share/gnome/help/command-line/uk/figures
 %%COMMANDER%%@dirrm share/gnome/help/command-line/uk
+%%COMMANDER%%@dirrm share/gnome/help/command-line/sv/figures
+%%COMMANDER%%@dirrm share/gnome/help/command-line/sv
 %%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR/figures
 %%COMMANDER%%@dirrm share/gnome/help/command-line/pt_BR
 %%COMMANDER%%@dirrm share/gnome/help/command-line/fr/figures
@@ -960,6 +1149,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%COMMANDER%%@dirrm share/gnome/help/command-line
 @dirrm share/gnome/help/char-palette/uk/figures
 @dirrm share/gnome/help/char-palette/uk
+@dirrm share/gnome/help/char-palette/sv/figures
+@dirrm share/gnome/help/char-palette/sv
 @dirrm share/gnome/help/char-palette/pt_BR/figures
 @dirrm share/gnome/help/char-palette/pt_BR
 @dirrm share/gnome/help/char-palette/nl/figures
@@ -977,6 +1168,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/char-palette
 %%BATTERY%%@dirrm share/gnome/help/battstat/uk/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/uk
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv/figures
+%%BATTERY%%@dirrm share/gnome/help/battstat/sv
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/fr
 %%BATTERY%%@dirrm share/gnome/help/battstat/es/figures
@@ -988,6 +1181,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 %%BATTERY%%@dirrm share/gnome/help/battstat
 @dirrm share/gnome/help/accessx-status/uk/figures
 @dirrm share/gnome/help/accessx-status/uk
+@dirrm share/gnome/help/accessx-status/sv/figures
+@dirrm share/gnome/help/accessx-status/sv
+@dirrm share/gnome/help/accessx-status/nl/figures
+@dirrm share/gnome/help/accessx-status/nl
 @dirrm share/gnome/help/accessx-status/it/figures
 @dirrm share/gnome/help/accessx-status/it
 @dirrm share/gnome/help/accessx-status/fr/figures
@@ -999,8 +1196,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/accessx-status/C/figures
 @dirrm share/gnome/help/accessx-status/C
 @dirrm share/gnome/help/accessx-status
+@dirrm share/gnome/gnome-applets/invest-applet
 @dirrm share/gnome/gnome-applets/gweather
 @dirrm share/gnome/gnome-applets/glade
+@dirrm share/gnome/gnome-applets/geyes/Tango
 @dirrm share/gnome/gnome-applets/geyes/Horrid
 @dirrm share/gnome/gnome-applets/geyes/Default-tiny
 @dirrm share/gnome/gnome-applets/geyes/Default
@@ -1008,5 +1207,94 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/gnome-applets/geyes/Bizarre
 @dirrm share/gnome/gnome-applets/geyes
 @dirrm share/gnome/gnome-applets
+%%PYTHON%%@dirrm %%PYTHON_SITELIBDIR%%/invest
 @dirrm include/libgweather
 @dirrm include/libgswitchit
+@dirrmtry share/locale/zh_TW/LC_MESSAGES
+@dirrmtry share/locale/zh_TW
+@dirrmtry share/locale/zh_HK/LC_MESSAGES
+@dirrmtry share/locale/zh_HK
+@dirrmtry share/locale/zh_CN/LC_MESSAGES
+@dirrmtry share/locale/zh_CN
+@dirrmtry share/locale/xh/LC_MESSAGES
+@dirrmtry share/locale/xh
+@dirrmtry share/locale/uk/LC_MESSAGES
+@dirrmtry share/locale/uk
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/sr/LC_MESSAGES
+@dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
+@dirrmtry share/locale/sk/LC_MESSAGES
+@dirrmtry share/locale/sk
+@dirrmtry share/locale/rw/LC_MESSAGES
+@dirrmtry share/locale/rw
+@dirrmtry share/locale/ro/LC_MESSAGES
+@dirrmtry share/locale/ro
+@dirrmtry share/locale/pt/LC_MESSAGES
+@dirrmtry share/locale/pt
+@dirrmtry share/locale/pl/LC_MESSAGES
+@dirrmtry share/locale/pl
+@dirrmtry share/locale/nn/LC_MESSAGES
+@dirrmtry share/locale/nn
+@dirrmtry share/locale/ne/LC_MESSAGES
+@dirrmtry share/locale/ne
+@dirrmtry share/locale/mr/LC_MESSAGES
+@dirrmtry share/locale/mr
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
+@dirrmtry share/locale/ko/LC_MESSAGES
+@dirrmtry share/locale/ko
+@dirrmtry share/locale/hy/LC_MESSAGES
+@dirrmtry share/locale/hy
+@dirrmtry share/locale/gl/LC_MESSAGES
+@dirrmtry share/locale/gl
+@dirrmtry share/locale/fi/LC_MESSAGES
+@dirrmtry share/locale/fi
+@dirrmtry share/locale/es_VE/LC_MESSAGES
+@dirrmtry share/locale/es_VE
+@dirrmtry share/locale/es_UY/LC_MESSAGES
+@dirrmtry share/locale/es_UY
+@dirrmtry share/locale/es_SV/LC_MESSAGES
+@dirrmtry share/locale/es_SV
+@dirrmtry share/locale/es_PR/LC_MESSAGES
+@dirrmtry share/locale/es_PR
+@dirrmtry share/locale/es_PE/LC_MESSAGES
+@dirrmtry share/locale/es_PE
+@dirrmtry share/locale/es_PA/LC_MESSAGES
+@dirrmtry share/locale/es_PA
+@dirrmtry share/locale/es_NI/LC_MESSAGES
+@dirrmtry share/locale/es_NI
+@dirrmtry share/locale/es_HN/LC_MESSAGES
+@dirrmtry share/locale/es_HN
+@dirrmtry share/locale/es_GT/LC_MESSAGES
+@dirrmtry share/locale/es_GT
+@dirrmtry share/locale/es_EC/LC_MESSAGES
+@dirrmtry share/locale/es_EC
+@dirrmtry share/locale/es_DO/LC_MESSAGES
+@dirrmtry share/locale/es_DO
+@dirrmtry share/locale/es_CR/LC_MESSAGES
+@dirrmtry share/locale/es_CR
+@dirrmtry share/locale/es_CO/LC_MESSAGES
+@dirrmtry share/locale/es_CO
+@dirrmtry share/locale/es_CL/LC_MESSAGES
+@dirrmtry share/locale/es_CL
+@dirrmtry share/locale/es_AR/LC_MESSAGES
+@dirrmtry share/locale/es_AR
+@dirrmtry share/locale/el/LC_MESSAGES
+@dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
+@dirrmtry share/locale/cs/LC_MESSAGES
+@dirrmtry share/locale/cs
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
author	marcus <marcus@FreeBSD.org>	2006-10-14 16:35:50 +0800
committer	marcus <marcus@FreeBSD.org>	2006-10-14 16:35:50 +0800
commit	9b9c902909a87b589432804ec4e8a7fa23943ff4 (patch)
tree	aa2e443568b953ce772558b2be74a8451e38ec3d /x11/gnome-applets
parent	f5a682ff4e0a5d73ce8bffeb88c799eb8ef0e816 (diff)
download	freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.gz freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.tar.zst freebsd-ports-gnome-9b9c902909a87b589432804ec4e8a7fa23943ff4.zip