Presenting GNOME 2.6.0. The FreeBSD GNOME Team feels this our best release

ever.  It fixes many bugs, and adds some features missing in previous
FreeBSD ports.  To help users upgrade from GNOME 2.4, we have constructed an
upgrade FAQ at:

http://www.freebsd.org/gnome/docs/faq26.html

Please read it carefully.  GNOME 2.6 packages are also available for all
supported i386 versions of FreeBSD at:

http://www.marcuscom.com/tinderbox/

The FreeBSD GNOME Team would like the thank the following users for their
wonderful testing and patching efforts.  We would especially like to thank
Franz Klammer <klammer@webonaut.com> for his wonderful new splash screen.
Without these people, our team, and our team alumni, GNOME on FreeBSD would
not be possible.

Jeremy Messenger <mezz7@cox.net>
Khairil Yusof <kaeru@pd.jaring.my>
Koop Mast <kwm@rainbow-runner.nl>
Simon Barner <barner@in.tum.de>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Scott Dodson <sdodson@sdodson.com>
Vladimir Grebenschikov <vova@sw.ru>

32 files changed, 291 insertions, 382 deletions

diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index f671b006eadb..4c2e7d843870 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -22,7 +21,10 @@ USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack gconf2
 USE_LIBTOOL_VER=13
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+MAN1=		gconf-editor.1
+
 .include <bsd.port.mk>
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index f516c9ba7941..a6923b7cd49c 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gconf-editor-2.4.0.tar.bz2) = 7ebc352062fc8b6d3c09a69ad6e963a7
-SIZE (gnome2/gconf-editor-2.4.0.tar.bz2) = 352468
+MD5 (gnome2/gconf-editor-2.6.0.tar.bz2) = 456d5dbddefffe7b49f18688aa9c1975
+SIZE (gnome2/gconf-editor-2.6.0.tar.bz2) = 372032
diff --git a/sysutils/gconf-editor/pkg-descr b/sysutils/gconf-editor/pkg-descr
index f840cc1d25d8..0c8d23c9b407 100644
--- a/sysutils/gconf-editor/pkg-descr
+++ b/sysutils/gconf-editor/pkg-descr
@@ -1,2 +1,2 @@
-gconf-editor is a gconf database editor for GNOME 2.0.  It is similar to 
+gconf-editor is a GNOME 2 GConf database editor.  It is analogous to
 regedit on Windows.
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 55767281a4e8..75b183159c71 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -22,6 +22,7 @@ share/locale/cy/LC_MESSAGES/gconf-editor.mo
 share/locale/da/LC_MESSAGES/gconf-editor.mo
 share/locale/de/LC_MESSAGES/gconf-editor.mo
 share/locale/el/LC_MESSAGES/gconf-editor.mo
+share/locale/en_GB/LC_MESSAGES/gconf-editor.mo
 share/locale/es/LC_MESSAGES/gconf-editor.mo
 share/locale/et/LC_MESSAGES/gconf-editor.mo
 share/locale/fa/LC_MESSAGES/gconf-editor.mo
@@ -31,6 +32,7 @@ share/locale/ga/LC_MESSAGES/gconf-editor.mo
 share/locale/gl/LC_MESSAGES/gconf-editor.mo
 share/locale/he/LC_MESSAGES/gconf-editor.mo
 share/locale/hi/LC_MESSAGES/gconf-editor.mo
+share/locale/hr/LC_MESSAGES/gconf-editor.mo
 share/locale/hu/LC_MESSAGES/gconf-editor.mo
 share/locale/id/LC_MESSAGES/gconf-editor.mo
 share/locale/it/LC_MESSAGES/gconf-editor.mo
@@ -43,9 +45,11 @@ share/locale/lv/LC_MESSAGES/gconf-editor.mo
 share/locale/mk/LC_MESSAGES/gconf-editor.mo
 share/locale/ml/LC_MESSAGES/gconf-editor.mo
 share/locale/mn/LC_MESSAGES/gconf-editor.mo
+share/locale/mr/LC_MESSAGES/gconf-editor.mo
 share/locale/ms/LC_MESSAGES/gconf-editor.mo
 share/locale/nl/LC_MESSAGES/gconf-editor.mo
 share/locale/no/LC_MESSAGES/gconf-editor.mo
+share/locale/pa/LC_MESSAGES/gconf-editor.mo
 share/locale/pl/LC_MESSAGES/gconf-editor.mo
 share/locale/pt/LC_MESSAGES/gconf-editor.mo
 share/locale/pt_BR/LC_MESSAGES/gconf-editor.mo
@@ -58,6 +62,7 @@ share/locale/sr/LC_MESSAGES/gconf-editor.mo
 share/locale/sr@Latn/LC_MESSAGES/gconf-editor.mo
 share/locale/sv/LC_MESSAGES/gconf-editor.mo
 share/locale/ta/LC_MESSAGES/gconf-editor.mo
+share/locale/th/LC_MESSAGES/gconf-editor.mo
 share/locale/tr/LC_MESSAGES/gconf-editor.mo
 share/locale/uk/LC_MESSAGES/gconf-editor.mo
 share/locale/vi/LC_MESSAGES/gconf-editor.mo
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index ea79decebbdf..2dff803143d3 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.4
+MASTER_SITE_SUBDIR=	sources/control-center/2.6
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
+LIB_DEPENDS=	xklavier.8:${PORTSDIR}/x11/libxklavier
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gnomehier metacity nautilus2
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index ff6267bd5edf..81cab7473379 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae
-SIZE (gnome2/control-center-2.4.0.tar.bz2) = 2042574
+MD5 (gnome2/control-center-2.6.0.3.tar.bz2) = 7d482e42842dc5b8a52714ae7a0aafed
+SIZE (gnome2/control-center-2.6.0.3.tar.bz2) = 2364656
diff --git a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
new file mode 100644
index 000000000000..5a6b0ba8f2d6
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
@@ -0,0 +1,11 @@
+--- capplets/desktop-links/Makefile.in.orig	Tue Dec 30 15:55:28 2003
++++ capplets/desktop-links/Makefile.in	Tue Dec 30 15:55:49 2003
+@@ -190,7 +190,7 @@
+ 
+ pixmaps_pre = $(capplets:=-capplet.png)
+ pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
+-pixmapsdir = $(datadir)/icons/gnome/48x48/apps
++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
+ 
+ desktop_files = $(capplets:=.desktop)
+ desktop_in_files = $(desktop_files:.desktop=.desktop.in)
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 83ef8876cbb3..820e1fc4bfb4 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,31 @@
---- configure.orig	Wed Dec 18 16:10:09 2002
-+++ configure	Sun Dec 22 16:36:03 2002
-@@ -12607,7 +12608,7 @@
+--- configure.orig	Thu Mar 11 03:09:48 2004
++++ configure	Thu Mar 11 03:12:25 2004
+@@ -21373,6 +21373,7 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21461,6 +21462,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -25595,7 +25597,7 @@
+ if test "x$CATOBJEXT" = "x.mo" ; then
+   localedir=`eval echo "${libdir}/locale"`
+ else
+-  localedir=`eval echo "${datadir}/locale"`
++  localedir=`eval echo "${prefix}/share/locale"`
+ fi
+ prefix="$glib_save_prefix"
+ exec_prefix="$glib_save_exec_prefix"
+@@ -26257,7 +26259,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/pkg-descr b/sysutils/gnome-control-center/pkg-descr
index 017e3d76e99e..26d4dbe929b2 100644
--- a/sysutils/gnome-control-center/pkg-descr
+++ b/sysutils/gnome-control-center/pkg-descr
@@ -1 +1 @@
-control center for GNOME 2.0 project.
+Configuration tools tightly integrated within the GNOME 2 desktop.
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 00cba32274e8..a1c257fb1b00 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -11,7 +11,6 @@ bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
-bin/gnome-settings-daemon
 bin/gnome-sound-properties
 bin/themus-theme-applier
 bin/gnome-theme-manager
@@ -22,8 +21,10 @@ bin/gnome-ui-properties
 bin/gnome-window-properties
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
@@ -32,8 +33,10 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-them
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
@@ -41,8 +44,10 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-fo
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
 etc/gconf/schemas/fontilus.schemas
 etc/gconf/schemas/themus.schemas
 etc/gnome-vfs-2.0/modules/font-method.conf
@@ -62,41 +67,33 @@ libdata/bonobo/servers/Themus_Properties_View.server
 libdata/bonobo/servers/fontilus.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/fontilus-context-menu
+libexec/gnome-settings-daemon
 share/gnome/application-registry/fontilus.applications
 share/gnome/application-registry/themus.applications
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/at-properties.desktop
 share/gnome/control-center-2.0/capplets/background.desktop
-share/gnome/control-center-2.0/capplets/behavior.desktop
 share/gnome/control-center-2.0/capplets/default-applications.desktop
 share/gnome/control-center-2.0/capplets/display-properties.desktop
 share/gnome/control-center-2.0/capplets/file-types.desktop
 share/gnome/control-center-2.0/capplets/font-properties.desktop
 share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
+share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop
+share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop
+share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop
 share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop
 share/gnome/control-center-2.0/capplets/keybinding.desktop
 share/gnome/control-center-2.0/capplets/keyboard.desktop
-share/gnome/control-center-2.0/capplets/mouse.desktop
-share/gnome/control-center-2.0/capplets/sound.desktop
 share/gnome/control-center-2.0/capplets/window-properties.desktop
-share/gnome/control-center-2.0/icons/accessibility-directory.png
-share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
-share/gnome/control-center-2.0/icons/at-enable-capplet.png
-share/gnome/control-center-2.0/icons/background-capplet.png
-share/gnome/control-center-2.0/icons/behavior-capplet.png
-share/gnome/control-center-2.0/icons/default-applications-capplet.png
 share/gnome/control-center-2.0/icons/display-capplet.png
-share/gnome/control-center-2.0/icons/font-capplet.png
-share/gnome/control-center-2.0/icons/gnome-network-capplet.png
-share/gnome/control-center-2.0/icons/mouse-capplet.png
-share/gnome/control-center-2.0/icons/sound-capplet.png
-share/gnome/control-center-2.0/icons/window-capplet.png
+share/gnome/control-center-2.0/interfaces/acme.glade
+share/gnome/control-center-2.0/interfaces/apply-font.glade
 share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
-share/gnome/control-center-2.0/interfaces/background-properties.glade
 share/gnome/control-center-2.0/interfaces/file-types-properties.glade
 share/gnome/control-center-2.0/interfaces/font-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
@@ -112,7 +109,8 @@ share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/at-enable-capplet.png
+share/gnome/control-center-2.0/pixmaps/acme-brightness.png
+share/gnome/control-center-2.0/pixmaps/acme-eject.png
 share/gnome/control-center-2.0/pixmaps/at-startup.png
 share/gnome/control-center-2.0/pixmaps/at-support.png
 share/gnome/control-center-2.0/pixmaps/bar-disabled.png
@@ -122,8 +120,9 @@ share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
-share/gnome/control-center-2.0/pixmaps/keyboard-capplet.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
 share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
@@ -134,7 +133,6 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/gnome/control-center-2.0/pixmaps/mouse-left.png
 share/gnome/control-center-2.0/pixmaps/mouse-right.png
 share/gnome/control-center-2.0/pixmaps/ocean-stripes.png
-share/gnome/control-center-2.0/pixmaps/sound-capplet.png
 share/gnome/control-center-2.0/pixmaps/stop.png
 share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
@@ -148,7 +146,6 @@ share/gnome/control-center-2.0/xrdb/General.ad
 share/gnome/control-center-2.0/xrdb/Motif.ad
 share/gnome/control-center-2.0/xrdb/Tk.ad
 share/gnome/control-center-2.0/xrdb/Xaw.ad
-share/gnome/control-center/apply-font.glade
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -158,27 +155,18 @@ share/gnome/idl/GNOME_SettingsDaemon.idl
 share/gnome/mime-info/fontilus.keys
 share/gnome/mime-info/fontilus.mime
 share/gnome/mime-info/themus.keys
-share/gnome/pixmaps/accessibility-keyboard-capplet.png
-share/gnome/pixmaps/at-enable-capplet.png
-share/gnome/pixmaps/background-capplet.png
-share/gnome/pixmaps/behavior-capplet.png
 share/gnome/pixmaps/control-center2.png
-share/gnome/pixmaps/default-applications-capplet.png
 share/gnome/pixmaps/display-capplet.png
-share/gnome/pixmaps/font-capplet.png
-share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
 share/gnome/pixmaps/gnomecc-2/blank.png
 share/gnome/pixmaps/gnomecc-2/title.png
-share/gnome/pixmaps/keyboard-capplet.png
-share/gnome/pixmaps/keyboard-shortcut.png
-share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
+share/icons/gnome/48x48/apps/accessibility-directory.png
+share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
@@ -191,6 +179,7 @@ share/locale/cy/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
 share/locale/de/LC_MESSAGES/control-center-2.0.mo
 share/locale/el/LC_MESSAGES/control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
 share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
 share/locale/es/LC_MESSAGES/control-center-2.0.mo
 share/locale/et/LC_MESSAGES/control-center-2.0.mo
@@ -217,6 +206,7 @@ share/locale/ms/LC_MESSAGES/control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/control-center-2.0.mo
 share/locale/no/LC_MESSAGES/control-center-2.0.mo
+share/locale/pa/LC_MESSAGES/control-center-2.0.mo
 share/locale/pl/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo
@@ -237,6 +227,7 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/pixmaps/gnomecc-2
+@dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
@@ -251,8 +242,11 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
@@ -261,7 +255,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 24082cb98839..ddf03c8cbaf9 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.6
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,7 +21,8 @@ LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
+USE_REINPLACE=	yes
+USE_GNOME=	gnomeprefix intlhack lthack gnomehack libgnomeui libwnck
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 7115f703da96..75cc73e5deaa 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf
-SIZE (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = 546873
+MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17
+SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694
diff --git a/sysutils/gnome-system-monitor/files/patch-src_util.c b/sysutils/gnome-system-monitor/files/patch-src_util.c
index b7e262b0c599..288ccc26adc0 100644
--- a/sysutils/gnome-system-monitor/files/patch-src_util.c
+++ b/sysutils/gnome-system-monitor/files/patch-src_util.c
@@ -1,5 +1,5 @@
---- src/util.c.orig	Thu May  9 01:16:48 2002
-+++ src/util.c	Thu May  9 01:17:13 2002
+--- src/util.c.orig	Fri Dec 12 02:26:57 2003
++++ src/util.c	Fri Dec 12 02:35:38 2003
 @@ -16,6 +16,7 @@
  
  #ifdef __FreeBSD__
@@ -8,3 +8,27 @@
  # include <libutil.h>
  #endif
  
+@@ -181,7 +182,11 @@
+ 	 * Make su think we're sending the password from a terminal:
+ 	 */
+ 
++#ifndef __FreeBSD__
+ 	if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
++#else
++	if ((t_fd = OPEN_TTY()) < 0) {
++#endif
+ 		fprintf (stderr, "Unable to open a terminal\n");
+ 		ABORT (root);
+ 	}
+@@ -259,7 +264,11 @@
+ 			}
+ 		}
+ 
++#ifndef __FreeBSD__
+ 		if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
++#else
++		if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
++#endif
+ 			perror ("Unable to open pseudo slave terminal");
+ 			_exit (-1);
+ 		}
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index d035ed3953c7..bf559c2732a3 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -13,6 +13,7 @@ share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
 share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png
 share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
 share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
 share/gnome/help/gnome-system-monitor/C/figures/processListing.png
@@ -38,6 +39,7 @@ share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
@@ -46,12 +48,14 @@ share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
@@ -70,6 +74,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index ea79decebbdf..2dff803143d3 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,23 +6,24 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0.3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.4
+MASTER_SITE_SUBDIR=	sources/control-center/2.6
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
+LIB_DEPENDS=	xklavier.8:${PORTSDIR}/x11/libxklavier
+
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gnomehier metacity nautilus2
+USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index ff6267bd5edf..81cab7473379 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.4.0.tar.bz2) = 44115d3174d2f603f34a336ada562bae
-SIZE (gnome2/control-center-2.4.0.tar.bz2) = 2042574
+MD5 (gnome2/control-center-2.6.0.3.tar.bz2) = 7d482e42842dc5b8a52714ae7a0aafed
+SIZE (gnome2/control-center-2.6.0.3.tar.bz2) = 2364656
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in
new file mode 100644
index 000000000000..5a6b0ba8f2d6
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in
@@ -0,0 +1,11 @@
+--- capplets/desktop-links/Makefile.in.orig	Tue Dec 30 15:55:28 2003
++++ capplets/desktop-links/Makefile.in	Tue Dec 30 15:55:49 2003
+@@ -190,7 +190,7 @@
+ 
+ pixmaps_pre = $(capplets:=-capplet.png)
+ pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
+-pixmapsdir = $(datadir)/icons/gnome/48x48/apps
++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
+ 
+ desktop_files = $(capplets:=.desktop)
+ desktop_in_files = $(desktop_files:.desktop=.desktop.in)
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index 83ef8876cbb3..820e1fc4bfb4 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,31 @@
---- configure.orig	Wed Dec 18 16:10:09 2002
-+++ configure	Sun Dec 22 16:36:03 2002
-@@ -12607,7 +12608,7 @@
+--- configure.orig	Thu Mar 11 03:09:48 2004
++++ configure	Thu Mar 11 03:12:25 2004
+@@ -21373,6 +21373,7 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21461,6 +21462,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+  have_ngettext=yes
+ fi
+ done
+@@ -25595,7 +25597,7 @@
+ if test "x$CATOBJEXT" = "x.mo" ; then
+   localedir=`eval echo "${libdir}/locale"`
+ else
+-  localedir=`eval echo "${datadir}/locale"`
++  localedir=`eval echo "${prefix}/share/locale"`
+ fi
+ prefix="$glib_save_prefix"
+ exec_prefix="$glib_save_exec_prefix"
+@@ -26257,7 +26259,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnomecontrolcenter2/pkg-descr b/sysutils/gnomecontrolcenter2/pkg-descr
index 017e3d76e99e..26d4dbe929b2 100644
--- a/sysutils/gnomecontrolcenter2/pkg-descr
+++ b/sysutils/gnomecontrolcenter2/pkg-descr
@@ -1 +1 @@
-control center for GNOME 2.0 project.
+Configuration tools tightly integrated within the GNOME 2 desktop.
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 00cba32274e8..a1c257fb1b00 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -11,7 +11,6 @@ bin/gnome-keybinding-properties
 bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
-bin/gnome-settings-daemon
 bin/gnome-sound-properties
 bin/themus-theme-applier
 bin/gnome-theme-manager
@@ -22,8 +21,10 @@ bin/gnome-ui-properties
 bin/gnome-window-properties
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings/%gconf.xml
 etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
@@ -32,8 +33,10 @@ etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-them
 etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf/%gconf.xml
@@ -41,8 +44,10 @@ etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-fo
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme-installed/%gconf.xml
 etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-gnome-theme/%gconf.xml
 etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
+etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
 etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
 etc/gconf/schemas/desktop_gnome_font_rendering.schemas
+etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
 etc/gconf/schemas/fontilus.schemas
 etc/gconf/schemas/themus.schemas
 etc/gnome-vfs-2.0/modules/font-method.conf
@@ -62,41 +67,33 @@ libdata/bonobo/servers/Themus_Properties_View.server
 libdata/bonobo/servers/fontilus.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
 libexec/fontilus-context-menu
+libexec/gnome-settings-daemon
 share/gnome/application-registry/fontilus.applications
 share/gnome/application-registry/themus.applications
 share/gnome/applications/gnomecc.desktop
 share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
 share/gnome/control-center-2.0/capplets/at-properties.desktop
 share/gnome/control-center-2.0/capplets/background.desktop
-share/gnome/control-center-2.0/capplets/behavior.desktop
 share/gnome/control-center-2.0/capplets/default-applications.desktop
 share/gnome/control-center-2.0/capplets/display-properties.desktop
 share/gnome/control-center-2.0/capplets/file-types.desktop
 share/gnome/control-center-2.0/capplets/font-properties.desktop
 share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
+share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop
+share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop
+share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop
 share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop
 share/gnome/control-center-2.0/capplets/keybinding.desktop
 share/gnome/control-center-2.0/capplets/keyboard.desktop
-share/gnome/control-center-2.0/capplets/mouse.desktop
-share/gnome/control-center-2.0/capplets/sound.desktop
 share/gnome/control-center-2.0/capplets/window-properties.desktop
-share/gnome/control-center-2.0/icons/accessibility-directory.png
-share/gnome/control-center-2.0/icons/accessibility-keyboard-capplet.png
-share/gnome/control-center-2.0/icons/at-enable-capplet.png
-share/gnome/control-center-2.0/icons/background-capplet.png
-share/gnome/control-center-2.0/icons/behavior-capplet.png
-share/gnome/control-center-2.0/icons/default-applications-capplet.png
 share/gnome/control-center-2.0/icons/display-capplet.png
-share/gnome/control-center-2.0/icons/font-capplet.png
-share/gnome/control-center-2.0/icons/gnome-network-capplet.png
-share/gnome/control-center-2.0/icons/mouse-capplet.png
-share/gnome/control-center-2.0/icons/sound-capplet.png
-share/gnome/control-center-2.0/icons/window-capplet.png
+share/gnome/control-center-2.0/interfaces/acme.glade
+share/gnome/control-center-2.0/interfaces/apply-font.glade
 share/gnome/control-center-2.0/interfaces/at-enable-dialog.glade
-share/gnome/control-center-2.0/interfaces/background-properties.glade
 share/gnome/control-center-2.0/interfaces/file-types-properties.glade
 share/gnome/control-center-2.0/interfaces/font-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-accessibility-keyboard-properties.glade
+share/gnome/control-center-2.0/interfaces/gnome-background-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-default-applications-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keybinding-properties.glade
 share/gnome/control-center-2.0/interfaces/gnome-keyboard-properties.glade
@@ -112,7 +109,8 @@ share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-mousekey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-slowkey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-stickykey.png
 share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-togglekey.png
-share/gnome/control-center-2.0/pixmaps/at-enable-capplet.png
+share/gnome/control-center-2.0/pixmaps/acme-brightness.png
+share/gnome/control-center-2.0/pixmaps/acme-eject.png
 share/gnome/control-center-2.0/pixmaps/at-startup.png
 share/gnome/control-center-2.0/pixmaps/at-support.png
 share/gnome/control-center-2.0/pixmaps/bar-disabled.png
@@ -122,8 +120,9 @@ share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
+share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
-share/gnome/control-center-2.0/pixmaps/keyboard-capplet.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
 share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
@@ -134,7 +133,6 @@ share/gnome/control-center-2.0/pixmaps/mouse-cursor-white.png
 share/gnome/control-center-2.0/pixmaps/mouse-left.png
 share/gnome/control-center-2.0/pixmaps/mouse-right.png
 share/gnome/control-center-2.0/pixmaps/ocean-stripes.png
-share/gnome/control-center-2.0/pixmaps/sound-capplet.png
 share/gnome/control-center-2.0/pixmaps/stop.png
 share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
 share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
@@ -148,7 +146,6 @@ share/gnome/control-center-2.0/xrdb/General.ad
 share/gnome/control-center-2.0/xrdb/Motif.ad
 share/gnome/control-center-2.0/xrdb/Tk.ad
 share/gnome/control-center-2.0/xrdb/Xaw.ad
-share/gnome/control-center/apply-font.glade
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -158,27 +155,18 @@ share/gnome/idl/GNOME_SettingsDaemon.idl
 share/gnome/mime-info/fontilus.keys
 share/gnome/mime-info/fontilus.mime
 share/gnome/mime-info/themus.keys
-share/gnome/pixmaps/accessibility-keyboard-capplet.png
-share/gnome/pixmaps/at-enable-capplet.png
-share/gnome/pixmaps/background-capplet.png
-share/gnome/pixmaps/behavior-capplet.png
 share/gnome/pixmaps/control-center2.png
-share/gnome/pixmaps/default-applications-capplet.png
 share/gnome/pixmaps/display-capplet.png
-share/gnome/pixmaps/font-capplet.png
-share/gnome/pixmaps/gnome-ccthemes.png
 share/gnome/pixmaps/gnomecc-2/active.png
 share/gnome/pixmaps/gnomecc-2/bcg_top.png
 share/gnome/pixmaps/gnomecc-2/blank.png
 share/gnome/pixmaps/gnomecc-2/title.png
-share/gnome/pixmaps/keyboard-capplet.png
-share/gnome/pixmaps/keyboard-shortcut.png
-share/gnome/pixmaps/mouse-capplet.png
-share/gnome/pixmaps/window-capplet.png
 share/gnome/vfolders/Accessibility.directory
 share/gnome/vfolders/Advanced.directory
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
+share/icons/gnome/48x48/apps/accessibility-directory.png
+share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
 share/locale/az/LC_MESSAGES/control-center-2.0.mo
@@ -191,6 +179,7 @@ share/locale/cy/LC_MESSAGES/control-center-2.0.mo
 share/locale/da/LC_MESSAGES/control-center-2.0.mo
 share/locale/de/LC_MESSAGES/control-center-2.0.mo
 share/locale/el/LC_MESSAGES/control-center-2.0.mo
+share/locale/en_CA/LC_MESSAGES/control-center-2.0.mo
 share/locale/en_GB/LC_MESSAGES/control-center-2.0.mo
 share/locale/es/LC_MESSAGES/control-center-2.0.mo
 share/locale/et/LC_MESSAGES/control-center-2.0.mo
@@ -217,6 +206,7 @@ share/locale/ms/LC_MESSAGES/control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/control-center-2.0.mo
 share/locale/no/LC_MESSAGES/control-center-2.0.mo
+share/locale/pa/LC_MESSAGES/control-center-2.0.mo
 share/locale/pl/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt/LC_MESSAGES/control-center-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/control-center-2.0.mo
@@ -237,6 +227,7 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/pixmaps/gnomecc-2
+@dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
@@ -251,8 +242,11 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-pcf
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/thumbnailers/application@x-font-otf
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/xkb
+@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/font_rendering
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/schemas/apps/gnome_settings_daemon
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-gnome-theme-installed
@@ -261,7 +255,8 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-ttf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-pcf
 @dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/thumbnailers/application@x-font-otf
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/font_rendering
+@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/xkb
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/screensaver
+@dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/keybindings
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon/editor
 @dirrm etc/gconf/gconf.xml.defaults/apps/gnome_settings_daemon
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 24082cb98839..ddf03c8cbaf9 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.4.0
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.4
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.6
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -22,7 +21,8 @@ LIB_DEPENDS=	gtop-2.0.2:${PORTSDIR}/devel/libgtop2
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeui libwnck
+USE_REINPLACE=	yes
+USE_GNOME=	gnomeprefix intlhack lthack gnomehack libgnomeui libwnck
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 7115f703da96..75cc73e5deaa 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = f855d85adcc2eb0f20f639cbc2f00cbf
-SIZE (gnome2/gnome-system-monitor-2.4.0.tar.bz2) = 546873
+MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17
+SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_util.c b/sysutils/gnomesystemmonitor/files/patch-src_util.c
index b7e262b0c599..288ccc26adc0 100644
--- a/sysutils/gnomesystemmonitor/files/patch-src_util.c
+++ b/sysutils/gnomesystemmonitor/files/patch-src_util.c
@@ -1,5 +1,5 @@
---- src/util.c.orig	Thu May  9 01:16:48 2002
-+++ src/util.c	Thu May  9 01:17:13 2002
+--- src/util.c.orig	Fri Dec 12 02:26:57 2003
++++ src/util.c	Fri Dec 12 02:35:38 2003
 @@ -16,6 +16,7 @@
  
  #ifdef __FreeBSD__
@@ -8,3 +8,27 @@
  # include <libutil.h>
  #endif
  
+@@ -181,7 +182,11 @@
+ 	 * Make su think we're sending the password from a terminal:
+ 	 */
+ 
++#ifndef __FreeBSD__
+ 	if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
++#else
++	if ((t_fd = OPEN_TTY()) < 0) {
++#endif
+ 		fprintf (stderr, "Unable to open a terminal\n");
+ 		ABORT (root);
+ 	}
+@@ -259,7 +264,11 @@
+ 			}
+ 		}
+ 
++#ifndef __FreeBSD__
+ 		if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
++#else
++		if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
++#endif
+ 			perror ("Unable to open pseudo slave terminal");
+ 			_exit (-1);
+ 		}
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index d035ed3953c7..bf559c2732a3 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -13,6 +13,7 @@ share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
 share/gnome/help/gnome-system-monitor/C/figures/colorPanel.png
 share/gnome/help/gnome-system-monitor/C/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/C/figures/gnome-system-monitor_window.png
 share/gnome/help/gnome-system-monitor/C/figures/memoryMaps.png
 share/gnome/help/gnome-system-monitor/C/figures/moreInfo.png
 share/gnome/help/gnome-system-monitor/C/figures/processListing.png
@@ -38,6 +39,7 @@ share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/da/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/de/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
@@ -46,12 +48,14 @@ share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/he/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/hi/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/hr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/hu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/id/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/it/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ja/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ko/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/li/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/lt/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/lv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
@@ -70,6 +74,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index f2f68f798864..715870d6a315 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	0.5.3
-PORTREVISION=	7
+PORTVERSION=	2.6.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.5
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -21,14 +20,31 @@ RUN_DEPENDS=	mkisofs:${PORTSDIR}/sysutils/mkisofs \
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack nautilus2
+USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2
 USE_LIBTOOL_VER=13
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+.include <bsd.port.pre.mk>
+
+.if exists(${LOCALBASE}/bin/growisofs)
+WITH_DVD=	yes
+.endif
+
+.if defined(WITH_DVD)
+RUN_DEPENDS+=	growisofs:${PORTSDIR}/sysutils/dvd+rw-tools
+.endif
+
+pre-everything::
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "${PORTNAME} has the following configurable option(s):"
+	@${ECHO_MSG} "	WITH_DVD	Enable DVD burning support"
+	@${ECHO_MSG} ""
+
 post-install:
 	@${CAT} ${PKGMESSAGE}
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 90ebf051db16..7f3b60ce0435 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-0.5.3.tar.bz2) = ba461f080a3ca63936c0c7cab46dd8d8
-SIZE (gnome2/nautilus-cd-burner-0.5.3.tar.bz2) = 311289
+MD5 (gnome2/nautilus-cd-burner-2.6.0.tar.bz2) = 3e1dbaa4b4a9c512cec8d7b5a5d86bf0
+SIZE (gnome2/nautilus-cd-burner-2.6.0.tar.bz2) = 448199
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
deleted file mode 100644
index aea6a2e1289f..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
+++ /dev/null
@@ -1,221 +0,0 @@
---- cd-drive.c.orig	Mon Sep  8 15:24:07 2003
-+++ cd-drive.c	Tue Dec 30 12:46:59 2003
-@@ -693,28 +693,133 @@
- #endif /* __linux__ */
- 
- #ifdef __FreeBSD__
-+static void
-+get_cd_properties (char *id, int *max_rd_speed, int *max_wr_speed,
-+	CDDriveType *type)
-+{
-+    	int i;
-+	const char *argv[20];
-+	char *dev_str, *stdout_data, *rd_speed, *wr_speed, *drive_cap;
-+
-+	*max_rd_speed = -1;
-+	*max_wr_speed = -1;
-+	*type = 0;
-+
-+	i = 0;
-+	argv[i++] = "cdrecord";
-+	argv[i++] = "-prcap";
-+	dev_str = g_strdup_printf ("dev=%s", id);
-+	argv[i++] = dev_str;
-+	argv[i++] = NULL;
-+
-+	if (g_spawn_sync (NULL,
-+			  (char **)argv,
-+			  NULL,
-+			  G_SPAWN_SEARCH_PATH | G_SPAWN_STDERR_TO_DEV_NULL,
-+			  NULL, NULL,
-+			  &stdout_data,
-+			  NULL,
-+			  NULL,
-+			  NULL)) {
-+		wr_speed = strstr (stdout_data, "Maximum write speed:");
-+		if (wr_speed != NULL) {
-+		    	char *tok;
-+		    	wr_speed += strlen ("Maximum write speed:");
-+			for (tok = strtok (wr_speed, " (),\t\n");
-+				tok && strcmp (tok, "CD");
-+				tok = strtok (NULL, " (),\t\n")) {}
-+			tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+			*max_wr_speed = atol (tok);
-+		}
-+		else {
-+		    	wr_speed = strstr (stdout_data, "Maximum write speed in kB/s:");
-+			if (wr_speed != NULL) {
-+			    	char *tok;
-+			    	wr_speed += strlen ("Maximum write speed in kB/s:");
-+				for (tok = strtok (wr_speed, " (),\t\n");
-+					tok && strcmp (tok, "CD");
-+					tok = strtok (NULL, " (),\t\n")) {}
-+				tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+				*max_wr_speed = atol (tok);
-+			}
-+		}
-+
-+		rd_speed = strstr (stdout_data, "Maximum read  speed:");
-+		if (rd_speed != NULL) {
-+		    	char *tok;
-+			rd_speed += strlen ("Maximum read  speed:");
-+			for (tok = strtok (rd_speed, " (),\t\n"); 
-+				tok && strcmp (tok, "CD"); 
-+				tok = strtok (NULL, " (),\t\n")) {}
-+			tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+			*max_rd_speed = atol (tok);
-+		}
-+		else {
-+		    	rd_speed = strstr (stdout_data, "Maximum read  speed in kB/s:");
-+			if (rd_speed != NULL) {
-+			    	char *tok;
-+			    	rd_speed += strlen ("Maximum read  speed in kB/s:");
-+				for (tok = strtok (rd_speed, " (),\t\n");
-+					tok && strcmp (tok, "CD");
-+					tok = strtok (NULL, " (),\t\n")) {}
-+				tok = strtok (NULL, " (),\t\n"); /* Get the CD speed. */
-+				*max_rd_speed = atol (tok);
-+			}
-+		}
-+		drive_cap = strstr (stdout_data, "Does write DVD-RAM media");
-+		if (drive_cap != NULL) {
-+		    	*type |= CDDRIVE_TYPE_DVD_RAM_RECORDER;
-+		}
-+		drive_cap = strstr (stdout_data, "Does read DVD-R media");
-+		if (drive_cap != NULL) {
-+		    	*type |= CDDRIVE_TYPE_DVD_RW_RECORDER;
-+		}
-+		drive_cap = strstr (stdout_data, "Does read DVD-ROM media");
-+		if (drive_cap != NULL) {
-+		    	*type |= CDDRIVE_TYPE_DVD_DRIVE;
-+		}
-+		drive_cap = strstr (stdout_data, "Does write CD-RW media");
-+		if (drive_cap != NULL) {
-+		    	*type |= CDDRIVE_TYPE_CDRW_RECORDER;
-+		}
-+		drive_cap = strstr (stdout_data, "Does write CD-R media");
-+		if (drive_cap != NULL) {
-+		    	*type |= CDDRIVE_TYPE_CD_RECORDER;
-+		}
-+		drive_cap = strstr (stdout_data, "Does read CD-R media");
-+		if (drive_cap != NULL) {
-+		    	*type |= CDDRIVE_TYPE_CD_DRIVE;
-+		}
-+		g_free (stdout_data);
-+	}
-+
-+	g_free (dev_str);
-+}
-+
- static GList *
- freebsd_scan (gboolean recorder_only)
- {
- 	GList *cdroms_list = NULL;
- 	const char *dev_type = "cd";
--	int fd;
- 	int speed = 16; /* XXX Hardcode the write speed for now. */
--	int max_speed = CDR_MAX_SPEED;
- 	int i = 0;
-+	int cnode = 1; /* Use the CD device's 'c' node. */
- 
- 	while (1) {
--		CDDriveType type;
- 		CDDrive *cdrom;
--		gchar *cam_path, *dev;
-+		gchar *cam_path;
- 		struct cam_device *cam_dev;
- 
--		type = 0;
- 		cam_path = g_strdup_printf ("/dev/%s%dc", dev_type, i);
- 
- 		if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) {
- 			g_free (cam_path);
--			break;
-+			cam_path = g_strdup_printf ("/dev/%s%d", dev_type, i);
-+			cnode = 0;
-+			if (!g_file_test (cam_path, G_FILE_TEST_EXISTS)) {
-+				g_free (cam_path);
-+				break;
-+			}
- 		}
- 
- 		if ((cam_dev = cam_open_spec_device (dev_type, i, O_RDWR, NULL)) == NULL) {
-@@ -723,47 +828,41 @@
- 			continue;
- 		}
- 
--		/* XXX Other controllers might need to be added. */
--		if ((strncmp (cam_dev->sim_name, "ata", 3)) == 0) {
--			dev = g_strdup_printf ("/dev/a%s%dc", dev_type, i);
--		} else {
--			dev = g_strdup (cam_path);
--		}
--
--		g_free (cam_path);
--
--		if ((fd = open (dev, O_RDWR, 0)) < 0) {
--			g_free (dev);
--			free (cam_dev);
--			i++;
--			continue;
--		}
--
--		type |= CDDRIVE_TYPE_CD_DRIVE;
--		if (ioctl (fd, CDRIOCWRITESPEED, &max_speed) >= 0) {
--			/* XXX is it CD-R or CD-RW ? */
--			type |= CDDRIVE_TYPE_CD_RECORDER;
--		}
--
--		close (fd);
--
--		if (type & CDDRIVE_TYPE_CD_RECORDER
--				|| type & CDDRIVE_TYPE_CDRW_RECORDER
--				|| recorder_only == FALSE) {
--			cdrom = g_new0 (CDDrive, 1);
--			cdrom->display_name = g_strdup_printf ("%s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.revision);
--			cdrom->device = g_strdup (dev);
--			cdrom->max_speed_read = speed;
--			cdrom->max_speed_write = speed;
--			cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun);
--			cdrom->type = type;
--
--			add_dvd_plus (cdrom);
-+		cdrom = g_new0 (CDDrive, 1);
-+		cdrom->display_name = g_strdup_printf ("%s %s", cam_dev->inq_data.vendor, cam_dev->inq_data.revision);
-+		cdrom->device = g_strdup (cam_path);
-+		cdrom->cdrecord_id = g_strdup_printf ("%d,%d,%d", cam_dev->path_id, cam_dev->target_id, cam_dev->target_lun);
-+		/* Attempt to get more specific information from
-+		 * this drive by using cdrecord.
-+		 */
-+		get_cd_properties (cdrom->cdrecord_id,
-+			&(cdrom->max_speed_read),
-+			&(cdrom->max_speed_write),
-+			&(cdrom->type));
-+		if (cdrom->type & CDDRIVE_TYPE_CD_RECORDER
-+				|| cdrom->type & CDDRIVE_TYPE_CDRW_RECORDER
-+				|| cdrom->type & CDDRIVE_TYPE_DVD_RAM_RECORDER
-+				|| cdrom->type & CDDRIVE_TYPE_DVD_RW_RECORDER
-+				|| !recorder_only) {
-+
-+			if (cdrom->max_speed_read == -1) {
-+		    		cdrom->max_speed_read = speed;
-+			}
-+			if (cdrom->max_speed_write == -1) {
-+			    	cdrom->max_speed_write = speed;
-+			}
-+
-+			if (cdrom->type & CDDRIVE_TYPE_DVD_DRIVE) {
-+				add_dvd_plus (cdrom);
-+			}
- 
- 			cdroms_list = g_list_append (cdroms_list, cdrom);
- 		}
-+		else {
-+		    	cd_drive_free (cdrom);
-+		}
- 
--		g_free (dev);
-+		g_free (cam_path);
- 		free (cam_dev);
- 
- 		i++;
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-record.c b/sysutils/nautilus-cd-burner/files/patch-cd-record.c
deleted file mode 100644
index e7b501be0227..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-cd-record.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- cd-recorder.c.orig	Thu Oct  2 13:09:26 2003
-+++ cd-recorder.c	Thu Oct  2 13:10:27 2003
-@@ -334,12 +334,9 @@
- 		cdrecorder->priv->music_count = build_list_of_music_arguments ("burn:///", &i, argv, 200-i-5);
- 	} else {
- 		cdrecorder->priv->music_count = 0;
-+		argv[i++] = "-dao";  /* XXX, this is a hack. */
- 		argv[i++] = "-data";
- 		argv[i++] = filename;
--	}
--
--	if (needs_dvd_writer) {
--		argv[i++] = "-dao";
- 	}
- 
- 	argv[i++] = NULL;
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
deleted file mode 100644
index ff42da02d5ad..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-configure
+++ /dev/null
@@ -1,10 +0,0 @@
---- configure.orig	Wed Dec 11 15:37:55 2002
-+++ configure	Wed Dec 11 15:38:17 2002
-@@ -7313,6 +7313,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
index 958fe4cd050f..87cd0836b813 100644
--- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c
+++ b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
@@ -1,18 +1,18 @@
---- make-iso.c.orig	Mon Sep  8 21:24:07 2003
-+++ make-iso.c	Thu Oct  2 21:06:43 2003
-@@ -545,6 +545,7 @@
- 	argv[i++] = "mkisofs";
+--- make-iso.c.orig	Fri Dec 19 13:06:34 2003
++++ make-iso.c	Mon Dec 29 16:18:15 2003
+@@ -571,6 +571,7 @@
  	argv[i++] = "-r";
- 	argv[i++] = "-J";
-+	argv[i++] = "-joliet-long";
+ 	if (use_joliet) {
+ 		argv[i++] = "-J";
++		argv[i++] = "-joliet-long";
+ 	}
+ 	argv[i++] = "-q";
  	argv[i++] = "-graft-points";
- 	argv[i++] = "-path-list";
- 	argv[i++] = filelist;
-@@ -598,6 +599,7 @@
- 	argv[i++] = "mkisofs";
+@@ -650,6 +651,7 @@
  	argv[i++] = "-r";
- 	argv[i++] = "-J";
-+	argv[i++] = "-joliet-long";
+ 	if (use_joliet) {
+ 		argv[i++] = "-J";
++		argv[i++] = "-joliet-long";
+ 	}
  	argv[i++] = "-graft-points";
  	argv[i++] = "-path-list";
- 	argv[i++] = filelist;
diff --git a/sysutils/nautilus-cd-burner/pkg-descr b/sysutils/nautilus-cd-burner/pkg-descr
index c3520e981e0f..0bdde4f1ac65 100644
--- a/sysutils/nautilus-cd-burner/pkg-descr
+++ b/sysutils/nautilus-cd-burner/pkg-descr
@@ -1,6 +1,2 @@
-nautilus-cd-burner is an extension to Nautilus that makes it easy to
-write files to a CD burner.
-
-The user uses Nautilus or another gnome-vfs aware app to copy the
-files he wants to write to burn:///, and then nautilus-cd-burner is
-launched in some way to write the files to the CD.
+Nautilus-cd-burner allows CDs to be created and burned directly from
+within Nautilus (using the burn:/// URI).
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 0e601abc70ac..e3ba00c5161d 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,9 +1,13 @@
 bin/nautilus-cd-burner
+etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner/%gconf.xml
+etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner/%gconf.xml
+etc/gconf/schemas/ncb.schemas
 etc/gnome-vfs-2.0/modules/mapping-modules.conf
 lib/gnome-vfs-2.0/modules/libmapping.so
-libdata/bonobo/servers/Nautilus_CD_Burner_Context_Menu.server
+lib/nautilus/extensions-1.0/libnautilus-burn.a
+lib/nautilus/extensions-1.0/libnautilus-burn.so
+lib/nautilus/extensions-1.0/libnautilus-burn.so.0
 libexec/mapping-daemon
-libexec/nautilus-cd-burner-context-menu
 share/gnome/nautilus-cd-burner/cdburn.glade
 share/gnome/nautilus-cd-burner/cdspin1.png
 share/gnome/nautilus-cd-burner/cdspin2.png
@@ -14,6 +18,7 @@ share/gnome/nautilus-cd-burner/cdspin6.png
 share/gnome/nautilus-cd-burner/cdspin7.png
 share/gnome/nautilus-cd-burner/cdspin8.png
 share/locale/am/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ar/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/az/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/be/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/bg/LC_MESSAGES/nautilus-cd-burner.mo
@@ -24,25 +29,33 @@ share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/da/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/de/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/el/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/en_GB/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/es/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/et/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/eu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/fa/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/fi/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/fr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ga/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/he/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hi/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/hr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/hu/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/id/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
-share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pl/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pt_BR/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ro/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ru/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sl/LC_MESSAGES/nautilus-cd-burner.mo
@@ -57,3 +70,5 @@ share/locale/vi/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_CN/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrm share/gnome/nautilus-cd-burner
+@dirrm etc/gconf/gconf.xml.defaults/schemas/apps/nautilus-cd-burner
+@dirrm etc/gconf/gconf.xml.defaults/apps/nautilus-cd-burner