Presenting GNOME 2.10 for FreeBSD!

The release notes can be found at http://www.gnome.org/start/2.10/notes/rnwhatsnew.html, and will give you a good idea of what has gone into this release overall. However, a lot of FreeBSD specific additions and fixes have been made. For example, this release offers fixed ACPI support as well as new CPU freqeuncy monitoring support. See the FreeBSD GNOME 2.10 upgrade page at http://www.FreeBSD.org/gnome/docs/faq210.html for the entire list as well as a list of known issues and upgrade instructions. GNOME 2.10, as well as all of our releases, would not be possible without the great team that goes into porting and testign each and every component. Thanks definitely goes out to ahze, adamw, bland, kwm, mezz, and pav for all their work. We would also like to thank our adventurous users that chose to ride the walrus. We'd especially like to thank the following users that provided patches for GNOME 2.10: ade Yasuda Keisuke Franz Klammer Khairil Yusof Radek Kozlowsk And anyone else I may have accidentally omitted. As with GNOME 2.8, 2.10 comes with a brand-spankin' new splashscreen courtesy of Franz Klammer. However, unlike GNOME 2.8, we've included all of the FreeBSD GNOME splashscreen entries with gnomesession. You can use the deskutils/splashsetter port to choose the one you like best. As always, GNOME users should _not_ use portupgrade alone to upgrade to 2.10. Instead, get the gnome_upgrade.sh script from http://www.FreeBSD.org/gnome/gnome_upgrade.sh. Enjoy!
author: marcus <marcus@FreeBSD.org> 2005-03-12 18:39:38 +0800
committer: marcus <marcus@FreeBSD.org> 2005-03-12 18:39:38 +0800
commit: 0b42143dea1a55d0f1f6d09704bbc131e1b633ed (patch)
tree: bc54902eb18f738e45a91362b2b0faf1ec6d04fa /x11
parent: 773c9ca4ac44ac67652d01f1e985e4df8dab5301 (diff)
download: freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.tar.gz
freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.tar.zst
freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.zip
102 files changed, 4022 insertions, 4066 deletions
diff --git a/x11/Makefile b/x11/Makefile
index e23e3f15c3b2..3b1004b8f87d 100644
--- a/x11/Makefile
+++ b/x11/Makefile
@@ -59,6 +59,7 @@
     SUBDIR += gmessage
     SUBDIR += gmrun
     SUBDIR += gnome-clipboard-daemon
+    SUBDIR += gnome-menus
     SUBDIR += gnome-swallow
     SUBDIR += gnome2
     SUBDIR += gnome2-fifth-toe
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
diff --git a/x11/gnome-desktop/Makefile b/x11/gnome-desktop/Makefile
index dd0d8e759343..e9e4262d4141 100644
--- a/x11/gnome-desktop/Makefile
+++ b/x11/gnome-desktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.10
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
diff --git a/x11/gnome-desktop/distinfo b/x11/gnome-desktop/distinfo
index 5cddabf936c5..91296a8ac2b4 100644
--- a/x11/gnome-desktop/distinfo
+++ b/x11/gnome-desktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.8.3.tar.bz2) = 607f8689f931336ad9a1f3f41d98a9c7
-SIZE (gnome2/gnome-desktop-2.8.3.tar.bz2) = 1142079
+MD5 (gnome2/gnome-desktop-2.10.0.tar.bz2) = 62edee01c309cb1b049ceaa801d415cc
+SIZE (gnome2/gnome-desktop-2.10.0.tar.bz2) = 1102509
diff --git a/x11/gnome-desktop/pkg-plist b/x11/gnome-desktop/pkg-plist
index d1cb33594f24..77b705c7d400 100644
--- a/x11/gnome-desktop/pkg-plist
+++ b/x11/gnome-desktop/pkg-plist
@@ -4,8 +4,9 @@ include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
 include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
 lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.3
+lib/libgnome-desktop-2.so.4
 libdata/pkgconfig/gnome-desktop-2.0.pc
+share/gnome/applications/gnome-about.desktop
 share/gnome/gnome-about/gnome-64.gif
 share/gnome/gnome-about/gnome-version.xml
 share/gnome/gnome-about/headers/header-bg-ancient01a.png
@@ -33,12 +34,10 @@ share/gnome/omf/gnome-desktop/gpl-C.omf
 share/gnome/omf/gnome-desktop/gpl-eu.omf
 share/gnome/omf/gnome-desktop/lgpl-C.omf
 share/gnome/omf/gnome-desktop/lgpl-eu.omf
-share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/gnome-aorta.png
 share/gnome/pixmaps/gnome-applets.png
-share/gnome/pixmaps/gnome-applications.png
 share/gnome/pixmaps/gnome-background-image.png
 share/gnome/pixmaps/gnome-background-pattern.png
 share/gnome/pixmaps/gnome-background.png
@@ -61,7 +60,6 @@ share/gnome/pixmaps/gnome-debian.png
 share/gnome/pixmaps/gnome-diskfree.png
 share/gnome/pixmaps/gnome-emacs.png
 share/gnome/pixmaps/gnome-eterm.png
-share/gnome/pixmaps/gnome-favorites.png
 share/gnome/pixmaps/gnome-file-c.png
 share/gnome/pixmaps/gnome-file-h.png
 share/gnome/pixmaps/gnome-folder.png
@@ -80,19 +78,13 @@ share/gnome/pixmaps/gnome-log.png
 share/gnome/pixmaps/gnome-logo-icon-transparent.png
 share/gnome/pixmaps/gnome-logo-icon.png
 share/gnome/pixmaps/gnome-logo-large.png
-share/gnome/pixmaps/gnome-mailcheck.png
 share/gnome/pixmaps/gnome-mdi.png
 share/gnome/pixmaps/gnome-mnemonic.png
-share/gnome/pixmaps/gnome-modem.png
-share/gnome/pixmaps/gnome-money.png
-share/gnome/pixmaps/gnome-monitor.png
 share/gnome/pixmaps/gnome-month.png
 share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-networktool.png
 share/gnome/pixmaps/gnome-news.png
 share/gnome/pixmaps/gnome-note.png
 share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
 share/gnome/pixmaps/gnome-spider.png
 share/gnome/pixmaps/gnome-squeak.png
@@ -106,7 +98,6 @@ share/gnome/pixmaps/gnome-term.png
 share/gnome/pixmaps/gnome-tigert.png
 share/gnome/pixmaps/gnome-touristinfo.png
 share/gnome/pixmaps/gnome-user-interface.png
-share/gnome/pixmaps/gnome-util.png
 share/gnome/pixmaps/gnome-week.png
 share/gnome/pixmaps/gnome-windows.png
 share/gnome/pixmaps/gnome-word.png
@@ -114,21 +105,8 @@ share/gnome/pixmaps/gnome-workspace.png
 share/gnome/pixmaps/gnome-xterm.png
 share/gnome/pixmaps/gtkvim.png
 share/gnome/pixmaps/kterm.xpm
-share/gnome/pixmaps/launcher-program.png
 share/gnome/pixmaps/monitor.png
 share/gnome/pixmaps/vnterm.xpm
-share/gnome/vfolders/Accessories.directory
-share/gnome/vfolders/Applications.directory
-share/gnome/vfolders/Development.directory
-share/gnome/vfolders/Games.directory
-share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Internet.directory
-share/gnome/vfolders/Multimedia.directory
-share/gnome/vfolders/Office.directory
-share/gnome/vfolders/Other.directory
-share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/System.directory
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -200,17 +178,14 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/yo 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 2> /dev/null || true
 @dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/gpl/eu
diff --git a/x11/gnome-menus/Makefile b/x11/gnome-menus/Makefile
new file mode 100644
index 000000000000..244555afbf3e
--- /dev/null
+++ b/x11/gnome-menus/Makefile
@@ -0,0 +1,39 @@
+# New ports collection makefile for:	gnome-menus
+# Date created:				30 November 2004
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	gnome-menus
+PORTVERSION=	2.10.0
+CATEGORIES=	x11 gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Implementation of the FreeDesktop Desktop Menu Spec
+
+USE_BZIP2=	yes
+USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
+USE_GMAKE=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomevfs2
+USE_LIBTOOL_VER=15
+INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|/usr/share/gnome|${X11BASE}/share/gnome|g' \
+		${WRKSRC}/layout/applications.menu \
+		${WRKSRC}/layout/settings.menu
+	@${SED} -e 's|/usr/local|${LOCALBASE}|g' \
+		< ${FILESDIR}/KDE.directory > ${WRKSRC}/KDE.directory
+
+post-install:
+	@${MKDIR} ${PREFIX}/share/gnome/desktop-directories
+	@${INSTALL_DATA} ${WRKSRC}/KDE.directory ${PREFIX}/share/gnome/desktop-directories
+
+.include <bsd.port.mk>
diff --git a/x11/gnome-menus/distinfo b/x11/gnome-menus/distinfo
new file mode 100644
index 000000000000..cf1ecb322ffe
--- /dev/null
+++ b/x11/gnome-menus/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/gnome-menus-2.10.0.tar.bz2) = 7c0776f79dcd08de97de2b6f9c17c830
+SIZE (gnome2/gnome-menus-2.10.0.tar.bz2) = 337595
diff --git a/x11/gnome-menus/files/KDE.directory b/x11/gnome-menus/files/KDE.directory
new file mode 100644
index 000000000000..032126bb99db
--- /dev/null
+++ b/x11/gnome-menus/files/KDE.directory
@@ -0,0 +1,5 @@
+[Desktop Entry]
+Name=KDE
+Comment=Some comment about KDE menu
+Icon=/usr/local/share/icons/kdeclassic/48x48/apps/kmenu.png
+Type=Directory
diff --git a/x11/gnome-menus/files/patch-layout::applications.menu b/x11/gnome-menus/files/patch-layout::applications.menu
new file mode 100644
index 000000000000..6f8b1fb5ae81
--- /dev/null
+++ b/x11/gnome-menus/files/patch-layout::applications.menu
@@ -0,0 +1,349 @@
+--- layout/applications.menu.orig	Fri Jan 14 14:17:53 2005
++++ layout/applications.menu	Tue Mar  1 01:28:57 2005
+@@ -15,15 +15,18 @@
+   <DefaultAppDirs/>
+   <DefaultDirectoryDirs/>
+ 
+-  <!-- Read in overrides and child menus from applications-merged/ -->
+-  <DefaultMergeDirs/>
+-
+   <!-- Accessories submenu -->
+   <Menu>
+     <Name>Accessories</Name>
+     <Directory>Accessories.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Utility</Category>
+         <Not>
+           <Category>System</Category>
+@@ -38,6 +41,12 @@
+     <Directory>Accessibility.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Accessibility</Category>
+         <Not>
+           <Category>Settings</Category>
+@@ -52,6 +61,12 @@
+     <Directory>Development.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Development</Category>
+       </And>
+       <Filename>emacs.desktop</Filename>
+@@ -64,6 +79,12 @@
+     <Directory>Edutainment.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Education</Category>
+       </And>
+     </Include>
+@@ -75,6 +96,12 @@
+     <Directory>Games.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Game</Category>
+       </And>
+     </Include>
+@@ -86,6 +113,12 @@
+     <Directory>Graphics.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Graphics</Category>
+       </And>
+     </Include>
+@@ -97,6 +130,12 @@
+     <Directory>Internet.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Network</Category>
+       </And>
+     </Include>
+@@ -108,6 +147,12 @@
+     <Directory>Multimedia.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>AudioVideo</Category>
+       </And>
+     </Include>
+@@ -119,6 +164,12 @@
+     <Directory>Office.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Office</Category>
+       </And>
+     </Include>
+@@ -130,6 +181,12 @@
+     <Directory>System-Tools.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>System</Category>
+         <Not><Category>Settings</Category></Not>
+       </And>
+@@ -143,11 +200,207 @@
+     <OnlyUnallocated/>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Application</Category>
+         <Not><Category>Core</Category></Not>
+         <Not><Category>Settings</Category></Not>
+       </And>
+     </Include>
+   </Menu> <!-- End Other -->
++
++  <!-- Read in overrides and child menus from applications-merged/ -->
++  <DefaultMergeDirs/>
++
++  <!-- KDE -->
++  <Menu>
++    <Name>KDE</Name>
++    <Directory>KDE.directory</Directory>
++
++    <!-- KAccessories submenu -->
++    <Menu>
++      <Name>Accessories</Name>
++      <Directory>Accessories.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Utility</Category>
++          <Not>
++            <Category>System</Category>
++          </Not>
++        </And>
++      </Include>
++    </Menu> <!-- End KAccessories -->
++
++    <!-- KAccessibility submenu -->
++    <Menu>
++      <Name>Accessibility</Name>
++      <Directory>Accessibility.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Accessibility</Category>
++          <Not>
++            <Category>Settings</Category>
++          </Not>
++        </And>
++      </Include>
++    </Menu> <!-- End KAccessibility -->
++
++    <!-- KDevelopment Tools -->
++    <Menu>
++      <Name>Development</Name>
++      <Directory>Development.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Development</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KDevelopment Tools -->
++
++    <!-- KEdutainment -->
++    <Menu>
++      <Name>Edutainment</Name>
++      <Directory>Edutainment.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Education</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KEdutainment -->
++
++    <!-- KGames -->
++    <Menu>
++      <Name>Games</Name>
++      <Directory>Games.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Game</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KGames -->
++
++    <!-- KGraphics -->
++    <Menu>
++      <Name>Graphics</Name>
++      <Directory>Graphics.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Graphics</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KGraphics -->
++
++    <!-- KInternet -->
++    <Menu>
++      <Name>Internet</Name>
++      <Directory>Internet.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Network</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KInternet -->
++
++    <!-- KMultimedia -->
++    <Menu>
++      <Name>Multimedia</Name>
++      <Directory>Multimedia.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>AudioVideo</Category>
++        </And>
++      </Include>
++    </Menu> <!-- End KMultimedia -->
++
++    <!-- KOffice -->
++    <Menu>
++      <Name>Office</Name>
++      <Directory>Office.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Or>
++            <Category>Office</Category>
++            <Category>Spreadsheet</Category>
++            <Category>WordProcessor</Category>
++            <Category>Calendar</Category>
++            <Category>ProjectManagement</Category>
++          </Or>
++        </And>
++      </Include>
++    </Menu><!-- End KOffice -->
++
++    <!-- KSystem Tools-->
++    <Menu>
++      <Name>System</Name>
++      <Directory>System-Tools.directory</Directory>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>System</Category>
++          <Not><Category>Settings</Category></Not>
++        </And>
++      </Include>
++    </Menu>   <!-- End KSystem Tools -->
++
++    <!-- KOther -->
++    <Menu>
++      <Name>Other</Name>
++      <Directory>Other.directory</Directory>
++      <OnlyUnallocated/>
++      <Include>
++        <And>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++          <Category>Application</Category>
++          <Not><Category>Core</Category></Not>
++          <Not><Category>Settings</Category></Not>
++        </And>
++      </Include>
++    </Menu> <!-- End KOther -->
++  </Menu> <!-- KDE -->
+ 
+ </Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-layout::preferences.menu b/x11/gnome-menus/files/patch-layout::preferences.menu
new file mode 100644
index 000000000000..fef1dc0dca96
--- /dev/null
+++ b/x11/gnome-menus/files/patch-layout::preferences.menu
@@ -0,0 +1,41 @@
+--- layout/preferences.menu.orig	Sat Dec 11 07:58:50 2004
++++ layout/preferences.menu	Tue Mar  1 01:28:57 2005
+@@ -9,12 +9,15 @@
+   <DefaultAppDirs/>
+   <DefaultDirectoryDirs/>
+ 
+-  <!-- Read in overrides and child menus from preferences-merged/ -->
+-  <DefaultMergeDirs/>
+-
+   <!-- Stuff in the toplevel -->
+   <Include>
+     <And>
++      <Not>
++        <Or>
++          <Category>Qt</Category>
++          <Category>KDE</Category>
++        </Or>
++      </Not>
+       <Category>Settings</Category>
+       <Not>
+         <Or>
+@@ -36,10 +39,19 @@
+     <Directory>Settings-Accessibility.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Settings</Category>
+         <Category>Accessibility</Category>
+       </And>
+     </Include>
+   </Menu>
++
++  <!-- Read in overrides and child menus from preferences-merged/ -->
++  <DefaultMergeDirs/>
+ 
+ </Menu>     <!-- End Prefs -->
diff --git a/x11/gnome-menus/files/patch-layout::settings.menu b/x11/gnome-menus/files/patch-layout::settings.menu
new file mode 100644
index 000000000000..266678df204c
--- /dev/null
+++ b/x11/gnome-menus/files/patch-layout::settings.menu
@@ -0,0 +1,32 @@
+--- layout/settings.menu.orig	Wed Jan  5 20:12:16 2005
++++ layout/settings.menu	Tue Mar  1 01:28:57 2005
+@@ -15,9 +15,6 @@
+   <DefaultAppDirs/>
+   <DefaultDirectoryDirs/>
+ 
+-  <!-- Read in overrides and child menus from applications-merged/ -->
+-  <DefaultMergeDirs/>
+-
+   <!-- Merge in these other files as submenus -->
+   <Menu>
+     <Name>Preferences</Name>
+@@ -30,10 +27,19 @@
+     <Directory>System-Settings.directory</Directory>
+     <Include>
+       <And>
++        <Not>
++          <Or>
++            <Category>Qt</Category>
++            <Category>KDE</Category>
++          </Or>
++        </Not>
+         <Category>Settings</Category>
+         <Category>System</Category>
+       </And>
+     </Include>
+   </Menu>     <!-- End System Settings -->
++
++  <!-- Read in overrides and child menus from settings-merged/ -->
++  <DefaultMergeDirs/>
+ 
+ </Menu> <!-- End Applications -->
diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.c b/x11/gnome-menus/files/patch-libmenu::menu-tree.c
new file mode 100644
index 000000000000..9bc620214ff6
--- /dev/null
+++ b/x11/gnome-menus/files/patch-libmenu::menu-tree.c
@@ -0,0 +1,173 @@
+--- libmenu/menu-tree.c.orig	Tue Mar  1 01:24:07 2005
++++ libmenu/menu-tree.c	Tue Mar  1 01:24:17 2005
+@@ -67,6 +67,12 @@
+   gpointer            user_data;
+ } MenuTreeMonitor;
+ 
++typedef struct
++{
++  MenuTreeDirectory *directory;
++  GSList            *list;
++} MenuTreeListifyForeachData;
++
+ struct MenuTreeDirectory
+ {
+   MenuTreeDirectory *parent;
+@@ -75,6 +81,7 @@
+   char         *name;
+ 
+   GSList *entries;
++  GSList *excluded_entries;
+   GSList *subdirs;
+ 
+   guint refcount : 24;
+@@ -702,17 +709,15 @@
+     }
+ }
+ 
+-GSList *
+-menu_tree_directory_get_entries (MenuTreeDirectory *directory)
++static GSList *
++copy_and_ref_entry_list (GSList *list)
+ {
+   GSList *retval;
+   GSList *tmp;
+ 
+-  g_return_val_if_fail (directory != NULL, NULL);
+-
+   retval = NULL;
+ 
+-  tmp = directory->entries;
++  tmp = list;
+   while (tmp != NULL)
+     {
+       retval = g_slist_prepend (retval,
+@@ -725,6 +730,22 @@
+ }
+ 
+ GSList *
++menu_tree_directory_get_entries (MenuTreeDirectory *directory)
++{
++  g_return_val_if_fail (directory != NULL, NULL);
++
++  return copy_and_ref_entry_list (directory->entries);
++}
++
++GSList *
++menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory)
++{
++  g_return_val_if_fail (directory != NULL, NULL);
++
++  return copy_and_ref_entry_list (directory->excluded_entries);
++}
++
++GSList *
+ menu_tree_directory_get_subdirs (MenuTreeDirectory *directory)
+ {
+   GSList *retval;
+@@ -891,6 +912,7 @@
+   retval->name             = g_strdup (name);
+   retval->directory_entry  = NULL;
+   retval->entries          = NULL;
++  retval->excluded_entries = NULL;
+   retval->subdirs          = NULL;
+   retval->only_unallocated = FALSE;
+   retval->refcount         = 1;
+@@ -2267,16 +2289,21 @@
+ }
+ 
+ static void
+-entries_listify_foreach (const char        *desktop_file_id,
+-                         DesktopEntry      *desktop_entry,
+-                         MenuTreeDirectory *directory)
++entries_listify_foreach (const char                 *desktop_file_id,
++                         DesktopEntry               *desktop_entry,
++                         MenuTreeListifyForeachData *foreach_data)
+ {
+   MenuTreeEntry *entry;
+ 
+-  entry = menu_tree_entry_new (directory, desktop_entry, desktop_file_id);
++  g_return_if_fail (foreach_data);
++  g_return_if_fail (foreach_data->directory);
++
++  entry = menu_tree_entry_new (foreach_data->directory,
++		  	       desktop_entry,
++			       desktop_file_id);
+ 
+-  directory->entries = g_slist_prepend (directory->entries,
+-                                        entry);
++  foreach_data->list = g_slist_prepend (foreach_data->list,
++		  			entry);
+ }
+ 
+ static MenuTreeDirectory *
+@@ -2290,11 +2317,14 @@
+   MenuLayoutNode     *layout_iter;
+   MenuTreeDirectory  *directory;
+   DesktopEntrySet    *entries;
++  DesktopEntrySet    *excluded_entries;
+   DesktopEntrySet    *allocated_set;
+   gboolean            deleted;
+   gboolean            only_unallocated;
+   GSList             *tmp;
+ 
++  MenuTreeListifyForeachData foreach_data;
++
+   g_assert (menu_layout_node_get_type (layout) == MENU_LAYOUT_NODE_MENU);
+   g_assert (menu_layout_node_menu_get_name (layout) != NULL);
+ 
+@@ -2311,6 +2341,7 @@
+   dir_dirs = menu_layout_node_menu_get_directory_dirs (layout);
+ 
+   entries = desktop_entry_set_new ();
++  excluded_entries = desktop_entry_set_new ();
+   allocated_set = desktop_entry_set_new ();
+ 
+   layout_iter = menu_layout_node_get_children (layout);
+@@ -2357,6 +2388,7 @@
+                 if (rule_set != NULL)
+                   {
+                     desktop_entry_set_union (entries, rule_set);
++                    desktop_entry_set_subtract (excluded_entries, rule_set);
+                     desktop_entry_set_union (allocated_set, rule_set);
+                     desktop_entry_set_unref (rule_set);
+                   }
+@@ -2389,6 +2421,7 @@
+                 if (rule_set != NULL)
+                   {
+                     desktop_entry_set_subtract (entries, rule_set);
++                    desktop_entry_set_union (excluded_entries, rule_set);
+                     desktop_entry_set_unref (rule_set);
+                   }
+ 
+@@ -2488,15 +2521,28 @@
+   if (deleted)
+     {
+       desktop_entry_set_unref (entries);
++      desktop_entry_set_unref (excluded_entries);
+       menu_tree_directory_unref (directory);
+       return NULL;
+     }
+ 
+-  directory->entries = NULL;
++  foreach_data.directory = directory;
++  foreach_data.list = NULL;
+   desktop_entry_set_foreach (entries,
+                              (DesktopEntrySetForeachFunc) entries_listify_foreach,
+-                             directory);
++                             &foreach_data);
+   desktop_entry_set_unref (entries);
++
++  directory->entries = foreach_data.list;
++
++  foreach_data.directory = directory;
++  foreach_data.list = NULL;
++  desktop_entry_set_foreach (excluded_entries,
++		  	     (DesktopEntrySetForeachFunc) entries_listify_foreach,
++			     &foreach_data);
++  desktop_entry_set_unref (excluded_entries);
++
++  directory->excluded_entries = foreach_data.list;
+ 
+   tmp = directory->entries;
+   while (tmp != NULL)
diff --git a/x11/gnome-menus/files/patch-libmenu::menu-tree.h b/x11/gnome-menus/files/patch-libmenu::menu-tree.h
new file mode 100644
index 000000000000..e5f5ae76691d
--- /dev/null
+++ b/x11/gnome-menus/files/patch-libmenu::menu-tree.h
@@ -0,0 +1,14 @@
+--- libmenu/menu-tree.h.orig	Wed Jan 12 15:23:52 2005
++++ libmenu/menu-tree.h	Tue Mar  1 01:24:17 2005
+@@ -44,8 +44,9 @@
+ MenuTreeDirectory *menu_tree_get_directory_from_path (MenuTree   *tree,
+ 						      const char *path);
+ 
+-GSList *menu_tree_directory_get_entries (MenuTreeDirectory *directory);
+-GSList *menu_tree_directory_get_subdirs (MenuTreeDirectory *directory);
++GSList *menu_tree_directory_get_entries          (MenuTreeDirectory *directory);
++GSList *menu_tree_directory_get_excluded_entries (MenuTreeDirectory *directory);
++GSList *menu_tree_directory_get_subdirs          (MenuTreeDirectory *directory);
+ 
+ MenuTreeDirectory *menu_tree_directory_ref   (MenuTreeDirectory *directory);
+ void               menu_tree_directory_unref (MenuTreeDirectory *directory);
diff --git a/x11/gnome-menus/pkg-descr b/x11/gnome-menus/pkg-descr
new file mode 100644
index 000000000000..3f2b7c336c7f
--- /dev/null
+++ b/x11/gnome-menus/pkg-descr
@@ -0,0 +1,12 @@
+This package is free software and is part of the
+GNOME project.
+
+The package contains an implementation of the draft "Desktop
+Menu Specification" from freedesktop.org:
+
+  http://www.freedesktop.org/Standards/menu-spec
+
+Also contained here are the GNOME menu layout configuration
+files, .directory files and assorted menu related utility programs.
+
+-- gnome-menus README
diff --git a/x11/gnome-menus/pkg-plist b/x11/gnome-menus/pkg-plist
new file mode 100644
index 000000000000..21d744dfa658
--- /dev/null
+++ b/x11/gnome-menus/pkg-plist
@@ -0,0 +1,77 @@
+bin/gnome-menu-spec-test
+etc/xdg/menus/applications.menu
+etc/xdg/menus/preferences.menu
+etc/xdg/menus/settings.menu
+include/gnome-menus/menu-tree.h
+lib/libgnome-menu.a
+lib/libgnome-menu.so
+lib/libgnome-menu.so.0
+libdata/pkgconfig/libgnome-menu.pc
+share/gnome/desktop-directories/Accessibility.directory
+share/gnome/desktop-directories/Accessories.directory
+share/gnome/desktop-directories/Applications.directory
+share/gnome/desktop-directories/Development.directory
+share/gnome/desktop-directories/Edutainment.directory
+share/gnome/desktop-directories/Games.directory
+share/gnome/desktop-directories/Graphics.directory
+share/gnome/desktop-directories/Internet.directory
+share/gnome/desktop-directories/KDE.directory
+share/gnome/desktop-directories/Multimedia.directory
+share/gnome/desktop-directories/Office.directory
+share/gnome/desktop-directories/Other.directory
+share/gnome/desktop-directories/Settings-Accessibility.directory
+share/gnome/desktop-directories/Settings.directory
+share/gnome/desktop-directories/System-Settings.directory
+share/gnome/desktop-directories/System-Tools.directory
+share/locale/ar/LC_MESSAGES/gnome-menus.mo
+share/locale/bg/LC_MESSAGES/gnome-menus.mo
+share/locale/ca/LC_MESSAGES/gnome-menus.mo
+share/locale/cs/LC_MESSAGES/gnome-menus.mo
+share/locale/cy/LC_MESSAGES/gnome-menus.mo
+share/locale/da/LC_MESSAGES/gnome-menus.mo
+share/locale/de/LC_MESSAGES/gnome-menus.mo
+share/locale/el/LC_MESSAGES/gnome-menus.mo
+share/locale/en_GB/LC_MESSAGES/gnome-menus.mo
+share/locale/en_CA/LC_MESSAGES/gnome-menus.mo
+share/locale/es/LC_MESSAGES/gnome-menus.mo
+share/locale/et/LC_MESSAGES/gnome-menus.mo
+share/locale/eu/LC_MESSAGES/gnome-menus.mo
+share/locale/fa/LC_MESSAGES/gnome-menus.mo
+share/locale/fi/LC_MESSAGES/gnome-menus.mo
+share/locale/fr/LC_MESSAGES/gnome-menus.mo
+share/locale/gu/LC_MESSAGES/gnome-menus.mo
+share/locale/hi/LC_MESSAGES/gnome-menus.mo
+share/locale/hu/LC_MESSAGES/gnome-menus.mo
+share/locale/id/LC_MESSAGES/gnome-menus.mo
+share/locale/it/LC_MESSAGES/gnome-menus.mo
+share/locale/ja/LC_MESSAGES/gnome-menus.mo
+share/locale/ko/LC_MESSAGES/gnome-menus.mo
+share/locale/lt/LC_MESSAGES/gnome-menus.mo
+share/locale/mk/LC_MESSAGES/gnome-menus.mo
+share/locale/ms/LC_MESSAGES/gnome-menus.mo
+share/locale/nb/LC_MESSAGES/gnome-menus.mo
+share/locale/ne/LC_MESSAGES/gnome-menus.mo
+share/locale/nl/LC_MESSAGES/gnome-menus.mo
+share/locale/nn/LC_MESSAGES/gnome-menus.mo
+share/locale/no/LC_MESSAGES/gnome-menus.mo
+share/locale/pa/LC_MESSAGES/gnome-menus.mo
+share/locale/pl/LC_MESSAGES/gnome-menus.mo
+share/locale/pt/LC_MESSAGES/gnome-menus.mo
+share/locale/pt_BR/LC_MESSAGES/gnome-menus.mo
+share/locale/ro/LC_MESSAGES/gnome-menus.mo
+share/locale/ru/LC_MESSAGES/gnome-menus.mo
+share/locale/sk/LC_MESSAGES/gnome-menus.mo
+share/locale/sq/LC_MESSAGES/gnome-menus.mo
+share/locale/sr/LC_MESSAGES/gnome-menus.mo
+share/locale/sr@Latn/LC_MESSAGES/gnome-menus.mo
+share/locale/sv/LC_MESSAGES/gnome-menus.mo
+share/locale/th/LC_MESSAGES/gnome-menus.mo
+share/locale/tr/LC_MESSAGES/gnome-menus.mo
+share/locale/uk/LC_MESSAGES/gnome-menus.mo
+share/locale/vi/LC_MESSAGES/gnome-menus.mo
+share/locale/zh_CN/LC_MESSAGES/gnome-menus.mo
+share/locale/zh_TW/LC_MESSAGES/gnome-menus.mo
+@dirrm share/gnome/desktop-directories
+@dirrm include/gnome-menus
+@dirrm etc/xdg/menus
+@dirrm etc/xdg
diff --git a/x11/gnome-panel/Makefile b/x11/gnome-panel/Makefile
index d28b9bf69171..effa2a92467c 100644
--- a/x11/gnome-panel/Makefile
+++ b/x11/gnome-panel/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.10
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,8 +22,8 @@ INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomedesktop \
-		libwnck
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
+		libwnck gnomemenus
 WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
@@ -33,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-panel.1
-GCONF_SCHEMAS=	clock.schemas fish.schemas gnome-panel-screenshot.schemas \
+GCONF_SCHEMAS=	clock.schemas fish.schemas \
 		panel-compatibility.schemas panel-general.schemas \
 		panel-global.schemas panel-object.schemas \
 		panel-toplevel.schemas window-list.schemas \
@@ -53,9 +54,9 @@ CONFIGURE_ARGS+=--enable-eds
 CONFIGURE_ARGS+=--disable-eds
 .endif
 
+post-patch:
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
-post-patch:
 .for po in da.po it.po zh_CN.po zh_TW.po
 	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
 .endfor
diff --git a/x11/gnome-panel/distinfo b/x11/gnome-panel/distinfo
index de09d47ea354..14d5d7ced6f6 100644
--- a/x11/gnome-panel/distinfo
+++ b/x11/gnome-panel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.8.3.tar.bz2) = d76a09c321e02c18e0fdecb86677550d
-SIZE (gnome2/gnome-panel-2.8.3.tar.bz2) = 3103815
+MD5 (gnome2/gnome-panel-2.10.0.tar.bz2) = 398e95097aeb7b8be2b6b47a0f9affe0
+SIZE (gnome2/gnome-panel-2.10.0.tar.bz2) = 3085157
diff --git a/x11/gnome-panel/pkg-plist b/x11/gnome-panel/pkg-plist
index 1c8d80f4a383..6f6a65805ea4 100644
--- a/x11/gnome-panel/pkg-plist
+++ b/x11/gnome-panel/pkg-plist
@@ -1,19 +1,18 @@
 bin/gnome-desktop-item-edit
 bin/gnome-panel
-bin/gnome-panel-screenshot
 bin/panel-test-applets
-@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
+@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 etc/gconf/schemas/panel-default-setup.entries
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
-@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
+@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
 include/panel-2.0/GNOME_Panel.h
 include/panel-2.0/panel-applet-enums.h
 include/panel-2.0/panel-applet-gconf.h
 include/panel-2.0/panel-applet.h
 lib/libpanel-applet-2.a
 lib/libpanel-applet-2.so
-lib/libpanel-applet-2.so.0
+lib/libpanel-applet-2.so.1
 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server
 libdata/bonobo/servers/GNOME_FishApplet_Factory.server
 libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
@@ -50,10 +49,6 @@ share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
-share/gnome/gnome-panel/glade/fish.glade
-share/gnome/gnome-panel/glade/panel-test-applets.glade
-share/gnome/gnome-panel/glade/window-list.glade
-share/gnome/gnome-panel/glade/workspace-switcher.glade
 share/gnome/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
@@ -79,6 +74,9 @@ share/gnome/help/clock/ko/legal.xml
 share/gnome/help/clock/sv/clock.xml
 share/gnome/help/clock/sv/figures/clock_applet.png
 share/gnome/help/clock/sv/legal.xml
+share/gnome/help/clock/uk/clock.xml
+share/gnome/help/clock/uk/figures/clock_applet.png
+share/gnome/help/clock/uk/legal.xml
 share/gnome/help/clock/zh_CN/clock.xml
 share/gnome/help/clock/zh_CN/figures/clock_applet.png
 share/gnome/help/clock/zh_CN/legal.xml
@@ -115,6 +113,9 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png
 share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
 share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
 share/gnome/help/fish-applet-2/sv/legal.xml
+share/gnome/help/fish-applet-2/uk/figures/fish_applet.png
+share/gnome/help/fish-applet-2/uk/fish-applet-2.xml
+share/gnome/help/fish-applet-2/uk/legal.xml
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -161,6 +162,10 @@ share/gnome/help/window-list/sv/figures/window_list_group.png
 share/gnome/help/window-list/sv/figures/window_list_group_applet.png
 share/gnome/help/window-list/sv/legal.xml
 share/gnome/help/window-list/sv/window-list.xml
+share/gnome/help/window-list/uk/figures/window_list_applet.png
+share/gnome/help/window-list/uk/figures/window_list_group_applet.png
+share/gnome/help/window-list/uk/legal.xml
+share/gnome/help/window-list/uk/window-list.xml
 share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
 share/gnome/help/window-list/zh_CN/figures/window_list_group.png
 share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
@@ -201,6 +206,9 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/sv/legal.xml
 share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
+share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/uk/legal.xml
+share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
 share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_CN/legal.xml
@@ -218,6 +226,7 @@ share/gnome/omf/gnome-panel/clock-it.omf
 share/gnome/omf/gnome-panel/clock-ja.omf
 share/gnome/omf/gnome-panel/clock-ko.omf
 share/gnome/omf/gnome-panel/clock-sv.omf
+share/gnome/omf/gnome-panel/clock-uk.omf
 share/gnome/omf/gnome-panel/clock-zh_CN.omf
 share/gnome/omf/gnome-panel/clock-zh_TW.omf
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
@@ -228,6 +237,7 @@ share/gnome/omf/gnome-panel/fish-applet-2-it.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
 share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
+share/gnome/omf/gnome-panel/fish-applet-2-uk.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
 share/gnome/omf/gnome-panel/window-list-C.omf
@@ -238,6 +248,7 @@ share/gnome/omf/gnome-panel/window-list-it.omf
 share/gnome/omf/gnome-panel/window-list-ja.omf
 share/gnome/omf/gnome-panel/window-list-ko.omf
 share/gnome/omf/gnome-panel/window-list-sv.omf
+share/gnome/omf/gnome-panel/window-list-uk.omf
 share/gnome/omf/gnome-panel/window-list-zh_CN.omf
 share/gnome/omf/gnome-panel/window-list-zh_TW.omf
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
@@ -248,33 +259,25 @@ share/gnome/omf/gnome-panel/workspace-switcher-it.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
 share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
+share/gnome/omf/gnome-panel/workspace-switcher-uk.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
-share/gnome/panel/gnome-panel-screenshot.glade
-share/gnome/panel/panel-properties-dialog.glade
-share/gnome/panel/panel-run-dialog.glade
-share/gnome/pixmaps/cdeappmenu.png
-share/gnome/pixmaps/fish/fishanim.png
-share/gnome/pixmaps/fish/footguy.png
-share/gnome/pixmaps/fish/monkey.png
-share/gnome/pixmaps/fish/oldwanda.png
-share/gnome/pixmaps/gnome-amusements.png
-share/gnome/pixmaps/gnome-clock.png
-share/gnome/pixmaps/gnome-fish.png
-share/gnome/pixmaps/gnome-gegl.png
-share/gnome/pixmaps/gnome-gegl2-2.png
-share/gnome/pixmaps/gnome-gegl2.png
-share/gnome/pixmaps/gnome-main-menu.png
-share/gnome/pixmaps/gnome-panel-type-corner.png
-share/gnome/pixmaps/gnome-panel-type-edge.png
-share/gnome/pixmaps/gnome-panel-type-floating.png
-share/gnome/pixmaps/gnome-panel-type-menu.png
-share/gnome/pixmaps/gnome-panel-type-sliding.png
-share/gnome/pixmaps/gnome-panel.png
-share/gnome/pixmaps/gnome-run.png
-share/gnome/pixmaps/gnome-screenshot.png
-share/gnome/pixmaps/panel-drawer.png
-share/gnome/pixmaps/panel-force-quit.png
+share/gnome/panel/glade/fish.glade
+share/gnome/panel/glade/panel-properties-dialog.glade
+share/gnome/panel/glade/panel-run-dialog.glade
+share/gnome/panel/glade/panel-test-applets.glade
+share/gnome/panel/glade/window-list.glade
+share/gnome/panel/glade/workspace-switcher.glade
+share/gnome/panel/pixmaps/fishanim.png
+share/gnome/panel/pixmaps/footguy.png
+share/gnome/panel/pixmaps/gnome-gegl2-2.png
+share/gnome/panel/pixmaps/gnome-gegl2.png
+share/gnome/panel/pixmaps/monkey.png
+share/gnome/panel/pixmaps/oldwanda.png
+share/icons/hicolor/48x48/apps/gnome-fish.png
+share/icons/hicolor/48x48/apps/gnome-gegl.png
+share/icons/hicolor/48x48/apps/gnome-main-menu.png
+share/icons/hicolor/48x48/apps/panel-force-quit.png
 share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -319,6 +322,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
@@ -347,13 +351,28 @@ share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
-@dirrm share/gnome/pixmaps/fish
+@unexec /bin/rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/zu 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/yi 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/sr@ije 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/nso 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mr 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mi 2>/dev/null || /usr/bin/true
+@dirrm share/gnome/panel/pixmaps
+@dirrm share/gnome/panel/glade
 @dirrm share/gnome/omf/gnome-panel
 @dirrm share/gnome/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
 @dirrm share/gnome/help/workspace-switcher/zh_CN/figures
 @dirrm share/gnome/help/workspace-switcher/zh_CN
+@dirrm share/gnome/help/workspace-switcher/uk/figures
+@dirrm share/gnome/help/workspace-switcher/uk
 @dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
 @dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -375,6 +394,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/window-list/zh_TW
 @dirrm share/gnome/help/window-list/zh_CN/figures
 @dirrm share/gnome/help/window-list/zh_CN
+@dirrm share/gnome/help/window-list/uk/figures
+@dirrm share/gnome/help/window-list/uk
 @dirrm share/gnome/help/window-list/sv/figures
 @dirrm share/gnome/help/window-list/sv
 @dirrm share/gnome/help/window-list/ko/figures
@@ -396,6 +417,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
 @dirrm share/gnome/help/fish-applet-2/zh_CN
+@dirrm share/gnome/help/fish-applet-2/uk/figures
+@dirrm share/gnome/help/fish-applet-2/uk
 @dirrm share/gnome/help/fish-applet-2/sv/figures
 @dirrm share/gnome/help/fish-applet-2/sv
 @dirrm share/gnome/help/fish-applet-2/ko/figures
@@ -417,6 +440,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/zh_TW
 @dirrm share/gnome/help/clock/zh_CN/figures
 @dirrm share/gnome/help/clock/zh_CN
+@dirrm share/gnome/help/clock/uk/figures
+@dirrm share/gnome/help/clock/uk
 @dirrm share/gnome/help/clock/sv/figures
 @dirrm share/gnome/help/clock/sv
 @dirrm share/gnome/help/clock/ko/figures
@@ -434,7 +459,5 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
-@dirrm share/gnome/gnome-panel/glade
-@dirrm share/gnome/gnome-panel
 @dirrm share/doc/panel-applet
 @dirrm include/panel-2.0
diff --git a/x11/gnome-session/Makefile b/x11/gnome-session/Makefile
index 37f82afac725..1f48df2e0f83 100644
--- a/x11/gnome-session/Makefile
+++ b/x11/gnome-session/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://people.FreeBSD.org/~marcus/:local \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.8 \
-		    	marcus/:local
+		${MASTER_SITE_LOCAL:S/$/:local/} \
+		http://people.FreeBSD.org/~pav/:local
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.10 \
+		    	pav/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SPLASH_IMG}:local
+		${SPLASHES}:local
 DIST_SUBDIR=	gnome2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -25,11 +24,9 @@ COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-CONFIGURE_ARGS=	--with-halt-command=/sbin/shutdown \
-		--with-reboot-command=/sbin/shutdown
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
@@ -38,13 +35,19 @@ MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash28.png
+SPLASHES=	freebsd-splashes-gnome-2.10.tar
 
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
+	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
+	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
+		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \
 		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \
+		${PREFIX}/share/gnome/pixmaps/splash
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnome-session/distinfo b/x11/gnome-session/distinfo
index 8f05e97ece4c..5f305e45c84f 100644
--- a/x11/gnome-session/distinfo
+++ b/x11/gnome-session/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98
-SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921
-MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55
-SIZE (gnome2/gnome-splash28.png) = 121715
+MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff
+SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754
+MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34
+SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336
diff --git a/x11/gnome-session/files/patch-gnome-session_Makefile.in b/x11/gnome-session/files/patch-gnome-session_Makefile.in
index 2b05e8c0027e..ed0b6ac56866 100644
--- a/x11/gnome-session/files/patch-gnome-session_Makefile.in
+++ b/x11/gnome-session/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-session/Makefile.in.orig	Mon May 31 14:34:48 2004
-+++ gnome-session/Makefile.in	Mon May 31 14:34:57 2004
-@@ -153,7 +153,7 @@
- 
+--- gnome-session/Makefile.in.orig	Tue Nov 30 14:07:39 2004
++++ gnome-session/Makefile.in	Tue Nov 30 14:07:51 2004
+@@ -209,7 +209,7 @@
+ target_alias = @target_alias@
  NULL = 
  
 -defaultdir = $(datadir)/gnome
 +defaultdir = $(datadir)
  
- INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						$(DISABLE_DEPRECATED_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""		-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DRSH_COMMAND=\""$(RSH_COMMAND)\""			-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""			-DDEFAULTDIR="\"$(defaultdir)\""			-DESD_SERVER="\"$(ESD_SERVER)\""
- 
+ INCLUDES = \
+ 	$(GNOME_SESSION_CFLAGS)				\
diff --git a/x11/gnome-session/files/patch-gnome-session_logout.c b/x11/gnome-session/files/patch-gnome-session_logout.c
deleted file mode 100644
index f82aefdc7d2e..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_logout.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- gnome-session/logout.c.orig	Sun May  9 15:45:34 2004
-+++ gnome-session/logout.c	Sun May  9 15:48:29 2004
-@@ -37,12 +37,20 @@
- 
- static gchar *halt_command[] =
- {
-+#ifdef __FreeBSD__
-+  HALT_COMMAND, "-p", "now", NULL
-+#else
-   HALT_COMMAND, NULL
-+#endif
- };
- 
- static gchar *reboot_command[] =
- {
-+#ifdef __FreeBSD__
-+  REBOOT_COMMAND, "-r", "now", NULL
-+#else
-   REBOOT_COMMAND, NULL
-+#endif
- };
- 
- /* What action to take upon shutdown */
-@@ -401,8 +409,12 @@
-    */
-   s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL);
-   t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL);
-+#ifndef __FreeBSD__
-   if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) &&
-       access (halt_command[0], X_OK) == 0)
-+#else
-+  if (access (halt_command[0], X_OK) == 0)
-+#endif
-     {
-       GtkWidget *title, *spacer;
-       GtkWidget *action_vbox, *hbox;
diff --git a/x11/gnome-session/files/patch-gnome-session_manager.c b/x11/gnome-session/files/patch-gnome-session_manager.c
deleted file mode 100644
index 7e56843ac733..000000000000
--- a/x11/gnome-session/files/patch-gnome-session_manager.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-session/manager.c.orig	Tue Oct 12 14:04:26 2004
-+++ gnome-session/manager.c	Tue Oct 12 14:05:51 2004
-@@ -1042,9 +1042,10 @@
- 
-       if (interact_ping_replied)
- 	{
-+	  IceConn ice_conn;
- 	  gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
- 	  print_client (client);
--	  IceConn ice_conn = SmsGetIceConnection (client->connection);
-+	  ice_conn = SmsGetIceConnection (client->connection);
- 	  interact_ping_replied = FALSE;
- 	  IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
- 	}
diff --git a/x11/gnome-session/pkg-plist b/x11/gnome-session/pkg-plist
index 6107618a5527..999c30043083 100644
--- a/x11/gnome-session/pkg-plist
+++ b/x11/gnome-session/pkg-plist
@@ -4,10 +4,17 @@ bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
-share/gnome/control-center-2.0/capplets/session-properties.desktop
+share/gnome/applications/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
+share/gnome/pixmaps/splash/adamw.png
+share/gnome/pixmaps/splash/banana_flex.png
+share/gnome/pixmaps/splash/franco_malatacca.jpg
+share/gnome/pixmaps/splash/franz_klammer-1.png
+share/gnome/pixmaps/splash/franz_klammer-3.png
 share/gnome/pixmaps/splash/gnome-splash.png
+share/gnome/pixmaps/splash/original-gnome-splash.png
+share/gnome/pixmaps/splash/radek.png
 share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
@@ -57,6 +64,7 @@ share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
@@ -76,5 +84,7 @@ share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnome-terminal/Makefile b/x11/gnome-terminal/Makefile
index f01b7bd6507b..61b4256f05e8 100644
--- a/x11/gnome-terminal/Makefile
+++ b/x11/gnome-terminal/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.10
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -17,11 +17,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui vte
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui vte
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnome-terminal/distinfo b/x11/gnome-terminal/distinfo
index ca84bcc12c2b..bb6a1fa2132f 100644
--- a/x11/gnome-terminal/distinfo
+++ b/x11/gnome-terminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.8.2.tar.bz2) = ffa668b7301dff6ce5ad9ec4c1e11c92
-SIZE (gnome2/gnome-terminal-2.8.2.tar.bz2) = 2171397
+MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1
+SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171
diff --git a/x11/gnome-terminal/files/patch-src::terminal-screen.c b/x11/gnome-terminal/files/patch-src::terminal-screen.c
deleted file mode 100644
index aafbb3a44ce0..000000000000
--- a/x11/gnome-terminal/files/patch-src::terminal-screen.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/terminal-screen.c.orig	Thu Nov 18 12:45:11 2004
-+++ src/terminal-screen.c	Thu Nov 18 12:46:31 2004
-@@ -246,16 +246,16 @@
- #define USER      "[" USERCHARS "]+(:["PASSCHARS "]+)?"
- 
-   terminal_widget_match_add (screen->priv->term,
--      "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?"
--      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS);
-+      "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?"
-+      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS);
- 
-   terminal_widget_match_add (screen->priv->term,
--      "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?"
--      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP);
-+      "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?"
-+      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP);
- 
-   terminal_widget_match_add (screen->priv->term, 
-       
--      "\\<(mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO);
-+      "[[:<:]](mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO);
- 
-   terminal_screen_setup_dnd (screen);
-   
diff --git a/x11/gnome-terminal/pkg-plist b/x11/gnome-terminal/pkg-plist
index ca1a70673fac..22d4a5870a1e 100644
--- a/x11/gnome-terminal/pkg-plist
+++ b/x11/gnome-terminal/pkg-plist
@@ -48,6 +48,10 @@ share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
 share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
 share/gnome/help/gnome-terminal/sv/legal.xml
+share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
+share/gnome/help/gnome-terminal/uk/legal.xml
 share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
@@ -67,6 +71,7 @@ share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-uk.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
 share/gnome/pixmaps/gnome-terminal.png
@@ -109,6 +114,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
 share/locale/nb/LC_MESSAGES/gnome-terminal.mo
+share/locale/ne/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/nn/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
@@ -137,6 +143,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/zh_TW
 @dirrm share/gnome/help/gnome-terminal/zh_CN/figures
 @dirrm share/gnome/help/gnome-terminal/zh_CN
+@dirrm share/gnome/help/gnome-terminal/uk/figures
+@dirrm share/gnome/help/gnome-terminal/uk
 @dirrm share/gnome/help/gnome-terminal/sv/figures
 @dirrm share/gnome/help/gnome-terminal/sv
 @dirrm share/gnome/help/gnome-terminal/ro/figures
diff --git a/x11/gnome2-fifth-toe/Makefile b/x11/gnome2-fifth-toe/Makefile
index 74107e376ac4..7b86e41a9a61 100644
--- a/x11/gnome2-fifth-toe/Makefile
+++ b/x11/gnome2-fifth-toe/Makefile
@@ -6,7 +6,8 @@
 #
 
 PORTNAME=	gnome2-fifth-toe
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -25,24 +26,29 @@ RUN_DEPENDS=	pan:${PORTSDIR}/news/pan2 \
 		tsclient:${PORTSDIR}/net/tsclient \
 		galeon:${PORTSDIR}/www/galeon \
 		seahorse:${PORTSDIR}/security/seahorse \
-		${X11BASE}/lib/gtk-2.0/2.4.0/engines/libindustrial.so:${PORTSDIR}/x11-themes/gnome-themes-extras \
+		${X11BASE}/share/gnome/themes/Gorilla/metacity-1/metacity-theme-1.xml:${PORTSDIR}/x11-themes/gnome-themes-extras \
 		bluefish:${PORTSDIR}/www/bluefish \
 		gossip:${PORTSDIR}/net/gossip \
-		inkscape:${PORTSDIR}/graphics/inkscape \
 		straw:${PORTSDIR}/net/straw \
 		liferea:${PORTSDIR}/net/liferea \
 		gnotime:${PORTSDIR}/deskutils/gnotime \
-		sound-juicer:${PORTSDIR}/audio/sound-juicer \
 		rhythmbox:${PORTSDIR}/audio/rhythmbox \
 		jamboree:${PORTSDIR}/audio/jamboree \
-		${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data
+		${X11BASE}/share/gnome/pixmaps/glines/classic.png:${PORTSDIR}/games/gnomegames2-extra-data \
+		nautilus-sendto:${PORTSDIR}/deskutils/nautilus-sendto \
+		evince:${PORTSDIR}/graphics/evince \
+		goobox:${PORTSDIR}/audio/goobox
 
-.if !defined(PACKAGE_BUILDING) && !defined(PARALLEL_PACKAGE_BUILD)
-RUN_DEPENDS+=	totem:${PORTSDIR}/multimedia/totem
+.include <bsd.port.pre.mk>
+
+#inkscape currently needs 5.X to build. this should hopefully
+#change soon
+.if ${OSVERSION} > 500000
+RUN_DEPENDS+=	inkscape:${PORTSDIR}/graphics/inkscape
 .endif
 
 NO_BUILD=	yes
 
 do-install:	# empty
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/x11/gnome2-lite/Makefile b/x11/gnome2-lite/Makefile
index 9f9fbefc76ae..4c8b3d422f4d 100644
--- a/x11/gnome2-lite/Makefile
+++ b/x11/gnome2-lite/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 PKGNAMESUFFIX=	-lite
@@ -16,11 +16,10 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The "meta-port" of the GNOME desktop slimmed down for FreeBSD releases
 
-RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
+RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
 		eog:${PORTSDIR}/graphics/eog \
-		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		gedit:${PORTSDIR}/editors/gedit \
 		gnome-terminal:${PORTSDIR}/x11/gnometerminal \
 		gnome-session:${PORTSDIR}/x11/gnomesession \
@@ -35,9 +34,10 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		ggv:${PORTSDIR}/print/ggv \
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
-		gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \
 		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
-		gconf-editor:${PORTSDIR}/sysutils/gconf-editor
+		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
+		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
+		totem:${PORTSDIR}/multimedia/totem-gstreamer
 
 NO_BUILD=	yes
 
@@ -54,7 +54,7 @@ do-install:	# empty
 
 .include <bsd.port.pre.mk>
 
-.if ${ARCH} != "amd64" && ( ${ARCH} == "i386" || ${OSVERSION} > 500035 )
+.if ${ARCH} == "i386" || ${OSVERSION} > 500035
 RUN_DEPENDS+=	epiphany:${PORTSDIR}/www/epiphany
 .endif
 
diff --git a/x11/gnome2-power-tools/Makefile b/x11/gnome2-power-tools/Makefile
index 38c95f237a05..f0b12cc46bfc 100644
--- a/x11/gnome2-power-tools/Makefile
+++ b/x11/gnome2-power-tools/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gnome2-power-tools
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -15,7 +15,7 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	"Geektoys" for the GNOME 2 power user
 
-RUN_DEPENDS=	${X11BASE}/lib/epiphany-1.4/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
+RUN_DEPENDS=	${X11BASE}/lib/epiphany-1.6/extensions/libgesturesextension.so:${PORTSDIR}/www/epiphany-extensions \
 		gnome-pkgview:${PORTSDIR}/sysutils/gnome-pkgview \
 		${X11BASE}/libexec/quick-lounge-applet:${PORTSDIR}/misc/quick-lounge-applet \
 		${X11BASE}/libexec/netspeed_applet2:${PORTSDIR}/net/netspeed_applet \
@@ -24,8 +24,10 @@ RUN_DEPENDS=	${X11BASE}/lib/epiphany-1.4/extensions/libgesturesextension.so:${PO
 		gdesklets:${PORTSDIR}/deskutils/gdesklets \
 		cog:${PORTSDIR}/sysutils/cog \
 		gnome-blog-poster:${PORTSDIR}/deskutils/gnomeblog \
-		gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager \
-		gnomesu:${PORTSDIR}/security/libgnomesu
+		gnomesu:${PORTSDIR}/security/libgnomesu \
+		bpm:${PORTSDIR}/sysutils/bpm \
+		gnome-file-share-properties:${PORTSDIR}/www/gnome-user-share \
+		gnome-keyring-manager:${PORTSDIR}/security/gnomekeyringmanager
 
 NO_BUILD=	yes
 
diff --git a/x11/gnome2/Makefile b/x11/gnome2/Makefile
index 0ddd63d09fca..c6b6052f6d8a 100644
--- a/x11/gnome2/Makefile
+++ b/x11/gnome2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gnome2
-PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	# empty
 DISTFILES=	# empty
@@ -16,11 +15,10 @@ EXTRACT_ONLY=	# empty
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The "meta-port" for the GNOME 2 integrated X11 desktop
 
-RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
+RUN_DEPENDS=	${X11BASE}/libexec/gweather-applet-2:${PORTSDIR}/x11/gnomeapplets2 \
 		gnome-cd:${PORTSDIR}/audio/gnomemedia2 \
 	 	gnome-dictionary:${PORTSDIR}/deskutils/gnomeutils2 \
 		eog:${PORTSDIR}/graphics/eog \
-		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
 		gconf-editor:${PORTSDIR}/sysutils/gconf-editor \
 		gnect:${PORTSDIR}/games/gnomegames2 \
 		gedit:${PORTSDIR}/editors/gedit \
@@ -44,17 +42,22 @@ RUN_DEPENDS=	${X11BASE}/libexec/cdplayer_applet2:${PORTSDIR}/x11/gnomeapplets2 \
 		gcalctool:${PORTSDIR}/math/gcalctool \
 		gucharmap:${PORTSDIR}/deskutils/gucharmap \
 		zenity:${PORTSDIR}/x11/zenity \
-		gst-thumbnail:${PORTSDIR}/multimedia/nautilus-media \
 		${X11BASE}/lib/X11/fonts/bitstream-vera/Vera.ttf:${PORTSDIR}/x11-fonts/bitstream-vera \
 		gnopernicus:${PORTSDIR}/accessibility/gnopernicus \
 		${X11BASE}/libexec/gnome-netstatus-applet:${PORTSDIR}/net/gnomenetstatus \
 		dasher:${PORTSDIR}/accessibility/dasher \
-		evolution-2.0:${PORTSDIR}/mail/evolution \
+		evolution-2.2:${PORTSDIR}/mail/evolution \
 		${X11BASE}/libexec/evolution-webcal:${PORTSDIR}/www/evolution-webcal \
 		network-admin:${PORTSDIR}/sysutils/gnomesystemtools \
 		gnome-nettool:${PORTSDIR}/net/gnomenettool \
 		vino-session:${PORTSDIR}/net/vino \
-		ximian-connector-setup-2.0:${PORTSDIR}/mail/ximian-connector
+		ximian-connector-setup-2.2:${PORTSDIR}/mail/ximian-connector \
+		${X11BASE}/lib/gstreamer-0.8/.gstreamer-plugins-core.keep:${PORTSDIR}/multimedia/gstreamer-plugins-core \
+		totem:${PORTSDIR}/multimedia/totem-gstreamer \
+		gnome-control-center:${PORTSDIR}/sysutils/gnomecontrolcenter2 \
+		${X11BASE}/share/gnome/gnome-background-properties/gnome-branded.xml:${PORTSDIR}/x11-themes/gnome-backgrounds \
+		sound-juicer:${PORTSDIR}/audio/sound-juicer \
+		${X11BASE}/libdata/pkgconfig/libgtkhtml-2.0.pc:${PORTSDIR}/www/libgtkhtml
 
 NO_BUILD=	yes
 
diff --git a/x11/gnomeapplets2/Makefile b/x11/gnomeapplets2/Makefile
index ddc1e9ce7ad9..d2ee9028fc0f 100644
--- a/x11/gnomeapplets2/Makefile
+++ b/x11/gnomeapplets2/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/gnomeapplets2/distinfo b/x11/gnomeapplets2/distinfo
index 5812235d13fa..7bfa1c4099db 100644
--- a/x11/gnomeapplets2/distinfo
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-aa b/x11/gnomeapplets2/files/patch-aa
index a0025a0ad050..2a74a1ed8f2b 100644
--- a/x11/gnomeapplets2/files/patch-aa
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-ad b/x11/gnomeapplets2/files/patch-ad
deleted file mode 100644
index 5a06416a08c4..000000000000
--- a/x11/gnomeapplets2/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/gnomeapplets2/files/patch-battstat-acpi b/x11/gnomeapplets2/files/patch-battstat-acpi
index 4025a9a360f1..ebaa93f7e670 100644
--- a/x11/gnomeapplets2/files/patch-battstat-acpi
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-battstat_battstat.schemas.in b/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in
index ecaea9dab09e..a6bed2361540 100644
--- a/x11/gnomeapplets2/files/patch-battstat_battstat.schemas.in
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-cpufreq-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-freebsd
new file mode 100644
index 000000000000..48f2ebb6c5b1
--- /dev/null
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-cpufreq-selector-freebsd b/x11/gnomeapplets2/files/patch-cpufreq-selector-freebsd
new file mode 100644
index 000000000000..f577a0fed39b
--- /dev/null
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-gkb-new_presets.c b/x11/gnomeapplets2/files/patch-gkb-new_presets.c
deleted file mode 100644
index f90708170e00..000000000000
--- a/x11/gnomeapplets2/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/gnomeapplets2/files/patch-gweather_weather-iwin.c b/x11/gnomeapplets2/files/patch-gweather_weather-iwin.c
new file mode 100644
index 000000000000..14c0190b2eed
--- /dev/null
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-gweather_weather.c b/x11/gnomeapplets2/files/patch-gweather_weather.c
new file mode 100644
index 000000000000..cdc1921ab4c7
--- /dev/null
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-modemlights_Makefile.in b/x11/gnomeapplets2/files/patch-modemlights_Makefile.in
new file mode 100644
index 000000000000..874884722127
--- /dev/null
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-modemlights_modem-applet.c b/x11/gnomeapplets2/files/patch-modemlights_modem-applet.c
new file mode 100644
index 000000000000..f4fb13717732
--- /dev/null
+++ b/x11/gnomeapplets2/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/gnomeapplets2/files/patch-wireless_wireless-applet.c b/x11/gnomeapplets2/files/patch-wireless_wireless-applet.c
deleted file mode 100644
index 636b36b21cb9..000000000000
--- a/x11/gnomeapplets2/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/gnomeapplets2/pkg-plist b/x11/gnomeapplets2/pkg-plist
index e3410d50878c..0f24cdc75ecc 100644
--- a/x11/gnomeapplets2/pkg-plist
+++ b/x11/gnomeapplets2/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
diff --git a/x11/gnomedesktop/Makefile b/x11/gnomedesktop/Makefile
index dd0d8e759343..e9e4262d4141 100644
--- a/x11/gnomedesktop/Makefile
+++ b/x11/gnomedesktop/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomedesktop
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-desktop/2.10
 DISTNAME=	gnome-desktop-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -20,7 +20,7 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
 USE_BISON=	yes
diff --git a/x11/gnomedesktop/distinfo b/x11/gnomedesktop/distinfo
index 5cddabf936c5..91296a8ac2b4 100644
--- a/x11/gnomedesktop/distinfo
+++ b/x11/gnomedesktop/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-desktop-2.8.3.tar.bz2) = 607f8689f931336ad9a1f3f41d98a9c7
-SIZE (gnome2/gnome-desktop-2.8.3.tar.bz2) = 1142079
+MD5 (gnome2/gnome-desktop-2.10.0.tar.bz2) = 62edee01c309cb1b049ceaa801d415cc
+SIZE (gnome2/gnome-desktop-2.10.0.tar.bz2) = 1102509
diff --git a/x11/gnomedesktop/pkg-plist b/x11/gnomedesktop/pkg-plist
index d1cb33594f24..77b705c7d400 100644
--- a/x11/gnomedesktop/pkg-plist
+++ b/x11/gnomedesktop/pkg-plist
@@ -4,8 +4,9 @@ include/gnome-desktop-2.0/libgnomeui/gnome-ditem-edit.h
 include/gnome-desktop-2.0/libgnomeui/gnome-hint.h
 lib/libgnome-desktop-2.a
 lib/libgnome-desktop-2.so
-lib/libgnome-desktop-2.so.3
+lib/libgnome-desktop-2.so.4
 libdata/pkgconfig/gnome-desktop-2.0.pc
+share/gnome/applications/gnome-about.desktop
 share/gnome/gnome-about/gnome-64.gif
 share/gnome/gnome-about/gnome-version.xml
 share/gnome/gnome-about/headers/header-bg-ancient01a.png
@@ -33,12 +34,10 @@ share/gnome/omf/gnome-desktop/gpl-C.omf
 share/gnome/omf/gnome-desktop/gpl-eu.omf
 share/gnome/omf/gnome-desktop/lgpl-C.omf
 share/gnome/omf/gnome-desktop/lgpl-eu.omf
-share/gnome/pixmaps/advanced-directory.png
 share/gnome/pixmaps/apple-green.png
 share/gnome/pixmaps/apple-red.png
 share/gnome/pixmaps/gnome-aorta.png
 share/gnome/pixmaps/gnome-applets.png
-share/gnome/pixmaps/gnome-applications.png
 share/gnome/pixmaps/gnome-background-image.png
 share/gnome/pixmaps/gnome-background-pattern.png
 share/gnome/pixmaps/gnome-background.png
@@ -61,7 +60,6 @@ share/gnome/pixmaps/gnome-debian.png
 share/gnome/pixmaps/gnome-diskfree.png
 share/gnome/pixmaps/gnome-emacs.png
 share/gnome/pixmaps/gnome-eterm.png
-share/gnome/pixmaps/gnome-favorites.png
 share/gnome/pixmaps/gnome-file-c.png
 share/gnome/pixmaps/gnome-file-h.png
 share/gnome/pixmaps/gnome-folder.png
@@ -80,19 +78,13 @@ share/gnome/pixmaps/gnome-log.png
 share/gnome/pixmaps/gnome-logo-icon-transparent.png
 share/gnome/pixmaps/gnome-logo-icon.png
 share/gnome/pixmaps/gnome-logo-large.png
-share/gnome/pixmaps/gnome-mailcheck.png
 share/gnome/pixmaps/gnome-mdi.png
 share/gnome/pixmaps/gnome-mnemonic.png
-share/gnome/pixmaps/gnome-modem.png
-share/gnome/pixmaps/gnome-money.png
-share/gnome/pixmaps/gnome-monitor.png
 share/gnome/pixmaps/gnome-month.png
 share/gnome/pixmaps/gnome-mouse.png
-share/gnome/pixmaps/gnome-networktool.png
 share/gnome/pixmaps/gnome-news.png
 share/gnome/pixmaps/gnome-note.png
 share/gnome/pixmaps/gnome-qeye.png
-share/gnome/pixmaps/gnome-session.png
 share/gnome/pixmaps/gnome-set-time.png
 share/gnome/pixmaps/gnome-spider.png
 share/gnome/pixmaps/gnome-squeak.png
@@ -106,7 +98,6 @@ share/gnome/pixmaps/gnome-term.png
 share/gnome/pixmaps/gnome-tigert.png
 share/gnome/pixmaps/gnome-touristinfo.png
 share/gnome/pixmaps/gnome-user-interface.png
-share/gnome/pixmaps/gnome-util.png
 share/gnome/pixmaps/gnome-week.png
 share/gnome/pixmaps/gnome-windows.png
 share/gnome/pixmaps/gnome-word.png
@@ -114,21 +105,8 @@ share/gnome/pixmaps/gnome-workspace.png
 share/gnome/pixmaps/gnome-xterm.png
 share/gnome/pixmaps/gtkvim.png
 share/gnome/pixmaps/kterm.xpm
-share/gnome/pixmaps/launcher-program.png
 share/gnome/pixmaps/monitor.png
 share/gnome/pixmaps/vnterm.xpm
-share/gnome/vfolders/Accessories.directory
-share/gnome/vfolders/Applications.directory
-share/gnome/vfolders/Development.directory
-share/gnome/vfolders/Games.directory
-share/gnome/vfolders/Graphics.directory
-share/gnome/vfolders/Internet.directory
-share/gnome/vfolders/Multimedia.directory
-share/gnome/vfolders/Office.directory
-share/gnome/vfolders/Other.directory
-share/gnome/vfolders/Root.directory
-share/gnome/vfolders/Settings.directory
-share/gnome/vfolders/System.directory
 share/locale/af/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-desktop-2.0.mo
@@ -200,17 +178,14 @@ share/locale/tr/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-desktop-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yi/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/yo/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-desktop-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-desktop-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec rmdir %D/share/locale/yo/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/yo 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/nso 2> /dev/null || true
 @dirrm share/gnome/omf/gnome-desktop
 @dirrm share/gnome/help/lgpl/eu
 @dirrm share/gnome/help/gpl/eu
diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index d28b9bf69171..effa2a92467c 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -6,10 +6,11 @@
 #
 
 PORTNAME=	gnomepanel
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
+PORTREVISION=	1
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-panel/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-panel/2.10
 DISTNAME=	gnome-panel-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -21,8 +22,8 @@ INSTALLS_OMF=	yes
 INSTALLS_SHLIB=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack gnomedesktop \
-		libwnck
+USE_GNOME=	gnomeprefix gnomehack intlhack gnomedesktop \
+		libwnck gnomemenus
 WANT_GNOME=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GMAKE=	yes
@@ -33,7 +34,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gnome-panel.1
-GCONF_SCHEMAS=	clock.schemas fish.schemas gnome-panel-screenshot.schemas \
+GCONF_SCHEMAS=	clock.schemas fish.schemas \
 		panel-compatibility.schemas panel-general.schemas \
 		panel-global.schemas panel-object.schemas \
 		panel-toplevel.schemas window-list.schemas \
@@ -53,9 +54,9 @@ CONFIGURE_ARGS+=--enable-eds
 CONFIGURE_ARGS+=--disable-eds
 .endif
 
+post-patch:
 .if ( ${OSVERSION} > 600000 && ${OSVERSION} < 600006 ) || \
 	( ${OSVERSION} < 503101 )
-post-patch:
 .for po in da.po it.po zh_CN.po zh_TW.po
 	@${REINPLACE_CMD} -e 's|%-|%|g' ${WRKSRC}/po/${po}
 .endfor
diff --git a/x11/gnomepanel/distinfo b/x11/gnomepanel/distinfo
index de09d47ea354..14d5d7ced6f6 100644
--- a/x11/gnomepanel/distinfo
+++ b/x11/gnomepanel/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-panel-2.8.3.tar.bz2) = d76a09c321e02c18e0fdecb86677550d
-SIZE (gnome2/gnome-panel-2.8.3.tar.bz2) = 3103815
+MD5 (gnome2/gnome-panel-2.10.0.tar.bz2) = 398e95097aeb7b8be2b6b47a0f9affe0
+SIZE (gnome2/gnome-panel-2.10.0.tar.bz2) = 3085157
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 1c8d80f4a383..6f6a65805ea4 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -1,19 +1,18 @@
 bin/gnome-desktop-item-edit
 bin/gnome-panel
-bin/gnome-panel-screenshot
 bin/panel-test-applets
-@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
+@unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
 @unexec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --unload %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
 etc/gconf/schemas/panel-default-setup.entries
 @exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries > /dev/null || /usr/bin/true
-@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel/profiles/default > /dev/null || /usr/bin/true
+@exec gconftool-2 --direct --config-source=xml::%D/etc/gconf/gconf.xml.defaults --load %D/etc/gconf/schemas/panel-default-setup.entries /apps/panel > /dev/null || /usr/bin/true
 include/panel-2.0/GNOME_Panel.h
 include/panel-2.0/panel-applet-enums.h
 include/panel-2.0/panel-applet-gconf.h
 include/panel-2.0/panel-applet.h
 lib/libpanel-applet-2.a
 lib/libpanel-applet-2.so
-lib/libpanel-applet-2.so.0
+lib/libpanel-applet-2.so.1
 libdata/bonobo/servers/GNOME_ClockApplet_Factory.server
 libdata/bonobo/servers/GNOME_FishApplet_Factory.server
 libdata/bonobo/servers/GNOME_NotificationAreaApplet.server
@@ -50,10 +49,6 @@ share/gnome/gnome-2.0/ui/GNOME_ShowDesktopApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WindowListApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WindowMenuApplet.xml
 share/gnome/gnome-2.0/ui/GNOME_WorkspaceSwitcherApplet.xml
-share/gnome/gnome-panel/glade/fish.glade
-share/gnome/gnome-panel/glade/panel-test-applets.glade
-share/gnome/gnome-panel/glade/window-list.glade
-share/gnome/gnome-panel/glade/workspace-switcher.glade
 share/gnome/gnome-panelrc
 share/gnome/help/clock/C/clock.xml
 share/gnome/help/clock/C/figures/clock_applet.png
@@ -79,6 +74,9 @@ share/gnome/help/clock/ko/legal.xml
 share/gnome/help/clock/sv/clock.xml
 share/gnome/help/clock/sv/figures/clock_applet.png
 share/gnome/help/clock/sv/legal.xml
+share/gnome/help/clock/uk/clock.xml
+share/gnome/help/clock/uk/figures/clock_applet.png
+share/gnome/help/clock/uk/legal.xml
 share/gnome/help/clock/zh_CN/clock.xml
 share/gnome/help/clock/zh_CN/figures/clock_applet.png
 share/gnome/help/clock/zh_CN/legal.xml
@@ -115,6 +113,9 @@ share/gnome/help/fish-applet-2/sv/figures/fish_applet.png
 share/gnome/help/fish-applet-2/sv/figures/fish_settings.png
 share/gnome/help/fish-applet-2/sv/fish-applet-2.xml
 share/gnome/help/fish-applet-2/sv/legal.xml
+share/gnome/help/fish-applet-2/uk/figures/fish_applet.png
+share/gnome/help/fish-applet-2/uk/fish-applet-2.xml
+share/gnome/help/fish-applet-2/uk/legal.xml
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_applet.png
 share/gnome/help/fish-applet-2/zh_CN/figures/fish_settings.png
 share/gnome/help/fish-applet-2/zh_CN/fish-applet-2.xml
@@ -161,6 +162,10 @@ share/gnome/help/window-list/sv/figures/window_list_group.png
 share/gnome/help/window-list/sv/figures/window_list_group_applet.png
 share/gnome/help/window-list/sv/legal.xml
 share/gnome/help/window-list/sv/window-list.xml
+share/gnome/help/window-list/uk/figures/window_list_applet.png
+share/gnome/help/window-list/uk/figures/window_list_group_applet.png
+share/gnome/help/window-list/uk/legal.xml
+share/gnome/help/window-list/uk/window-list.xml
 share/gnome/help/window-list/zh_CN/figures/window_list_applet.png
 share/gnome/help/window-list/zh_CN/figures/window_list_group.png
 share/gnome/help/window-list/zh_CN/figures/window_list_group_applet.png
@@ -201,6 +206,9 @@ share/gnome/help/workspace-switcher/sv/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/sv/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/sv/legal.xml
 share/gnome/help/workspace-switcher/sv/workspace-switcher.xml
+share/gnome/help/workspace-switcher/uk/figures/workspace_switcher_applet.png
+share/gnome/help/workspace-switcher/uk/legal.xml
+share/gnome/help/workspace-switcher/uk/workspace-switcher.xml
 share/gnome/help/workspace-switcher/zh_CN/figures/workspace_switcher_applet.png
 share/gnome/help/workspace-switcher/zh_CN/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_CN/legal.xml
@@ -218,6 +226,7 @@ share/gnome/omf/gnome-panel/clock-it.omf
 share/gnome/omf/gnome-panel/clock-ja.omf
 share/gnome/omf/gnome-panel/clock-ko.omf
 share/gnome/omf/gnome-panel/clock-sv.omf
+share/gnome/omf/gnome-panel/clock-uk.omf
 share/gnome/omf/gnome-panel/clock-zh_CN.omf
 share/gnome/omf/gnome-panel/clock-zh_TW.omf
 share/gnome/omf/gnome-panel/fish-applet-2-C.omf
@@ -228,6 +237,7 @@ share/gnome/omf/gnome-panel/fish-applet-2-it.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ja.omf
 share/gnome/omf/gnome-panel/fish-applet-2-ko.omf
 share/gnome/omf/gnome-panel/fish-applet-2-sv.omf
+share/gnome/omf/gnome-panel/fish-applet-2-uk.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_CN.omf
 share/gnome/omf/gnome-panel/fish-applet-2-zh_TW.omf
 share/gnome/omf/gnome-panel/window-list-C.omf
@@ -238,6 +248,7 @@ share/gnome/omf/gnome-panel/window-list-it.omf
 share/gnome/omf/gnome-panel/window-list-ja.omf
 share/gnome/omf/gnome-panel/window-list-ko.omf
 share/gnome/omf/gnome-panel/window-list-sv.omf
+share/gnome/omf/gnome-panel/window-list-uk.omf
 share/gnome/omf/gnome-panel/window-list-zh_CN.omf
 share/gnome/omf/gnome-panel/window-list-zh_TW.omf
 share/gnome/omf/gnome-panel/workspace-switcher-C.omf
@@ -248,33 +259,25 @@ share/gnome/omf/gnome-panel/workspace-switcher-it.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ja.omf
 share/gnome/omf/gnome-panel/workspace-switcher-ko.omf
 share/gnome/omf/gnome-panel/workspace-switcher-sv.omf
+share/gnome/omf/gnome-panel/workspace-switcher-uk.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
-share/gnome/panel/gnome-panel-screenshot.glade
-share/gnome/panel/panel-properties-dialog.glade
-share/gnome/panel/panel-run-dialog.glade
-share/gnome/pixmaps/cdeappmenu.png
-share/gnome/pixmaps/fish/fishanim.png
-share/gnome/pixmaps/fish/footguy.png
-share/gnome/pixmaps/fish/monkey.png
-share/gnome/pixmaps/fish/oldwanda.png
-share/gnome/pixmaps/gnome-amusements.png
-share/gnome/pixmaps/gnome-clock.png
-share/gnome/pixmaps/gnome-fish.png
-share/gnome/pixmaps/gnome-gegl.png
-share/gnome/pixmaps/gnome-gegl2-2.png
-share/gnome/pixmaps/gnome-gegl2.png
-share/gnome/pixmaps/gnome-main-menu.png
-share/gnome/pixmaps/gnome-panel-type-corner.png
-share/gnome/pixmaps/gnome-panel-type-edge.png
-share/gnome/pixmaps/gnome-panel-type-floating.png
-share/gnome/pixmaps/gnome-panel-type-menu.png
-share/gnome/pixmaps/gnome-panel-type-sliding.png
-share/gnome/pixmaps/gnome-panel.png
-share/gnome/pixmaps/gnome-run.png
-share/gnome/pixmaps/gnome-screenshot.png
-share/gnome/pixmaps/panel-drawer.png
-share/gnome/pixmaps/panel-force-quit.png
+share/gnome/panel/glade/fish.glade
+share/gnome/panel/glade/panel-properties-dialog.glade
+share/gnome/panel/glade/panel-run-dialog.glade
+share/gnome/panel/glade/panel-test-applets.glade
+share/gnome/panel/glade/window-list.glade
+share/gnome/panel/glade/workspace-switcher.glade
+share/gnome/panel/pixmaps/fishanim.png
+share/gnome/panel/pixmaps/footguy.png
+share/gnome/panel/pixmaps/gnome-gegl2-2.png
+share/gnome/panel/pixmaps/gnome-gegl2.png
+share/gnome/panel/pixmaps/monkey.png
+share/gnome/panel/pixmaps/oldwanda.png
+share/icons/hicolor/48x48/apps/gnome-fish.png
+share/icons/hicolor/48x48/apps/gnome-gegl.png
+share/icons/hicolor/48x48/apps/gnome-main-menu.png
+share/icons/hicolor/48x48/apps/panel-force-quit.png
 share/locale/af/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -319,6 +322,7 @@ share/locale/mn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/mr/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/ms/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nb/LC_MESSAGES/gnome-panel-2.0.mo
+share/locale/ne/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-panel-2.0.mo
@@ -347,13 +351,28 @@ share/locale/yi/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
-@dirrm share/gnome/pixmaps/fish
+@unexec /bin/rmdir %D/share/locale/zu/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/zu 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/yi/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/yi 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/sr@ije/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/sr@ije 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/nso/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/nso 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mr/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mr 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mi/LC_MESSAGES 2>/dev/null || /usr/bin/true
+@unexec /bin/rmdir %D/share/locale/mi 2>/dev/null || /usr/bin/true
+@dirrm share/gnome/panel/pixmaps
+@dirrm share/gnome/panel/glade
 @dirrm share/gnome/omf/gnome-panel
 @dirrm share/gnome/idl/gnome-panel-2.0
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
 @dirrm share/gnome/help/workspace-switcher/zh_CN/figures
 @dirrm share/gnome/help/workspace-switcher/zh_CN
+@dirrm share/gnome/help/workspace-switcher/uk/figures
+@dirrm share/gnome/help/workspace-switcher/uk
 @dirrm share/gnome/help/workspace-switcher/sv/figures
 @dirrm share/gnome/help/workspace-switcher/sv
 @dirrm share/gnome/help/workspace-switcher/ko/figures
@@ -375,6 +394,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/window-list/zh_TW
 @dirrm share/gnome/help/window-list/zh_CN/figures
 @dirrm share/gnome/help/window-list/zh_CN
+@dirrm share/gnome/help/window-list/uk/figures
+@dirrm share/gnome/help/window-list/uk
 @dirrm share/gnome/help/window-list/sv/figures
 @dirrm share/gnome/help/window-list/sv
 @dirrm share/gnome/help/window-list/ko/figures
@@ -396,6 +417,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/fish-applet-2/zh_TW
 @dirrm share/gnome/help/fish-applet-2/zh_CN/figures
 @dirrm share/gnome/help/fish-applet-2/zh_CN
+@dirrm share/gnome/help/fish-applet-2/uk/figures
+@dirrm share/gnome/help/fish-applet-2/uk
 @dirrm share/gnome/help/fish-applet-2/sv/figures
 @dirrm share/gnome/help/fish-applet-2/sv
 @dirrm share/gnome/help/fish-applet-2/ko/figures
@@ -417,6 +440,8 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/zh_TW
 @dirrm share/gnome/help/clock/zh_CN/figures
 @dirrm share/gnome/help/clock/zh_CN
+@dirrm share/gnome/help/clock/uk/figures
+@dirrm share/gnome/help/clock/uk
 @dirrm share/gnome/help/clock/sv/figures
 @dirrm share/gnome/help/clock/sv
 @dirrm share/gnome/help/clock/ko/figures
@@ -434,7 +459,5 @@ share/locale/zu/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/help/clock/C/figures
 @dirrm share/gnome/help/clock/C
 @dirrm share/gnome/help/clock
-@dirrm share/gnome/gnome-panel/glade
-@dirrm share/gnome/gnome-panel
 @dirrm share/doc/panel-applet
 @dirrm include/panel-2.0
diff --git a/x11/gnomesession/Makefile b/x11/gnomesession/Makefile
index 37f82afac725..1f48df2e0f83 100644
--- a/x11/gnomesession/Makefile
+++ b/x11/gnomesession/Makefile
@@ -6,17 +6,16 @@
 #
 
 PORTNAME=	gnomesession
-PORTVERSION=	2.8.1
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME} \
-		http://people.FreeBSD.org/~marcus/:local \
-		${MASTER_SITE_LOCAL:S/$/:local/}
-MASTER_SITE_SUBDIR=	sources/gnome-session/2.8 \
-		    	marcus/:local
+		${MASTER_SITE_LOCAL:S/$/:local/} \
+		http://people.FreeBSD.org/~pav/:local
+MASTER_SITE_SUBDIR=	sources/gnome-session/2.10 \
+		    	pav/:local
 DISTNAME=	gnome-session-${PORTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		${SPLASH_IMG}:local
+		${SPLASHES}:local
 DIST_SUBDIR=	gnome2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -25,11 +24,9 @@ COMMENT=	Session component for the GNOME 2 desktop
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack libgnomeui
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=15
-CONFIGURE_ARGS=	--with-halt-command=/sbin/shutdown \
-		--with-reboot-command=/sbin/shutdown
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
@@ -38,13 +35,19 @@ MAN1=		gnome-session.1 gnome-smproxy.1 gnome-wm.1 \
 MAN5=		default.session.5
 GCONF_SCHEMAS=	gnome-session.schemas
 
-SPLASH_IMG=	gnome-splash28.png
+SPLASHES=	freebsd-splashes-gnome-2.10.tar
 
 post-extract:
-	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${SPLASH_IMG} ${WRKDIR}
+	cd ${WRKDIR} && ${TAR} xf ${DISTDIR}/${DIST_SUBDIR}/${SPLASHES}
 
 post-install:
-	${INSTALL_DATA} ${WRKDIR}/${SPLASH_IMG} \
+	${INSTALL_DATA} ${WRKSRC}/gnome-session/gnome-splash.png \
+		${PREFIX}/share/gnome/pixmaps/splash/original-gnome-splash.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/franz_klammer-2.png \
 		${PREFIX}/share/gnome/pixmaps/splash/gnome-splash.png
+.for splash in adamw.png banana_flex.png franco_malatacca.jpg franz_klammer-1.png franz_klammer-3.png radek.png
+	${INSTALL_DATA} ${WRKDIR}/freebsd-splashes-gnome-2.10/${splash} \
+		${PREFIX}/share/gnome/pixmaps/splash
+.endfor
 
 .include <bsd.port.mk>
diff --git a/x11/gnomesession/distinfo b/x11/gnomesession/distinfo
index 8f05e97ece4c..5f305e45c84f 100644
--- a/x11/gnomesession/distinfo
+++ b/x11/gnomesession/distinfo
@@ -1,4 +1,4 @@
-MD5 (gnome2/gnome-session-2.8.1.tar.bz2) = 15402d84eef4cf159bb8de78f432bb98
-SIZE (gnome2/gnome-session-2.8.1.tar.bz2) = 883921
-MD5 (gnome2/gnome-splash28.png) = 2ac880af4ca6929a82f8b64912b95a55
-SIZE (gnome2/gnome-splash28.png) = 121715
+MD5 (gnome2/gnome-session-2.10.0.tar.bz2) = cbeb2db49dac11bf8088e6b025265fff
+SIZE (gnome2/gnome-session-2.10.0.tar.bz2) = 796754
+MD5 (gnome2/freebsd-splashes-gnome-2.10.tar) = 92cfd1945f9a48dd8df3981935e9ef34
+SIZE (gnome2/freebsd-splashes-gnome-2.10.tar) = 462336
diff --git a/x11/gnomesession/files/patch-gnome-session_Makefile.in b/x11/gnomesession/files/patch-gnome-session_Makefile.in
index 2b05e8c0027e..ed0b6ac56866 100644
--- a/x11/gnomesession/files/patch-gnome-session_Makefile.in
+++ b/x11/gnomesession/files/patch-gnome-session_Makefile.in
@@ -1,11 +1,11 @@
---- gnome-session/Makefile.in.orig	Mon May 31 14:34:48 2004
-+++ gnome-session/Makefile.in	Mon May 31 14:34:57 2004
-@@ -153,7 +153,7 @@
- 
+--- gnome-session/Makefile.in.orig	Tue Nov 30 14:07:39 2004
++++ gnome-session/Makefile.in	Tue Nov 30 14:07:51 2004
+@@ -209,7 +209,7 @@
+ target_alias = @target_alias@
  NULL = 
  
 -defaultdir = $(datadir)/gnome
 +defaultdir = $(datadir)
  
- INCLUDES =  	$(GNOME_SESSION_CFLAGS)					$(STANDARD_PROPERTIES_CFLAGS)				$(WARN_CFLAGS)						$(DISABLE_DEPRECATED_CFLAGS)				-DGNOMELOCALEDIR=\""$(prefix)/${DATADIRNAME}/locale\""		-DGCONF_SANITY_CHECK=\""$(GCONF_SANITY_CHECK)"\"	    	-DGNOME_KEYRING_DAEMON=\""$(GNOME_KEYRING_DAEMON)"\"	    	-DGNOME_ICONDIR=\""$(datadir)/pixmaps\""		-DREBOOT_COMMAND=\""$(REBOOT_COMMAND)\""		-DHALT_COMMAND=\""$(HALT_COMMAND)\""			-DRSH_COMMAND=\""$(RSH_COMMAND)\""			-DGCONFTOOL_CMD=\""$(GCONFTOOL)\""			-DDEFAULTDIR="\"$(defaultdir)\""			-DESD_SERVER="\"$(ESD_SERVER)\""
- 
+ INCLUDES = \
+ 	$(GNOME_SESSION_CFLAGS)				\
diff --git a/x11/gnomesession/files/patch-gnome-session_logout.c b/x11/gnomesession/files/patch-gnome-session_logout.c
deleted file mode 100644
index f82aefdc7d2e..000000000000
--- a/x11/gnomesession/files/patch-gnome-session_logout.c
+++ /dev/null
@@ -1,36 +0,0 @@
---- gnome-session/logout.c.orig	Sun May  9 15:45:34 2004
-+++ gnome-session/logout.c	Sun May  9 15:48:29 2004
-@@ -37,12 +37,20 @@
- 
- static gchar *halt_command[] =
- {
-+#ifdef __FreeBSD__
-+  HALT_COMMAND, "-p", "now", NULL
-+#else
-   HALT_COMMAND, NULL
-+#endif
- };
- 
- static gchar *reboot_command[] =
- {
-+#ifdef __FreeBSD__
-+  REBOOT_COMMAND, "-r", "now", NULL
-+#else
-   REBOOT_COMMAND, NULL
-+#endif
- };
- 
- /* What action to take upon shutdown */
-@@ -401,8 +409,12 @@
-    */
-   s = g_strconcat ("/var/lock/console/", g_get_user_name (), NULL);
-   t = g_strconcat ("/var/run/console/", g_get_user_name (), NULL);
-+#ifndef __FreeBSD__
-   if (((geteuid () == 0) || g_file_exists (t) || g_file_exists(s)) &&
-       access (halt_command[0], X_OK) == 0)
-+#else
-+  if (access (halt_command[0], X_OK) == 0)
-+#endif
-     {
-       GtkWidget *title, *spacer;
-       GtkWidget *action_vbox, *hbox;
diff --git a/x11/gnomesession/files/patch-gnome-session_manager.c b/x11/gnomesession/files/patch-gnome-session_manager.c
deleted file mode 100644
index 7e56843ac733..000000000000
--- a/x11/gnomesession/files/patch-gnome-session_manager.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- gnome-session/manager.c.orig	Tue Oct 12 14:04:26 2004
-+++ gnome-session/manager.c	Tue Oct 12 14:05:51 2004
-@@ -1042,9 +1042,10 @@
- 
-       if (interact_ping_replied)
- 	{
-+	  IceConn ice_conn;
- 	  gsm_verbose ("have interact_list; sending ping with data to client %p\n", client);
- 	  print_client (client);
--	  IceConn ice_conn = SmsGetIceConnection (client->connection);
-+	  ice_conn = SmsGetIceConnection (client->connection);
- 	  interact_ping_replied = FALSE;
- 	  IcePing (ice_conn, interact_ping_reply, (IcePointer)client);
- 	}
diff --git a/x11/gnomesession/pkg-plist b/x11/gnomesession/pkg-plist
index 6107618a5527..999c30043083 100644
--- a/x11/gnomesession/pkg-plist
+++ b/x11/gnomesession/pkg-plist
@@ -4,10 +4,17 @@ bin/gnome-session-remove
 bin/gnome-session-save
 bin/gnome-smproxy
 bin/gnome-wm
-share/gnome/control-center-2.0/capplets/session-properties.desktop
+share/gnome/applications/session-properties.desktop
 share/gnome/default.session
 share/gnome/default.wm
+share/gnome/pixmaps/splash/adamw.png
+share/gnome/pixmaps/splash/banana_flex.png
+share/gnome/pixmaps/splash/franco_malatacca.jpg
+share/gnome/pixmaps/splash/franz_klammer-1.png
+share/gnome/pixmaps/splash/franz_klammer-3.png
 share/gnome/pixmaps/splash/gnome-splash.png
+share/gnome/pixmaps/splash/original-gnome-splash.png
+share/gnome/pixmaps/splash/radek.png
 share/locale/af/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/am/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/ar/LC_MESSAGES/gnome-session-2.0.mo
@@ -57,6 +64,7 @@ share/locale/ne/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/nn/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/no/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/nso/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pa/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pl/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/pt/LC_MESSAGES/gnome-session-2.0.mo
@@ -76,5 +84,7 @@ share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
+share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
diff --git a/x11/gnometerminal/Makefile b/x11/gnometerminal/Makefile
index f01b7bd6507b..61b4256f05e8 100644
--- a/x11/gnometerminal/Makefile
+++ b/x11/gnometerminal/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnometerminal
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-terminal/2.10
 DISTNAME=	gnome-terminal-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -17,11 +17,11 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Terminal component for the GNOME 2 Desktop
 
 USE_BZIP2=	yes
-USE_X_PREFIX=	yes
 INSTALLS_OMF=	yes
+USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack gnomehier libgnomeui vte
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui vte
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
diff --git a/x11/gnometerminal/distinfo b/x11/gnometerminal/distinfo
index ca84bcc12c2b..bb6a1fa2132f 100644
--- a/x11/gnometerminal/distinfo
+++ b/x11/gnometerminal/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-terminal-2.8.2.tar.bz2) = ffa668b7301dff6ce5ad9ec4c1e11c92
-SIZE (gnome2/gnome-terminal-2.8.2.tar.bz2) = 2171397
+MD5 (gnome2/gnome-terminal-2.10.0.tar.bz2) = 062744daca0c7f708b8c52f47b5db0d1
+SIZE (gnome2/gnome-terminal-2.10.0.tar.bz2) = 2334171
diff --git a/x11/gnometerminal/files/patch-src::terminal-screen.c b/x11/gnometerminal/files/patch-src::terminal-screen.c
deleted file mode 100644
index aafbb3a44ce0..000000000000
--- a/x11/gnometerminal/files/patch-src::terminal-screen.c
+++ /dev/null
@@ -1,24 +0,0 @@
---- src/terminal-screen.c.orig	Thu Nov 18 12:45:11 2004
-+++ src/terminal-screen.c	Thu Nov 18 12:46:31 2004
-@@ -246,16 +246,16 @@
- #define USER      "[" USERCHARS "]+(:["PASSCHARS "]+)?"
- 
-   terminal_widget_match_add (screen->priv->term,
--      "\\<(" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?"
--      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_AS_IS);
-+      "[[:<:]](" SCHEME "://(" USER "@)?)[" HOSTCHARS ".]+(:[0-9]+)?"
-+      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_AS_IS);
- 
-   terminal_widget_match_add (screen->priv->term,
--      "\\<(www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?"
--      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?\\>", FLAVOR_DEFAULT_TO_HTTP);
-+      "[[:<:]](www|ftp)[" HOSTCHARS "]*\\.[" HOSTCHARS ".]+(:[0-9]+)?"
-+      "(/[-A-Za-z0-9_$.+!*(),;:@&=?/~#%]*[^]'.}>) \t\r\n,\\\"])?[[:>:]]", FLAVOR_DEFAULT_TO_HTTP);
- 
-   terminal_widget_match_add (screen->priv->term, 
-       
--      "\\<(mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+\\>", FLAVOR_MAILTO);
-+      "[[:<:]](mailto:)?[a-z0-9]+@[a-z0-9][a-z0-9-]*(\\.[a-z0-9][a-z0-9-]*)+[[:>:]]", FLAVOR_MAILTO);
- 
-   terminal_screen_setup_dnd (screen);
-   
diff --git a/x11/gnometerminal/pkg-plist b/x11/gnometerminal/pkg-plist
index ca1a70673fac..22d4a5870a1e 100644
--- a/x11/gnometerminal/pkg-plist
+++ b/x11/gnometerminal/pkg-plist
@@ -48,6 +48,10 @@ share/gnome/help/gnome-terminal/sv/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/sv/figures/terminal_window.png
 share/gnome/help/gnome-terminal/sv/gnome-terminal.xml
 share/gnome/help/gnome-terminal/sv/legal.xml
+share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-default.png
+share/gnome/help/gnome-terminal/uk/figures/gnome-terminal-tabbed.png
+share/gnome/help/gnome-terminal/uk/gnome-terminal.xml
+share/gnome/help/gnome-terminal/uk/legal.xml
 share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-default.png
 share/gnome/help/gnome-terminal/zh_CN/figures/gnome-terminal-tabbed.png
 share/gnome/help/gnome-terminal/zh_CN/figures/terminal_window.png
@@ -67,6 +71,7 @@ share/gnome/omf/gnome-terminal/gnome-terminal-ja.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ko.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-ro.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-sv.omf
+share/gnome/omf/gnome-terminal/gnome-terminal-uk.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-zh_CN.omf
 share/gnome/omf/gnome-terminal/gnome-terminal-zh_TW.omf
 share/gnome/pixmaps/gnome-terminal.png
@@ -109,6 +114,7 @@ share/locale/ml/LC_MESSAGES/gnome-terminal.mo
 share/locale/mn/LC_MESSAGES/gnome-terminal.mo
 share/locale/ms/LC_MESSAGES/gnome-terminal.mo
 share/locale/nb/LC_MESSAGES/gnome-terminal.mo
+share/locale/ne/LC_MESSAGES/gnome-terminal.mo
 share/locale/nl/LC_MESSAGES/gnome-terminal.mo
 share/locale/nn/LC_MESSAGES/gnome-terminal.mo
 share/locale/no/LC_MESSAGES/gnome-terminal.mo
@@ -137,6 +143,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-terminal.mo
 @dirrm share/gnome/help/gnome-terminal/zh_TW
 @dirrm share/gnome/help/gnome-terminal/zh_CN/figures
 @dirrm share/gnome/help/gnome-terminal/zh_CN
+@dirrm share/gnome/help/gnome-terminal/uk/figures
+@dirrm share/gnome/help/gnome-terminal/uk
 @dirrm share/gnome/help/gnome-terminal/sv/figures
 @dirrm share/gnome/help/gnome-terminal/sv
 @dirrm share/gnome/help/gnome-terminal/ro/figures
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index e3ffc9118ca1..64e07c6fa498 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.8.1
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,7 +23,7 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack esound \
+USE_GNOME=	gnomeprefix gnomehack intlhack esound \
 		gnomevfs2 libxslt
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
@@ -47,8 +47,6 @@ GCONF_SCHEMAS=	desktop_gnome_accessibility_keyboard.schemas \
 		desktop_gnome_sound.schemas desktop_gnome_thumbnailers.schemas \
 		desktop_gnome_typing_break.schemas
 
-.include <bsd.port.pre.mk>
-
 post-patch:
 	@${SED} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		< ${MASTERDIR}/pkg-deinstall.in > ${PKGDEINSTALL}
@@ -57,4 +55,4 @@ post-patch:
 		${WRKSRC}/Makefile.in
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index f102c8bb2600..c21b936b02c0 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnome-2.8.1.tar.bz2) = 17577198f5086c48f69c361be2f4806c
-SIZE (gnome2/libgnome-2.8.1.tar.bz2) = 1178438
+MD5 (gnome2/libgnome-2.10.0.tar.bz2) = f8e1225d96126f5139232821a6723d15
+SIZE (gnome2/libgnome-2.10.0.tar.bz2) = 871282
diff --git a/x11/libgnome/files/patch-libgnome_gnome-program.c b/x11/libgnome/files/patch-libgnome_gnome-program.c
index 8485c2aa7660..9dd33f9c2838 100644
--- a/x11/libgnome/files/patch-libgnome_gnome-program.c
+++ b/x11/libgnome/files/patch-libgnome_gnome-program.c
@@ -1,5 +1,5 @@
---- libgnome/gnome-program.c.orig	Mon Feb 21 07:39:01 2005
-+++ libgnome/gnome-program.c	Mon Feb 21 23:35:17 2005
+--- libgnome/gnome-program.c.orig	Mon May 31 16:37:02 2004
++++ libgnome/gnome-program.c	Mon May 31 16:37:05 2004
 @@ -895,17 +895,17 @@
  	attr_rel = "";
  	break;
@@ -68,12 +68,3 @@
  
  	search_path = FALSE;
  	break;
-@@ -1928,7 +1928,7 @@
-                            int argc, char **argv,
-                            guint nparams, GParameter *params)
- {
--    va_list args = 0;
-+    va_list args;
- 
-     return gnome_program_init_common (type, app_id, app_version, module_info,
- 				      argc, argv, NULL, args, nparams, params);
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index a79ee22d3ec2..6a186eaadcac 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -19,34 +19,35 @@ include/libgnome-2.0/libgnome/libgnometypebuiltins.h
 lib/bonobo/monikers/libmoniker_extra_2.so
 lib/libgnome-2.a
 lib/libgnome-2.so
-lib/libgnome-2.so.800
+lib/libgnome-2.so.1000
 libdata/bonobo/servers/GNOME_Moniker_std.server
 libdata/pkgconfig/libgnome-2.0.pc
-share/doc/libgnome/ch01s02.html
-share/doc/libgnome/ch01s03.html
-share/doc/libgnome/ch01s04.html
-share/doc/libgnome/ch01s05.html
-share/doc/libgnome/home.png
-share/doc/libgnome/index.html
-share/doc/libgnome/index.sgml
-share/doc/libgnome/left.png
-share/doc/libgnome/libgnome-gnome-config.html
-share/doc/libgnome/libgnome-gnome-exec.html
-share/doc/libgnome/libgnome-gnome-gconf.html
-share/doc/libgnome/libgnome-gnome-help.html
-share/doc/libgnome/libgnome-gnome-i18n.html
-share/doc/libgnome/libgnome-gnome-init.html
-share/doc/libgnome/libgnome-gnome-program.html
-share/doc/libgnome/libgnome-gnome-score.html
-share/doc/libgnome/libgnome-gnome-sound.html
-share/doc/libgnome/libgnome-gnome-triggers.html
-share/doc/libgnome/libgnome-gnome-url.html
-share/doc/libgnome/libgnome-gnome-util.html
-share/doc/libgnome/libgnome-libgnometypebuiltins.html
-share/doc/libgnome/libgnome.devhelp
-share/doc/libgnome/libgnome.html
-share/doc/libgnome/right.png
-share/doc/libgnome/up.png
+%%DOCSDIR%%/ch01s02.html
+%%DOCSDIR%%/ch01s03.html
+%%DOCSDIR%%/ch01s04.html
+%%DOCSDIR%%/ch01s05.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnome-gnome-config.html
+%%DOCSDIR%%/libgnome-gnome-exec.html
+%%DOCSDIR%%/libgnome-gnome-gconf.html
+%%DOCSDIR%%/libgnome-gnome-help.html
+%%DOCSDIR%%/libgnome-gnome-i18n.html
+%%DOCSDIR%%/libgnome-gnome-init.html
+%%DOCSDIR%%/libgnome-gnome-program.html
+%%DOCSDIR%%/libgnome-gnome-score.html
+%%DOCSDIR%%/libgnome-gnome-sound.html
+%%DOCSDIR%%/libgnome-gnome-triggers.html
+%%DOCSDIR%%/libgnome-gnome-url.html
+%%DOCSDIR%%/libgnome-gnome-util.html
+%%DOCSDIR%%/libgnome-libgnometypebuiltins.html
+%%DOCSDIR%%/libgnome.devhelp
+%%DOCSDIR%%/libgnome.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
 share/locale/am/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ar/LC_MESSAGES/libgnome-2.0.mo
 share/locale/az/LC_MESSAGES/libgnome-2.0.mo
@@ -110,9 +111,10 @@ share/locale/tr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/uk/LC_MESSAGES/libgnome-2.0.mo
 share/locale/vi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/wa/LC_MESSAGES/libgnome-2.0.mo
+share/locale/xh/LC_MESSAGES/libgnome-2.0.mo
 share/locale/yi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/libgnome-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/libgnome-2.0.mo
-@dirrm share/doc/libgnome
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
+@dirrm %%DOCSDIR%%
diff --git a/x11/libxklavier/Makefile b/x11/libxklavier/Makefile
index d00571d57dd5..3ec757055fd6 100644
--- a/x11/libxklavier/Makefile
+++ b/x11/libxklavier/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	libxklavier
-PORTVERSION=	1.04
-PORTREVISION=	1
+PORTVERSION=	2.0
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
@@ -20,10 +20,12 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnometarget gnomehack libxml2
 INSTALLS_SHLIB=	yes
+USE_GETOPT_LONG=yes
 USE_LIBTOOL_VER=15
+CPPFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include
 CONFIGURE_ARGS=	--disable-doxygen \
 		--with-xkb-base=${X11BASE}/lib/X11/xkb
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
+CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
 PLIST_SUB=	VERSION=${PORTVERSION}
diff --git a/x11/libxklavier/distinfo b/x11/libxklavier/distinfo
index 12b8565f2e87..3236c8a12b54 100644
--- a/x11/libxklavier/distinfo
+++ b/x11/libxklavier/distinfo
@@ -1,2 +1,2 @@
-MD5 (libxklavier-1.04.tar.gz) = 322078ad3681465f69a65c0758c74460
-SIZE (libxklavier-1.04.tar.gz) = 422337
+MD5 (libxklavier-2.0.tar.gz) = 9257653ee3d194d9c8d669e969fe4332
+SIZE (libxklavier-2.0.tar.gz) = 435898
diff --git a/x11/libxklavier/files/patch-configure b/x11/libxklavier/files/patch-configure
new file mode 100644
index 000000000000..4de85e18100f
--- /dev/null
+++ b/x11/libxklavier/files/patch-configure
@@ -0,0 +1,33 @@
+--- configure.orig	Mon Dec 13 00:57:33 2004
++++ configure	Mon Dec 13 00:58:14 2004
+@@ -20135,9 +20135,9 @@
+ 
+ echo "$as_me:$LINENO: checking whether at least one libxklavier backend is enabled" >&5
+ echo $ECHO_N "checking whether at least one libxklavier backend is enabled... $ECHO_C" >&6
+-if test \( "$enable_xkb_support" == "yes" -a \
+-          "$xkb_headers_present" == "yes" \) -o \
+-        "$enable_xmm_support" == "yes" ; then
++if test \( "$enable_xkb_support" = "yes" -a \
++          "$xkb_headers_present" = "yes" \) -o \
++        "$enable_xmm_support" = "yes" ; then
+   echo "$as_me:$LINENO: result: yes" >&5
+ echo "${ECHO_T}yes" >&6
+ else
+@@ -21744,14 +21744,14 @@
+ 
+ echo '**********************************************************'
+ echo '  Libxklavier is configured with the following backends:'
+-if test "$enable_xkb_support" == "yes" ; then
+-  if test "$xkb_headers_present" == "yes" ; then
++if test "$enable_xkb_support" = "yes" ; then
++  if test "$xkb_headers_present" = "yes" ; then
+     echo '    XKB (libxkbfile headers are present)'
+   else
+     echo '    XKB (but libxkbfile headers are NOT present)'
+   fi
+ fi
+-if test "$enable_xmm_support" == "yes" ; then
++if test "$enable_xmm_support" = "yes" ; then
+   echo '    xmodmap'
+ fi
+ echo '**********************************************************'
diff --git a/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c
deleted file mode 100644
index fed33a78f971..000000000000
--- a/x11/libxklavier/files/patch-libxklavier-xklavier_config_i18n.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- libxklavier/xklavier_config_i18n.c.orig	Mon Oct 25 21:55:29 2004
-+++ libxklavier/xklavier_config_i18n.c	Mon Oct 25 21:56:51 2004
-@@ -142,13 +142,14 @@
-     XklDebug( 0,
-               "Unable to convert %s from UTF-8 to %s, this string will probably display wrong.",
-               utf8string, charset );
-+    iconv_close( converter );
-     return strdup( utf8string );
-   }
-   *convertedStart = '\0';
- 
-   iconv_close( converter );
- 
--  return converted;
-+  return strdup( converted );
- }
- 
- /*
diff --git a/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c b/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c
deleted file mode 100644
index 946d2d5808b9..000000000000
--- a/x11/libxklavier/files/patch-libxklavier-xklavier_config_xkb.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- libxklavier/xklavier_config_xkb.c.orig	Fri Oct  1 22:04:54 2004
-+++ libxklavier/xklavier_config_xkb.c	Tue Oct 12 18:44:59 2004
-@@ -184,10 +184,11 @@
- 
-   if ( supportState == UNCHECKED )
-   {
-+    XkbRF_RulesPtr rulesPtr;
-     XklDebug( 100, "!!! Checking multiple layouts support\n" );
-     supportState = NON_SUPPORTED;
- #ifdef XKB_HEADERS_PRESENT
--    XkbRF_RulesPtr rulesPtr = _XklLoadRulesSet();
-+    rulesPtr = _XklLoadRulesSet();
-     if ( rulesPtr )
-     {
-       XkbRF_VarDefsRec varDefs;
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier.c b/x11/libxklavier/files/patch-libxklavier_xklavier.c
new file mode 100644
index 000000000000..195b48534da1
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier.c
@@ -0,0 +1,23 @@
+--- libxklavier/xklavier.c.orig	Tue Nov  2 16:58:48 2004
++++ libxklavier/xklavier.c	Tue Nov 23 19:56:29 2004
+@@ -536,7 +536,7 @@
+                             int level, const char format[], va_list args )
+ {
+   time_t now = time( NULL );
+-  fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", now, level, file, function );
++  fprintf( stdout, "[%08ld,%03d,%s:%s/] \t", (long) now, level, file, function );
+   vfprintf( stdout, format, args );
+ }
+ 
+@@ -700,9 +700,10 @@
+ {
+   if ( xklVTable == NULL )
+   {
++    char *p;
+     XklDebug( 0, "ERROR: XKL VTable is NOT initialized.\n" );
+     /* force the crash! */
+-    char *p = NULL; *p = '\0';
++    p = NULL; *p = '\0';
+   }
+ }
+ 
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
new file mode 100644
index 000000000000..0ef120607f55
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_config_i18n.c
@@ -0,0 +1,11 @@
+--- libxklavier/xklavier_config_i18n.c.orig	Tue Nov 23 18:33:37 2004
++++ libxklavier/xklavier_config_i18n.c	Tue Nov 23 18:34:30 2004
+@@ -106,7 +106,7 @@
+   iconv_t converter;
+   static char converted[XKL_MAX_CI_DESC_LENGTH];
+   char *convertedStart = converted;
+-  char *utfStart = ( char * ) utf8string;
++  const char *utfStart = ( const char * ) utf8string;
+   size_t clen = XKL_MAX_CI_DESC_LENGTH - 1;
+   const char *charset;
+ 
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
new file mode 100644
index 000000000000..8dbfe37c7977
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_evt_xmm.c
@@ -0,0 +1,22 @@
+--- libxklavier/xklavier_evt_xmm.c.orig	Tue Nov 30 02:18:31 2004
++++ libxklavier/xklavier_evt_xmm.c	Tue Nov 30 02:20:24 2004
+@@ -13,15 +13,15 @@
+ {
+   if( _xklListenerType & XKLL_MANAGE_LAYOUTS )
+   {
+-    XklDebug( 200, "Processing the KeyPress event\n" );
+     int currentShortcut = 0;
+     const XmmSwitchOptionPtr sop = _XklXmmFindSwitchOption( kpe->keycode, 
+-                                                            kpe->state,
+-                                                            &currentShortcut );
++                                   kpe->state,
++                                   &currentShortcut );
++    XklDebug( 200, "Processing the KeyPress event\n" );
+     if( sop != NULL )
+     {
+-      XklDebug( 150, "It is THE shortcut\n" );
+       XklState state;
++      XklDebug( 150, "It is THE shortcut\n" );
+       _XklXmmGetRealState( &state );
+       if( state.group != -1 )
+       {
diff --git a/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
new file mode 100644
index 000000000000..6db8c55088c3
--- /dev/null
+++ b/x11/libxklavier/files/patch-libxklavier_xklavier_xmm.c
@@ -0,0 +1,15 @@
+--- libxklavier/xklavier_xmm.c.orig	Tue Nov 30 02:17:37 2004
++++ libxklavier/xklavier_xmm.c	Tue Nov 30 02:17:51 2004
+@@ -66,10 +66,11 @@
+ const XmmSwitchOptionPtr _XklXmmGetCurrentShortcut()
+ {
+   const char* optionName = _XklXmmGetCurrentShortcutOptionName();
++  XmmSwitchOptionPtr switchOption;
+   XklDebug( 150, "Configured switch option: [%s]\n", optionName );
+   if( optionName == NULL )
+     return NULL;
+-  XmmSwitchOptionPtr switchOption = allSwitchOptions;
++  switchOption = allSwitchOptions;
+   while( switchOption->optionName != NULL )
+   {
+     if( !strcmp( switchOption->optionName, optionName ) )
diff --git a/x11/libxklavier/files/patch-tests-test_config.c b/x11/libxklavier/files/patch-tests-test_config.c
deleted file mode 100644
index cc374f0b96d2..000000000000
--- a/x11/libxklavier/files/patch-tests-test_config.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- tests/test_config.c.orig	Fri Oct  1 21:52:02 2004
-+++ tests/test_config.c	Tue Oct 12 18:46:32 2004
-@@ -46,6 +46,7 @@
-   const char* layouts = NULL;
-   const char* options = NULL;
-   int debugLevel = 0;
-+  Display* dpy;
- 
-   while (1)
-   {
-@@ -89,7 +90,7 @@
-     exit( 0 );
-   }
- 
--  Display* dpy = XOpenDisplay( NULL );
-+  dpy = XOpenDisplay( NULL );
-   if ( dpy == NULL )
-   {
-     fprintf( stderr, "Could not open display\n" );
diff --git a/x11/libxklavier/files/patch-tests-test_monitor.c b/x11/libxklavier/files/patch-tests-test_monitor.c
deleted file mode 100644
index 3fcc08426904..000000000000
--- a/x11/libxklavier/files/patch-tests-test_monitor.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- tests/test_monitor.c.orig	Fri Oct  1 21:52:02 2004
-+++ tests/test_monitor.c	Tue Oct 12 18:47:32 2004
-@@ -42,6 +42,7 @@
-   int c;
-   int debugLevel = 0;
-   XkbEvent ev;
-+  Display* dpy;
- 
-   while (1)
-   {
-@@ -63,7 +64,7 @@
-     }
-   }
- 
--  Display* dpy = XOpenDisplay( NULL );
-+  dpy = XOpenDisplay( NULL );
-   if ( dpy == NULL )
-   {
-     fprintf( stderr, "Could not open display\n" );
diff --git a/x11/libxklavier/pkg-plist b/x11/libxklavier/pkg-plist
index d58809c9513d..0a50a33fefdd 100644
--- a/x11/libxklavier/pkg-plist
+++ b/x11/libxklavier/pkg-plist
@@ -2,8 +2,8 @@ include/libxklavier/xklavier.h
 include/libxklavier/xklavier_config.h
 lib/libxklavier.a
 lib/libxklavier.so
-lib/libxklavier.so.8
+lib/libxklavier.so.10
 libdata/pkgconfig/libxklavier.pc
-share/libxklavier/xfree86.xml
-@dirrm share/libxklavier
+%%DATADIR%%/xfree86.xml
+@dirrm %%DATADIR%%
 @dirrm include/libxklavier
diff --git a/x11/yelp/Makefile b/x11/yelp/Makefile
index 06d274d2aac8..880ac2eed127 100644
--- a/x11/yelp/Makefile
+++ b/x11/yelp/Makefile
@@ -6,23 +6,95 @@
 #
 
 PORTNAME=	yelp
-PORTVERSION=	2.6.5
+PORTVERSION=	2.9.3
+PORTREVISION=	2
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.9
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A help browser for the GNOME 2 desktop
 
+BUILD_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \
+		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+RUN_DEPENDS=	${X11BASE}/libdata/pkgconfig/gnome-doc-utils.pc:${PORTSDIR}/textproc/gnomedocutils \
+		${X11BASE}/lib/${MOZILLA}/components/libwidget_gtk2.so:${PORTSDIR}/www/${MOZILLA}
+
+MOZILLA=	mozilla
+HEADERS_SUFX=
+
+.if !defined(WITH_MOZILLA)
+MOZILLA=	mozilla
+HEADERS_SUFX=
+.else
+.if ${WITH_MOZILLA}=="firefox"
+MOZILLA=	firefox
+.else
+.if ${WITH_MOZILLA}=="mozilla-devel" || ${WITH_MOZILLA}=="mozilla-devel-gtk2"
+MOZILLA=	mozilla-devel
+HEADERS_SUFX=	-devel
+.else
+MOZILLA=	mozilla
+HEADERS_SUFX=
+.endif
+.endif
+.endif
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libgtkhtml
+USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
 USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
+CONFIGURE_ARGS=	--enable-man \
+		--enable-info \
+		--with-mozilla=${MOZILLA}
 MAKE_ENV=	G_CHARSET_ALIAS="${LOCALBASE}/libdata/charset.alias"
 
-.include <bsd.port.mk>
+GCONF_SCHEMAS=	yelp.schemas
+
+.include <bsd.port.pre.mk>
+
+.if ${OSVERSION} < 500000
+.if ${MOZILLA}=="mozilla-devel"
+USE_GCC=	3.4
+.endif
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} " By default yelp uses www/mozilla for html rendering, but you can"
+	@${ECHO_MSG} " change this by defining WITH_MOZILLA to one of the following values:"
+	@${ECHO_MSG}
+	@${ECHO_MSG} "  mozilla-devel "
+	@${ECHO_MSG} "  firefox "
+	@${ECHO_MSG} ""
+
+post-patch:
+.if defined(WITH_MOZILLA) && ${WITH_MOZILLA}=="mozilla-devel"
+	@${REINPLACE_CMD} -e 's|xmozilla|xmozilla-devel|g; \
+		s|mozilla-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g; \
+		s|$$MOZILLA-gtkmozembed|mozilla-gtkmozembed${HEADERS_SUFX}|g' \
+		${WRKSRC}/configure
+.endif
+
+post-configure:
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g ; \
+		s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/yelp.sh \
+		> ${WRKDIR}/yelp.sh
+	@${SED} -e 's|%%PREFIX%%|${PREFIX}|g ; \
+		s|%%X11BASE%%|${X11BASE}|g ; \
+		s|%%MOZILLA%%|${MOZILLA}|g' <${FILESDIR}/gnome-help.sh \
+		> ${WRKDIR}/gnome-help.sh
+
+post-install:
+	${MV} -f ${PREFIX}/bin/yelp ${PREFIX}/bin/yelp-bin
+	${MV} -f ${PREFIX}/bin/gnome-help ${PREFIX}/bin/gnome-help-bin
+	${INSTALL_SCRIPT} ${WRKDIR}/yelp.sh ${PREFIX}/bin/yelp
+	${INSTALL_SCRIPT} ${WRKDIR}/gnome-help.sh ${PREFIX}/bin/gnome-help
+
+.include <bsd.port.post.mk>
diff --git a/x11/yelp/distinfo b/x11/yelp/distinfo
index 84e9d90bbd8e..626d42489854 100644
--- a/x11/yelp/distinfo
+++ b/x11/yelp/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/yelp-2.6.5.tar.bz2) = 9bd94af344ee6a0bf69aa6f9cbd6b7e9
-SIZE (gnome2/yelp-2.6.5.tar.bz2) = 654264
+MD5 (gnome2/yelp-2.9.3.tar.bz2) = a6ed659313698900a7170426881b874b
+SIZE (gnome2/yelp-2.9.3.tar.bz2) = 637236
diff --git a/x11/yelp/files/gnome-help.sh b/x11/yelp/files/gnome-help.sh
new file mode 100644
index 000000000000..0951d0096233
--- /dev/null
+++ b/x11/yelp/files/gnome-help.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+dist_bin=`dirname $0`
+
+MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+exec "%%PREFIX%%/bin/gnome-help-bin" "$@"
diff --git a/x11/yelp/files/patch-configure b/x11/yelp/files/patch-configure
deleted file mode 100644
index 7e0c0705f738..000000000000
--- a/x11/yelp/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Mon Mar 22 19:14:23 2004
-+++ configure	Mon Mar 22 19:14:23 2004
-@@ -9879,7 +9879,7 @@
- 
- YELP_MODULES="gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0"
- 
--idl_dirs="`$PKG_CONFIG --variable=idldir gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
-+idl_dirs="`$PKG_CONFIG --variable=idldir libgtkhtml-2.0 gnome-vfs-2.0 libgnomeui-2.0 libbonobo-2.0 bonobo-activation-2.0`"
- for ac_prog in gsed sed
- do
-   # Extract the first word of "$ac_prog", so it can be a program name with args.
diff --git a/x11/yelp/files/yelp.sh b/x11/yelp/files/yelp.sh
new file mode 100644
index 000000000000..52a6643b7544
--- /dev/null
+++ b/x11/yelp/files/yelp.sh
@@ -0,0 +1,17 @@
+#!/bin/sh
+
+dist_bin=`dirname $0`
+
+MOZILLA_HOME=%%X11BASE%%/lib/%%MOZILLA%%
+
+if [ -n "$LD_LIBRARY_PATH" ]; then
+  LD_LIBRARY_PATH=$MOZILLA_HOME:$LD_LIBRARY_PATH
+else
+  LD_LIBRARY_PATH=$MOZILLA_HOME
+fi
+export LD_LIBRARY_PATH
+
+MOZILLA_FIVE_HOME=$MOZILLA_HOME
+export MOZILLA_FIVE_HOME
+
+exec "%%PREFIX%%/bin/yelp-bin" "$@"
diff --git a/x11/yelp/pkg-plist b/x11/yelp/pkg-plist
index d12169a1d3d8..e6dea27dee6a 100644
--- a/x11/yelp/pkg-plist
+++ b/x11/yelp/pkg-plist
@@ -1,47 +1,29 @@
 bin/gnome-help
+bin/gnome-help-bin
 bin/yelp
+bin/yelp-bin
 libdata/bonobo/servers/GNOME_Yelp.server
 share/gnome/applications/yelp.desktop
-share/gnome/sgml/docbook/yelp/db2html-admon.xsl
-share/gnome/sgml/docbook/yelp/db2html-biblio.xsl
-share/gnome/sgml/docbook/yelp/db2html-block.xsl
-share/gnome/sgml/docbook/yelp/db2html-callout.xsl
-share/gnome/sgml/docbook/yelp/db2html-chunk.xsl
-share/gnome/sgml/docbook/yelp/db2html-common.xsl
-share/gnome/sgml/docbook/yelp/db2html-division.xsl
-share/gnome/sgml/docbook/yelp/db2html-ebnf.xsl
-share/gnome/sgml/docbook/yelp/db2html-footnote.xsl
-share/gnome/sgml/docbook/yelp/db2html-glossary.xsl
-share/gnome/sgml/docbook/yelp/db2html-header.xsl
-share/gnome/sgml/docbook/yelp/db2html-html.xsl
-share/gnome/sgml/docbook/yelp/db2html-index.xsl
-share/gnome/sgml/docbook/yelp/db2html-inline.xsl
-share/gnome/sgml/docbook/yelp/db2html-list.xsl
-share/gnome/sgml/docbook/yelp/db2html-math.xsl
-share/gnome/sgml/docbook/yelp/db2html-media.xsl
-share/gnome/sgml/docbook/yelp/db2html-navbar.xsl
-share/gnome/sgml/docbook/yelp/db2html-param.xsl
-share/gnome/sgml/docbook/yelp/db2html-qanda.xsl
-share/gnome/sgml/docbook/yelp/db2html-refentry.xsl
-share/gnome/sgml/docbook/yelp/db2html-suppressed.xsl
-share/gnome/sgml/docbook/yelp/db2html-synopsis.xsl
-share/gnome/sgml/docbook/yelp/db2html-table.xsl
-share/gnome/sgml/docbook/yelp/db2html-title.xsl
-share/gnome/sgml/docbook/yelp/db2html-titlepage.xsl
-share/gnome/sgml/docbook/yelp/db2html-toc.xsl
-share/gnome/sgml/docbook/yelp/db2html-xref.xsl
 share/gnome/sgml/docbook/yelp/db2html.xsl
-share/gnome/sgml/docbook/yelp/gettext.xsl
-share/gnome/sgml/docbook/yelp/l10n.xml
+share/gnome/sgml/docbook/yelp/info2html.xsl
 share/gnome/sgml/docbook/yelp/man2html.xsl
+share/gnome/sgml/docbook/yelp/toc2html.xsl
 share/gnome/yelp/default.css
-share/gnome/yelp/icons/caution.png
-share/gnome/yelp/icons/important.png
-share/gnome/yelp/icons/note.png
-share/gnome/yelp/icons/tip.png
-share/gnome/yelp/icons/warning.png
+share/gnome/yelp/icons/yelp-icon-caution.png
+share/gnome/yelp/icons/yelp-icon-important.png
+share/gnome/yelp/icons/yelp-icon-note.png
+share/gnome/yelp/icons/yelp-icon-tip.png
+share/gnome/yelp/icons/yelp-icon-warning.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-00AB.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-00BB.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-201C.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-201D.png
+share/gnome/yelp/icons/yelp-watermark-blockquote-201E.png
 share/gnome/yelp/important_docs.xml
+share/gnome/yelp/man.xml
+share/gnome/yelp/scrollkeeper.xml
 share/gnome/yelp/toc.xml
+share/gnome/yelp/ui/yelp-ui.xml
 share/gnome/yelp/ui/yelp.glade
 share/locale/af/LC_MESSAGES/yelp.mo
 share/locale/am/LC_MESSAGES/yelp.mo
@@ -83,7 +65,6 @@ share/locale/ko/LC_MESSAGES/yelp.mo
 share/locale/li/LC_MESSAGES/yelp.mo
 share/locale/lt/LC_MESSAGES/yelp.mo
 share/locale/lv/LC_MESSAGES/yelp.mo
-share/locale/mi/LC_MESSAGES/yelp.mo
 share/locale/mk/LC_MESSAGES/yelp.mo
 share/locale/ml/LC_MESSAGES/yelp.mo
 share/locale/mn/LC_MESSAGES/yelp.mo
@@ -110,7 +91,6 @@ share/locale/sv/LC_MESSAGES/yelp.mo
 share/locale/ta/LC_MESSAGES/yelp.mo
 share/locale/tg/LC_MESSAGES/yelp.mo
 share/locale/th/LC_MESSAGES/yelp.mo
-share/locale/tk/LC_MESSAGES/yelp.mo
 share/locale/tr/LC_MESSAGES/yelp.mo
 share/locale/uk/LC_MESSAGES/yelp.mo
 share/locale/vi/LC_MESSAGES/yelp.mo
@@ -118,11 +98,13 @@ share/locale/wa/LC_MESSAGES/yelp.mo
 share/locale/zh_CN/LC_MESSAGES/yelp.mo
 share/locale/zh_TW/LC_MESSAGES/yelp.mo
 share/locale/zu/LC_MESSAGES/yelp.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
+@dirrm share/locale/zu/LC_MESSAGES
+@dirrm share/locale/zu
+@dirrm share/locale/nso/LC_MESSAGES
+@dirrm share/locale/nso
+@dirrm share/locale/mr/LC_MESSAGES
+@dirrm share/locale/mr
 @dirrm share/gnome/yelp/ui
 @dirrm share/gnome/yelp/icons
 @dirrm share/gnome/yelp
 @dirrm share/gnome/sgml/docbook/yelp
-@dirrm share/gnome/sgml/docbook
-@dirrm share/gnome/sgml
diff --git a/x11/zenity/Makefile b/x11/zenity/Makefile
index 261b01610a50..966d951dd6c1 100644
--- a/x11/zenity/Makefile
+++ b/x11/zenity/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	zenity
-PORTVERSION=	2.8.2
+PORTVERSION=	2.10.0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=    gnome2
 
 MAINTAINER=	klammer@webonaut.com
@@ -25,6 +25,7 @@ USE_GNOME=	gnomeprefix gnomehack libgnomecanvas gconf2
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
diff --git a/x11/zenity/distinfo b/x11/zenity/distinfo
index 5475b2b207d5..ea553b6190df 100644
--- a/x11/zenity/distinfo
+++ b/x11/zenity/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/zenity-2.8.2.tar.bz2) = 166e57a71f61ed86cd4f7437ff010b66
-SIZE (gnome2/zenity-2.8.2.tar.bz2) = 721700
+MD5 (gnome2/zenity-2.10.0.tar.bz2) = 2e501bba72b6e7d4f951080b9e5f675b
+SIZE (gnome2/zenity-2.10.0.tar.bz2) = 742206
diff --git a/x11/zenity/pkg-plist b/x11/zenity/pkg-plist
index d1a62bf16c78..879d5604c2cf 100644
--- a/x11/zenity/pkg-plist
+++ b/x11/zenity/pkg-plist
@@ -6,6 +6,7 @@ share/gnome/help/zenity/C/figures/zenity-error-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-fileselection-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-information-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-list-screenshot.png
+share/gnome/help/zenity/C/figures/zenity-notification-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-progress-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-question-screenshot.png
 share/gnome/help/zenity/C/figures/zenity-text-screenshot.png
@@ -25,9 +26,7 @@ share/gnome/help/zenity/sr/figures/zenity-warning-screenshot.png
 share/gnome/help/zenity/sr/legal.xml
 share/gnome/help/zenity/sr/zenity.xml
 share/gnome/omf/zenity/zenity-C.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/zenity/zenity-sr.omf
-@exec scrollkeeper-install -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true
 share/gnome/zenity/clothes/gnome-tshirt.png
 share/gnome/zenity/clothes/hawaii-shirt.png
 share/gnome/zenity/clothes/monk.png
@@ -37,6 +36,7 @@ share/gnome/zenity/zenity-calendar.png
 share/gnome/zenity/zenity-entry.png
 share/gnome/zenity/zenity-file.png
 share/gnome/zenity/zenity-list.png
+share/gnome/zenity/zenity-notification.png
 share/gnome/zenity/zenity-progress.png
 share/gnome/zenity/zenity-text.png
 share/gnome/zenity/zenity.glade
@@ -112,5 +112,3 @@ share/locale/zh_TW/LC_MESSAGES/zenity-0.1.mo
 @dirrm share/gnome/help/zenity/C/figures
 @dirrm share/gnome/help/zenity/C
 @dirrm share/gnome/help/zenity
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-C.omf 2>/dev/null || /usr/bin/true
-@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/zenity/zenity-sr.omf 2>/dev/null || /usr/bin/true
author	marcus <marcus@FreeBSD.org>	2005-03-12 18:39:38 +0800
committer	marcus <marcus@FreeBSD.org>	2005-03-12 18:39:38 +0800
commit	0b42143dea1a55d0f1f6d09704bbc131e1b633ed (patch)
tree	bc54902eb18f738e45a91362b2b0faf1ec6d04fa /x11
parent	773c9ca4ac44ac67652d01f1e985e4df8dab5301 (diff)
download	freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.tar.gz freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.tar.zst freebsd-ports-gnome-0b42143dea1a55d0f1f6d09704bbc131e1b633ed.zip