Presenting GNOME 2.8 for FreeBSD (2.8.1 to be exact).

This release notes detailing all of the new goodies in GNOME 2.8 can
be found at http://www.gnome.org/start/2.8/notes/, and the list of what
was fixed in GNOME 2.8.1 can be found at
http://lists.gnome.org/archives/gnome-announce-list/2004-October/msg00056.html.

This release, as well as all of our others, would not have been possible
without the great efforts of our FreeBSD GNOME Team.  The list of
current members can be found at http://www.freebsd.org/gnome/contact.html
(including our newest member, Michael Johnson <ahze@FreeBSD.org>).

Special thanks also goes out to all of the loyal FreeBSD GNOME users that
put up with crashes and hangs to test and debug GNOME on FreeBSD.  We would
especially like to thank those users that provided patches for GNOME 2.7 and
2.8:

Franz Klammer <klammer@webonaut.com>
Piotr Smyrak <piotr.smyrak@heron.pl>
Radek Kozlowski <radek@raadradd.com>
Khairil Yusof <kaeru@pd.jaring.my>
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Tom McLaughlin <tmclaugh@sdf.lonestar.org>
Vladimir Grebenschikov <vova@fbsd.ru>

GNOME 2.8 also features a new, FreeBSD-specific splashscreen that
was designed by jimmac for GNOME 2.8, then daemonized by
Franz Klammer <klammer@webonaut.com> and Radek Kozlowski
<radek@raadradd.com>.

As with GNOME 2.6, you cannot just "portupgrade" to GNOME 2.8.  There is
a script provided at http://www.marcuscom.com/downloads/gnome_upgrade28.sh
that will aid in the upgrade process.  Full documentation on the GNOME 2.8
upgrade is coming following this commit.

From all of us at FreeBSD GNOME, ENJOY!

36 files changed, 570 insertions, 246 deletions

diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 2cd9723bb74b..5eb6b77538c1 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.6.2
+PORTVERSION=	2.8.2
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -19,12 +19,13 @@ COMMENT=	A gconf database editor for the GNOME 2 environment
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack gconf2
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui
+USE_LIBTOOL_VER=15
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 MAN1=		gconf-editor.1
+GCONF_SCHEMAS=	gconf-editor.schemas
 
 .include <bsd.port.mk>
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index fd91b290e760..31bf7e95fecc 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gconf-editor-2.6.2.tar.bz2) = 4b739532de350969c71f96c3b97f1093
-SIZE (gnome2/gconf-editor-2.6.2.tar.bz2) = 387614
+MD5 (gnome2/gconf-editor-2.8.2.tar.bz2) = 193d5970b570366fd435b2b7ebdd8047
+SIZE (gnome2/gconf-editor-2.8.2.tar.bz2) = 510014
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 4b66bf1fa370..49065627221b 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -1,5 +1,16 @@
 bin/gconf-editor
 share/gnome/applications/gconf-editor.desktop
+share/gnome/help/gconf-editor/C/figures/entry-blank.png
+share/gnome/help/gconf-editor/C/figures/entry-bool.png
+share/gnome/help/gconf-editor/C/figures/entry-list.png
+share/gnome/help/gconf-editor/C/figures/entry-number.png
+share/gnome/help/gconf-editor/C/figures/entry-schema.png
+share/gnome/help/gconf-editor/C/figures/entry-string.png
+share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/C/gconf-editor.xml
+share/gnome/help/gconf-editor/C/legal.xml
+share/gnome/omf/gconf-editor/gconf-editor-C.omf
+@exec scrollkeeper-install -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/gconf-editor.png
 share/gnome/pixmaps/gconf-editor/entry-blank.png
 share/gnome/pixmaps/gconf-editor/entry-bool.png
@@ -9,19 +20,20 @@ share/gnome/pixmaps/gconf-editor/entry-schema.png
 share/gnome/pixmaps/gconf-editor/entry-string.png
 share/gnome/pixmaps/gconf-editor/folder-closed.png
 share/gnome/pixmaps/gconf-editor/folder-open.png
-share/gnome/pixmaps/gconf-editor/stock-about-16.png
 share/locale/am/LC_MESSAGES/gconf-editor.mo
 share/locale/ar/LC_MESSAGES/gconf-editor.mo
 share/locale/az/LC_MESSAGES/gconf-editor.mo
 share/locale/be/LC_MESSAGES/gconf-editor.mo
 share/locale/bg/LC_MESSAGES/gconf-editor.mo
 share/locale/bn/LC_MESSAGES/gconf-editor.mo
+share/locale/bs/LC_MESSAGES/gconf-editor.mo
 share/locale/ca/LC_MESSAGES/gconf-editor.mo
 share/locale/cs/LC_MESSAGES/gconf-editor.mo
 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_CA/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
@@ -49,8 +61,11 @@ 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/nb/LC_MESSAGES/gconf-editor.mo
+share/locale/ne/LC_MESSAGES/gconf-editor.mo
 share/locale/nl/LC_MESSAGES/gconf-editor.mo
 share/locale/no/LC_MESSAGES/gconf-editor.mo
+share/locale/or/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
@@ -71,3 +86,8 @@ share/locale/vi/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_CN/LC_MESSAGES/gconf-editor.mo
 share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 @dirrm share/gnome/pixmaps/gconf-editor
+@dirrm share/gnome/omf/gconf-editor
+@dirrm share/gnome/help/gconf-editor/C/figures
+@dirrm share/gnome/help/gconf-editor/C
+@dirrm share/gnome/help/gconf-editor
+@unexec scrollkeeper-uninstall -q %D/share/gnome/omf/gconf-editor/gconf-editor-C.omf 2>/dev/null || /usr/bin/true
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index 7030776e333b..79415cb3df72 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.6.1
-PORTREVISION=	3
+PORTVERSION=	2.8.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.6
+MASTER_SITE_SUBDIR=	sources/control-center/2.8
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,11 +25,18 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \
 		gstreamerplugins
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
+		apps_gnome_settings_daemon_keybindings.schemas \
+		apps_gnome_settings_daemon_screensaver.schemas \
+		desktop_gnome_font_rendering.schemas \
+		desktop_gnome_peripherals_keyboard_xkb.schemas \
+		fontilus.schemas themus.schemas
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 32f5ad00952e..c420e2166db6 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.6.1.tar.bz2) = da02f983fbf2e94cd5f09fc8f9d1d143
-SIZE (gnome2/control-center-2.6.1.tar.bz2) = 2487807
+MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea
+SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
new file mode 100644
index 000000000000..f66b82c9ffd1
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Thu Oct 14 15:44:21 2004
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Thu Oct 14 15:44:38 2004
+@@ -813,7 +813,7 @@
+ 		do_mail_action (acme);
+ 		break;
+ 	case SLEEP_KEY:
+-		do_sleep_action ("apm", "xset dpms force off");
++		do_sleep_action ("zzz", "xset dpms force off");
+ 		break;
+ 	case SCREENSAVER_KEY:
+ 		execute ("xscreensaver-command -lock", FALSE);
diff --git a/sysutils/gnome-control-center/files/patch-ltmain.sh b/sysutils/gnome-control-center/files/patch-ltmain.sh
deleted file mode 100644
index 49efbb5decf5..000000000000
--- a/sysutils/gnome-control-center/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Thu May  1 11:30:14 2003
-+++ ltmain.sh	Mon Aug 11 14:38:46 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 6676dfd5a3fa..ddf5788902c0 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -4,7 +4,6 @@ bin/gnome-background-properties
 bin/gnome-control-center
 bin/gnome-default-applications-properties
 bin/gnome-display-properties
-bin/gnome-file-types-properties
 bin/gnome-font-properties
 bin/gnome-font-viewer
 bin/gnome-keybinding-properties
@@ -12,34 +11,13 @@ bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/themus-theme-applier
 bin/gnome-theme-manager
 bin/gnome-theme-thumbnailer
 bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_font_rendering.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/fontilus.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/themus.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
+bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
@@ -66,7 +44,6 @@ 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/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
@@ -80,7 +57,6 @@ share/gnome/control-center-2.0/icons/display-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/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
@@ -163,6 +139,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/bs/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo
 share/locale/cy/LC_MESSAGES/control-center-2.0.mo
@@ -195,6 +172,7 @@ share/locale/mk/LC_MESSAGES/control-center-2.0.mo
 share/locale/ml/LC_MESSAGES/control-center-2.0.mo
 share/locale/mn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/control-center-2.0.mo
+share/locale/nb/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
@@ -225,6 +203,5 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
 @dirrm share/gnome/control-center-2.0/icons
-@dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index ea752f096a58..37a7e1672735 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.8.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.8
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,9 +22,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix intlhack lthack gnomehack libgnomeui libwnck
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
 
+GCONF_SCHEMAS=	gnome-system-monitor.schemas
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 75cc73e5deaa..9653e3817c5e 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17
-SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694
+MD5 (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 9aec14e8c549b26b2d2cd0e997038d8f
+SIZE (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 681242
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
index fda683104a47..05f4c5384caf 100644
--- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c
+++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
@@ -1,6 +1,6 @@
---- src/proctable.c.orig	Sun Feb  8 10:06:08 2004
-+++ src/proctable.c	Tue Apr 13 01:01:51 2004
-@@ -547,6 +548,9 @@
+--- src/proctable.c.orig	Mon Jul 19 10:02:09 2004
++++ src/proctable.c	Mon Jul 19 10:08:18 2004
+@@ -563,6 +563,9 @@
  	glibtop_get_proc_uid (&procuid, pid);
  	glibtop_get_proc_time (&proctime, pid);
  	newcputime = proctime.utime + proctime.stime;
@@ -10,38 +10,40 @@
  	model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
  
          wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
-@@ -651,6 +655,9 @@
+@@ -667,6 +670,10 @@
  	glibtop_get_proc_uid (&procuid, pid);
  	glibtop_get_proc_time (&proctime, pid);
  	newcputime = proctime.utime + proctime.stime;
 +	if (proctime.frequency) {
 +		newcputime /= (proctime.frequency/100);
 +	}
++
  
          wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
                                        pid,
-@@ -751,12 +758,20 @@
- 	return NULL;
+@@ -761,6 +768,12 @@
+ 	return FALSE;
  }
  
 +static int
 +pid_compare(const void* first, const void* second)
 +{
-+  return *(unsigned*)first - *(unsigned*)second;
++	return *(unsigned*)first - *(unsigned*)second;
 +}
 +
  static void
  refresh_list (ProcData *data, unsigned *pid_list, gint n)
  {
- 	ProcData *procdata = data;
- 	GList *list = procdata->info;
+@@ -769,6 +782,8 @@
+ 	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
  	gint i = 0;
-+
-+	qsort(pid_list, n, sizeof (*pid_list), pid_compare);
  	
- 	while (i < n)
- 	{
-@@ -848,6 +863,9 @@
++	qsort(pid_list, n, sizeof (*pid_list), pid_compare);
++
+ 	/* Add or update processes */
+ 	while (i < n) {
+ 		ProcInfo *info;
+@@ -862,6 +877,9 @@
  	** should probably have a total_time_last gint in the ProcInfo structure */
  	glibtop_get_cpu (&cpu);
  	total_time = cpu.total - total_time_last;
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 96505c1e463e..27dd1f9c7159 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-system-monitor
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-system-monitor.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-system-monitor.desktop
 share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
@@ -27,6 +24,7 @@ share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
@@ -34,12 +32,15 @@ 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/en_GB/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/gu/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
@@ -55,8 +56,10 @@ share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
@@ -64,10 +67,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
 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
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 63af3b9274af..ea712a90ad50 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	0.92.0
-PORTREVISION=	1
+PORTVERSION=	1.0.0
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.92
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.0
 DISTNAME=	gnome-system-tools-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -35,4 +35,10 @@ PLIST_SUB+=		SERVICES=""
 PLIST_SUB+=		SERVICES="@comment "
 .endif
 
+.if ${PERL_LEVEL} < 500600
+post-configure:
+	@${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \
+		${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g'
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 3a6b3da6e230..9d0dc16e5062 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 1c2e3ae388e179b669ffa8d293bd17f1
-SIZE (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 2614845
+MD5 (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 7f85cab03aeffdb9c57925fe2be0e001
+SIZE (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 2719276
diff --git a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in
new file mode 100644
index 000000000000..7f7cce28ee37
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in
@@ -0,0 +1,34 @@
+--- backends/replace.pl.in.orig	Fri Oct 22 02:41:56 2004
++++ backends/replace.pl.in	Fri Oct 22 02:42:48 2004
+@@ -1113,19 +1113,19 @@
+ 
+   return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface));
+ 
+-  delete $$buff[$line_no];
++  splice @{$buff},$line_no,1;
+   $line_no ++;
+   
+   while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1)
+   {
+-    delete $$buff[$line_no];
++    splice @{$buff},$line_no,1;
+     $line_no ++;
+   }
+ 
+   $line_no = 0;
+   if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface))
+   {
+-    delete $$buff[$line_no];
++   splice @{$buff},$line_no,1;
+   }
+   
+   &gst_file_buffer_clean ($buff);
+@@ -1663,7 +1663,7 @@
+         }
+         else
+         {
+-          delete $$buff[$i];
++	  splice @{$buff},$i,1;
+         }
+       }
+     }
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index fabe1da2680f..1ccb07eb14e1 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -97,6 +97,8 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf
 share/gnome/omf/gnome-system-tools/users-admin-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ar/LC_MESSAGES/setup-tools-backends.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
@@ -104,6 +106,7 @@ share/locale/bn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ca/LC_MESSAGES/setup-tools-backends.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/da/LC_MESSAGES/gnome-system-tools.mo
@@ -122,6 +125,7 @@ share/locale/et/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
+share/locale/fi/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
@@ -157,6 +161,8 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pt/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ro/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
@@ -168,13 +174,16 @@ share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sv/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sv/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ta/LC_MESSAGES/setup-tools-backends.mo
 share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/uk/LC_MESSAGES/setup-tools-backends.mo
 share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo
 share/setup-tool-backends/files/debian_ipchains
 share/setup-tool-backends/scripts/boot-conf
 share/setup-tool-backends/scripts/boot-grub.pl
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index 7030776e333b..79415cb3df72 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.6.1
-PORTREVISION=	3
+PORTVERSION=	2.8.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.6
+MASTER_SITE_SUBDIR=	sources/control-center/2.8
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -26,11 +25,18 @@ USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \
 		gstreamerplugins
-GNU_CONFIGURE=	yes
+USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
 
+GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
+		apps_gnome_settings_daemon_keybindings.schemas \
+		apps_gnome_settings_daemon_screensaver.schemas \
+		desktop_gnome_font_rendering.schemas \
+		desktop_gnome_peripherals_keyboard_xkb.schemas \
+		fontilus.schemas themus.schemas
+
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index 32f5ad00952e..c420e2166db6 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.6.1.tar.bz2) = da02f983fbf2e94cd5f09fc8f9d1d143
-SIZE (gnome2/control-center-2.6.1.tar.bz2) = 2487807
+MD5 (gnome2/control-center-2.8.1.tar.bz2) = 7bd9c12b9abb05b6fcf7b4906b6918ea
+SIZE (gnome2/control-center-2.8.1.tar.bz2) = 2547071
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
new file mode 100644
index 000000000000..f66b82c9ffd1
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_gnome-settings-multimedia-keys.c
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/gnome-settings-multimedia-keys.c.orig	Thu Oct 14 15:44:21 2004
++++ gnome-settings-daemon/gnome-settings-multimedia-keys.c	Thu Oct 14 15:44:38 2004
+@@ -813,7 +813,7 @@
+ 		do_mail_action (acme);
+ 		break;
+ 	case SLEEP_KEY:
+-		do_sleep_action ("apm", "xset dpms force off");
++		do_sleep_action ("zzz", "xset dpms force off");
+ 		break;
+ 	case SCREENSAVER_KEY:
+ 		execute ("xscreensaver-command -lock", FALSE);
diff --git a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh b/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
deleted file mode 100644
index 49efbb5decf5..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-ltmain.sh
+++ /dev/null
@@ -1,51 +0,0 @@
---- ltmain.sh.orig	Thu May  1 11:30:14 2003
-+++ ltmain.sh	Mon Aug 11 14:38:46 2003
-@@ -1280,7 +1280,7 @@
- 	  esac
- 	elif test "X$arg" = "X-lc_r"; then
- 	 case $host in
--	 *-*-openbsd* | *-*-freebsd*)
-+	 *-*-openbsd* | *-*-freebsd4*)
- 	   # Do not include libc_r directly, use -pthread flag.
- 	   continue
- 	   ;;
-@@ -1290,8 +1290,16 @@
- 	continue
- 	;;
- 
-+      -pthread)
-+      compile_command="$compile_command -pthread"
-+      finalize_command="$finalize_command -pthread"
-+      compiler_flags="$compiler_flags -pthread"
-+      continue
-+      ;;
-+
-       -module)
- 	module=yes
-+	build_old_libs=no
- 	continue
- 	;;
- 
-@@ -3000,6 +3008,9 @@
- 	    # problems, so we reset it completely
- 	    verstring=
- 	    ;;
-+	  *-*-freebsd*)
-+	    # FreeBSD doesn't need this...
-+	    ;;
- 	  *)
- 	    verstring="0.0"
- 	    ;;
-@@ -5428,10 +5439,12 @@
- 	fi
- 
- 	# Install the pseudo-library for information purposes.
-+	if /usr/bin/false; then
- 	name=`$echo "X$file" | $Xsed -e 's%^.*/%%'`
- 	instname="$dir/$name"i
- 	$show "$install_prog $instname $destdir/$name"
- 	$run eval "$install_prog $instname $destdir/$name" || exit $?
-+	fi
- 
- 	# Maybe install the static library, too.
- 	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 6676dfd5a3fa..ddf5788902c0 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -4,7 +4,6 @@ bin/gnome-background-properties
 bin/gnome-control-center
 bin/gnome-default-applications-properties
 bin/gnome-display-properties
-bin/gnome-file-types-properties
 bin/gnome-font-properties
 bin/gnome-font-viewer
 bin/gnome-keybinding-properties
@@ -12,34 +11,13 @@ bin/gnome-keyboard-properties
 bin/gnome-mouse-properties
 bin/gnome-network-preferences
 bin/gnome-sound-properties
-bin/themus-theme-applier
 bin/gnome-theme-manager
 bin/gnome-theme-thumbnailer
 bin/gnome-thumbnail-font
 bin/gnome-typing-monitor
 bin/gnome-ui-properties
 bin/gnome-window-properties
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_default_editor.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_keybindings.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/apps_gnome_settings_daemon_screensaver.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_font_rendering.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_font_rendering.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/fontilus.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/fontilus.schemas > /dev/null || /usr/bin/true
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/themus.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/themus.schemas > /dev/null || /usr/bin/true
+bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
@@ -66,7 +44,6 @@ 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/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
@@ -80,7 +57,6 @@ share/gnome/control-center-2.0/icons/display-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/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
@@ -163,6 +139,7 @@ share/locale/az/LC_MESSAGES/control-center-2.0.mo
 share/locale/be/LC_MESSAGES/control-center-2.0.mo
 share/locale/bg/LC_MESSAGES/control-center-2.0.mo
 share/locale/bn/LC_MESSAGES/control-center-2.0.mo
+share/locale/bs/LC_MESSAGES/control-center-2.0.mo
 share/locale/ca/LC_MESSAGES/control-center-2.0.mo
 share/locale/cs/LC_MESSAGES/control-center-2.0.mo
 share/locale/cy/LC_MESSAGES/control-center-2.0.mo
@@ -195,6 +172,7 @@ share/locale/mk/LC_MESSAGES/control-center-2.0.mo
 share/locale/ml/LC_MESSAGES/control-center-2.0.mo
 share/locale/mn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/control-center-2.0.mo
+share/locale/nb/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
@@ -225,6 +203,5 @@ share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
 @dirrm share/gnome/control-center-2.0/icons
-@dirrm share/gnome/applications
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index ea752f096a58..37a7e1672735 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.8.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.6
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.8
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -23,9 +22,11 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_REINPLACE=	yes
-USE_GNOME=	gnomeprefix intlhack lthack gnomehack libgnomeui libwnck
-USE_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
+USE_LIBTOOL_VER=15
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lutil"
 
+GCONF_SCHEMAS=	gnome-system-monitor.schemas
+
 .include <bsd.port.mk>
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 75cc73e5deaa..9653e3817c5e 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 1bc8709baa43fdca7eee8cad1dc76b17
-SIZE (gnome2/gnome-system-monitor-2.6.0.tar.bz2) = 597694
+MD5 (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 9aec14e8c549b26b2d2cd0e997038d8f
+SIZE (gnome2/gnome-system-monitor-2.8.0.tar.bz2) = 681242
diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
index fda683104a47..05f4c5384caf 100644
--- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
+++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
@@ -1,6 +1,6 @@
---- src/proctable.c.orig	Sun Feb  8 10:06:08 2004
-+++ src/proctable.c	Tue Apr 13 01:01:51 2004
-@@ -547,6 +548,9 @@
+--- src/proctable.c.orig	Mon Jul 19 10:02:09 2004
++++ src/proctable.c	Mon Jul 19 10:08:18 2004
+@@ -563,6 +563,9 @@
  	glibtop_get_proc_uid (&procuid, pid);
  	glibtop_get_proc_time (&proctime, pid);
  	newcputime = proctime.utime + proctime.stime;
@@ -10,38 +10,40 @@
  	model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
  
          wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
-@@ -651,6 +655,9 @@
+@@ -667,6 +670,10 @@
  	glibtop_get_proc_uid (&procuid, pid);
  	glibtop_get_proc_time (&proctime, pid);
  	newcputime = proctime.utime + proctime.stime;
 +	if (proctime.frequency) {
 +		newcputime /= (proctime.frequency/100);
 +	}
++
  
          wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
                                        pid,
-@@ -751,12 +758,20 @@
- 	return NULL;
+@@ -761,6 +768,12 @@
+ 	return FALSE;
  }
  
 +static int
 +pid_compare(const void* first, const void* second)
 +{
-+  return *(unsigned*)first - *(unsigned*)second;
++	return *(unsigned*)first - *(unsigned*)second;
 +}
 +
  static void
  refresh_list (ProcData *data, unsigned *pid_list, gint n)
  {
- 	ProcData *procdata = data;
- 	GList *list = procdata->info;
+@@ -769,6 +782,8 @@
+ 	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
  	gint i = 0;
-+
-+	qsort(pid_list, n, sizeof (*pid_list), pid_compare);
  	
- 	while (i < n)
- 	{
-@@ -848,6 +863,9 @@
++	qsort(pid_list, n, sizeof (*pid_list), pid_compare);
++
+ 	/* Add or update processes */
+ 	while (i < n) {
+ 		ProcInfo *info;
+@@ -862,6 +877,9 @@
  	** should probably have a total_time_last gint in the ProcInfo structure */
  	glibtop_get_cpu (&cpu);
  	total_time = cpu.total - total_time_last;
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index 96505c1e463e..27dd1f9c7159 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -1,7 +1,4 @@
 bin/gnome-system-monitor
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/gnome-system-monitor.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/gnome-system-monitor.schemas > /dev/null || /usr/bin/true
 share/gnome/applications/gnome-system-monitor.desktop
 share/gnome/help/gnome-system-monitor/C/figures/addColumn.png
 share/gnome/help/gnome-system-monitor/C/figures/changePriority.png
@@ -27,6 +24,7 @@ share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/be/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bg/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/bn/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/bs/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ca/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/cs/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/cy/LC_MESSAGES/gnome-system-monitor.mo
@@ -34,12 +32,15 @@ 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/en_GB/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ga/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/gl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/gu/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
@@ -55,8 +56,10 @@ share/locale/mk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pt/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-system-monitor.mo
@@ -64,10 +67,10 @@ share/locale/ro/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ru/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sl/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/sq/LC_MESSAGES/gnome-system-monitor.mo
 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
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 63af3b9274af..ea712a90ad50 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	0.92.0
-PORTREVISION=	1
+PORTVERSION=	1.0.0
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.92
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.0
 DISTNAME=	gnome-system-tools-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -35,4 +35,10 @@ PLIST_SUB+=		SERVICES=""
 PLIST_SUB+=		SERVICES="@comment "
 .endif
 
+.if ${PERL_LEVEL} < 500600
+post-configure:
+	@${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \
+		${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g'
+.endif
+
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index 3a6b3da6e230..9d0dc16e5062 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 1c2e3ae388e179b669ffa8d293bd17f1
-SIZE (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 2614845
+MD5 (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 7f85cab03aeffdb9c57925fe2be0e001
+SIZE (gnome2/gnome-system-tools-1.0.0.tar.bz2) = 2719276
diff --git a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in
new file mode 100644
index 000000000000..7f7cce28ee37
--- /dev/null
+++ b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in
@@ -0,0 +1,34 @@
+--- backends/replace.pl.in.orig	Fri Oct 22 02:41:56 2004
++++ backends/replace.pl.in	Fri Oct 22 02:42:48 2004
+@@ -1113,19 +1113,19 @@
+ 
+   return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface));
+ 
+-  delete $$buff[$line_no];
++  splice @{$buff},$line_no,1;
+   $line_no ++;
+   
+   while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1)
+   {
+-    delete $$buff[$line_no];
++    splice @{$buff},$line_no,1;
+     $line_no ++;
+   }
+ 
+   $line_no = 0;
+   if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface))
+   {
+-    delete $$buff[$line_no];
++   splice @{$buff},$line_no,1;
+   }
+   
+   &gst_file_buffer_clean ($buff);
+@@ -1663,7 +1663,7 @@
+         }
+         else
+         {
+-          delete $$buff[$i];
++	  splice @{$buff},$i,1;
+         }
+       }
+     }
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index fabe1da2680f..1ccb07eb14e1 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -97,6 +97,8 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf
 share/gnome/omf/gnome-system-tools/users-admin-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-system-tools/users-admin-C.omf 2>/dev/null || /usr/bin/true
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ar/LC_MESSAGES/setup-tools-backends.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
@@ -104,6 +106,7 @@ share/locale/bn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ca/LC_MESSAGES/setup-tools-backends.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/da/LC_MESSAGES/gnome-system-tools.mo
@@ -122,6 +125,7 @@ share/locale/et/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
+share/locale/fi/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
@@ -157,6 +161,8 @@ share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pt/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ro/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
@@ -168,13 +174,16 @@ share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sv/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sv/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ta/LC_MESSAGES/setup-tools-backends.mo
 share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/uk/LC_MESSAGES/setup-tools-backends.mo
 share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
+share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo
 share/setup-tool-backends/files/debian_ipchains
 share/setup-tool-backends/scripts/boot-conf
 share/setup-tool-backends/scripts/boot-grub.pl
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index d797995a06d6..41f1a5d3afef 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.6.1
-PORTREVISION=	1
+PORTVERSION=	2.8.5
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
@@ -23,13 +22,21 @@ USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack intlhack lthack nautilus2
-USE_INC_LIBTOOL_VER=13
+USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
+USE_LIBTOOL_VER=15
+INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
+GCONF_SCHEMAS=	ncb.schemas
+
 .include <bsd.port.pre.mk>
 
+.if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
+.undef WITHOUT_DVD
+WITH_DVD=	yes
+.endif
+
 .if exists(${LOCALBASE}/bin/growisofs)
 WITH_DVD=	yes
 .endif
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 52439e08a10e..6b36ce4a810a 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-2.6.1.tar.bz2) = 7998cbe011e9e0a22d9362a2430d578b
-SIZE (gnome2/nautilus-cd-burner-2.6.1.tar.bz2) = 455965
+MD5 (gnome2/nautilus-cd-burner-2.8.5.tar.bz2) = 970173a3f93270950ca9fd247bdf07a7
+SIZE (gnome2/nautilus-cd-burner-2.8.5.tar.bz2) = 529099
diff --git a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c
new file mode 100644
index 000000000000..a684ac82a0de
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c
@@ -0,0 +1,15 @@
+--- bacon-cd-selection.c.orig	Thu Nov  4 00:25:43 2004
++++ bacon-cd-selection.c	Thu Nov  4 00:25:57 2004
+@@ -177,10 +177,10 @@
+ static void
+ bacon_cd_selection_init (BaconCdSelection *bcs)
+ {
+-	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
+-  
+ 	GtkCellRenderer *cell;
+ 	GtkListStore *store;
++	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
++  
+ 
+   store = gtk_list_store_new (1, G_TYPE_STRING);
+ 	gtk_combo_box_set_model (GTK_COMBO_BOX (bcs),
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
new file mode 100644
index 000000000000..1bcf94f3e29b
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
@@ -0,0 +1,218 @@
+--- cd-drive.c.orig	Wed Sep 22 09:20:04 2004
++++ cd-drive.c	Mon Oct  4 02:20:47 2004
+@@ -270,9 +270,21 @@
+ {
+ 	int fd;
+ 	int mmc_profile;
++#ifdef __FreeBSD__
++	struct cam_device *cam;
++#endif
+ 
+ 	g_return_val_if_fail (device != NULL, CD_MEDIA_TYPE_ERROR);
+ 
++#ifdef __FreeBSD__
++	cam = cam_open_device (device, O_RDWR);
++	if (cam == NULL) {
++		return CD_MEDIA_TYPE_ERROR;
++	}
++
++	fd = cam->fd;
++#else
++
+ 	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
+ 	if (fd < 0) {
+ 		if (errno == EBUSY) {
+@@ -280,6 +292,7 @@
+ 		}
+ 		return CD_MEDIA_TYPE_ERROR;
+ 	}
++#endif
+ 
+ 	mmc_profile = get_mmc_profile (fd);
+ 
+@@ -307,7 +320,11 @@
+ 		}
+ 	}
+ 
++#ifdef __FreeBSD__
++	cam_close_device (cam);
++#else
+ 	close (fd);
++#endif
+ 
+ 	switch (mmc_profile) {
+ 	case -1:
+@@ -442,10 +459,21 @@
+ 	int secs;
+ 	int mmc_profile;
+ 	gint64 size;
++#ifdef __FreeBSD__
++	struct cam_device *cam;
++#endif
+ 
+ 	g_return_val_if_fail (device != NULL, CD_MEDIA_SIZE_UNKNOWN);
+ 
+ 	secs = 0;
++#ifdef __FreeBSD__
++	cam = cam_open_device (device, O_RDWR);
++	if (cam == NULL) {
++		return CD_MEDIA_SIZE_UNKNOWN;
++	}
++
++	fd = cam->fd;
++#else
+ 
+ 	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
+ 	if (fd < 0) {
+@@ -454,6 +482,7 @@
+ 		}
+ 		return CD_MEDIA_SIZE_UNKNOWN;
+ 	}
++#endif
+ 
+ 	mmc_profile = get_mmc_profile (fd);
+ 
+@@ -476,7 +505,11 @@
+ 		size = CD_MEDIA_SIZE_NA;
+ 	}
+ 
++#ifdef __FreeBSD__
++	cam_close_device (cam);
++#else
+ 	close (fd);
++#endif
+ 
+ 	return size;
+ }
+@@ -595,9 +628,81 @@
+ #endif /* USE_HAL */
+ 
+ #if defined(__linux__) || defined(__FreeBSD__)
++static int
++get_device_max_write_speed (char *device)
++{
++	int fd;
++	int max_speed;
++	int read_speed, write_speed;
++#ifdef __FreeBSD__
++	struct cam_device *cam;
++#endif
++
++	max_speed = -1;
++#ifdef __FreeBSD__
++	cam = cam_open_device (device, O_RDWR);
++	if (cam == NULL) {
++		return -1;
++	}
++
++	fd = cam->fd;
++#else
++
++	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
++	if (fd < 0) {
++		return -1;
++	}
++#endif
+ 
++	get_read_write_speed (fd, &read_speed, &write_speed);
++#ifdef __FreeBSD__
++	cam_close_device (cam);
++#else
++	close (fd);
++#endif
++	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
+ 
++	return max_speed;
++}
+ 
++#if !defined(__linux)
++static int
++get_device_max_read_speed (char *device)
++{
++	int fd;
++	int max_speed;
++	int read_speed, write_speed;
++#ifdef __FreeBSD__
++	struct cam_device *cam;
++#endif
++
++	max_speed = -1;
++#ifdef __FreeBSD__
++	cam = cam_open_device (device, O_RDWR);
++	if (cam == NULL) {
++		return -1;
++	}
++
++	fd = cam->fd;
++#else
++
++	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
++	if (fd < 0) {
++		return -1;
++	}
++#endif
++
++	get_read_write_speed (fd, &read_speed, &write_speed);
++#ifdef __FreeBSD__
++	cam_close_device (cam);
++#else
++	close (fd);
++#endif
++	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
++
++	return max_speed;
++}
++#endif
+ #endif /* __linux__ || __FreeBSD__ */
+ 
+ #if defined (__linux__)
+@@ -800,49 +905,7 @@
+ 	return NULL;
+ }
+ 
+-#if !defined(__linux)
+-static int
+-get_device_max_read_speed (char *device)
+-{
+-	int fd;
+-	int max_speed;
+-	int read_speed, write_speed;
+ 
+-	max_speed = -1;
+-
+-	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
+-	if (fd < 0) {
+-		return -1;
+-	}
+-
+-	get_read_write_speed (fd, &read_speed, &write_speed);
+-	close (fd);
+-	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
+-
+-	return max_speed;
+-}
+-#endif
+-
+-static int
+-get_device_max_write_speed (char *device)
+-{
+-	int fd;
+-	int max_speed;
+-	int read_speed, write_speed;
+-
+-	max_speed = -1;
+-
+-	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
+-	if (fd < 0) {
+-		return -1;
+-	}
+-
+-	get_read_write_speed (fd, &read_speed, &write_speed);
+-	close (fd);
+-	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
+-
+-	return max_speed;
+-}
+ 
+ static char *
+ get_scsi_cd_name (int bus, int id, int lun, const char *dev,
diff --git a/sysutils/nautilus-cd-burner/files/patch-configure b/sysutils/nautilus-cd-burner/files/patch-configure
new file mode 100644
index 000000000000..e8dbb4a5b891
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-configure
@@ -0,0 +1,27 @@
+--- configure.orig	Thu Jul 22 10:27:35 2004
++++ configure	Thu Jul 22 10:29:32 2004
+@@ -21015,6 +21015,8 @@
+ if eval "test \"\${$as_ac_var+set}\" = set"; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
++  ac_check_lib_save_LIBS=$LIBS
++  LIBS="-lintl $LIBS"
+   cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h.  */
+ _ACEOF
+@@ -21097,6 +21099,7 @@
+ fi
+ rm -f conftest.err conftest.$ac_objext \
+       conftest$ac_exeext conftest.$ac_ext
++      LIBS=$ac_check_lib_save_LIBS
+ fi
+ echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5
+ echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
+@@ -21104,6 +21107,7 @@
+   cat >>confdefs.h <<_ACEOF
+ #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+ _ACEOF
++LIBS="-lintl $LIBS"
+ 
+ fi
+ done
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
new file mode 100644
index 000000000000..3b8b07293043
--- /dev/null
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
@@ -0,0 +1,33 @@
+--- nautilus-cd-burner.c.orig	Sun Sep 19 18:44:15 2004
++++ nautilus-cd-burner.c	Sun Oct 31 13:06:08 2004
+@@ -21,6 +21,8 @@
+   
+    Authors: Alexander Larsson <alexl@redhat.com>
+ */
++#include <sys/types.h>
++#include <sys/stat.h>
+ #include <gtk/gtk.h>
+ #include <gtk/gtkfilesel.h>
+ #include <gtk/gtkseparatormenuitem.h>
+@@ -632,8 +634,19 @@
+ 		}
+ 
+ 		if (res == RESULT_RETRY) {
+-			g_free (filename);
+-			filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
++			gchar *path1;
++
++			path1 = g_strdup_printf ("%s/.ncb", g_get_home_dir());
++
++			if (!g_file_test (path1, G_FILE_TEST_EXISTS)) {
++				mkdir (path1, 0700);
++			}
++
++			if (filename != NULL) {
++				g_free (filename);
++			}
++			filename = g_build_filename (path1, "image.iso.XXXXXX", NULL);
++			g_free (path1);
+ 			fd = g_mkstemp(filename);
+ 			close (fd);
+ 
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index c568590ce43b..c73c94fd94d0 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,12 +1,14 @@
 bin/nautilus-cd-burner
-@unexec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-uninstall-rule %D/etc/gconf/schemas/ncb.schemas > /dev/null || /usr/bin/true
-etc/gconf/schemas/ncb.schemas
-@exec env GCONF_CONFIG_SOURCE=xml::%D/etc/gconf/gconf.xml.defaults gconftool-2 --makefile-install-rule %D/etc/gconf/schemas/ncb.schemas > /dev/null || /usr/bin/true
 etc/gnome-vfs-2.0/modules/mapping-modules.conf
+include/libnautilus-burn/bacon-cd-selection.h
+include/libnautilus-burn/cd-drive.h
+include/libnautilus-burn/cd-recorder.h
 lib/gnome-vfs-2.0/modules/libmapping.so
-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
+lib/libnautilus-burn.a
+lib/libnautilus-burn.so
+lib/libnautilus-burn.so.0
+lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
+libdata/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
 share/gnome/nautilus-cd-burner/cdburn.glade
 share/gnome/nautilus-cd-burner/cdspin1.png
@@ -23,6 +25,7 @@ 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
 share/locale/bn/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/bs/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ca/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/cs/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/cy/LC_MESSAGES/nautilus-cd-burner.mo
@@ -44,6 +47,7 @@ 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/is/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
@@ -51,8 +55,10 @@ share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lv/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/nb/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/or/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
@@ -72,3 +78,4 @@ 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 include/libnautilus-burn