15 files changed, 1347 insertions, 1744 deletions

diff --git a/x11/gnome-applets/Makefile b/x11/gnome-applets/Makefile
index ddc1e9ce7ad9..d2ee9028fc0f 100644
--- a/x11/gnome-applets/Makefile
+++ b/x11/gnome-applets/Makefile
@@ -6,27 +6,28 @@
 #
 
 PORTNAME=	gnomeapplets2
-PORTVERSION=	2.8.2
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-applets/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-applets/2.10
 DISTNAME=	gnome-applets-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Applets components for the Gnome 2 Desktop Environment
 
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-system-tools.pc:${PORTSDIR}/sysutils/gnomesystemtools
 LIB_DEPENDS=	gtop-2.0:${PORTSDIR}/devel/libgtop2 \
-		xklavier.8:${PORTSDIR}/x11/libxklavier
+		xklavier.10:${PORTSDIR}/x11/libxklavier \
+		gucharmap.4:${PORTSDIR}/deskutils/gucharmap
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/system-tools-backends.pc:${PORTSDIR}/sysutils/gnomesystemtools
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
 USE_GMAKE=	yes
-USE_REINPLACE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomehier gnomeprefix gnomehack intlhack gnomepanel \
+INSTALLS_OMF=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomepanel \
 		gail
 USE_GSTREAMER=	yes
 USE_LIBTOOL_VER=15
@@ -34,10 +35,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		FREEBSD_SYS=${FREEBSD_SYS}
 
-GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas gkb.schemas \
+GCONF_SCHEMAS=	charpick.schemas drivemount.schemas geyes.schemas \
 		gswitchit.schemas gtik.schemas gweather.schemas \
-		mailcheck.schemas mini-commander.schemas mixer.schemas \
-		modemlights.schemas multiload.schemas stickynotes.schemas
+		mini-commander-global.schemas mini-commander.schemas \
+		mixer.schemas multiload.schemas \
+		stickynotes.schemas
 
 FREEBSD_SYS?=	/usr/src/sys
 
@@ -50,6 +52,7 @@ PLIST_SUB=	BATTERY="@comment "
 GCONF_SCHEMAS+=	battstat.schemas
 PLIST_SUB=	BATTERY=""
 
+.if ${OSVERSION} < 600019
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "              W  A  R  N  I  N  G"
@@ -62,5 +65,13 @@ pre-everything::
 	@${ECHO_MSG} "*****************************************************"
 	@${ECHO_MSG} ""
 .endif
+.endif
+
+.if ${ARCH} != "i386" && ${ARCH} != "amd64"
+PLIST_SUB+=	CPUFREQ="@comment "
+.else
+PLIST_SUB+=	CPUFREQ=""
+GCONF_SCHEMAS+=	cpufreq-applet.schemas
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/x11/gnome-applets/distinfo b/x11/gnome-applets/distinfo
index 5812235d13fa..7bfa1c4099db 100644
--- a/x11/gnome-applets/distinfo
+++ b/x11/gnome-applets/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-applets-2.8.2.tar.bz2) = 10d83b6e031bad31d7cfefe2c4884bd7
-SIZE (gnome2/gnome-applets-2.8.2.tar.bz2) = 6049108
+MD5 (gnome2/gnome-applets-2.10.0.tar.bz2) = c230df43a21a0d788197b5b0f3e688f1
+SIZE (gnome2/gnome-applets-2.10.0.tar.bz2) = 5662438
diff --git a/x11/gnome-applets/files/patch-aa b/x11/gnome-applets/files/patch-aa
index a0025a0ad050..2a74a1ed8f2b 100644
--- a/x11/gnome-applets/files/patch-aa
+++ b/x11/gnome-applets/files/patch-aa
@@ -1,23 +1,25 @@
---- configure.orig	Mon Dec  6 21:22:34 2004
-+++ configure	Mon Dec  6 21:22:58 2004
+--- configure.orig	Tue Mar  1 12:35:29 2005
++++ configure	Tue Mar  1 12:36:09 2005
 @@ -463,7 +463,7 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT mkdir_p CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL ICONV MSGFMT MSGMERGE XGETTEXT mkdir_p CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE USE_NLS GMSGFMT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE CDDA_SOLARIS_TRUE CDDA_SOLARIS_FALSE APPLET_CDPLAYER_TRUE APPLET_CDPLAYER_FALSE CDROM_HOST CDROM_LIBS ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT INTLTOOL_DESKTOP_RULE INTLTOOL_DIRECTORY_RULE INTLTOOL_KEYS_RULE INTLTOOL_PROP_RULE INTLTOOL_OAF_RULE INTLTOOL_PONG_RULE INTLTOOL_SERVER_RULE INTLTOOL_SHEET_RULE INTLTOOL_SOUNDLIST_RULE INTLTOOL_UI_RULE INTLTOOL_XAM_RULE INTLTOOL_KBD_RULE INTLTOOL_XML_RULE INTLTOOL_XML_NOMERGE_RULE INTLTOOL_CAVES_RULE INTLTOOL_SCHEMAS_RULE INTLTOOL_THEME_RULE INTLTOOL_EXTRACT INTLTOOL_MERGE INTLTOOL_UPDATE INTLTOOL_PERL INTLTOOL_ICONV INTLTOOL_MSGFMT INTLTOOL_MSGMERGE INTLTOOL_XGETTEXT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP build build_cpu build_vendor build_os host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL PATH_TO_XRDB X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS WARN_CFLAGS PKG_CONFIG GAILUTIL_CFLAGS GAILUTIL_LIBS GNOME_APPLETS_CFLAGS GNOME_APPLETS_LIBS GNOME_LIBS2_CFLAGS GNOME_LIBS2_LIBS GNOME_VFS_APPLETS_CFLAGS GNOME_VFS_APPLETS_LIBS BUILD_GNOME_VFS_APPLETS_TRUE BUILD_GNOME_VFS_APPLETS_FALSE LIBGLADE_CFLAGS LIBGLADE_LIBS GDK_PIXBUF_CSOURCE GCONFTOOL GCONF_SCHEMA_CONFIG_SOURCE GCONF_SCHEMA_FILE_DIR GCONF_SCHEMAS_INSTALL_TRUE GCONF_SCHEMAS_INSTALL_FALSE XSLTPROC GTOP_APPLETS_CFLAGS GTOP_APPLETS_LIBS BUILD_GTOP_APPLETS_TRUE BUILD_GTOP_APPLETS_FALSE LIBXKLAVIER_CFLAGS LIBXKLAVIER_LIBS ENABLE_FLAGS_TRUE ENABLE_FLAGS_FALSE LIBWNCK_CFLAGS LIBWNCK_LIBS INCLUDE_GSWITCHIT_DEVEL_TRUE INCLUDE_GSWITCHIT_DEVEL_FALSE GETTEXT_PACKAGE GNOMELOCALEDIR USE_NLS MSGFMT GMSGFMT XGETTEXT CATALOGS CATOBJEXT DATADIRNAME GMOFILES INSTOBJEXT INTLLIBS PO_IN_DATADIR_TRUE PO_IN_DATADIR_FALSE POFILES POSUB MKINSTALLDIRS gnomelocaledir SCROLLKEEPER_CONFIG SCROLLKEEPER_REQUIRED JW HAVE_JW_TRUE HAVE_JW_FALSE HAVE_JW GKB_SUN_TRUE GKB_SUN_FALSE ACPIINC HAVE_LIBAPM NEED_LIBAPM HAVE_LIBAPM_TRUE HAVE_LIBAPM_FALSE NEED_LIBAPM_TRUE NEED_LIBAPM_FALSE BUILD_BATTSTAT_APPLET_TRUE BUILD_BATTSTAT_APPLET_FALSE MIXER_CFLAGS MIXER_LIBS APPLET_MIXER_TRUE APPLET_MIXER_FALSE GUCHARMAP_CFLAGS GUCHARMAP_LIBS APPLET_ACCESSX_TRUE APPLET_ACCESSX_FALSE APPLET_GSWITCHIT_TRUE APPLET_GSWITCHIT_FALSE SU_TOOL STB_SCRIPTS_DIR APPLET_MODEMLIGHTS_TRUE APPLET_MODEMLIGHTS_FALSE MODEMLIGHTS_LIBS CPUFREQ_SELECTOR_CFLAGS CPUFREQ_SELECTOR_LIBS BUILD_CPUFREQ_APPLET_TRUE BUILD_CPUFREQ_APPLET_FALSE BUILD_CPUFREQ_SELECTOR_TRUE BUILD_CPUFREQ_SELECTOR_FALSE CPUFREQ_SELECTOR_SUID_TRUE CPUFREQ_SELECTOR_SUID_FALSE ACLOCAL_AMFLAGS iconsdir pixmapsdir pkgdatadir gladedir GNOME_ICONDIR GNOME_PIXMAPSDIR GNOME_GLADEDIR DATADIR SYSCONFDIR LIBDIR PREFIX LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
-@@ -24351,6 +24351,7 @@
- *irix*) CDROM_HOST=irix; CDROM_LIBS="-lcdaudio -lmediad -lds";cd_device_path="/dev/cdrom";;
- *linux*) CDROM_HOST=linux;cd_device_path="/dev/cdrom";;
- *netbsd*) CDROM_HOST=netbsd;cd_device_path="/dev/rcd0";;
-+*freebsd*) CDROM_HOST=freebsd;cd_device_path="/dev/acd0c";;
- *solaris*) CDROM_HOST=solaris;cd_device_path="/vol/dev/aliases/cdrom0";cdplayer_type_sun=true;;
- esac
- case "$host" in
-@@ -24412,6 +24413,7 @@
+@@ -23136,8 +23136,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${prefix}/share/locale"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "${prefix}/share/locale"`
+   GNOMELOCALEDIR="$ac_define_dir"
+ 
+ 
+@@ -24838,6 +24837,7 @@
  
  HAVE_LIBAPM=no
  NEED_LIBAPM=no
@@ -25,7 +27,7 @@
  build_battstat_applet=no
  
  if test x$disable_battstat = xno; then
-@@ -24563,7 +24565,12 @@
+@@ -24989,7 +24989,12 @@
  
  	   ;;
         # list of supported OS cores that do not use libapm
@@ -39,28 +41,100 @@
  	   ;;
         *)
  	   echo "warning: ${host} is not supported by battstat_applet, not building" >&2
-@@ -26794,14 +26801,14 @@
- ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
+@@ -25795,6 +25800,9 @@
+       *linux*)
+          build_cpufreq_applet=yes
+ 	 ;;
++      i386-*-freebsd*|amd64-*-freebsd*)
++         build_cpufreq_applet=yes
++	 ;;
+       *)
+          echo "warning: ${host} is not supported by cpufreq applet, not building" >&2
+ 	 build_cpufreq_applet=no
+@@ -26085,7 +26093,7 @@
+ ACLOCAL_AMFLAGS="\${ACLOCAL_FLAGS}"
  
- cat >>confdefs.h <<_ACEOF
--#define GNOME_ICONDIR "${prefix}/share/pixmaps"
-+#define GNOME_ICONDIR "${datadir}/pixmaps"
- _ACEOF
  
+-iconsdir="${datadir}/icons"
++iconsdir="${prefix}/share/icons"
  
- #defined the below to enable help to work for applets
+ pixmapsdir="${datadir}/pixmaps"
  
- cat >>confdefs.h <<_ACEOF
--#define DATADIR "${prefix}/share"
-+#define DATADIR "${datadir}"
- _ACEOF
+@@ -26099,8 +26107,7 @@
  
- cat >>confdefs.h <<_ACEOF
-@@ -27954,6 +27961,7 @@
- s,@APPLET_CDPLAYER_FALSE@,$APPLET_CDPLAYER_FALSE,;t t
- s,@CDROM_HOST@,$CDROM_HOST,;t t
- s,@CDROM_LIBS@,$CDROM_LIBS,;t t
-+s,@ACPIINC@,$ACPIINC,;t t
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${iconsdir}"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "${iconsdir}"`
+   GNOME_ICONDIR="$ac_define_dir"
+ 
+ 
+@@ -26112,8 +26119,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${pixmapsdir}"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "${pixmapsdir}"`
+   GNOME_PIXMAPSDIR="$ac_define_dir"
+ 
+ 
+@@ -26125,8 +26131,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${gladedir}"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "${gladedir}"`
+   GNOME_GLADEDIR="$ac_define_dir"
+ 
+ 
+@@ -26138,8 +26143,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${datadir}"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "${datadir}"`
+   DATADIR="$ac_define_dir"
+ 
+ 
+@@ -26151,8 +26155,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${sysconfdir}"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "${sysconfdir}"`
+   SYSCONFDIR="$ac_define_dir"
+ 
+ 
+@@ -26164,8 +26167,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"${libdir}"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "${libdir}"`
+   LIBDIR="$ac_define_dir"
+ 
+ 
+@@ -26177,8 +26179,7 @@
+ 
+   test "x$prefix" = xNONE && prefix="$ac_default_prefix"
+   test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+-  ac_define_dir=`eval echo $"$prefix"`
+-  ac_define_dir=`eval echo $ac_define_dir`
++  ac_define_dir=`eval echo "$prefix"`
+   PREFIX="$ac_define_dir"
+ 
+ 
+@@ -27311,6 +27312,7 @@
+ s,@GKB_SUN_FALSE@,$GKB_SUN_FALSE,;t t
  s,@HAVE_LIBAPM@,$HAVE_LIBAPM,;t t
  s,@NEED_LIBAPM@,$NEED_LIBAPM,;t t
++s,@ACPIINC@,$ACPIINC,;t t
  s,@HAVE_LIBAPM_TRUE@,$HAVE_LIBAPM_TRUE,;t t
+ s,@HAVE_LIBAPM_FALSE@,$HAVE_LIBAPM_FALSE,;t t
+ s,@NEED_LIBAPM_TRUE@,$NEED_LIBAPM_TRUE,;t t
diff --git a/x11/gnome-applets/files/patch-ad b/x11/gnome-applets/files/patch-ad
deleted file mode 100644
index 5a06416a08c4..000000000000
--- a/x11/gnome-applets/files/patch-ad
+++ /dev/null
@@ -1,354 +0,0 @@
---- cdplayer/cdplayer.c.orig     Tue Apr 16 16:42:54 2002
-+++ cdplayer/cdplayer.c  Tue Apr 30 17:31:41 2002
-@@ -671,6 +671,12 @@
-                     description = TRUE;
-                     break;
-                 case DISC_COMPLETED:
-+                       led_time(cd->panel.time,
-+                               stat.relative_address.minute,
-+                               stat.relative_address.second,
-+                               cd->panel.track_control.display,
-+                               stat.track);
-+                       break;
-                 case DISC_STOP:
-                 case DISC_ERROR:
-                     led_stop(cd->panel.time, cd->panel.track_control.display);
---- /dev/null	Mon May 29 02:15:42 2000
-+++ cdplayer/cdrom-freebsd.c	Mon May 29 10:37:28 2000
-@@ -0,0 +1,336 @@
-+#include <stdlib.h>
-+#include <string.h>
-+#include <fcntl.h>
-+#include <glib.h>
-+#include <sys/ioctl.h>
-+#include <unistd.h>
-+
-+#include <sys/types.h>
-+#include <sys/cdio.h>
-+#include "cdrom-interface.h"
-+
-+
-+#define ASSIGN_MSF(dest, src) \
-+{ \
-+  (dest).minute = (src).minute; \
-+  (dest).second = (src).second; \
-+  (dest).frame = (src).frame; \
-+}
-+
-+int
-+cdrom_play(cdrom_device_t cdp, int start, int stop)
-+{
-+	struct ioc_play_track ti;
-+
-+	ti.start_track = start;
-+	ti.start_index = 1;
-+	ti.end_track = stop;
-+	ti.end_index = 1;
-+
-+	if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
-+	    (ioctl(cdp->device, CDIOCPLAYTRACKS, &ti) == -1)) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_play_msf(cdrom_device_t cdp, cdrom_msf_t * start)
-+{
-+	struct ioc_play_msf msf;
-+
-+	if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
-+		return DISC_IO_ERROR;
-+	msf.start_m = start->minute;
-+	msf.start_s = start->second;
-+	msf.start_f = start->frame;
-+
-+	msf.end_m = cdp->track_info[cdp->nr_track].address.minute;
-+	msf.end_s = cdp->track_info[cdp->nr_track].address.second;
-+	msf.end_f = cdp->track_info[cdp->nr_track].address.frame;
-+
-+	if ((ioctl(cdp->device, CDIOCPREVENT) == -1) ||
-+	    (ioctl(cdp->device, CDIOCPLAYMSF, &msf) == -1)) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_pause(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCPAUSE) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_IO_ERROR;
-+}
-+
-+int
-+cdrom_resume(cdrom_device_t cdp)
-+{
-+	if (ioctl(cdp->device, CDIOCRESUME) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+
-+int
-+cdrom_stop(cdrom_device_t cdp)
-+{
-+	if ((ioctl(cdp->device, CDIOCSTOP) == -1) ||
-+	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_read_track_info(cdrom_device_t cdp)
-+{
-+	struct ioc_toc_header toc;
-+	struct ioc_read_toc_single_entry tocentry;
-+
-+	int i, j, nr_track;
-+
-+	if (ioctl(cdp->device, CDIOREADTOCHEADER, &toc) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	cdp->track0 = toc.starting_track;
-+	cdp->track1 = toc.ending_track;
-+	nr_track = cdp->track1 - cdp->track0 + 1;
-+	if (nr_track <= 0)
-+		return DISC_IO_ERROR;
-+
-+	if (nr_track != cdp->nr_track) {
-+		if (cdp->track_info)
-+			g_free(cdp->track_info);
-+		cdp->nr_track = nr_track;
-+		cdp->track_info = g_malloc((cdp->nr_track + 1) * sizeof(track_info_t));
-+	}
-+	for (i = 0, j = cdp->track0; i < cdp->nr_track; i++, j++) {
-+		tocentry.track = j;
-+		tocentry.address_format = CD_MSF_FORMAT;
-+
-+		if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+			cdp->my_errno = errno;
-+			ioctl(cdp->device, CDIOCALLOW);
-+			return DISC_IO_ERROR;
-+		}
-+		/* fill the trackinfo field */
-+		cdp->track_info[i].track = j;
-+		cdp->track_info[i].audio_track = tocentry.entry.control !=
-+		    0x04 ? 1 : 0;
-+		ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf);
-+	}
-+
-+	tocentry.track = 0xAA;
-+	tocentry.address_format = CD_MSF_FORMAT;
-+	if (ioctl(cdp->device, CDIOREADTOCENTRY, &tocentry) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	cdp->track_info[i].track = j;
-+	cdp->track_info[i].audio_track = 0;
-+	ASSIGN_MSF(cdp->track_info[i].address, tocentry.entry.addr.msf);
-+
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_get_status(cdrom_device_t cdp, cdrom_device_status_t * stat)
-+{
-+	struct ioc_read_subchannel subchnl;
-+	struct cd_sub_channel_info subchnlinfo;
-+	
-+	subchnl.address_format = CD_MSF_FORMAT;
-+	subchnl.data_format = CD_CURRENT_POSITION;
-+	subchnl.track = 0;
-+	subchnl.data_len = sizeof(subchnlinfo);
-+	subchnl.data = &subchnlinfo;
-+	if (ioctl(cdp->device, CDIOCREADSUBCHANNEL, &subchnl) == -1) {
-+		cdp->my_errno = errno;
-+		ioctl(cdp->device, CDIOCALLOW);
-+		return DISC_IO_ERROR;
-+	}
-+	stat->track = subchnlinfo.what.position.track_number;
-+     	ASSIGN_MSF(stat->relative_address, subchnlinfo.what.position.reladdr.msf);
-+     	ASSIGN_MSF(stat->absolute_address, subchnlinfo.what.position.absaddr.msf);
-+	switch (subchnlinfo.header.audio_status) {
-+	case CD_AS_PLAY_IN_PROGRESS:
-+		ioctl(cdp->device, CDIOCPREVENT);
-+		stat->audio_status = DISC_PLAY;
-+		break;
-+	case CD_AS_PLAY_PAUSED:
-+		ioctl(cdp->device, CDIOCPREVENT);
-+		stat->audio_status = DISC_PAUSED;
-+		break;
-+	case CD_AS_PLAY_COMPLETED:
-+		if (cdrom_read_track_info(cdp) == DISC_IO_ERROR)
-+			return DISC_IO_ERROR;
-+		stat->track = cdp->nr_track;
-+	     	ASSIGN_MSF(stat->relative_address, 
-+		     		cdp->track_info[cdp->nr_track].address);
-+	     	ASSIGN_MSF(stat->absolute_address,
-+		     		cdp->track_info[cdp->nr_track].address);
-+		ioctl(cdp->device, CDIOCALLOW);
-+		stat->audio_status = DISC_COMPLETED;
-+		break;
-+	case CD_AS_AUDIO_INVALID:
-+	case CD_AS_NO_STATUS:
-+	case CD_AS_PLAY_ERROR:
-+		ioctl(cdp->device, CDIOCALLOW);
-+		stat->audio_status = DISC_STOP;
-+		break;
-+	default:
-+		ioctl(cdp->device, CDIOCALLOW);
-+		stat->audio_status = DISC_ERROR;
-+	}
-+	return (stat->audio_status == DISC_ERROR ?
-+			DISC_IO_ERROR : DISC_NO_ERROR);
-+}
-+
-+cdrom_device_t
-+cdrom_open(char *device, int *errcode)
-+{
-+	cdrom_device_t cdp;
-+
-+	cdp = g_malloc(sizeof(struct cdrom_device));
-+
-+	cdp->device = open(device, O_RDONLY);
-+	if (cdp->device == -1) {
-+		*errcode = errno;
-+		g_free(cdp);
-+		return NULL;
-+	}
-+	cdp->nr_track = 0;
-+	cdp->track_info = NULL;
-+	return cdp;
-+}
-+
-+void
-+cdrom_close(cdrom_device_t cdp)
-+{
-+	if (cdp->nr_track)
-+		g_free(cdp->track_info);
-+	close(cdp->device);
-+	g_free(cdp);
-+}
-+
-+int
-+cdrom_load(cdrom_device_t cdp)
-+{
-+	if ((ioctl(cdp->device, CDIOCCLOSE) == -1) ||
-+	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int
-+cdrom_eject(cdrom_device_t cdp)
-+{
-+	if ((ioctl(cdp->device, CDIOCEJECT) == -1) ||
-+	    (ioctl(cdp->device, CDIOCALLOW) == -1)) {
-+		cdp->my_errno = errno;
-+		return DISC_IO_ERROR;
-+	}
-+	return DISC_NO_ERROR;
-+}
-+
-+int 
-+cdrom_next(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	return cdrom_play(cdp, stat.track + 1, cdp->track1);
-+}
-+
-+int 
-+cdrom_prev(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	return cdrom_play(cdp, stat.track - 1, cdp->track1);
-+}
-+
-+int
-+cdrom_rewind(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	if (stat.absolute_address.second != 0)
-+		stat.absolute_address.second--;
-+	else {
-+		stat.absolute_address.second = 0;
-+		if (stat.absolute_address.minute > 0)
-+			stat.absolute_address.minute--;
-+	}
-+	stat.absolute_address.frame = 0;
-+	return cdrom_play_msf(cdp, &stat.absolute_address);
-+}
-+
-+int
-+cdrom_ff(cdrom_device_t cdp)
-+{
-+	cdrom_device_status_t stat;
-+	int track;
-+
-+	if ((cdrom_read_track_info(cdp) == DISC_IO_ERROR) ||
-+	    (cdrom_get_status(cdp, &stat) == DISC_IO_ERROR))
-+		return DISC_IO_ERROR;
-+	stat.absolute_address.second++;
-+	if (stat.absolute_address.second >= 60) {
-+		stat.absolute_address.minute++;
-+		stat.absolute_address.second = 0;
-+	}
-+	stat.absolute_address.frame = 0;
-+	return cdrom_play_msf(cdp, &stat.absolute_address);
-+}
-+
-+int
-+cdrom_track_length(cdrom_device_t cdp, int track, cdrom_msf_t * length)
-+{
-+	int index, s1, s2, i;
-+
-+	if ((track < cdp->track0) || (track > cdp->track1))
-+		return DISC_INDEX_OUT_OF_RANGE;
-+	index = track - cdp->track0;
-+
-+	s1 = cdp->track_info[index + 1].address.second;
-+	s2 = cdp->track_info[index].address.second;
-+	length->second = s1 = s1 - s2;
-+	if (s1 < 0) {
-+		i = 1;
-+		length->second = s1 + 60;
-+	} else
-+		i = 0;
-+
-+	length->minute = cdp->track_info[index + 1].address.minute -
-+	    cdp->track_info[index].address.minute - i;
-+
-+	return 0;
-+}
diff --git a/x11/gnome-applets/files/patch-battstat-acpi b/x11/gnome-applets/files/patch-battstat-acpi
index 4025a9a360f1..ebaa93f7e670 100644
--- a/x11/gnome-applets/files/patch-battstat-acpi
+++ b/x11/gnome-applets/files/patch-battstat-acpi
@@ -1,58 +1,3 @@
---- battstat/Makefile.in.orig	Mon Sep 27 18:39:44 2004
-+++ battstat/Makefile.in	Mon Sep 27 18:40:56 2004
-@@ -173,6 +173,8 @@
- pixmapsdir = $(datadir)/pixmaps
- pixmaps_DATA = battstat.png
- 
-+ACPIINC = @ACPIINC@
-+
- @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@APMLIB = apmlib/libapm.a
- @HAVE_LIBAPM_TRUE@@NEED_LIBAPM_TRUE@APMLIB = -lapm
- @NEED_LIBAPM_FALSE@APMLIB = 
-@@ -191,6 +193,7 @@
- 	$(GNOME_APPLETS_CFLAGS) \
- 	$(LIBGLADE_CFLAGS) \
- 	$(APMINC) \
-+	$(ACPIINC) \
- 	-DDATA_DIR=\"$(datadir)\" \
- 	-DGLADE_DIR=\"$(gladedir)\" \
- 	-DG_LOG_DOMAIN=\"battstat_applet\" \
-@@ -205,7 +208,9 @@
- 	properties.c \
- 	battstat_applet.c \
- 	acpi-linux.c \
--	acpi-linux.h
-+	acpi-linux.h \
-+	acpi-freebsd.c \
-+	acpi-freebsd.h
- 
- 
- battstat_applet_2_LDADD = \
-@@ -242,7 +247,7 @@
- PROGRAMS = $(libexec_PROGRAMS)
- 
- am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
--	battstat_applet.$(OBJEXT) acpi-linux.$(OBJEXT)
-+	battstat_applet.$(OBJEXT) acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT)
- battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS)
- @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@battstat_applet_2_DEPENDENCIES = \
- @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@	apmlib/libapm.a
-@@ -259,6 +264,7 @@
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
- @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \
-+@AMDEP_TRUE@	./$(DEPDIR)/acpi-freebsd.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/battstat_applet.Po \
- @AMDEP_TRUE@	./$(DEPDIR)/properties.Po
- COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
-@@ -330,6 +336,7 @@
- 	-rm -f *.tab.c
- 
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@
-+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@
- 
 --- battstat/acpi-freebsd.h.orig	Mon Sep 27 18:39:30 2004
 +++ battstat/acpi-freebsd.h	Mon Sep 27 18:39:30 2004
 @@ -0,0 +1,45 @@
@@ -101,9 +46,171 @@
 +void acpi_freebsd_cleanup(struct acpi_info * acpiinfo);
 +
 +#endif /* __ACPI_FREEBSD_H__ */
---- battstat/acpi-freebsd.c.orig	Tue Sep 28 16:55:52 2004
-+++ battstat/acpi-freebsd.c	Tue Sep 28 17:00:32 2004
-@@ -0,0 +1,213 @@
+--- battstat/Makefile.in.orig	Mon Jan 24 20:20:49 2005
++++ battstat/Makefile.in	Mon Jan 24 20:22:02 2005
+@@ -55,9 +55,10 @@
+ PROGRAMS = $(libexec_PROGRAMS)
+ am_battstat_applet_2_OBJECTS = properties.$(OBJEXT) \
+ 	battstat_applet.$(OBJEXT) power-management.$(OBJEXT) \
+-	acpi-linux.$(OBJEXT)
++	acpi-freebsd.$(OBJEXT) acpi-linux.$(OBJEXT)
+ battstat_applet_2_OBJECTS = $(am_battstat_applet_2_OBJECTS)
+ am__DEPENDENCIES_1 =
++ACPIINC = @ACPIINC@
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@am__DEPENDENCIES_2 =  \
+ @HAVE_LIBAPM_FALSE@@NEED_LIBAPM_TRUE@	apmlib/libapm.a
+ battstat_applet_2_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+@@ -66,6 +67,7 @@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/acpi-linux.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/acpi-freebsd.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/battstat_applet.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/power-management.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/properties.Po
+@@ -336,6 +338,7 @@
+ 	$(GNOME_APPLETS_CFLAGS)			\
+ 	$(LIBGLADE_CFLAGS)			\
+ 	$(APMINC)				\
++	$(ACPIINC)				\
+ 	-DG_LOG_DOMAIN=\"battstat_applet\"
+ 
+ battstat_applet_2_SOURCES = \
+@@ -345,7 +348,9 @@
+ 	battstat_applet.c \
+ 	power-management.c \
+ 	acpi-linux.c \
+-	acpi-linux.h
++	acpi-linux.h \
++	acpi-freebsd.c \
++	acpi-freebsd.h
+ 
+ battstat_applet_2_LDADD = \
+ 		     $(GNOME_APPLETS_LIBS) \
+@@ -439,6 +444,7 @@
+ 	-rm -f *.tab.c
+ 
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-linux.Po@am__quote@
++@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/acpi-freebsd.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/battstat_applet.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/power-management.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/properties.Po@am__quote@
+--- battstat/battstat_applet.c.orig	Mon Jan 24 12:51:51 2005
++++ battstat/battstat_applet.c	Mon Jan 24 20:20:50 2005
+@@ -953,6 +953,7 @@
+ 	"Seth Nickell <snickell@stanford.edu> (GNOME2 port)",
+ 	"Davyd Madeley <davyd@madeley.id.au>",
+ 	"Ryan Lortie <desrt@desrt.ca>",
++	"Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)",
+ 	NULL
+    };
+ 
+--- battstat/power-management.c.orig	Thu Jan 13 23:06:40 2005
++++ battstat/power-management.c	Wed Feb 16 02:58:10 2005
+@@ -76,6 +76,14 @@
+ #ifdef __FreeBSD__
+ 
+ #include <machine/apm_bios.h>
++#include "acpi-freebsd.h"
++
++struct acpi_info acpiinfo;
++gboolean using_acpi;
++int acpi_count;
++struct apm_info apminfo;
++
++gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo);
+ 
+ #define APMDEVICE "/dev/apm"
+ 
+@@ -86,32 +94,48 @@
+      FreeBSD.  Each time this functions is called (once every second)
+      the APM device is opened, read from and then closed.
+   */
+-  struct apm_info apminfo;
+   int fd;
+ 
+   if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
+ 
+-  fd = open(APMDEVICE, O_RDONLY);
+-  if (fd == -1)
+-  {
+-    pm_initialised = 0;
+-    return ERR_OPEN_APMDEV;
++  if (using_acpi) {
++    fd = -1;
++    if (acpi_count <= 0) {
++      acpi_count = 30;
++      acpi_freebsd_read(&apminfo, &acpiinfo);
++    }
++    acpi_count--;
+   }
++  else {
++    fd = open(APMDEVICE, O_RDONLY);
++    if (fd == -1) {
++      return ERR_OPEN_APMDEV;
++    }
+ 
+-  if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
+-    err(1, "ioctl(APMIO_GETINFO)");
++    if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
++      err(1, "ioctl(APMIO_GETINFO)");
+ 
+-  close(fd);
++      close(fd);
+ 
+-  if(apminfo.ai_status == 0)
+-    return ERR_APM_E;
++    if(apminfo.ai_status == 0)
++      return ERR_APM_E;
++
++  }
++
++  if (using_acpi) {
++    acpi_process_event(&acpiinfo);
++    acpi_freebsd_read(&apminfo, &acpiinfo);
++  }
+ 
+   status->present = TRUE;
+   status->on_ac_power = apminfo.ai_acline ? 1 : 0;
+   status->state = apminfo.ai_batt_stat;
+   status->percent = apminfo.ai_batt_life;
+   status->charging = (status->state == 3) ? TRUE : FALSE;
+-  status->minutes = apminfo.ai_batt_time;
++  if (using_acpi)
++    status->minutes = apminfo.ai_batt_time;
++  else
++    status->minutes = (int) (apminfo.ai_batt_time/60.0);
+ 
+   return NULL;
+ }
+@@ -339,6 +363,13 @@
+         G_IO_IN | G_IO_ERR | G_IO_HUP,
+         acpi_callback, NULL);
+   }
++#elif defined(__FreeBSD__)
++  if (acpi_freebsd_init(&acpiinfo)) {
++    using_acpi = TRUE;
++    acpi_count = 0;
++  }
++  else
++    using_acpi = FALSE;
+ #endif
+   pm_initialised = 1;
+ 
+@@ -360,6 +391,10 @@
+       g_source_remove(acpiwatch);
+      acpiwatch = 0;
+      acpi_linux_cleanup(&acpiinfo);
++  }
++#elif defined(__FreeBSD__)
++  if (using_acpi) {
++    acpi_freebsd_cleanup(&acpiinfo);
+   }
+ #endif
+ 
+--- battstat/acpi-freebsd.c.orig	Mon Feb 28 01:41:08 2005
++++ battstat/acpi-freebsd.c	Mon Feb 28 03:00:11 2005
+@@ -0,0 +1,206 @@
 +/* battstat        A GNOME battery meter for laptops.
 + * Copyright (C) 2000 by Jörgen Pehrson <jp@spektr.eu.org>
 + *
@@ -121,7 +228,7 @@
 + *  along with this program; if not, write to the Free Software
 + *  Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA.
 + *
-+ $Id: patch-battstat-acpi,v 1.3 2004/10/01 20:45:45 marcus Exp $
++ $Id: patch-battstat-acpi,v 1.13 2005/02/28 08:02:03 marcus Exp $
 + */
 +
 +/*
@@ -147,7 +254,6 @@
 +#include <glib.h>
 +
 +#include <dev/acpica/acpiio.h>
-+#include <contrib/dev/acpica/acpi.h>
 +
 +#include "acpi-freebsd.h"
 +
@@ -300,160 +406,14 @@
 +  }
 +  apminfo->ai_batt_life = life;
 +  if (!charging) {
-+    apminfo->ai_batt_time = time * 60;
++    apminfo->ai_batt_time = time;
 +  }
 +  else if (charging && rate > 0) {
-+    apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate * 60);
++    apminfo->ai_batt_time = (int) ((acpiinfo->max_capacity-remain)/(float)rate);
 +  }
 +  else
-+    /* This multiplication is a hack to make sure the -1 survives so the applet
-+     * can process it.  Battstat wants the remaining time in minutes, but
-+     * ai_batt_time is in seconds.  In order to make both ACPI and APM work
-+     * with the fewest amount of hacks, we will just assume everything is
-+     * in seconds.
-+     */
-+    apminfo->ai_batt_time = -1 * 60;
++    apminfo->ai_batt_time = -1;
 +
 +  return TRUE;
 +}
 +#endif
---- battstat/battstat_applet.c.orig	Mon Sep 13 04:33:31 2004
-+++ battstat/battstat_applet.c	Fri Oct  1 16:46:01 2004
-@@ -62,6 +62,9 @@
- #ifdef __linux__
- #include "acpi-linux.h"
- #endif
-+#ifdef __FreeBSD__
-+#include "acpi-freebsd.h"
-+#endif
- 
- #ifndef gettext_noop
- #define gettext_noop(String) (String)
-@@ -237,6 +240,24 @@
- #endif
- 
- #ifdef __FreeBSD__
-+struct acpi_info acpiinfo;
-+gboolean using_acpi;
-+int acpi_count;
-+
-+gboolean acpi_freebsd_read(struct apm_info *apminfo, struct acpi_info *acpiinfo);
-+
-+gboolean acpi_callback (gpointer data)
-+{
-+  ProgressData * battstat = (ProgressData *) data;
-+
-+  if (acpi_process_event(&acpiinfo)) {
-+    acpi_freebsd_read(&apminfo, &acpiinfo);
-+    pixmap_timeout(data);
-+  }
-+
-+  return TRUE;
-+}
-+
- void
- apm_readinfo (PanelApplet *applet, ProgressData * battstat)
- {
-@@ -247,13 +268,22 @@
-   int fd;
-   if (DEBUG) g_print("apm_readinfo() (FreeBSD)\n");
- 
--  fd = open(APMDEVICE, O_RDONLY);
--  if (fd == -1) cleanup (applet, 1);
-+  if (using_acpi) {
-+    if (acpi_count <= 0) {
-+      acpi_count = 30;
-+      acpi_freebsd_read(&apminfo, &acpiinfo);
-+    }
-+    acpi_count--;
-+  }
-+  else {
-+    fd = open(APMDEVICE, O_RDONLY);
-+    if (fd == -1) cleanup (applet, 1);
- 
--  if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
--    err(1, "ioctl(APMIO_GETINFO)");
-+    if (ioctl(fd, APMIO_GETINFO, &apminfo) == -1)
-+      err(1, "ioctl(APMIO_GETINFO)");
- 
--  close(fd);
-+    close(fd);
-+  }
- }
- #elif defined(__NetBSD__) || defined(__OpenBSD__)
- void
-@@ -361,7 +391,7 @@
- 
- #ifdef __FreeBSD__
- 	acline_status = apminfo.ai_acline ? 1 : 0;
--	time = apminfo.ai_batt_time;
-+	time = (int) (apminfo.ai_batt_time / 60);
- 	batt_life = apminfo.ai_batt_life;
- #elif defined (__NetBSD__) || defined(__OpenBSD__)
- 	acline_status = apminfo.ac_state ? 1 : 0;
-@@ -375,8 +405,10 @@
- 
- 	if (batt_life > 100) batt_life = 100;
- 
--	hours = time / 60;
--	mins = time % 60;
-+	if (time >= 0) {
-+		hours = time / 60;
-+		mins = time % 60;
-+	}
- 
- 	if (acline_status && batt_life == 100)
- 		return g_strdup_printf (_("Battery charged (%d%%)"), batt_life);
-@@ -912,6 +944,13 @@
-      pdata->acpiwatch = 0;
-      acpi_linux_cleanup(&acpiinfo);
-    }
-+#elif defined(__FreeBSD__)
-+   if (using_acpi) {
-+     if (pdata->acpiwatch != 0)
-+       g_source_remove(pdata->acpiwatch);
-+     pdata->acpiwatch = 0;
-+     acpi_freebsd_cleanup(&acpiinfo);
-+   }
- #endif
- 
-    if (pdata->suspend_cmd)
-@@ -1052,6 +1091,7 @@
- 	"Lennart Poettering <lennart@poettering.de> (Linux ACPI support)",
- 	"Seth Nickell <snickell@stanford.edu> (GNOME2 port)",
- 	"Davyd Madeley <davyd@ucc.asn.au>",
-+	"Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD ACPI support)",
- 	NULL
-    };
- 
-@@ -1760,11 +1800,18 @@
-       using_acpi = TRUE;
-       acpi_count = 0;
-   }
-+#elif defined(__FreeBSD__)
-+  if (acpi_freebsd_init(&acpiinfo)) {
-+    using_acpi = TRUE;
-+    acpi_count = 0;
-+  }
-+  else
-+    using_acpi = FALSE;
- #endif
-   apm_readinfo (applet, NULL);
- 
- #ifdef __FreeBSD__
--  if(apminfo.ai_status == 0) cleanup (applet, 2);
-+  if(!using_acpi && apminfo.ai_status == 0) cleanup (applet, 2);
- #endif
-   
-   battstat = g_new0 (ProgressData, 1);
-@@ -1803,6 +1850,10 @@
-     battstat->acpiwatch = g_io_add_watch (acpiinfo.channel,
-         G_IO_IN | G_IO_ERR | G_IO_HUP,
-         acpi_callback, battstat);
-+  }
-+#elif defined(__FreeBSD__)
-+  if (using_acpi) {
-+    battstat->acpiwatch = g_timeout_add (2000, acpi_callback, battstat);
-   }
- #endif
- 
diff --git a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in
index ecaea9dab09e..a6bed2361540 100644
--- a/x11/gnome-applets/files/patch-battstat_battstat.schemas.in
+++ b/x11/gnome-applets/files/patch-battstat_battstat.schemas.in
@@ -5,7 +5,7 @@
          <owner>battstat-applet</owner>
          <type>string</type>
 -        <default>/usr/bin/apm -s</default>
-+        <default>/usr/sbin/apm -s</default>
++        <default>/usr/sbin/zzz</default>
          <locale name="C">
  	  <short>Suspend Command</short>
            <long>Command to send to suspend the computer</long>
diff --git a/x11/gnome-applets/files/patch-cpufreq-freebsd b/x11/gnome-applets/files/patch-cpufreq-freebsd
new file mode 100644
index 000000000000..48f2ebb6c5b1
--- /dev/null
+++ b/x11/gnome-applets/files/patch-cpufreq-freebsd
@@ -0,0 +1,514 @@
+--- cpufreq/src/Makefile.in.orig	Sun Feb 13 01:00:35 2005
++++ cpufreq/src/Makefile.in	Sun Feb 13 01:01:31 2005
+@@ -55,6 +55,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)
+@@ -68,6 +69,7 @@
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-cpuinfo.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-factory.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-procfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor-sysfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-monitor.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-popup.Po \
+@@ -336,6 +338,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
+ 
+@@ -419,6 +422,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@
+--- 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 @@
++/*
++ * Copyright (C) 2001, 2002 Free Software Foundation
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *  General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public
++ *  License along with this library; if not, write to the Free
++ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
++ */
++
++#ifndef __CPUFREQ_MONITOR_SYSCTL_H__
++#define __CPUFREQ_MONITOR_SYSCTL_H__
++
++#include <glib-object.h>
++#include "cpufreq-monitor.h"
++
++#define TYPE_CPUFREQ_MONITOR_SYSCTL            (cpufreq_monitor_sysctl_get_type ())
++#define CPUFREQ_MONITOR_SYSCTL(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctl))
++#define CPUFREQ_MONITOR_SYSCTL_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST((klass), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass))
++#define IS_CPUFREQ_MONITOR_SYSCTL(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL))
++#define IS_CPUFREQ_MONITOR_SYSCTL_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), TYPE_CPUFREQ_MONITOR_SYSCTL))
++#define CPUFREQ_MONITOR_SYSCTL_GET_CLASS(obj)  (G_TYPE_INSTANCE_GET_CLASS ((obj), TYPE_CPUFREQ_MONITOR_SYSCTL, CPUFreqMonitorSysctlClass))
++
++typedef struct _CPUFreqMonitorSysctl      CPUFreqMonitorSysctl;
++typedef struct _CPUFreqMonitorSysctlClass CPUFreqMonitorSysctlClass;
++
++struct _CPUFreqMonitorSysctl {
++	   CPUFreqMonitor parent;
++};
++
++struct _CPUFreqMonitorSysctlClass {
++	   CPUFreqMonitorClass parent_class;
++};
++
++GType           cpufreq_monitor_sysctl_get_type ();
++CPUFreqMonitor *cpufreq_monitor_sysctl_new      (guint cpu);
++
++#endif /* __CPUFREQ_MONITOR_SYSCTL_H__ */
+--- cpufreq/src/cpufreq-monitor-cpuinfo.c.orig	Fri Dec 31 14:39:04 2004
++++ cpufreq/src/cpufreq-monitor-cpuinfo.c	Sun Feb 13 23:58:38 2005
+@@ -22,6 +22,10 @@
+ #include <glib/gi18n.h>
+ #include <libgnomevfs/gnome-vfs.h>
+ 
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif /* __FreeBSD__ */
+ #include <string.h>
+ 
+ #include "cpufreq-monitor-cpuinfo.h"
+@@ -102,6 +106,7 @@
+ static gboolean
+ cpufreq_monitor_cpuinfo_get (gpointer gdata)
+ {
++#ifndef __FreeBSD__
+ 	   GnomeVFSHandle           *handle;
+ 	   GnomeVFSFileSize          bytes_read;
+ 	   GnomeVFSResult            result;
+@@ -109,6 +114,9 @@
+ 	   gchar                   **lines;
+ 	   gchar                     buffer[256];
+ 	   gchar                    *p;
++#else
++	   size_t                    len;
++#endif /* __FreeBSD__ */
+ 	   gchar                    *freq, *perc, *unit, *governor;
+ 	   gint                      cpu, i;
+ 	   CPUFreqMonitorCPUInfo    *monitor;
+@@ -118,6 +126,7 @@
+ 
+ 	   private = CPUFREQ_MONITOR_GET_PROTECTED (CPUFREQ_MONITOR (monitor));
+ 	   
++#ifndef __FreeBSD__
+ 	   uri = gnome_vfs_get_uri_from_local_path ("/proc/cpuinfo");
+ 
+ 	   result = gnome_vfs_open (&handle, uri, GNOME_VFS_OPEN_READ);
+@@ -178,6 +187,12 @@
+ 
+ 	   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-monitor-factory.c.orig	Mon Dec 27 12:53:46 2004
++++ cpufreq/src/cpufreq-monitor-factory.c	Sun Feb 13 23:58:44 2005
+@@ -16,13 +16,21 @@
+  *  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.h>
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#include <sys/sysctl.h>
++#endif /* __FreeBSD__ */
+ 
+ #include "cpufreq-applet.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"
+ 
+@@ -30,6 +38,7 @@
+ 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);
+@@ -48,6 +57,20 @@
+ 			 
+ 			 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);
++	   } 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);
++	   }
++#endif /* __FreeBSD__ */
+ 
+ 	   return monitor;
+ }
+--- 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 @@
++/*
++ * Copyright (C) 2001, 2002 Free Software Foundation
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *  General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public
++ *  License along with this library; if not, write to the Free
++ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
++ */
++
++#include <glib.h>
++#include <glib/gi18n.h>
++
++#include <string.h>
++
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#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 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;
++}
++
++static void
++cpufreq_monitor_sysctl_class_init (CPUFreqMonitorSysctlClass *klass)
++{
++	   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)
++{
++	   g_return_if_fail (IS_CPUFREQ_MONITOR_SYSCTL (object));
++
++	   if (G_OBJECT_CLASS (parent_class)->finalize)
++			 (* G_OBJECT_CLASS (parent_class)->finalize) (object);
++}
++
++CPUFreqMonitor *
++cpufreq_monitor_sysctl_new (guint cpu)
++{
++	   CPUFreqMonitorSysctl *monitor;
++
++	   monitor = g_object_new (TYPE_CPUFREQ_MONITOR_SYSCTL, "cpu", cpu, NULL);
++
++	   return CPUFREQ_MONITOR (monitor);
++}
++
++static gboolean
++cpufreq_monitor_sysctl_get (gpointer gdata)
++{
++	   gint                     fmax, fmin, ifreq;
++	   gchar                   *freq, *perc, *unit, *governor;
++	   gboolean                 changed;
++	   size_t                   len;
++	   gchar                   *freq_oid;
++	   CPUFreqMonitorSysctl    *monitor;
++	   CPUFreqMonitorProtected *private;
++
++	   monitor = (CPUFreqMonitorSysctl *) gdata;
++	   private = CPUFREQ_MONITOR_GET_PROTECTED (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)));
++
++	   len = sizeof (ifreq);
++	   freq_oid = g_strdup_printf ("dev.cpu.%d.freq", private->cpu);
++
++	   if (sysctlbyname (freq_oid, &ifreq, &len, NULL, 0) == -1) {
++	       		 g_free (freq_oid);
++	       		 return FALSE;
++	   }
++
++	   ifreq *= 1000;
++	   
++	   if (ifreq == fmax)
++	       		 governor = g_strdup ("performance");
++	   else if (ifreq == fmin)
++	       		 governor = g_strdup ("economy");
++	   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);
++
++	   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;
++	   gint mib[4];
++	   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;
++	   }
++
++	   levels_oid = g_strdup_printf ("dev.cpu.%d.freq_levels",
++	   	private->cpu);
++	   len = 4;
++	   sysctlnametomib (levels_oid, mib, &len);
++	   len = sizeof (levels);
++	   g_free (levels_oid);
++
++	   if (sysctl (mib, 4, NULL, &len, NULL, 0) == -1)
++			 return NULL;
++
++	   levels = g_malloc (len);
++	   if (sysctl (mib, 4, levels, &len, NULL, 0) == -1)
++	       		 return NULL;
++	   
++	   levelsp = g_strsplit (levels, " ", 0);
++	   g_free (levels);
++
++	   for (l = levelsp; l && *l; l++) {
++	       		 gchar **frpr;
++
++			 frpr = g_strsplit (*l, "/", 0);
++	       		 if (frpr && frpr[0] != NULL) {
++			     		/* sysctl format is %d/%d where the
++					 * first %d is the frequency, and
++					 * the second is the power used in
++					 * mW.
++					 */
++			     		int freq = atoi (frpr[0]);
++		   	 		private->available_freqs =
++						g_list_append (private->available_freqs, g_strdup_printf ("%d", freq * 1000));
++			 }
++			 g_strfreev (frpr);
++	   }
++
++	   g_strfreev (levelsp);
++
++	   return private->available_freqs;
++}
++#endif /* __FreeBSD__ */
+--- cpufreq/src/cpufreq-applet.c.orig	Fri Jan 14 23:38:20 2005
++++ cpufreq/src/cpufreq-applet.c	Mon Feb 14 00:47:36 2005
+@@ -16,6 +16,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>
+@@ -25,6 +26,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"
+@@ -192,6 +197,7 @@
+ {
+ 	   static const gchar *authors[] = {
+ 			 "Carlos Garcia Campos <carlosgc@gnome.org>",
++			 "Joe Marcus Clarke <marcus@FreeBSD.org> (FreeBSD support)",
+ 			 NULL
+ 	   };
+ 	   static const gchar *documenters[] = {
+@@ -231,6 +237,7 @@
+ cpufreq_applet_get_max_cpu ()
+ {
+ 	   gint   mcpu = -1;
++#ifndef __FreeBSD__
+ 	   gchar *file = NULL;
+ 
+ 	   do {
+@@ -253,6 +260,14 @@
+ 	   } while (g_file_test (file, G_FILE_TEST_EXISTS));
+ 	   g_free (file);
+ 	   mcpu --;
++#else
++	   size_t len;
++
++	   len = sizeof (mcpu);
++
++	   sysctlbyname ("hw.ncpu", &mcpu, &len, NULL, 0);
++	   mcpu --;
++#endif /* __FreeBSD__ */
+ 
+ 	   if (mcpu >= 0)
+ 			 return mcpu;
diff --git a/x11/gnome-applets/files/patch-cpufreq-selector-freebsd b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
new file mode 100644
index 000000000000..f577a0fed39b
--- /dev/null
+++ b/x11/gnome-applets/files/patch-cpufreq-selector-freebsd
@@ -0,0 +1,373 @@
+--- cpufreq/src/cpufreq-selector/Makefile.in.orig	Mon Feb 14 00:26:10 2005
++++ cpufreq/src/cpufreq-selector/Makefile.in	Mon Feb 14 00:26:58 2005
+@@ -53,7 +53,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)
+@@ -61,6 +61,7 @@
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cpufreq-procfs.Po \
++@AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysctl.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq-sysfs.Po \
+ @AMDEP_TRUE@	./$(DEPDIR)/cpufreq.Po ./$(DEPDIR)/main.Po
+ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+@@ -310,6 +311,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
+@@ -385,6 +387,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@
+--- 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 @@
++/*
++ * Copyright (C) 2001, 2002 Free Software Foundation
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *  General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public
++ *  License along with this library; if not, write to the Free
++ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
++ */
++
++#ifndef __CPUFREQ_SYSCTL_H__
++#define __CPUFREQ_SYSCTL_H__
++
++#include <glib-object.h>
++
++#include "cpufreq.h"
++
++#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))
++
++typedef struct _CPUFreqSysctl      CPUFreqSysctl;
++typedef struct _CPUFreqSysctlClass CPUFreqSysctlClass;
++typedef struct _CPUFreqSysctlPriv  CPUFreqSysctlPriv;
++
++struct _CPUFreqSysctl {
++	   CPUFreq parent;
++};
++
++struct _CPUFreqSysctlClass {
++	   CPUFreqClass parent_class;
++};
++
++
++GType          cpufreq_sysctl_get_type ();
++CPUFreqSysctl *cpufreq_sysctl_new      ();
++
++#endif /* __CPUFREQ_SYSCTL_H__ */
+--- cpufreq/src/cpufreq-selector/main.c.orig	Mon Feb 14 00:22:12 2005
++++ cpufreq/src/cpufreq-selector/main.c	Mon Feb 14 00:26:04 2005
+@@ -16,6 +16,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)
+@@ -35,6 +39,9 @@
+ 	   gulong      frequency = 0;
+ 	   poptContext ctx;
+ 	   gint        nextopt;
++#ifdef __FreeBSD__
++	   size_t      len;
++#endif /* __FreeBSD__ */
+ 	   CPUFreq    *cfq;
+ 
+ 	   struct poptOption options[] = {
+@@ -76,10 +83,15 @@
+ 
+ 	   poptFreeContext(ctx);
+ 
++#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/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 @@
++/*
++ * Copyright (C) 2001, 2002 Free Software Foundation
++ *
++ *  This library is free software; you can redistribute it and/or
++ *  modify it under the terms of the GNU General Public
++ *  License as published by the Free Software Foundation; either
++ *  version 2 of the License, or (at your option) any later version.
++ *
++ *  This library is distributed in the hope that it will be useful,
++ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
++ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
++ *  General Public License for more details.
++ *
++ *  You should have received a copy of the GNU General Public
++ *  License along with this library; if not, write to the Free
++ *  Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
++ *
++ * Authors : Joe Marcus Clarke <marcus@FreeBSD.org>
++ */
++
++#include <glib.h>
++#include <stdio.h>
++#include <stdlib.h>
++
++#ifdef __FreeBSD__
++#include <sys/types.h>
++#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;
++
++	   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
++			 };
++
++			 type = g_type_register_static (PARENT_TYPE, "CPUFreqSysctl",
++									  &info, 0);
++	   }
++
++	   return type;
++}
++
++static void
++cpufreq_sysctl_init (CPUFreqSysctl *cfq)
++{
++	   CPUFreqSysctlPrivate *private;
++	   
++	   g_return_if_fail (IS_CPUFREQ_SYSCTL (cfq));
++
++	   private = CPUFREQ_SYSCTL_GET_PRIVATE (cfq);
++}
++
++static void
++cpufreq_sysctl_class_init (CPUFreqSysctlClass *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;
++
++	   object_class->finalize = cpufreq_sysctl_finalize;
++}
++
++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 ()
++{
++	   CPUFreqSysctl *cfq;
++
++	   cfq = g_object_new (TYPE_CPUFREQ_SYSCTL, NULL);
++
++	   cpufreq_sysctl_setup (cfq);
++
++	   return cfq;
++}
++
++static void
++cpufreq_sysctl_set_governor (CPUFreq *cfq, const gchar *governor)
++{
++    /* Not implemented. */
++}
++
++static void
++cpufreq_sysctl_set_frequency (CPUFreq *cfq, gint frequency)
++{
++	   gint                  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);
++
++	   pmax = 100;
++	   fmax = 0;
++	   fmin = 0;
++	   ifreq = 0;
++
++	   private->pmax = pmax;
++
++	   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);
++}
diff --git a/x11/gnome-applets/files/patch-gkb-new_presets.c b/x11/gnome-applets/files/patch-gkb-new_presets.c
deleted file mode 100644
index f90708170e00..000000000000
--- a/x11/gnome-applets/files/patch-gkb-new_presets.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- gkb-new/preset.c.orig	Fri Mar 14 09:13:44 2003
-+++ gkb-new/preset.c	Fri Mar 14 09:13:54 2003
-@@ -42,7 +42,7 @@
- 
-   /* TODO: user's local presets */
- 
--  text = gnome_unconditional_datadir_file ("gnome/gkb/");
-+  text = gnome_unconditional_datadir_file ("gkb/");
-   if (!text)
-   	return NULL;
-   dir = opendir (text);
diff --git a/x11/gnome-applets/files/patch-gweather_weather-iwin.c b/x11/gnome-applets/files/patch-gweather_weather-iwin.c
new file mode 100644
index 000000000000..14c0190b2eed
--- /dev/null
+++ b/x11/gnome-applets/files/patch-gweather_weather-iwin.c
@@ -0,0 +1,9 @@
+--- gweather/weather-iwin.c.orig	Tue Dec 21 18:42:38 2004
++++ gweather/weather-iwin.c	Tue Dec 21 18:42:47 2004
+@@ -1,5 +1,6 @@
+ /* $Id: patch-gweather_weather-iwin.c,v 1.1 2004/12/22 00:06:21 marcus Exp $ */
+ 
++#include <sys/types.h>
+ #include <regex.h>
+ #include <gnome.h>
+ #include "weather.h"
diff --git a/x11/gnome-applets/files/patch-gweather_weather.c b/x11/gnome-applets/files/patch-gweather_weather.c
new file mode 100644
index 000000000000..cdc1921ab4c7
--- /dev/null
+++ b/x11/gnome-applets/files/patch-gweather_weather.c
@@ -0,0 +1,12 @@
+--- gweather/weather.c.orig	Tue Mar  1 04:34:33 2005
++++ gweather/weather.c	Tue Mar  1 12:36:54 2005
+@@ -20,7 +20,9 @@
+ #include <string.h>
+ #include <ctype.h>
+ #include <math.h>
++#ifndef __FreeBSD__
+ #include <values.h>
++#endif
+ 
+ #ifdef __FreeBSD__
+ #include <sys/types.h>
diff --git a/x11/gnome-applets/files/patch-modemlights_Makefile.in b/x11/gnome-applets/files/patch-modemlights_Makefile.in
new file mode 100644
index 000000000000..874884722127
--- /dev/null
+++ b/x11/gnome-applets/files/patch-modemlights_Makefile.in
@@ -0,0 +1,10 @@
+--- modemlights/Makefile.in.orig	Fri Jan 14 00:08:52 2005
++++ modemlights/Makefile.in	Fri Jan 14 00:09:20 2005
+@@ -319,6 +319,7 @@
+ modem_applet_LDADD = \
+ 	$(GNOME_APPLETS_LIBS)	\
+ 	$(LIBGLADE_LIBS)	\
++	-lutil			\
+ 	$(MODEMLIGHTS_LIBS)
+ 
+ uidir = $(datadir)/gnome-2.0/ui
diff --git a/x11/gnome-applets/files/patch-modemlights_modem-applet.c b/x11/gnome-applets/files/patch-modemlights_modem-applet.c
new file mode 100644
index 000000000000..f4fb13717732
--- /dev/null
+++ b/x11/gnome-applets/files/patch-modemlights_modem-applet.c
@@ -0,0 +1,22 @@
+--- modemlights/modem-applet.c.orig	Fri Jan 14 00:06:52 2005
++++ modemlights/modem-applet.c	Fri Jan 14 00:08:28 2005
+@@ -24,12 +24,19 @@
+ 
+ #include <panel-applet.h>
+ #include <fcntl.h>
++#ifndef __FreeBSD__
+ #include <pty.h>
++#endif
+ #include <sys/poll.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+ #include <libxml/tree.h>
+ #include <glade/glade.h>
++#ifdef __FreeBSD__
++#include <sys/ioctl.h>
++#include <termios.h>
++#include <libutil.h>
++#endif
+ 
+ #include "modem-applet.h"
+ 
diff --git a/x11/gnome-applets/files/patch-wireless_wireless-applet.c b/x11/gnome-applets/files/patch-wireless_wireless-applet.c
deleted file mode 100644
index 636b36b21cb9..000000000000
--- a/x11/gnome-applets/files/patch-wireless_wireless-applet.c
+++ /dev/null
@@ -1,349 +0,0 @@
---- wireless/wireless-applet.c.orig	Sat Oct 30 09:46:28 2004
-+++ wireless/wireless-applet.c	Mon Dec  6 21:24:29 2004
-@@ -30,12 +30,25 @@
- #include <math.h>
- #include <dirent.h>
- 
-+#ifdef __FreeBSD__
-+#include <sys/socket.h>
-+#include <sys/ioctl.h>
-+#include <net/if.h>
-+#include <net/if_var.h>
-+#include <dev/an/if_aironet_ieee.h>
-+#include <dev/wi/if_wavelan_ieee.h>
-+#endif
-+
- #include <gnome.h>
- #include <panel-applet.h>
- #include <panel-applet-gconf.h>
- #include <glade/glade.h>
- 
-+#ifdef __FreeBSD__
-+#define CFG_DEVICE "an0"
-+#else
- #define CFG_DEVICE "eth0"
-+#endif
- #define CFG_UPDATE_INTERVAL 2
- 
- typedef enum {
-@@ -92,6 +105,12 @@
- 		WirelessApplet *applet);
- static void wireless_applet_about_cb (BonoboUIComponent *uic,
- 		WirelessApplet *applet);
-+#ifdef __FreeBSD__
-+static int an_getval(WirelessApplet *applet, char *device, struct an_req *areq);
-+static void get_an_data(WirelessApplet *applet, char *device, long int *level);
-+static int wi_getval(WirelessApplet *applet, char *device, struct wi_req *areq);
-+static void get_wi_data(WirelessApplet *applet, char *device, long int *level);
-+#endif
- static void prefs_response_cb (GtkDialog *dialog, gint response, gpointer data);
- 
- static const BonoboUIVerb wireless_menu_verbs [] = {
-@@ -159,9 +178,11 @@
- 	g_free (tltp);
- 
- 	/* Update the image */
-+#ifndef __FreeBSD__
- 	percent = CLAMP (percent, -1, 100);
-+#endif
- 
--	if (percent < 0)
-+	if (percent < 0 || percent > 100)
- 		state = PIX_BROKEN;
- 	else if (percent == 0)
- 		state = PIX_NO_LINK;
-@@ -192,6 +213,7 @@
- 	int percent;
- 
- 	/* Calculate the percentage based on the link quality */
-+#ifndef __FreeBSD__
- 	if (level < 0) {
- 		percent = -1;
- 	} else {
-@@ -202,6 +224,9 @@
- 			percent = CLAMP (percent, 0, 100);
- 		}
- 	}
-+#else
-+	percent = (int)level;
-+#endif
- 
- 	wireless_applet_draw (applet, percent);
- }
-@@ -244,14 +269,179 @@
- 	}
- }
- 
-+#ifdef __FreeBSD__
-+static int
-+wi_getval(WirelessApplet *applet, char *device, struct wi_req *wreq)
-+{
-+	struct ifreq	ifr;
-+	int		s;
-+ 
-+	bzero((char *)&ifr, sizeof(ifr));
-+ 
-+	strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
-+	ifr.ifr_data = (caddr_t)wreq;
-+ 
-+	s = socket(AF_INET, SOCK_DGRAM, 0);
-+ 
-+	if (s == -1)
-+	{
-+		gtk_tooltips_set_tip (applet->tips,
-+				GTK_WIDGET (applet),
-+				"Socket Error",
-+				NULL);
-+		return 0;
-+	}
-+ 
-+	if (ioctl(s, SIOCGWAVELAN, &ifr) == -1)
-+	{
-+		gtk_tooltips_set_tip (applet->tips,
-+				GTK_WIDGET (applet),
-+				"ioctl Error",
-+				NULL);
-+		close (s);
-+		return 0;
-+	}
-+ 
-+	close(s);
-+                                                                 
-+	return 1;
-+}
-+
-+static void
-+get_wi_data (WirelessApplet *applet, char *device, long int *level)
-+{
-+    	struct wi_req wreq;
-+	long int signal_strength;
-+
-+	bzero((char *)&wreq, sizeof(wreq));
-+
-+	wreq.wi_len  = WI_MAX_DATALEN;
-+	wreq.wi_type = WI_RID_COMMS_QUALITY;
-+
-+	(void)wi_getval(applet, device, &wreq);
-+
-+	signal_strength = (long int) (wreq.wi_val[1]);
-+
-+#ifdef WI_RID_READ_APS
-+	if (signal_strength <= 0) {
-+		/* we fail to get signal strength by usual means, try another way */
-+		static time_t last_scan;
-+		static long int cached;
-+		time_t now = time(NULL);
-+		
-+		/* XXX: this is long operation, and we will scan station not often then one in 5 secs */
-+		if (now > last_scan + 5) {
-+			struct wi_apinfo *w;
-+			int nstations;
-+			
-+			bzero((char *)&wreq, sizeof(wreq));
-+			wreq.wi_len = WI_MAX_DATALEN;
-+			wreq.wi_type = WI_RID_READ_APS;
-+
-+			(void)wi_getval(applet, device, &wreq);
-+		
-+			nstations = *(int *)wreq.wi_val;
-+			if (nstations > 0) {
-+				w = (struct wi_apinfo *)(((char *)&wreq.wi_val) + sizeof(int));
-+				signal_strength = (long int)w->signal;
-+			}
-+			
-+			cached = signal_strength;
-+			last_scan = now;
-+		} else {
-+			signal_strength = cached;
-+		}
-+	}
-+#endif
-+
-+	memcpy(level, &signal_strength, sizeof( *level ));
-+
-+	return;
-+}
-+
-+static int
-+an_getval(WirelessApplet *applet, char *device, struct an_req *areq)
-+{
-+	struct ifreq  ifr;
-+	int s;
-+
-+	bzero((char *)&ifr, sizeof(ifr));
-+
-+	strlcpy(ifr.ifr_name, device, sizeof(ifr.ifr_name));
-+	ifr.ifr_data = (caddr_t)areq;
-+
-+	s = socket(AF_INET, SOCK_DGRAM, 0);
-+
-+	if (s == -1) {
-+		gtk_tooltips_set_tip (applet->tips,
-+				GTK_WIDGET (applet),
-+				"Socket Error",
-+				NULL);
-+		return 0;
-+	}
-+
-+	if (ioctl(s, SIOCGAIRONET, &ifr) == -1) {
-+		gtk_tooltips_set_tip (applet->tips,
-+				GTK_WIDGET (applet),
-+				"ioctl Error",
-+				NULL);
-+		close (s);
-+		return 0;
-+	}
-+
-+	close(s);
-+	return 1;
-+}
-+
-+static void
-+get_an_data (WirelessApplet *applet, char *device, long int *level)
-+{
-+    	struct an_req areq;
-+	struct an_ltv_status *sts;
-+#ifdef AN_RID_RSSI_MAP
-+	struct an_ltv_rssi_map an_rssimap;
-+#endif
-+	long int signal_strength;
-+	int rssimap_valid = 0;
-+
-+#ifdef AN_RID_RSSI_MAP
-+	an_rssimap.an_len = sizeof(an_rssimap);
-+	an_rssimap.an_type = AN_RID_RSSI_MAP;
-+	rssimap_valid = an_getval(applet, device, (struct an_req*)&an_rssimap);
-+#endif
-+
-+	areq.an_len = sizeof(areq);
-+	areq.an_type = AN_RID_STATUS;
-+
-+	(void)an_getval(applet, device, &areq);
-+
-+	sts = (struct an_ltv_status *)&areq;
-+#ifdef AN_RID_RSSI_MAP
-+	if (rssimap_valid)
-+	    signal_strength = (long int)(an_rssimap.an_entries[
-+		    sts->an_normalized_strength].an_rss_pct);
-+	else
-+	    signal_strength = (long int)(sts->an_normalized_strength);
-+#else
-+	signal_strength = (long int)(sts->an_normalized_rssi);
-+#endif
-+	memcpy(level, &signal_strength, sizeof(level));
-+}
-+#endif
-+
- /* check stats, modify the state attribute */
- static void
- wireless_applet_read_device_state (WirelessApplet *applet)
- {
--	long int level, noise;
--	double link;
-+	long int level;
- 	char device[256];
-+#ifdef __FreeBSD__
-+	struct if_nameindex *ifstart, *ifs;
-+#else
-+	long int noise;
-+	double link;
- 	char line[256];
-+#endif
- 	gboolean found = FALSE;
- 
- 	/* resest list of available wireless devices */
-@@ -259,8 +449,37 @@
- 	g_list_free (applet->devices);
- 	applet->devices = NULL;
- 
-+#ifdef __FreeBSD__
-+	ifs = ifstart = if_nameindex ();
-+#endif
-+
- 	/* Here we begin to suck... */
- 	do {
-+#ifdef __FreeBSD__
-+		if (ifs == NULL || ifs->if_name == NULL) {
-+				break;
-+		}
-+		strlcpy (device, ifs->if_name, 6);
-+		if (g_strncasecmp (device, "an", 2)==0) {
-+				applet->devices = g_list_prepend (applet->devices, g_strdup (device));
-+				if (g_strcasecmp (applet->device, device)==0) {
-+						get_an_data (applet, device, &level);
-+						wireless_applet_update_state (applet, device, 0, level, 0);
-+						found = TRUE;
-+				}
-+		}
-+		else if (g_strncasecmp (device, "wi",   2)==0 || 
-+			 g_strncasecmp (device, "ath",  3)==0 ||
-+			 g_strncasecmp (device, "ndis", 4)==0) {
-+				applet->devices = g_list_prepend (applet->devices, g_strdup (device));
-+				if (g_strcasecmp (applet->device, device)==0) {
-+						get_wi_data (applet, device, &level);
-+						wireless_applet_update_state (applet, device, 0, level, 0);
-+						found = TRUE;
-+				}
-+		}
-+		ifs++;
-+#else
- 		char *ptr;
- 
- 		fgets (line, 256, applet->file);
-@@ -294,6 +513,7 @@
- 				found = TRUE;
- 			}
- 		}
-+#endif
- 	} while (1);
- 
- 	if (g_list_length (applet->devices)==1) {
-@@ -305,17 +525,23 @@
- 	}
- 
- 	/* rewind the /proc/net/wireless file */
-+#ifdef __FreeBSD__
-+	if_freenameindex(ifstart);
-+#else
- 	rewind (applet->file);
-+#endif
- }
- 
- static int
- wireless_applet_timeout_handler (WirelessApplet *applet)
- {
-+#ifndef __FreeBSD__
- 	if (applet->file == NULL) {
- 		wireless_applet_update_state (applet,
- 				applet->device, -1, -1, -1);
- 		return FALSE;
- 	}
-+#endif
- 
- 	wireless_applet_read_device_state (applet);
- 
-@@ -364,10 +590,12 @@
- static void
- start_file_read (WirelessApplet *applet)
- {
--	applet->file = fopen ("/proc/net/wireless", "rt");
-+#ifndef __FreeBSD__
-+	applet->file1 = fopen ("/proc/net/wireless", "rt");
- 	if (applet->file == NULL) {
- 		show_error_dialog (applet, _("There doesn't seem to be any wireless devices configured on your system.\nPlease verify your configuration if you think this is incorrect."));
- 	}
-+#endif
- }
- 
- static void
-@@ -670,8 +898,10 @@
- 		applet->prefs = NULL;
- 	}
- 
-+#ifndef __FreeBSD__
- 	if (applet->file)
- 		fclose (applet->file);
-+#endif
- 	if (applet->tips)
- 		g_object_unref (applet->tips);
- }
diff --git a/x11/gnome-applets/pkg-plist b/x11/gnome-applets/pkg-plist
index e3410d50878c..0f24cdc75ecc 100644
--- a/x11/gnome-applets/pkg-plist
+++ b/x11/gnome-applets/pkg-plist
@@ -1,13 +1,12 @@
-bin/gkb_xmmap
-bin/gnome-keyboard-layout
+%%CPUFREQ%%bin/cpufreq-selector
 bin/gswitchit-plugins-capplet
 %%BATTERY%%etc/sound/events/battstat_applet.soundlist
-etc/sound/events/mailcheck.soundlist
+include/libgswitchit/gswitchit_config.h
 include/libgswitchit/gswitchit_plugin.h
-include/libgswitchit/gswitchit_xkb_config.h
 libdata/bonobo/servers/GNOME_AccessxStatusApplet.server
 %%BATTERY%%libdata/bonobo/servers/GNOME_BattstatApplet.server
 libdata/bonobo/servers/GNOME_CDPlayerApplet.server
+%%CPUFREQ%%libdata/bonobo/servers/GNOME_CPUFreqApplet.server
 libdata/bonobo/servers/GNOME_CharpickerApplet.server
 libdata/bonobo/servers/GNOME_DriveMountApplet.server
 libdata/bonobo/servers/GNOME_GWeatherApplet_Factory.server
@@ -17,198 +16,69 @@ libdata/bonobo/servers/GNOME_KeyboardApplet.server
 libdata/bonobo/servers/GNOME_MailcheckApplet_Factory.server
 libdata/bonobo/servers/GNOME_MiniCommanderApplet.server
 libdata/bonobo/servers/GNOME_MixerApplet.server
-libdata/bonobo/servers/GNOME_ModemLightsApplet.server
+libdata/bonobo/servers/GNOME_ModemLights.server
 libdata/bonobo/servers/GNOME_MultiLoadApplet_Factory.server
+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
 libdata/pkgconfig/gswitchit.pc
 libexec/accessx-status-applet
 %%BATTERY%%libexec/battstat-applet-2
-libexec/cdplayer_applet2
 libexec/charpick_applet2
+%%CPUFREQ%%libexec/cpufreq-applet
 libexec/drivemount_applet2
 libexec/geyes_applet2
 libexec/gnome-applets/mc-install-default-macros
 libexec/gnome-keyboard-applet
 libexec/gtik2_applet2
 libexec/gweather-applet-2
-libexec/mailcheck-applet
 libexec/mini_commander_applet
+libexec/modem_applet
 libexec/mixer_applet2
-libexec/modemlights_applet2
 libexec/multiload-applet-2
+libexec/null_applet
 libexec/stickynotes_applet
-libexec/wireless-applet
-%%BATTERY%%share/gnome/battstat_applet/battstat_applet.glade
-share/gnome/gen_util/mini-commander.glade
-share/gnome/geyes/Bizarre/Bizarre-eye.png
-share/gnome/geyes/Bizarre/Bizarre-pupil.png
-share/gnome/geyes/Bizarre/config
-share/gnome/geyes/Bloodshot/Bloodshot-eye.png
-share/gnome/geyes/Bloodshot/Bloodshot-pupil.png
-share/gnome/geyes/Bloodshot/config
-share/gnome/geyes/Default-tiny/Default-tiny-eye.png
-share/gnome/geyes/Default-tiny/Default-tiny-pupil.png
-share/gnome/geyes/Default-tiny/config
-share/gnome/geyes/Default/Default-eye.png
-share/gnome/geyes/Default/Default-pupil.png
-share/gnome/geyes/Default/config
-share/gnome/geyes/Horrid/config
-share/gnome/geyes/Horrid/horrid_eye.png
-share/gnome/geyes/Horrid/horrid_pupil.png
-share/gnome/gkb/AM_Armenian.keyprop
-share/gnome/gkb/AR_Arabic.keyprop
-share/gnome/gkb/AR_Arabic_x.keyprop
-share/gnome/gkb/AZ_Azerbaidjani_Turkic.keyprop
-share/gnome/gkb/Armenian.keyprop
-share/gnome/gkb/BE_Dutch.keyprop
-share/gnome/gkb/BG_Bulgarian.keyprop
-share/gnome/gkb/BG_Bulgarian_x.keyprop
-share/gnome/gkb/BR_Portuguese.keyprop
-share/gnome/gkb/BR_Portuguese_x.keyprop
-share/gnome/gkb/BY_Belarussian.keyprop
-share/gnome/gkb/Basque.keyprop
-share/gnome/gkb/Belgian.keyprop
-share/gnome/gkb/BulgarianCyril.keyprop
-share/gnome/gkb/CA_English.keyprop
-share/gnome/gkb/CH_German_x.keyprop
-share/gnome/gkb/CZ_Czech.keyprop
-share/gnome/gkb/CZ_Czech_Slovak.keyprop
-share/gnome/gkb/CZ_Czech_x.keyprop
-share/gnome/gkb/DE_German.keyprop
-share/gnome/gkb/DE_German_x.keyprop
-share/gnome/gkb/DK_Danish.keyprop
-share/gnome/gkb/DK_Danish_x.keyprop
-share/gnome/gkb/Default.keyprop
-share/gnome/gkb/Dvorak.keyprop
-share/gnome/gkb/EE_Estonian.keyprop
-share/gnome/gkb/EE_Estonian_x.keyprop
-share/gnome/gkb/ES_Spanish-x86.keyprop
-share/gnome/gkb/ES_Spanish.keyprop
-share/gnome/gkb/ES_Spanish_x.keyprop
-share/gnome/gkb/FI_Finnish.keyprop
-share/gnome/gkb/FI_Finnish_x.keyprop
-share/gnome/gkb/FR_French-x86.keyprop
-share/gnome/gkb/FR_French.keyprop
-share/gnome/gkb/FR_French_x.keyprop
-share/gnome/gkb/FrenchCanadian.keyprop
-share/gnome/gkb/FrenchCanadian2.keyprop
-share/gnome/gkb/FrenchSwiss.keyprop
-share/gnome/gkb/GE_Georgian_x.keyprop
-share/gnome/gkb/GR_Greek.keyprop
-share/gnome/gkb/GR_Greek_x.keyprop
-share/gnome/gkb/GeorgianLatin.keyprop
-share/gnome/gkb/GeorgianRussian.keyprop
-share/gnome/gkb/German.keyprop
-share/gnome/gkb/GermanSwiss.keyprop
-share/gnome/gkb/HR_Croatian.keyprop
-share/gnome/gkb/HU_Hungarian.keyprop
-share/gnome/gkb/Hungarian-101.keyprop
-share/gnome/gkb/Hungarian-lat1.keyprop
-share/gnome/gkb/Hungarian-sun.keyprop
-share/gnome/gkb/Hungarian-x86.keyprop
-share/gnome/gkb/Hungarian.keyprop
-share/gnome/gkb/Hungarian101-1.keyprop
-share/gnome/gkb/Hungarian101.keyprop
-share/gnome/gkb/IL_Hebrew.keyprop
-share/gnome/gkb/IL_Hebrew_x.keyprop
-share/gnome/gkb/IS_Icelandic.keyprop
-share/gnome/gkb/IS_Icelandic_x.keyprop
-share/gnome/gkb/IT_Italian.keyprop
-share/gnome/gkb/IT_Italian_x.keyprop
-share/gnome/gkb/JP_Japanese.keyprop
-share/gnome/gkb/JP_Japanese_x.keyprop
-share/gnome/gkb/KR_Korean.keyprop
-share/gnome/gkb/LA_Lao_x.keyprop
-share/gnome/gkb/LT_Lithuanian.keyprop
-share/gnome/gkb/LT_Lithuanian_x.keyprop
-share/gnome/gkb/LT_Prog.keyprop
-share/gnome/gkb/LT_Standard.keyprop
-share/gnome/gkb/MK_Macedonian.keyprop
-share/gnome/gkb/MN_Mongolian.keyprop
-share/gnome/gkb/MN_Mongolian_x.keyprop
-share/gnome/gkb/MN_Mongolian_x_rev.keyprop
-share/gnome/gkb/MN_Mongolian_x_uni.keyprop
-share/gnome/gkb/Macedonian.keyprop
-share/gnome/gkb/NL_Dutch_x.keyprop
-share/gnome/gkb/NO_Norwegian.keyprop
-share/gnome/gkb/Norwegian.keyprop
-share/gnome/gkb/PL_Polish.keyprop
-share/gnome/gkb/PT_Portuguese.keyprop
-share/gnome/gkb/PT_Portuguese_x.keyprop
-share/gnome/gkb/Polish.keyprop
-share/gnome/gkb/PolishDeadkeys.keyprop
-share/gnome/gkb/Portugal.keyprop
-share/gnome/gkb/PortugalDeadkeys.keyprop
-share/gnome/gkb/RO_Romanian.keyprop
-share/gnome/gkb/RU_Russian.keyprop
-share/gnome/gkb/RU_Russian_x.keyprop
-share/gnome/gkb/RU_Russian_x_rev.keyprop
-share/gnome/gkb/RussianCyril.keyprop
-share/gnome/gkb/SE_Swedish.keyprop
-share/gnome/gkb/SE_Swedish_x.keyprop
-share/gnome/gkb/SI_Slovenian.keyprop
-share/gnome/gkb/SI_Slovenian_x.keyprop
-share/gnome/gkb/SK__x.keyprop
-share/gnome/gkb/SR_Dutch.keyprop
-share/gnome/gkb/Slovak.keyprop
-share/gnome/gkb/Slovene.keyprop
-share/gnome/gkb/Slovenian.keyprop
-share/gnome/gkb/Swedish.keyprop
-share/gnome/gkb/Syriac.keyprop
-share/gnome/gkb/Syriac_Phonetic.keyprop
-share/gnome/gkb/TH_Thai.keyprop
-share/gnome/gkb/TH_Thai_x.keyprop
-share/gnome/gkb/TR-f.keyprop
-share/gnome/gkb/TR-q.keyprop
-share/gnome/gkb/TR_Turkish.keyprop
-share/gnome/gkb/TR_Turkish_x.keyprop
-share/gnome/gkb/Thai.keyprop
-share/gnome/gkb/Thai2.keyprop
-share/gnome/gkb/UA_Ukrainian.keyprop
-share/gnome/gkb/UK-102.keyprop
-share/gnome/gkb/UK-x86.keyprop
-share/gnome/gkb/UK.keyprop
-share/gnome/gkb/UK_English.keyprop
-share/gnome/gkb/UK_English_x.keyprop
-share/gnome/gkb/UK_United_Kingdom.keyprop
-share/gnome/gkb/US-101.keyprop
-share/gnome/gkb/US-101A-x86.keyprop
-share/gnome/gkb/US-84.keyprop
-share/gnome/gkb/US-dec.keyprop
-share/gnome/gkb/US-ibm.keyprop
-share/gnome/gkb/US-int.keyprop
-share/gnome/gkb/US-mac.keyprop
-share/gnome/gkb/US-sgi-101.keyprop
-share/gnome/gkb/US-sun.keyprop
-share/gnome/gkb/US.keyprop
-share/gnome/gkb/US_English.keyprop
-share/gnome/gkb/US_international.keyprop
-share/gnome/gkb/VN_Vietnamese.keyprop
-share/gnome/gkb/YU_Serb_x.keyprop
-share/gnome/gkb/YU_Serbo-Croatian_x.keyprop
-share/gnome/gkb/Yugoslav.keyprop
-share/gnome/gkb/presets.xml
+libexec/trashapplet
 share/gnome/gnome-2.0/ui/GNOME_AccessxApplet.xml
 %%BATTERY%%share/gnome/gnome-2.0/ui/GNOME_BattstatApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_CDPlayerApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_CharpickerApplet.xml
+%%CPUFREQ%%share/gnome/gnome-2.0/ui/GNOME_CPUFreqApplet.xml
 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
-share/gnome/gnome-2.0/ui/GNOME_KeyboardApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_MailCheckApplet.xml
 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_ModemlightsApplet.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_StickyNotesApplet.xml
-share/gnome/gnome-2.0/ui/GNOME_WirelessApplet.xml
-share/gnome/gswitchit/gswitchit-plugins.glade
-share/gnome/gswitchit/gswitchit-properties.glade
-share/gnome/gweather/Locations.xml
+share/gnome/gnome-2.0/ui/GNOME_Panel_TrashApplet.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
+share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-eye.png
+share/gnome/gnome-applets/geyes/Bloodshot/Bloodshot-pupil.png
+share/gnome/gnome-applets/geyes/Bloodshot/config
+share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-eye.png
+share/gnome/gnome-applets/geyes/Default-tiny/Default-tiny-pupil.png
+share/gnome/gnome-applets/geyes/Default-tiny/config
+share/gnome/gnome-applets/geyes/Default/Default-eye.png
+share/gnome/gnome-applets/geyes/Default/Default-pupil.png
+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
+%%BATTERY%%share/gnome/gnome-applets/glade/battstat_applet.glade
+%%CPUFREQ%%share/gnome/gnome-applets/glade/cpufreq-preferences.glade
+share/gnome/gnome-applets/glade/gswitchit-plugins.glade
+share/gnome/gnome-applets/glade/gswitchit-properties.glade
+share/gnome/gnome-applets/glade/mini-commander.glade
+share/gnome/gnome-applets/glade/modemlights.glade
+share/gnome/gnome-applets/glade/stickynotes.glade
+share/gnome/gnome-applets/gweather/Locations.xml
+share/gnome/gnome-applets/gweather/locations.dtd
 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/legal.xml
@@ -216,6 +86,7 @@ share/gnome/help/accessx-status/eu/accessx-status.xml
 share/gnome/help/accessx-status/eu/figures/accessx-status-applet.png
 share/gnome/help/accessx-status/eu/legal.xml
 %%BATTERY%%share/gnome/help/battstat/C/battstat.xml
+%%BATTERY%%share/gnome/help/battstat/C/figures/battstat-preferences.png
 %%BATTERY%%share/gnome/help/battstat/C/figures/ac_small.png
 %%BATTERY%%share/gnome/help/battstat/C/figures/batt_green.png
 %%BATTERY%%share/gnome/help/battstat/C/figures/batt_orange.png
@@ -352,154 +223,11 @@ share/gnome/help/accessx-status/eu/legal.xml
 %%BATTERY%%share/gnome/help/battstat/zh_TW/figures/flash_small.png
 %%BATTERY%%share/gnome/help/battstat/zh_TW/figures/warning_small.png
 %%BATTERY%%share/gnome/help/battstat/zh_TW/legal.xml
-share/gnome/help/cdplayer/C/cdplayer.xml
-share/gnome/help/cdplayer/C/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/C/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/C/legal.xml
-share/gnome/help/cdplayer/de/cdplayer.xml
-share/gnome/help/cdplayer/de/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/de/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/de/legal.xml
-share/gnome/help/cdplayer/es/cdplayer.xml
-share/gnome/help/cdplayer/es/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/es/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/es/legal.xml
-share/gnome/help/cdplayer/eu/cdplayer.xml
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/eu/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/eu/legal.xml
-share/gnome/help/cdplayer/fr/cdplayer.xml
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/fr/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/fr/legal.xml
-share/gnome/help/cdplayer/it/cdplayer.xml
-share/gnome/help/cdplayer/it/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/it/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/it/legal.xml
-share/gnome/help/cdplayer/ja/cdplayer.xml
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/ja/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/ja/legal.xml
-share/gnome/help/cdplayer/ko/cdplayer.xml
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/ko/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/ko/legal.xml
-share/gnome/help/cdplayer/sv/cdplayer.xml
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/sv/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/sv/legal.xml
-share/gnome/help/cdplayer/zh_CN/cdplayer.xml
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/zh_CN/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/zh_CN/legal.xml
-share/gnome/help/cdplayer/zh_HK/cdplayer.xml
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/zh_HK/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/zh_HK/legal.xml
-share/gnome/help/cdplayer/zh_TW/cdplayer.xml
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_eject.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_nexttrack.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_pause.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_play.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playafterpause.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playing.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_playpause.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_prevtrack.png
-share/gnome/help/cdplayer/zh_TW/figures/cdplayer_applet_stop.png
-share/gnome/help/cdplayer/zh_TW/legal.xml
 share/gnome/help/char-palette/C/char-palette.xml
 share/gnome/help/char-palette/C/figures/charpalette_applet.png
 share/gnome/help/char-palette/C/figures/charpalette_chargroup.png
 share/gnome/help/char-palette/C/figures/charpick_characters.png
+share/gnome/help/char-palette/C/figures/charpick-preferences.png
 share/gnome/help/char-palette/C/legal.xml
 share/gnome/help/char-palette/de/char-palette.xml
 share/gnome/help/char-palette/de/figures/charpalette_applet.png
@@ -571,6 +299,8 @@ share/gnome/help/char-palette/zh_TW/figures/charpick_chargroup.png
 share/gnome/help/char-palette/zh_TW/legal.xml
 share/gnome/help/command-line/C/command-line.xml
 share/gnome/help/command-line/C/figures/command-line.png
+share/gnome/help/command-line/C/figures/prefs-macros.png
+share/gnome/help/command-line/C/figures/prefs.png
 share/gnome/help/command-line/C/legal.xml
 share/gnome/help/command-line/de/command-line.xml
 share/gnome/help/command-line/de/figures/command-line.png
@@ -605,12 +335,21 @@ share/gnome/help/command-line/zh_HK/legal.xml
 share/gnome/help/command-line/zh_TW/command-line.xml
 share/gnome/help/command-line/zh_TW/figures/command-line.png
 share/gnome/help/command-line/zh_TW/legal.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/cpufreq-applet.xml
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-100.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-25.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-50.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-75.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-preferences.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/figures/cpufreq-applet-selector.png
+%%CPUFREQ%%share/gnome/help/cpufreq-applet/C/legal.xml
 share/gnome/help/drivemount/C/drivemount.xml
-share/gnome/help/drivemount/C/figures/drivemount-applet_window.png
-share/gnome/help/drivemount/C/figures/drivemount_applet_all.png
-share/gnome/help/drivemount/C/figures/drivemount_applet_floppy.png
-share/gnome/help/drivemount/C/figures/drivemount_applet_settings.png
-share/gnome/help/drivemount/C/figures/drivemount_applet_tooltip.png
+share/gnome/help/drivemount/C/figures/drivemount-applet_eject.png
+share/gnome/help/drivemount/C/figures/drivemount-applet_example.png
+share/gnome/help/drivemount/C/figures/drivemount-applet_mount.png
+share/gnome/help/drivemount/C/figures/drivemount-applet_open.png
+share/gnome/help/drivemount/C/figures/drivemount-applet_status.png
 share/gnome/help/drivemount/C/legal.xml
 share/gnome/help/drivemount/de/drivemount.xml
 share/gnome/help/drivemount/de/figures/drivemount-applet_window.png
@@ -733,42 +472,6 @@ share/gnome/help/geyes/zh_TW/figures/geyes_applet.png
 share/gnome/help/geyes/zh_TW/figures/geyes_settings.png
 share/gnome/help/geyes/zh_TW/geyes.xml
 share/gnome/help/geyes/zh_TW/legal.xml
-share/gnome/help/gkb/C/figures/gkb_applet.png
-share/gnome/help/gkb/C/gkb.xml
-share/gnome/help/gkb/C/legal.xml
-share/gnome/help/gkb/de/figures/gkb_applet.png
-share/gnome/help/gkb/de/gkb.xml
-share/gnome/help/gkb/de/legal.xml
-share/gnome/help/gkb/es/figures/gkb_applet.png
-share/gnome/help/gkb/es/gkb.xml
-share/gnome/help/gkb/es/legal.xml
-share/gnome/help/gkb/eu/figures/gkb_applet.png
-share/gnome/help/gkb/eu/gkb.xml
-share/gnome/help/gkb/eu/legal.xml
-share/gnome/help/gkb/fr/figures/gkb_applet.png
-share/gnome/help/gkb/fr/gkb.xml
-share/gnome/help/gkb/fr/legal.xml
-share/gnome/help/gkb/it/figures/gkb_applet.png
-share/gnome/help/gkb/it/gkb.xml
-share/gnome/help/gkb/it/legal.xml
-share/gnome/help/gkb/ja/figures/gkb_applet.png
-share/gnome/help/gkb/ja/gkb.xml
-share/gnome/help/gkb/ja/legal.xml
-share/gnome/help/gkb/ko/figures/gkb_applet.png
-share/gnome/help/gkb/ko/gkb.xml
-share/gnome/help/gkb/ko/legal.xml
-share/gnome/help/gkb/sv/figures/gkb_applet.png
-share/gnome/help/gkb/sv/gkb.xml
-share/gnome/help/gkb/sv/legal.xml
-share/gnome/help/gkb/zh_CN/figures/gkb_applet.png
-share/gnome/help/gkb/zh_CN/gkb.xml
-share/gnome/help/gkb/zh_CN/legal.xml
-share/gnome/help/gkb/zh_HK/figures/gkb_applet.png
-share/gnome/help/gkb/zh_HK/gkb.xml
-share/gnome/help/gkb/zh_HK/legal.xml
-share/gnome/help/gkb/zh_TW/figures/gkb_applet.png
-share/gnome/help/gkb/zh_TW/gkb.xml
-share/gnome/help/gkb/zh_TW/legal.xml
 share/gnome/help/gswitchit/C/gswitchit.xml
 share/gnome/help/gswitchit/C/legal.xml
 share/gnome/help/gtik2_applet2/C/figures/gtik_applet.png
@@ -808,8 +511,18 @@ share/gnome/help/gtik2_applet2/zh_TW/figures/gtik_applet.png
 share/gnome/help/gtik2_applet2/zh_TW/gtik2_applet2.xml
 share/gnome/help/gtik2_applet2/zh_TW/legal.xml
 share/gnome/help/gweather/C/figures/gweather_applet.png
-share/gnome/help/gweather/C/figures/gweather_settings.png
-share/gnome/help/gweather/C/figures/gweather_weather.png
+share/gnome/help/gweather/C/figures/gweather-details.png
+share/gnome/help/gweather/C/figures/gweather-prefs-general.png
+share/gnome/help/gweather/C/figures/gweather-prefs-locations.png
+share/gnome/help/gweather/C/figures/stock_weather-cloudy.png
+share/gnome/help/gweather/C/figures/stock_weather-few-clouds.png
+share/gnome/help/gweather/C/figures/stock_weather-fog.png
+share/gnome/help/gweather/C/figures/stock_weather-night-clear.png
+share/gnome/help/gweather/C/figures/stock_weather-night-few-clouds.png
+share/gnome/help/gweather/C/figures/stock_weather-showers.png
+share/gnome/help/gweather/C/figures/stock_weather-snow.png
+share/gnome/help/gweather/C/figures/stock_weather-storm.png
+share/gnome/help/gweather/C/figures/stock_weather-sunny.png
 share/gnome/help/gweather/C/gweather.xml
 share/gnome/help/gweather/C/legal.xml
 share/gnome/help/gweather/de/figures/gweather_applet.png
@@ -867,66 +580,6 @@ share/gnome/help/gweather/zh_TW/figures/gweather_settings.png
 share/gnome/help/gweather/zh_TW/figures/gweather_weather.png
 share/gnome/help/gweather/zh_TW/gweather.xml
 share/gnome/help/gweather/zh_TW/legal.xml
-share/gnome/help/mailcheck/C/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/C/legal.xml
-share/gnome/help/mailcheck/C/mailcheck.xml
-share/gnome/help/mailcheck/de/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/de/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/de/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/de/legal.xml
-share/gnome/help/mailcheck/de/mailcheck.xml
-share/gnome/help/mailcheck/es/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/es/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/es/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/es/legal.xml
-share/gnome/help/mailcheck/es/mailcheck.xml
-share/gnome/help/mailcheck/eu/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/eu/legal.xml
-share/gnome/help/mailcheck/eu/mailcheck.xml
-share/gnome/help/mailcheck/fr/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/fr/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/fr/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/fr/legal.xml
-share/gnome/help/mailcheck/fr/mailcheck.xml
-share/gnome/help/mailcheck/it/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/it/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/it/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/it/legal.xml
-share/gnome/help/mailcheck/it/mailcheck.xml
-share/gnome/help/mailcheck/ja/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/ja/legal.xml
-share/gnome/help/mailcheck/ja/mailcheck.xml
-share/gnome/help/mailcheck/ko/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/ko/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/ko/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/ko/legal.xml
-share/gnome/help/mailcheck/ko/mailcheck.xml
-share/gnome/help/mailcheck/sv/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/sv/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/sv/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/sv/legal.xml
-share/gnome/help/mailcheck/sv/mailcheck.xml
-share/gnome/help/mailcheck/zh_CN/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/zh_CN/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/zh_CN/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/zh_CN/legal.xml
-share/gnome/help/mailcheck/zh_CN/mailcheck.xml
-share/gnome/help/mailcheck/zh_HK/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/zh_HK/legal.xml
-share/gnome/help/mailcheck/zh_HK/mailcheck.xml
-share/gnome/help/mailcheck/zh_TW/figures/mailcheck-applet.png
-share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck/zh_TW/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck/zh_TW/figures/mailcheck_applet.png
-share/gnome/help/mailcheck/zh_TW/legal.xml
-share/gnome/help/mailcheck/zh_TW/mailcheck.xml
 share/gnome/help/mixer_applet2/C/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/C/legal.xml
 share/gnome/help/mixer_applet2/C/mixer_applet2.xml
@@ -972,49 +625,9 @@ share/gnome/help/mixer_applet2/zh_TW/figures/mixer_applet.png
 share/gnome/help/mixer_applet2/zh_TW/figures/volumecontrol_applet.png
 share/gnome/help/mixer_applet2/zh_TW/legal.xml
 share/gnome/help/mixer_applet2/zh_TW/mixer_applet2.xml
-share/gnome/help/modemlights/C/figures/modemlights-advanced.png
-share/gnome/help/modemlights/C/figures/modemlights-advpref.png
-share/gnome/help/modemlights/C/figures/modemlights-color.png
-share/gnome/help/modemlights/C/figures/modemlights-general.png
-share/gnome/help/modemlights/C/figures/modemlights-prefs.png
-share/gnome/help/modemlights/C/figures/modemlights.png
-share/gnome/help/modemlights/C/figures/modemlights_applet.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_advanced.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_awaiting.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_button.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_button_2.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_colors.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_connected.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_general.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_if_connect.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_not_connected.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_connecting.png
-share/gnome/help/modemlights/C/figures/modemlights_applet_prefs_display.png
-share/gnome/help/modemlights/C/legal.xml
-share/gnome/help/modemlights/C/modemlights.xml
-share/gnome/help/modemlights/eu/figures/modemlights-advanced.png
-share/gnome/help/modemlights/eu/figures/modemlights-advpref.png
-share/gnome/help/modemlights/eu/figures/modemlights-color.png
-share/gnome/help/modemlights/eu/figures/modemlights-general.png
-share/gnome/help/modemlights/eu/figures/modemlights-prefs.png
-share/gnome/help/modemlights/eu/figures/modemlights.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_advanced.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_awaiting.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_button.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_button_2.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_colors.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_connected.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_general.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_if_connect.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_not_connected.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_prefs_connecting.png
-share/gnome/help/modemlights/eu/figures/modemlights_applet_prefs_display.png
-share/gnome/help/modemlights/eu/legal.xml
-share/gnome/help/modemlights/eu/modemlights.xml
+share/gnome/help/multiload/C/figures/multiload-preferences.png
 share/gnome/help/multiload/C/figures/system-monitor-applet_window.png
 share/gnome/help/multiload/C/figures/system_monitor.png
-share/gnome/help/multiload/C/figures/system_monitor_prefs.png
 share/gnome/help/multiload/C/legal.xml
 share/gnome/help/multiload/C/multiload.xml
 share/gnome/help/multiload/de/figures/system-monitor-applet_window.png
@@ -1053,6 +666,11 @@ share/gnome/help/multiload/zh_TW/legal.xml
 share/gnome/help/multiload/zh_TW/multiload.xml
 share/gnome/help/stickynotes_applet/C/legal.xml
 share/gnome/help/stickynotes_applet/C/stickynotes_applet.xml
+share/gnome/help/stickynotes_applet/C/figures/stickynote-left-menu.png
+share/gnome/help/stickynotes_applet/C/figures/stickynote-right-menu.png
+share/gnome/help/stickynotes_applet/C/figures/stickynotes-note-prefs.png
+share/gnome/help/stickynotes_applet/C/figures/stickynotes-prefs.png
+share/gnome/help/stickynotes_applet/C/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/de/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/de/legal.xml
 share/gnome/help/stickynotes_applet/de/stickynotes_applet.xml
@@ -1086,50 +704,9 @@ share/gnome/help/stickynotes_applet/zh_HK/stickynotes_applet.xml
 share/gnome/help/stickynotes_applet/zh_TW/figures/stickynotes_applet.png
 share/gnome/help/stickynotes_applet/zh_TW/legal.xml
 share/gnome/help/stickynotes_applet/zh_TW/stickynotes_applet.xml
-share/gnome/help/wireless/C/legal.xml
-share/gnome/help/wireless/C/wireless.xml
-share/gnome/help/wireless/de/figures/wireless_applet_conn.png
-share/gnome/help/wireless/de/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/de/legal.xml
-share/gnome/help/wireless/de/wireless.xml
-share/gnome/help/wireless/es/figures/wireless_applet_conn.png
-share/gnome/help/wireless/es/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/es/legal.xml
-share/gnome/help/wireless/es/wireless.xml
-share/gnome/help/wireless/eu/legal.xml
-share/gnome/help/wireless/eu/wireless.xml
-share/gnome/help/wireless/fr/figures/wireless_applet_conn.png
-share/gnome/help/wireless/fr/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/fr/legal.xml
-share/gnome/help/wireless/fr/wireless.xml
-share/gnome/help/wireless/it/figures/wireless_applet_conn.png
-share/gnome/help/wireless/it/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/it/legal.xml
-share/gnome/help/wireless/it/wireless.xml
-share/gnome/help/wireless/ja/figures/wireless_applet_conn.png
-share/gnome/help/wireless/ja/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/ja/legal.xml
-share/gnome/help/wireless/ja/wireless.xml
-share/gnome/help/wireless/ko/figures/wireless_applet_conn.png
-share/gnome/help/wireless/ko/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/ko/legal.xml
-share/gnome/help/wireless/ko/wireless.xml
-share/gnome/help/wireless/sv/figures/wireless_applet_conn.png
-share/gnome/help/wireless/sv/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/sv/legal.xml
-share/gnome/help/wireless/sv/wireless.xml
-share/gnome/help/wireless/zh_CN/figures/wireless_applet_conn.png
-share/gnome/help/wireless/zh_CN/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/zh_CN/legal.xml
-share/gnome/help/wireless/zh_CN/wireless.xml
-share/gnome/help/wireless/zh_HK/figures/wireless_applet_conn.png
-share/gnome/help/wireless/zh_HK/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/zh_HK/legal.xml
-share/gnome/help/wireless/zh_HK/wireless.xml
-share/gnome/help/wireless/zh_TW/figures/wireless_applet_conn.png
-share/gnome/help/wireless/zh_TW/figures/wireless_applet_no_conn.png
-share/gnome/help/wireless/zh_TW/legal.xml
-share/gnome/help/wireless/zh_TW/wireless.xml
+share/gnome/help/trashapplet/C/legal.xml
+share/gnome/help/trashapplet/C/figures/trash-applet.png
+share/gnome/help/trashapplet/C/trashapplet.xml
 share/gnome/omf/gnome-applets/accessx-status-C.omf
 share/gnome/omf/gnome-applets/accessx-status-eu.omf
 %%BATTERY%%share/gnome/omf/gnome-applets/battstat-C.omf
@@ -1144,18 +721,6 @@ share/gnome/omf/gnome-applets/accessx-status-eu.omf
 %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_CN.omf
 %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_HK.omf
 %%BATTERY%%share/gnome/omf/gnome-applets/battstat-zh_TW.omf
-share/gnome/omf/gnome-applets/cdplayer-C.omf
-share/gnome/omf/gnome-applets/cdplayer-de.omf
-share/gnome/omf/gnome-applets/cdplayer-es.omf
-share/gnome/omf/gnome-applets/cdplayer-eu.omf
-share/gnome/omf/gnome-applets/cdplayer-fr.omf
-share/gnome/omf/gnome-applets/cdplayer-it.omf
-share/gnome/omf/gnome-applets/cdplayer-ja.omf
-share/gnome/omf/gnome-applets/cdplayer-ko.omf
-share/gnome/omf/gnome-applets/cdplayer-sv.omf
-share/gnome/omf/gnome-applets/cdplayer-zh_CN.omf
-share/gnome/omf/gnome-applets/cdplayer-zh_HK.omf
-share/gnome/omf/gnome-applets/cdplayer-zh_TW.omf
 share/gnome/omf/gnome-applets/char-palette-C.omf
 share/gnome/omf/gnome-applets/char-palette-de.omf
 share/gnome/omf/gnome-applets/char-palette-es.omf
@@ -1180,6 +745,7 @@ share/gnome/omf/gnome-applets/command-line-sv.omf
 share/gnome/omf/gnome-applets/command-line-zh_CN.omf
 share/gnome/omf/gnome-applets/command-line-zh_HK.omf
 share/gnome/omf/gnome-applets/command-line-zh_TW.omf
+%%CPUFREQ%%share/gnome/omf/gnome-applets/cpufreq-applet-C.omf
 share/gnome/omf/gnome-applets/drivemount-C.omf
 share/gnome/omf/gnome-applets/drivemount-de.omf
 share/gnome/omf/gnome-applets/drivemount-es.omf
@@ -1204,18 +770,6 @@ share/gnome/omf/gnome-applets/geyes-sv.omf
 share/gnome/omf/gnome-applets/geyes-zh_CN.omf
 share/gnome/omf/gnome-applets/geyes-zh_HK.omf
 share/gnome/omf/gnome-applets/geyes-zh_TW.omf
-share/gnome/omf/gnome-applets/gkb-C.omf
-share/gnome/omf/gnome-applets/gkb-de.omf
-share/gnome/omf/gnome-applets/gkb-es.omf
-share/gnome/omf/gnome-applets/gkb-eu.omf
-share/gnome/omf/gnome-applets/gkb-fr.omf
-share/gnome/omf/gnome-applets/gkb-it.omf
-share/gnome/omf/gnome-applets/gkb-ja.omf
-share/gnome/omf/gnome-applets/gkb-ko.omf
-share/gnome/omf/gnome-applets/gkb-sv.omf
-share/gnome/omf/gnome-applets/gkb-zh_CN.omf
-share/gnome/omf/gnome-applets/gkb-zh_HK.omf
-share/gnome/omf/gnome-applets/gkb-zh_TW.omf
 share/gnome/omf/gnome-applets/gswitchit-C.omf
 share/gnome/omf/gnome-applets/gtik2_applet2-C.omf
 share/gnome/omf/gnome-applets/gtik2_applet2-de.omf
@@ -1241,18 +795,6 @@ share/gnome/omf/gnome-applets/gweather-sv.omf
 share/gnome/omf/gnome-applets/gweather-zh_CN.omf
 share/gnome/omf/gnome-applets/gweather-zh_HK.omf
 share/gnome/omf/gnome-applets/gweather-zh_TW.omf
-share/gnome/omf/gnome-applets/mailcheck-C.omf
-share/gnome/omf/gnome-applets/mailcheck-de.omf
-share/gnome/omf/gnome-applets/mailcheck-es.omf
-share/gnome/omf/gnome-applets/mailcheck-eu.omf
-share/gnome/omf/gnome-applets/mailcheck-fr.omf
-share/gnome/omf/gnome-applets/mailcheck-it.omf
-share/gnome/omf/gnome-applets/mailcheck-ja.omf
-share/gnome/omf/gnome-applets/mailcheck-ko.omf
-share/gnome/omf/gnome-applets/mailcheck-sv.omf
-share/gnome/omf/gnome-applets/mailcheck-zh_CN.omf
-share/gnome/omf/gnome-applets/mailcheck-zh_HK.omf
-share/gnome/omf/gnome-applets/mailcheck-zh_TW.omf
 share/gnome/omf/gnome-applets/mixer_applet2-C.omf
 share/gnome/omf/gnome-applets/mixer_applet2-de.omf
 share/gnome/omf/gnome-applets/mixer_applet2-es.omf
@@ -1265,8 +807,6 @@ share/gnome/omf/gnome-applets/mixer_applet2-sv.omf
 share/gnome/omf/gnome-applets/mixer_applet2-zh_CN.omf
 share/gnome/omf/gnome-applets/mixer_applet2-zh_HK.omf
 share/gnome/omf/gnome-applets/mixer_applet2-zh_TW.omf
-share/gnome/omf/gnome-applets/modemlights-C.omf
-share/gnome/omf/gnome-applets/modemlights-eu.omf
 share/gnome/omf/gnome-applets/multiload-C.omf
 share/gnome/omf/gnome-applets/multiload-de.omf
 share/gnome/omf/gnome-applets/multiload-es.omf
@@ -1291,18 +831,7 @@ share/gnome/omf/gnome-applets/stickynotes_applet-sv.omf
 share/gnome/omf/gnome-applets/stickynotes_applet-zh_CN.omf
 share/gnome/omf/gnome-applets/stickynotes_applet-zh_HK.omf
 share/gnome/omf/gnome-applets/stickynotes_applet-zh_TW.omf
-share/gnome/omf/gnome-applets/wireless-C.omf
-share/gnome/omf/gnome-applets/wireless-de.omf
-share/gnome/omf/gnome-applets/wireless-es.omf
-share/gnome/omf/gnome-applets/wireless-eu.omf
-share/gnome/omf/gnome-applets/wireless-fr.omf
-share/gnome/omf/gnome-applets/wireless-it.omf
-share/gnome/omf/gnome-applets/wireless-ja.omf
-share/gnome/omf/gnome-applets/wireless-ko.omf
-share/gnome/omf/gnome-applets/wireless-sv.omf
-share/gnome/omf/gnome-applets/wireless-zh_CN.omf
-share/gnome/omf/gnome-applets/wireless-zh_HK.omf
-share/gnome/omf/gnome-applets/wireless-zh_TW.omf
+share/gnome/omf/gnome-applets/trashapplet-C.omf
 share/gnome/pixmaps/accessx-status-applet/ax-applet.png
 share/gnome/pixmaps/accessx-status-applet/ax-bouncekeys.png
 share/gnome/pixmaps/accessx-status-applet/ax-key-base.png
@@ -1339,104 +868,12 @@ share/gnome/pixmaps/accessx-status-applet/sticky-shift-none.png
 share/gnome/pixmaps/accessx-status-applet/sticky-super-latched.png
 share/gnome/pixmaps/accessx-status-applet/sticky-super-locked.png
 share/gnome/pixmaps/accessx-status-applet/sticky-super-none.png
-%%BATTERY%%share/gnome/pixmaps/battstat.png
-share/gnome/pixmaps/charpick.png
-share/gnome/pixmaps/drivemount-applet.png
-share/gnome/pixmaps/gkb-icon.png
-share/gnome/pixmaps/gkb.png
-share/gnome/pixmaps/gkb/ae.png
-share/gnome/pixmaps/gkb/am.png
-share/gnome/pixmaps/gkb/ar.png
-share/gnome/pixmaps/gkb/at.png
-share/gnome/pixmaps/gkb/az.png
-share/gnome/pixmaps/gkb/be.png
-share/gnome/pixmaps/gkb/bg.png
-share/gnome/pixmaps/gkb/bh.png
-share/gnome/pixmaps/gkb/br.png
-share/gnome/pixmaps/gkb/by.png
-share/gnome/pixmaps/gkb/ca.png
-share/gnome/pixmaps/gkb/ch.png
-share/gnome/pixmaps/gkb/cu.png
-share/gnome/pixmaps/gkb/cz.png
-share/gnome/pixmaps/gkb/de.png
-share/gnome/pixmaps/gkb/dj.png
-share/gnome/pixmaps/gkb/dk.png
-share/gnome/pixmaps/gkb/dz.png
-share/gnome/pixmaps/gkb/ee.png
-share/gnome/pixmaps/gkb/eg.png
-share/gnome/pixmaps/gkb/es.png
-share/gnome/pixmaps/gkb/eu.png
-share/gnome/pixmaps/gkb/fi.png
-share/gnome/pixmaps/gkb/fr.png
-share/gnome/pixmaps/gkb/ge.png
-share/gnome/pixmaps/gkb/gkb.png
-share/gnome/pixmaps/gkb/gr.png
-share/gnome/pixmaps/gkb/hr.png
-share/gnome/pixmaps/gkb/hu.png
-share/gnome/pixmaps/gkb/il.png
-share/gnome/pixmaps/gkb/iq.png
-share/gnome/pixmaps/gkb/is.png
-share/gnome/pixmaps/gkb/it.png
-share/gnome/pixmaps/gkb/jo.png
-share/gnome/pixmaps/gkb/jp.png
-share/gnome/pixmaps/gkb/km.png
-share/gnome/pixmaps/gkb/kr.png
-share/gnome/pixmaps/gkb/kw.png
-share/gnome/pixmaps/gkb/la.png
-share/gnome/pixmaps/gkb/lam.png
-share/gnome/pixmaps/gkb/lb.png
-share/gnome/pixmaps/gkb/lt.png
-share/gnome/pixmaps/gkb/ly.png
-share/gnome/pixmaps/gkb/ma.png
-share/gnome/pixmaps/gkb/mk.png
-share/gnome/pixmaps/gkb/mn.png
-share/gnome/pixmaps/gkb/mx.png
-share/gnome/pixmaps/gkb/nl.png
-share/gnome/pixmaps/gkb/no.png
-share/gnome/pixmaps/gkb/om.png
-share/gnome/pixmaps/gkb/pl.png
-share/gnome/pixmaps/gkb/ps.png
-share/gnome/pixmaps/gkb/pt.png
-share/gnome/pixmaps/gkb/qa.png
-share/gnome/pixmaps/gkb/qc.png
-share/gnome/pixmaps/gkb/ro.png
-share/gnome/pixmaps/gkb/ru.png
-share/gnome/pixmaps/gkb/sa.png
-share/gnome/pixmaps/gkb/sd.png
-share/gnome/pixmaps/gkb/se.png
-share/gnome/pixmaps/gkb/si.png
-share/gnome/pixmaps/gkb/sk.png
-share/gnome/pixmaps/gkb/so.png
-share/gnome/pixmaps/gkb/sr.png
-share/gnome/pixmaps/gkb/sy.png
-share/gnome/pixmaps/gkb/th.png
-share/gnome/pixmaps/gkb/tn.png
-share/gnome/pixmaps/gkb/tr.png
-share/gnome/pixmaps/gkb/ua.png
-share/gnome/pixmaps/gkb/uk.png
-share/gnome/pixmaps/gkb/un.png
-share/gnome/pixmaps/gkb/us.png
-share/gnome/pixmaps/gkb/uy.png
-share/gnome/pixmaps/gkb/vn.png
-share/gnome/pixmaps/gkb/ye.png
-share/gnome/pixmaps/gkb/yu.png
-share/gnome/pixmaps/gnome-cpu.png
-share/gnome/pixmaps/gnome-eyes.png
-share/gnome/pixmaps/gnome-mini-commander.png
-share/gnome/pixmaps/gnome-mixer-applet.png
-share/gnome/pixmaps/mailcheck/eclouds.png
-share/gnome/pixmaps/mailcheck/email-e.png
-share/gnome/pixmaps/mailcheck/email-eclouds.png
-share/gnome/pixmaps/mailcheck/email-tiny.png
-share/gnome/pixmaps/mailcheck/email.png
-share/gnome/pixmaps/mailcheck/tux-anim.png
-share/gnome/pixmaps/mini-commander/browser-mini.xpm
-share/gnome/pixmaps/mini-commander/history-mini.xpm
-share/gnome/pixmaps/mixer/volume-max.png
-share/gnome/pixmaps/mixer/volume-medium.png
-share/gnome/pixmaps/mixer/volume-min.png
-share/gnome/pixmaps/mixer/volume-mute.png
-share/gnome/pixmaps/mixer/volume-zero.png
+%%CPUFREQ%%share/gnome/pixmaps/cpufreq-applet/cpufreq-100.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
 share/gnome/pixmaps/stickynotes/close.png
 share/gnome/pixmaps/stickynotes/locked.png
 share/gnome/pixmaps/stickynotes/resize_se.png
@@ -1444,15 +881,7 @@ 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/pixmaps/wireless-applet/broken-0.png
-share/gnome/pixmaps/wireless-applet/no-link-0.png
-share/gnome/pixmaps/wireless-applet/signal-1-40.png
-share/gnome/pixmaps/wireless-applet/signal-41-60.png
-share/gnome/pixmaps/wireless-applet/signal-61-80.png
-share/gnome/pixmaps/wireless-applet/signal-81-100.png
-share/gnome/pixmaps/wireless-applet/wireless-applet.png
-share/gnome/stickynotes/stickynotes.glade
-share/gnome/wireless-applet/wireless-applet.glade
+share/gnome/xmodmap/base.xml
 share/gnome/xmodmap/xmodmap.am
 share/gnome/xmodmap/xmodmap.ar
 share/gnome/xmodmap/xmodmap.be
@@ -1538,6 +967,13 @@ 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/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
+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/locale/am/LC_MESSAGES/gnome-applets-2.0.mo
@@ -1603,39 +1039,13 @@ share/locale/vi/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-applets-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
-@dirrm share/gnome/wireless-applet
-@dirrm share/gnome/stickynotes
-@dirrm share/gnome/pixmaps/wireless-applet
 @dirrm share/gnome/pixmaps/stickynotes
-@dirrm share/gnome/pixmaps/mixer
-@dirrm share/gnome/pixmaps/mini-commander
-@dirrm share/gnome/pixmaps/mailcheck
-@dirrm share/gnome/pixmaps/gkb
+%%CPUFREQ%%@dirrm share/gnome/pixmaps/cpufreq-applet
 @dirrm share/gnome/pixmaps/accessx-status-applet
 @dirrm share/gnome/omf/gnome-applets
-@dirrm share/gnome/help/wireless/zh_TW/figures
-@dirrm share/gnome/help/wireless/zh_TW
-@dirrm share/gnome/help/wireless/zh_HK/figures
-@dirrm share/gnome/help/wireless/zh_HK
-@dirrm share/gnome/help/wireless/zh_CN/figures
-@dirrm share/gnome/help/wireless/zh_CN
-@dirrm share/gnome/help/wireless/sv/figures
-@dirrm share/gnome/help/wireless/sv
-@dirrm share/gnome/help/wireless/ko/figures
-@dirrm share/gnome/help/wireless/ko
-@dirrm share/gnome/help/wireless/ja/figures
-@dirrm share/gnome/help/wireless/ja
-@dirrm share/gnome/help/wireless/it/figures
-@dirrm share/gnome/help/wireless/it
-@dirrm share/gnome/help/wireless/fr/figures
-@dirrm share/gnome/help/wireless/fr
-@dirrm share/gnome/help/wireless/eu
-@dirrm share/gnome/help/wireless/es/figures
-@dirrm share/gnome/help/wireless/es
-@dirrm share/gnome/help/wireless/de/figures
-@dirrm share/gnome/help/wireless/de
-@dirrm share/gnome/help/wireless/C
-@dirrm share/gnome/help/wireless
+@dirrm share/gnome/help/trashapplet/C/figures
+@dirrm share/gnome/help/trashapplet/C
+@dirrm share/gnome/help/trashapplet
 @dirrm share/gnome/help/stickynotes_applet/zh_TW/figures
 @dirrm share/gnome/help/stickynotes_applet/zh_TW
 @dirrm share/gnome/help/stickynotes_applet/zh_HK/figures
@@ -1658,6 +1068,7 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/stickynotes_applet/es
 @dirrm share/gnome/help/stickynotes_applet/de/figures
 @dirrm share/gnome/help/stickynotes_applet/de
+@dirrm share/gnome/help/stickynotes_applet/C/figures
 @dirrm share/gnome/help/stickynotes_applet/C
 @dirrm share/gnome/help/stickynotes_applet
 @dirrm share/gnome/help/multiload/zh_TW/figures
@@ -1685,11 +1096,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/multiload/C/figures
 @dirrm share/gnome/help/multiload/C
 @dirrm share/gnome/help/multiload
-@dirrm share/gnome/help/modemlights/eu/figures
-@dirrm share/gnome/help/modemlights/eu
-@dirrm share/gnome/help/modemlights/C/figures
-@dirrm share/gnome/help/modemlights/C
-@dirrm share/gnome/help/modemlights
 @dirrm share/gnome/help/mixer_applet2/zh_TW/figures
 @dirrm share/gnome/help/mixer_applet2/zh_TW
 @dirrm share/gnome/help/mixer_applet2/zh_HK/figures
@@ -1715,31 +1121,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/mixer_applet2/C/figures
 @dirrm share/gnome/help/mixer_applet2/C
 @dirrm share/gnome/help/mixer_applet2
-@dirrm share/gnome/help/mailcheck/zh_TW/figures
-@dirrm share/gnome/help/mailcheck/zh_TW
-@dirrm share/gnome/help/mailcheck/zh_HK/figures
-@dirrm share/gnome/help/mailcheck/zh_HK
-@dirrm share/gnome/help/mailcheck/zh_CN/figures
-@dirrm share/gnome/help/mailcheck/zh_CN
-@dirrm share/gnome/help/mailcheck/sv/figures
-@dirrm share/gnome/help/mailcheck/sv
-@dirrm share/gnome/help/mailcheck/ko/figures
-@dirrm share/gnome/help/mailcheck/ko
-@dirrm share/gnome/help/mailcheck/ja/figures
-@dirrm share/gnome/help/mailcheck/ja
-@dirrm share/gnome/help/mailcheck/it/figures
-@dirrm share/gnome/help/mailcheck/it
-@dirrm share/gnome/help/mailcheck/fr/figures
-@dirrm share/gnome/help/mailcheck/fr
-@dirrm share/gnome/help/mailcheck/eu/figures
-@dirrm share/gnome/help/mailcheck/eu
-@dirrm share/gnome/help/mailcheck/es/figures
-@dirrm share/gnome/help/mailcheck/es
-@dirrm share/gnome/help/mailcheck/de/figures
-@dirrm share/gnome/help/mailcheck/de
-@dirrm share/gnome/help/mailcheck/C/figures
-@dirrm share/gnome/help/mailcheck/C
-@dirrm share/gnome/help/mailcheck
 @dirrm share/gnome/help/gweather/zh_TW/figures
 @dirrm share/gnome/help/gweather/zh_TW
 @dirrm share/gnome/help/gweather/zh_HK/figures
@@ -1792,31 +1173,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/gtik2_applet2
 @dirrm share/gnome/help/gswitchit/C
 @dirrm share/gnome/help/gswitchit
-@dirrm share/gnome/help/gkb/zh_TW/figures
-@dirrm share/gnome/help/gkb/zh_TW
-@dirrm share/gnome/help/gkb/zh_HK/figures
-@dirrm share/gnome/help/gkb/zh_HK
-@dirrm share/gnome/help/gkb/zh_CN/figures
-@dirrm share/gnome/help/gkb/zh_CN
-@dirrm share/gnome/help/gkb/sv/figures
-@dirrm share/gnome/help/gkb/sv
-@dirrm share/gnome/help/gkb/ko/figures
-@dirrm share/gnome/help/gkb/ko
-@dirrm share/gnome/help/gkb/ja/figures
-@dirrm share/gnome/help/gkb/ja
-@dirrm share/gnome/help/gkb/it/figures
-@dirrm share/gnome/help/gkb/it
-@dirrm share/gnome/help/gkb/fr/figures
-@dirrm share/gnome/help/gkb/fr
-@dirrm share/gnome/help/gkb/eu/figures
-@dirrm share/gnome/help/gkb/eu
-@dirrm share/gnome/help/gkb/es/figures
-@dirrm share/gnome/help/gkb/es
-@dirrm share/gnome/help/gkb/de/figures
-@dirrm share/gnome/help/gkb/de
-@dirrm share/gnome/help/gkb/C/figures
-@dirrm share/gnome/help/gkb/C
-@dirrm share/gnome/help/gkb
 @dirrm share/gnome/help/geyes/zh_TW/figures
 @dirrm share/gnome/help/geyes/zh_TW
 @dirrm share/gnome/help/geyes/zh_HK/figures
@@ -1867,6 +1223,9 @@ 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/C/figures
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet/C
+%%CPUFREQ%%@dirrm share/gnome/help/cpufreq-applet
 @dirrm share/gnome/help/command-line/zh_TW/figures
 @dirrm share/gnome/help/command-line/zh_TW
 @dirrm share/gnome/help/command-line/zh_HK/figures
@@ -1917,31 +1276,6 @@ share/locale/zh_TW/LC_MESSAGES/gnome-applets-2.0.mo
 @dirrm share/gnome/help/char-palette/C/figures
 @dirrm share/gnome/help/char-palette/C
 @dirrm share/gnome/help/char-palette
-@dirrm share/gnome/help/cdplayer/zh_TW/figures
-@dirrm share/gnome/help/cdplayer/zh_TW
-@dirrm share/gnome/help/cdplayer/zh_HK/figures
-@dirrm share/gnome/help/cdplayer/zh_HK
-@dirrm share/gnome/help/cdplayer/zh_CN/figures
-@dirrm share/gnome/help/cdplayer/zh_CN
-@dirrm share/gnome/help/cdplayer/sv/figures
-@dirrm share/gnome/help/cdplayer/sv
-@dirrm share/gnome/help/cdplayer/ko/figures
-@dirrm share/gnome/help/cdplayer/ko
-@dirrm share/gnome/help/cdplayer/ja/figures
-@dirrm share/gnome/help/cdplayer/ja
-@dirrm share/gnome/help/cdplayer/it/figures
-@dirrm share/gnome/help/cdplayer/it
-@dirrm share/gnome/help/cdplayer/fr/figures
-@dirrm share/gnome/help/cdplayer/fr
-@dirrm share/gnome/help/cdplayer/eu/figures
-@dirrm share/gnome/help/cdplayer/eu
-@dirrm share/gnome/help/cdplayer/es/figures
-@dirrm share/gnome/help/cdplayer/es
-@dirrm share/gnome/help/cdplayer/de/figures
-@dirrm share/gnome/help/cdplayer/de
-@dirrm share/gnome/help/cdplayer/C/figures
-@dirrm share/gnome/help/cdplayer/C
-@dirrm share/gnome/help/cdplayer
 %%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW/figures
 %%BATTERY%%@dirrm share/gnome/help/battstat/zh_TW
 %%BATTERY%%@dirrm share/gnome/help/battstat/zh_HK/figures
@@ -1972,16 +1306,14 @@ 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/gweather
-@dirrm share/gnome/gswitchit
-@dirrm share/gnome/gkb
-@dirrm share/gnome/geyes/Horrid
-@dirrm share/gnome/geyes/Default-tiny
-@dirrm share/gnome/geyes/Default
-@dirrm share/gnome/geyes/Bloodshot
-@dirrm share/gnome/geyes/Bizarre
-@dirrm share/gnome/geyes
-@dirrm share/gnome/gen_util
-%%BATTERY%%@dirrm share/gnome/battstat_applet
+@dirrm share/gnome/gnome-applets/gweather
+@dirrm share/gnome/gnome-applets/glade
+@dirrm share/gnome/gnome-applets/geyes/Horrid
+@dirrm share/gnome/gnome-applets/geyes/Default
+@dirrm share/gnome/gnome-applets/geyes/Default-tiny
+@dirrm share/gnome/gnome-applets/geyes/Bloodshot
+@dirrm share/gnome/gnome-applets/geyes/Bizarre
+@dirrm share/gnome/gnome-applets/geyes
+@dirrm share/gnome/gnome-applets
 @dirrm libexec/gnome-applets
 @dirrm include/libgswitchit