author: Joe Marcus Clarke <marcus@FreeBSD.org> 2007-03-19 05:14:07 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2007-03-19 05:14:07 +0000
commit: 951c257ea3655de6e80c26a36c18c69ee8047ea8 (patch)
tree: 249b59a23d9c6fae8db5e5639385f6273d237705 /sysutils
parent: 91926e92b73e3751382216a16044c5d8b24ad126 (diff)
download: ports-951c257ea3655de6e80c26a36c18c69ee8047ea8.tar.gz
ports-951c257ea3655de6e80c26a36c18c69ee8047ea8.zip
54 files changed, 1096 insertions, 1013 deletions
diff --git a/sysutils/brasero/Makefile b/sysutils/brasero/Makefile
index f0b39a1b3ff9..dd5f670eecd1 100644
--- a/sysutils/brasero/Makefile
+++ b/sysutils/brasero/Makefile
@@ -3,10 +3,10 @@
 # Whom:			Michael Johnson <ahze@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports/sysutils/brasero/Makefile,v 1.11 2006/09/08 00:44:18 ahze Exp $
+#    $MCom: ports/sysutils/brasero/Makefile,v 1.15 2007/03/04 22:46:49 ahze Exp $
 
 PORTNAME=	brasero
-PORTVERSION=	0.4.90
+PORTVERSION=	0.5.1
 PORTREVISION=	1
 CATEGORIES=	sysutils audio multimedia gnome
 MASTER_SITES=	SOURCEFORGE
@@ -16,7 +16,7 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	CD/DVD mastering tool for the GNOME desktop
 
 LIB_DEPENDS=	notify.1:${PORTSDIR}/devel/libnotify \
-		totem-plparser.1:${PORTSDIR}/multimedia/totem-gstreamer
+		totem-plparser.1:${PORTSDIR}/multimedia/totem
 
 USE_GETTEXT=	yes
 USE_BZIP2=	yes
diff --git a/sysutils/brasero/distinfo b/sysutils/brasero/distinfo
index 60101bc529eb..25a1ec709823 100644
--- a/sysutils/brasero/distinfo
+++ b/sysutils/brasero/distinfo
@@ -1,3 +1,3 @@
-MD5 (brasero-0.4.90.tar.bz2) = 172a8feb5bf0e68bb3cb94d97583cdbd
-SHA256 (brasero-0.4.90.tar.bz2) = 484e2cfa3b0d94aa5674be86d4aeb6da5cc59dad71682d428e0f0c92a84f57a7
-SIZE (brasero-0.4.90.tar.bz2) = 842349
+MD5 (brasero-0.5.1.tar.bz2) = f578d2aaf6b434f91beb935f112728e2
+SHA256 (brasero-0.5.1.tar.bz2) = 6224c274b82622f2ebff1607067e8577a26f594a8a968a30cc66e9e5ac64d20d
+SIZE (brasero-0.5.1.tar.bz2) = 847034
diff --git a/sysutils/brasero/pkg-plist b/sysutils/brasero/pkg-plist
index ccb87a70364b..235bdc29ebf5 100644
--- a/sysutils/brasero/pkg-plist
+++ b/sysutils/brasero/pkg-plist
@@ -1,5 +1,8 @@
 bin/brasero
 share/applications/brasero.desktop
+%%DATADIR%%/brasero.png
+%%DATADIR%%/cd-action-burn-16.png
+%%DATADIR%%/cd-action-burn.png
 %%DATADIR%%/disc-00.png
 %%DATADIR%%/disc-05.png
 %%DATADIR%%/disc-10.png
@@ -21,26 +24,22 @@ share/applications/brasero.desktop
 %%DATADIR%%/disc-85.png
 %%DATADIR%%/disc-90.png
 %%DATADIR%%/disc-95.png
-%%DATADIR%%/icon-final-128x128.png
-%%DATADIR%%/icon-final-256x256.png
-%%DATADIR%%/icon-final-48x48.png
 %%DATADIR%%/logo.png
-share/icons/gnome/48x48/mimetypes/gnome-mime-application-x-brasero.png
+share/icons/hicolor/16x16/apps/brasero.png
+share/icons/hicolor/24x24/apps/brasero.png
+share/icons/hicolor/scalable/apps/brasero.svg
 share/locale/ca/LC_MESSAGES/brasero.mo
 share/locale/de/LC_MESSAGES/brasero.mo
 share/locale/es/LC_MESSAGES/brasero.mo
 share/locale/fr/LC_MESSAGES/brasero.mo
+share/locale/hu/LC_MESSAGES/brasero.mo
 share/locale/it/LC_MESSAGES/brasero.mo
 share/locale/ja/LC_MESSAGES/brasero.mo
+share/locale/lt/LC_MESSAGES/brasero.mo
 share/locale/pl/LC_MESSAGES/brasero.mo
 share/locale/pt_BR/LC_MESSAGES/brasero.mo
+share/locale/sv/LC_MESSAGES/brasero.mo
 share/mime/packages/brasero.xml
-share/pixmaps/brasero.png
-@dirrmtry share/pixmaps
-@dirrm share/icons/gnome/48x48/mimetypes
-@dirrm share/icons/gnome/48x48
-@dirrm share/icons/gnome
-@dirrm share/icons
 @dirrm %%DATADIR%%
 @dirrmtry share/applications
 @exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index 7c1a2d3d45bd..1f224eb2380d 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.56 2006/09/05 00:53:22 ahze Exp $
+#   $MCom: ports/sysutils/gconf-editor/Makefile,v 1.59 2007/03/13 12:30:40 ahze Exp $
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.16.0
+PORTVERSION=	2.18.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 7b6a548e0c3d..d02ed43c2037 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gconf-editor-2.16.0.tar.bz2) = e52b3177ef6ebd1fcf2c84acbe90a663
-SHA256 (gnome2/gconf-editor-2.16.0.tar.bz2) = efee1e2e65e280abe30b94b20b59d24d2c71e55e5ad26cb3041966a32b436786
-SIZE (gnome2/gconf-editor-2.16.0.tar.bz2) = 528644
+MD5 (gnome2/gconf-editor-2.18.0.tar.bz2) = cbaefa1ff8a548a3d381c67aed426fb7
+SHA256 (gnome2/gconf-editor-2.18.0.tar.bz2) = ffd3d8ef4637ead6ebd7469c1e4283e3c1044351a243e81e6f242194e07fa057
+SIZE (gnome2/gconf-editor-2.18.0.tar.bz2) = 694449
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index a2ee10cc1863..641ccff6f777 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -3,7 +3,16 @@ share/gnome/applications/gconf-editor.desktop
 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/help/gconf-editor/fr/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/fr/gconf-editor.xml
+share/gnome/help/gconf-editor/it/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/it/gconf-editor.xml
+share/gnome/help/gconf-editor/sv/figures/gconf_editor_anno_window.png
+share/gnome/help/gconf-editor/sv/gconf-editor.xml
 share/gnome/omf/gconf-editor/gconf-editor-C.omf
+share/gnome/omf/gconf-editor/gconf-editor-fr.omf
+share/gnome/omf/gconf-editor/gconf-editor-it.omf
+share/gnome/omf/gconf-editor/gconf-editor-sv.omf
 share/gnome/pixmaps/gconf-editor/entry-blank.png
 share/gnome/pixmaps/gconf-editor/entry-bool.png
 share/gnome/pixmaps/gconf-editor/entry-list.png
@@ -17,6 +26,7 @@ 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/be@latin/LC_MESSAGES/gconf-editor.mo
 share/locale/bg/LC_MESSAGES/gconf-editor.mo
 share/locale/bn/LC_MESSAGES/gconf-editor.mo
 share/locale/bn_IN/LC_MESSAGES/gconf-editor.mo
@@ -90,6 +100,12 @@ share/locale/zh_HK/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/sv/figures
+@dirrm share/gnome/help/gconf-editor/sv
+@dirrm share/gnome/help/gconf-editor/it/figures
+@dirrm share/gnome/help/gconf-editor/it
+@dirrm share/gnome/help/gconf-editor/fr/figures
+@dirrm share/gnome/help/gconf-editor/fr
 @dirrm share/gnome/help/gconf-editor/C/figures
 @dirrm share/gnome/help/gconf-editor/C
 @dirrm share/gnome/help/gconf-editor
@@ -147,5 +163,7 @@ share/locale/zh_TW/LC_MESSAGES/gconf-editor.mo
 @dirrmtry share/locale/ca
 @dirrmtry share/locale/bn_IN/LC_MESSAGES
 @dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be@latin/LC_MESSAGES
+@dirrmtry share/locale/be@latin
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index fe250e8a4c15..0829a1f84d91 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.120 2006/10/03 00:02:39 ahze Exp $
+#   $MCom: ports/sysutils/gnome-control-center/Makefile,v 1.132 2007/03/12 22:05:56 marcus Exp $
 #
 
 PORTNAME=	gnome-control-center
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/control-center/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -27,7 +27,7 @@ GNOME_DESKTOP_VERSION=2
 USE_GSTREAMER=	good
 WANT_GNOME=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
-		gnomemenus desktopfileutils nautilus2
+		gnomemenus desktopfileutils libgnomekbd gnomepanel
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
@@ -39,8 +39,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 		apps_gnome_settings_daemon_keybindings.schemas \
 		apps_gnome_settings_daemon_screensaver.schemas \
+		control-center.schemas \
 		desktop_gnome_font_rendering.schemas \
-		desktop_gnome_peripherals_keyboard_xkb.schemas \
 		fontilus.schemas themus.schemas
 
 .if defined(PACKAGE_BUILDING) || defined(PARALLEL_PACKAGE_BUILD)
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index 428041be50db..f6b4fabd0a84 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/control-center-2.16.3.tar.bz2) = 75ec00d864a69684abc561546fb762bb
-SHA256 (gnome2/control-center-2.16.3.tar.bz2) = 6bffec96f9014b3742df80f193b68877e31b26b2a1cc0ba961fcba15a22af9d9
-SIZE (gnome2/control-center-2.16.3.tar.bz2) = 2025478
+MD5 (gnome2/control-center-2.18.0.tar.bz2) = e5251c30c45577b78770beb2df59df5d
+SHA256 (gnome2/control-center-2.18.0.tar.bz2) = 5879c85775c2ba659174c506def2f0db11cad4215c956415c5e13908c5d06611
+SIZE (gnome2/control-center-2.18.0.tar.bz2) = 2138980
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index 94466c8551f1..6527e6758b0e 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,28 +1,10 @@
---- configure.orig	Thu Jul 13 12:02:50 2006
-+++ configure	Thu Jul 13 12:04:24 2006
-@@ -22229,6 +22229,7 @@ echo $ECHO_N "checking for $ac_func... $
- if eval "test \"\${$as_ac_var+set}\" = set"; then
+--- configure.orig	Tue Feb 13 07:51:47 2007
++++ configure	Tue Feb 13 07:51:47 2007
+@@ -22302,6 +22302,7 @@
+ if test "${gt_cv_func_ngettext_libc+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
 +  LIBS="-lintl $LIBS"
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -28440,7 +28441,7 @@ BONOBO_ACTIVATION_IDL_DIR="`$PKG_CONFIG 
- 
- 
- # dbus directory
--DBUS_SERVICES_DIR='$(datadir)'"/dbus-1/services"
-+DBUS_SERVICES_DIR='$(prefix)'"/share/dbus-1/services"
- 
- 
- cat >>confdefs.h <<_ACEOF
-@@ -29126,7 +29127,7 @@ fi
- 
- 
- cat >>confdefs.h <<_ACEOF
--#define GNOMECC_DATA_DIR "${real_prefix}/share/${GETTEXT_PACKAGE}"
-+#define GNOMECC_DATA_DIR "${datadir}/${GETTEXT_PACKAGE}"
- _ACEOF
- 
- 
diff --git a/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
new file mode 100644
index 000000000000..86acdbe0c46e
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-libslab_directory-tile.c
@@ -0,0 +1,9 @@
+--- libslab/directory-tile.c.orig	Mon Mar 12 16:33:35 2007
++++ libslab/directory-tile.c	Mon Mar 12 16:35:48 2007
+@@ -644,5 +644,5 @@ static void
+ disown_spawned_child (gpointer user_data)
+ {
+ 	setsid  ();
+-	setpgrp ();
++	setpgrp (0, 0);
+ }
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index f37dab73c184..955244143dbf 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -21,9 +21,29 @@ bin/gnome-window-properties
 bin/themus-theme-applier
 etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
+etc/xdg/menus/gnomecc.menu
 include/gnome-settings-daemon-2.0/gnome-settings-daemon/gnome-settings-client.h
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
+include/slab/app-resizer.h
+include/slab/app-shell-startup.h
+include/slab/app-shell.h
+include/slab/application-tile.h
+include/slab/directory-tile.h
+include/slab/document-tile.h
+include/slab/gnome-utils.h
+include/slab/nameplate-tile.h
+include/slab/nld-marshal.c
+include/slab/nld-marshal.h
+include/slab/search-bar.h
+include/slab/search-context-picker.h
+include/slab/search-entry-watermark.h
+include/slab/search-entry.h
+include/slab/shell-window.h
+include/slab/slab-gnome-util.h
+include/slab/slab-section.h
+include/slab/system-tile.h
+include/slab/tile.h
 lib/gnome-vfs-2.0/modules/libfont-method.a
 lib/gnome-vfs-2.0/modules/libfont-method.la
 lib/gnome-vfs-2.0/modules/libfont-method.so
@@ -34,6 +54,10 @@ lib/libgnome-window-settings.a
 lib/libgnome-window-settings.la
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
+lib/libslab.a
+lib/libslab.la
+lib/libslab.so
+lib/libslab.so.0
 lib/nautilus/extensions-1.0/libnautilus-fontilus.a
 lib/nautilus/extensions-1.0/libnautilus-fontilus.la
 lib/nautilus/extensions-1.0/libnautilus-fontilus.so
@@ -45,6 +69,7 @@ lib/window-manager-settings/libmetacity.la
 lib/window-manager-settings/libmetacity.so
 libdata/pkgconfig/gnome-settings-daemon.pc
 libdata/pkgconfig/gnome-window-settings-2.0.pc
+libdata/pkgconfig/libslab.pc
 libexec/gnome-settings-daemon
 share/dbus-1/services/org.gnome.SettingsDaemon.service
 share/gnome/applications/accessibility-keyboard.desktop
@@ -58,6 +83,7 @@ share/gnome/applications/gnome-font-viewer.desktop
 share/gnome/applications/gnome-network-preferences.desktop
 share/gnome/applications/gnome-settings-mouse.desktop
 share/gnome/applications/gnome-settings-sound.desktop
+share/gnome/applications/gnome-theme-installer.desktop
 share/gnome/applications/gnome-ui-properties.desktop
 share/gnome/applications/gnomecc.desktop
 share/gnome/applications/gtk-theme-selector.desktop
@@ -65,73 +91,72 @@ share/gnome/applications/keybinding.desktop
 share/gnome/applications/keyboard.desktop
 share/gnome/applications/themus-theme-applier.desktop
 share/gnome/applications/window-properties.desktop
-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/font-properties.glade
-%%ABOUTME%%share/gnome/control-center-2.0/interfaces/gnome-about-me.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
-share/gnome/control-center-2.0/interfaces/gnome-mouse-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-network-preferences.glade
-share/gnome/control-center-2.0/interfaces/gnome-ui-properties.glade
-share/gnome/control-center-2.0/interfaces/gnome-window-properties.glade
-share/gnome/control-center-2.0/interfaces/modmap-dialog.glade
-share/gnome/control-center-2.0/interfaces/sound-properties.glade
-share/gnome/control-center-2.0/interfaces/theme-properties.glade
-share/gnome/control-center-2.0/pixmaps/accessibility-keyboard-bouncekey.png
-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/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
-share/gnome/control-center-2.0/pixmaps/bar-green.png
-share/gnome/control-center-2.0/pixmaps/bar-red.png
-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
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock-open.png
-%%ABOUTME%%share/gnome/control-center-2.0/pixmaps/gnome-about-me-lock.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-cursor.png
-share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
-share/gnome/control-center-2.0/pixmaps/keyboard-volume.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal-large.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-normal.png
-share/gnome/control-center-2.0/pixmaps/mouse-cursor-white-large.png
-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/stop.png
-share/gnome/control-center-2.0/pixmaps/subpixel-bgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-rgb.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vbgr.png
-share/gnome/control-center-2.0/pixmaps/subpixel-vrgb.png
-share/gnome/control-center-2.0/pixmaps/theme-thumbnailing.png
-share/gnome/control-center-2.0/pixmaps/visual-bell.png
-share/gnome/control-center-2.0/xrdb/Editres.ad
-share/gnome/control-center-2.0/xrdb/Emacs.ad
-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/glade/acme.glade
+share/gnome/control-center/glade/apply-font.glade
+share/gnome/control-center/glade/at-enable-dialog.glade
+share/gnome/control-center/glade/font-properties.glade
+%%ABOUTME%%share/gnome/control-center/glade/gnome-about-me.glade
+share/gnome/control-center/glade/gnome-accessibility-keyboard-properties.glade
+share/gnome/control-center/glade/gnome-background-properties.glade
+share/gnome/control-center/glade/gnome-default-applications-properties.glade
+share/gnome/control-center/glade/gnome-keybinding-properties.glade
+share/gnome/control-center/glade/gnome-keyboard-properties.glade
+share/gnome/control-center/glade/gnome-mouse-properties.glade
+share/gnome/control-center/glade/gnome-network-preferences.glade
+share/gnome/control-center/glade/gnome-ui-properties.glade
+share/gnome/control-center/glade/gnome-window-properties.glade
+share/gnome/control-center/glade/modmap-dialog.glade
+share/gnome/control-center/glade/sound-properties.glade
+share/gnome/control-center/glade/theme-properties.glade
+share/gnome/control-center/gnome-default-applications.xml
+share/gnome/control-center/icons/display-capplet.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-bouncekey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-mousekey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-slowkey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-stickykey.png
+share/gnome/control-center/pixmaps/accessibility-keyboard-togglekey.png
+share/gnome/control-center/pixmaps/acme-eject.png
+share/gnome/control-center/pixmaps/at-startup.png
+share/gnome/control-center/pixmaps/at-support.png
+share/gnome/control-center/pixmaps/bar-disabled.png
+share/gnome/control-center/pixmaps/bar-green.png
+share/gnome/control-center/pixmaps/bar-red.png
+share/gnome/control-center/pixmaps/bar.png
+share/gnome/control-center/pixmaps/double-click-maybe.png
+share/gnome/control-center/pixmaps/double-click-off.png
+share/gnome/control-center/pixmaps/double-click-on.png
+%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock-open.png
+%%ABOUTME%%share/gnome/control-center/pixmaps/gnome-about-me-lock.png
+share/gnome/control-center/pixmaps/keyboard-bell.png
+share/gnome/control-center/pixmaps/keyboard-cursor.png
+share/gnome/control-center/pixmaps/keyboard-repeat.png
+share/gnome/control-center/pixmaps/keyboard-volume.png
+share/gnome/control-center/pixmaps/mouse-cursor-normal-large.png
+share/gnome/control-center/pixmaps/mouse-cursor-normal.png
+share/gnome/control-center/pixmaps/mouse-cursor-white-large.png
+share/gnome/control-center/pixmaps/mouse-cursor-white.png
+share/gnome/control-center/pixmaps/mouse-left.png
+share/gnome/control-center/pixmaps/mouse-right.png
+share/gnome/control-center/pixmaps/ocean-stripes.png
+share/gnome/control-center/pixmaps/stop.png
+share/gnome/control-center/pixmaps/subpixel-bgr.png
+share/gnome/control-center/pixmaps/subpixel-rgb.png
+share/gnome/control-center/pixmaps/subpixel-vbgr.png
+share/gnome/control-center/pixmaps/subpixel-vrgb.png
+share/gnome/control-center/pixmaps/theme-thumbnailing.png
+share/gnome/control-center/pixmaps/visual-bell.png
+share/gnome/control-center/xrdb/Editres.ad
+share/gnome/control-center/xrdb/Emacs.ad
+share/gnome/control-center/xrdb/General.ad
+share/gnome/control-center/xrdb/Motif.ad
+share/gnome/control-center/xrdb/Tk.ad
+share/gnome/control-center/xrdb/Xaw.ad
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
 share/gnome/desktop-directories/font-method.directory
+share/gnome/desktop-directories/gnomecc.directory
 share/gnome/desktop-directories/theme-method.directory
-share/gnome/gnome-default-applications/gnome-default-applications.xml
 share/gnome/help/control-center/C/config-accessibility-keyboard.xml
 share/gnome/help/control-center/C/config-background.xml
 share/gnome/help/control-center/C/config-behavior.xml
@@ -147,21 +172,26 @@ share/gnome/help/control-center/C/config-screensaver.xml
 share/gnome/help/control-center/C/config-sound.xml
 share/gnome/help/control-center/C/config-themes.xml
 share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/en_GB/control-center.xml
 share/gnome/help/control-center/es/control-center.xml
 share/gnome/help/control-center/fr/control-center.xml
+share/gnome/help/control-center/pa/control-center.xml
 share/gnome/help/control-center/ru/control-center.xml
 share/gnome/help/control-center/sv/control-center.xml
+share/gnome/help/control-center/uk/control-center.xml
 share/gnome/help/control-center/zh_CN/control-center.xml
-share/gnome/idl/ConfigArchiver.idl
-share/gnome/idl/GNOME_SettingsDaemon.idl
 share/gnome/omf/control-center/control-center-C.omf
+share/gnome/omf/control-center/control-center-en_GB.omf
 share/gnome/omf/control-center/control-center-es.omf
 share/gnome/omf/control-center/control-center-fr.omf
+share/gnome/omf/control-center/control-center-pa.omf
 share/gnome/omf/control-center/control-center-ru.omf
 share/gnome/omf/control-center/control-center-sv.omf
+share/gnome/omf/control-center/control-center-uk.omf
 share/gnome/omf/control-center/control-center-zh_CN.omf
 share/gnome/pixmaps/display-capplet.png
-share/icons/hicolor/48x48/apps/gnome-control-center.png
+share/icons/hicolor/48x48/apps/typing-monitor.png
+share/icons/hicolor/scalable/apps/typing-monitor.svg
 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
@@ -240,28 +270,8 @@ share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
-@dirrm share/gnome/omf/control-center
-@dirrm share/gnome/help/control-center/zh_CN
-@dirrm share/gnome/help/control-center/sv
-@dirrm share/gnome/help/control-center/ru
-@dirrm share/gnome/help/control-center/fr
-@dirrm share/gnome/help/control-center/es
-@dirrm share/gnome/help/control-center/C
-@dirrm share/gnome/help/control-center
-@dirrm share/gnome/gnome-default-applications
-@dirrm share/gnome/gnome-background-properties
-@dirrm share/gnome/desktop-directories
-@dirrm share/gnome/cursor-fonts
-@dirrm share/gnome/control-center-2.0/xrdb
-@dirrm share/gnome/control-center-2.0/pixmaps
-@dirrm share/gnome/control-center-2.0/interfaces
-@dirrmtry share/gnome/control-center-2.0/icons
-@dirrm lib/window-manager-settings
-@dirrm include/gnome-window-settings-2.0
-@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
-@dirrm include/gnome-settings-daemon-2.0
-@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
-@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+share/mime/application/x-gnome-theme-package.xml
+share/mime/packages/gnome-theme-package.xml
 @dirrmtry share/locale/zu/LC_MESSAGES
 @dirrmtry share/locale/zu
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
@@ -320,3 +330,30 @@ share/locale/zu/LC_MESSAGES/control-center-2.0.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
+@dirrm share/gnome/omf/control-center
+@dirrm share/gnome/help/control-center/zh_CN
+@dirrm share/gnome/help/control-center/uk
+@dirrm share/gnome/help/control-center/sv
+@dirrm share/gnome/help/control-center/ru
+@dirrm share/gnome/help/control-center/pa
+@dirrm share/gnome/help/control-center/fr
+@dirrm share/gnome/help/control-center/es
+@dirrm share/gnome/help/control-center/en_GB
+@dirrm share/gnome/help/control-center/C
+@dirrm share/gnome/help/control-center
+@dirrmtry share/gnome/gnome-background-properties
+@dirrm share/gnome/desktop-directories
+@dirrm share/gnome/cursor-fonts
+@dirrm share/gnome/control-center/xrdb
+@dirrm share/gnome/control-center/pixmaps
+@dirrmtry share/gnome/control-center/icons
+@dirrm share/gnome/control-center/glade
+@dirrm lib/window-manager-settings
+@dirrm include/slab
+@dirrm include/gnome-window-settings-2.0
+@dirrm include/gnome-settings-daemon-2.0/gnome-settings-daemon
+@dirrm include/gnome-settings-daemon-2.0
+@exec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@unexec %%LOCALBASE%%/bin/update-mime-database %D/share/mime
+@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
+@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnome-mount/Makefile b/sysutils/gnome-mount/Makefile
index 64cdda75fa8f..6be9c4a95637 100644
--- a/sysutils/gnome-mount/Makefile
+++ b/sysutils/gnome-mount/Makefile
@@ -3,19 +3,20 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.4 2006/10/05 07:37:38 mezz Exp $
+#   $MCom: ports/sysutils/gnome-mount/Makefile,v 1.13 2007/02/11 06:03:50 marcus Exp $
 #
 
 PORTNAME=	gnome-mount
-PORTVERSION=	0.4
-PORTREVISION=	2
+PORTVERSION=	0.5
+PORTREVISION=	6
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://people.freedesktop.org/~david/dist/
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	A front-end to mount, umount, and eject using HAL
 
-LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal
+LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
+		notify.1:${PORTSDIR}/devel/libnotify
 
 USE_XLIB=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack nautilus2
@@ -27,8 +28,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	gnome-mount.schemas
+MAN1=		gnome-mount.1
 
-post-extract:
-	@${CP} -f ${FILESDIR}/mntent.h ${WRKSRC}/src
+post-patch:
+	@${REINPLACE_CMD} -e 's|0.5.8.1|0.5.8|g' \
+	    	${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-mount/distinfo b/sysutils/gnome-mount/distinfo
index 656c038250f9..fa1d4818b5bf 100644
--- a/sysutils/gnome-mount/distinfo
+++ b/sysutils/gnome-mount/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-mount-0.4.tar.gz) = 75f260ea6b0ec3c5e0af3c722fbd9568
-SHA256 (gnome-mount-0.4.tar.gz) = fa9456c0cd1adeda962721fed955914bdc23723a403bebf31bd95a1f54211dd8
-SIZE (gnome-mount-0.4.tar.gz) = 364546
+MD5 (gnome-mount-0.5.tar.gz) = 76622ff9af0131fc44687aed7204f84f
+SHA256 (gnome-mount-0.5.tar.gz) = f705a44a2534acdae8bae752c54066eb3fc85ce082b3a25a50310f4ad377019b
+SIZE (gnome-mount-0.5.tar.gz) = 408472
diff --git a/sysutils/gnome-mount/files/mntent.h b/sysutils/gnome-mount/files/mntent.h
deleted file mode 100644
index 078b246cd02e..000000000000
--- a/sysutils/gnome-mount/files/mntent.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- *  mntent
- *  mntent.h - compatability header for FreeBSD
- *
- *  Copyright (c) 2001 David Rufino <daverufino@btinternet.com>
- *  All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- */
-
-#if defined(HAVE_MNTENT_H)
-#include <mntent.h>
-#else
-#ifndef _MNTENT_H
-#define _MNTENT_H
-#include <stdio.h>
-
-#define MOUNTED "dummy"
-
-#define MNTTYPE_NFS "nfs"
-
-struct mntent {
-	char *mnt_fsname;
-	char *mnt_dir;
-	char *mnt_type;
-	char *mnt_opts;
-	int mnt_freq;
-	int mnt_passno;
-};
-
-#define setmntent(x,y) ((FILE *)0x1)
-struct mntent *getmntent __P ((FILE *fp));
-char *hasmntopt __P ((const struct mntent *mnt, const char *option));
-#define endmntent(x) ((int)1)
-
-#endif /* _MNTENT_H */
-#endif /* HAVE_MNTENT_H */
diff --git a/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in b/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
new file mode 100644
index 000000000000..d4a0961b4018
--- /dev/null
+++ b/sysutils/gnome-mount/files/patch-gnome-mount.schemas.in
@@ -0,0 +1,38 @@
+--- gnome-mount.schemas.in.orig	Wed Jun 21 22:45:53 2006
++++ gnome-mount.schemas.in	Sun Dec 31 15:38:28 2006
+@@ -6,7 +6,7 @@
+         <applyto>/system/storage/default_options/vfat/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[shortname=winnt,uid=]</default>
++        <default>[longnames,-u=]</default>
+         <locale name="C">
+           <short>Default mount options for vfat fs</short>
+           <long>A list of default mount options for volumes formatted with the vfat file system.</long>
+@@ -18,7 +18,7 @@
+         <applyto>/system/storage/default_options/iso9660/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[uid=]</default>
++        <default>[]</default>
+         <locale name="C">
+           <short>Default mount options for iso9660 fs</short>
+           <long>A list of default mount options for volumes formatted with the iso9660 file system.</long>
+@@ -30,7 +30,7 @@
+         <applyto>/system/storage/default_options/udf/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[uid=]</default>
++        <default>[]</default>
+         <locale name="C">
+           <short>Default mount options for udf fs</short>
+           <long>A list of default mount options for volumes formatted with the udf file system.</long>
+@@ -42,7 +42,7 @@
+         <applyto>/system/storage/default_options/ntfs/mount_options</applyto>
+         <type>list</type>
+         <list_type>string</list_type>
+-        <default>[umask=222]</default>
++        <default>[-m=222]</default>
+         <locale name="C">
+           <short>Default mount options for ntfs fs</short>
+           <long>A list of default mount options for volumes formatted with the ntfs file system.</long>
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
index e33d84fd3192..481e82858656 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties-view.c
@@ -1,10 +1,81 @@
---- src/gnome-mount-properties-view.c.orig	Sun Dec  3 02:24:16 2006
-+++ src/gnome-mount-properties-view.c	Sun Dec  3 02:25:20 2006
-@@ -30,6 +30,7 @@
- #include <glib/gi18n.h>
- #include <gtk/gtk.h>
- #include <glade/glade.h>
-+#include <libgnomevfs/gnome-vfs-utils.h>
- #include <time.h>
+--- src/gnome-mount-properties-view.c.orig	Mon Aug 14 00:17:22 2006
++++ src/gnome-mount-properties-view.c	Sun Dec  3 02:38:08 2006
+@@ -34,6 +34,7 @@
  #include <sys/time.h>
  #include <string.h>
+ #include <gconf/gconf-client.h>
++#include <libgnomevfs/gnome-vfs-utils.h>
+ 
+ #ifdef __FreeBSD__
+ #include <fstab.h>
+@@ -59,6 +60,35 @@ struct _GnomeMountPropertiesViewClass {
+ 	GtkVBoxClass base_class;
+ };
+ 
++#ifdef __FreeBSD__
++static struct opt {
++	int o_opt;
++	const char *o_name;
++} optnames[] = {
++	{ MNT_ASYNC,		"asynchronous" },
++	{ MNT_EXPORTED,		"NFS exported" },
++	{ MNT_LOCAL,		"local" },
++	{ MNT_NOATIME,		"noatime" },
++	{ MNT_NOEXEC,		"noexec" },
++	{ MNT_NOSUID,		"nosuid" },
++	{ MNT_NOSYMFOLLOW,	"nosymfollow" },
++	{ MNT_QUOTA,		"with quotas" },
++	{ MNT_RDONLY,		"read-only" },
++	{ MNT_SYNCHRONOUS,	"synchronous" },
++	{ MNT_UNION,		"union" },
++	{ MNT_NOCLUSTERR,	"noclusterr" },
++	{ MNT_NOCLUSTERW,	"noclusterw" },
++	{ MNT_SUIDDIR,		"suiddir" },
++	{ MNT_SOFTDEP,		"soft-updates" },
++	{ MNT_MULTILABEL,	"multilabel" },
++	{ MNT_ACLS,		"acls" },
++#ifdef MNT_GJOURNAL
++	{ MNT_GJOURNAL,		"gjournal" },
++#endif
++	{ 0, NULL }
++};
++#endif
++
+ G_DEFINE_TYPE (GnomeMountPropertiesView, gm_properties_view, GTK_TYPE_VBOX)
+ 
+ static void
+@@ -445,13 +475,29 @@ static gboolean
+ mtab_next (gpointer handle, char **device_file, char **mount_options, char **mount_fstype)
+ {
+ #ifdef __FreeBSD__
+-#error FIXME TODO XXX fix this up for FreeBSD. Thanks.
+ 	struct mtab_handle *mtab = handle;
+ 
+-	if (mtab->iter < mtab->n_mounts)
+-		return mtab->mounts[mtab->iter++].f_mntfromname;
+-	else
+-		return NULL;
++	if (mtab->iter < mtab->n_mounts) {
++		struct opt *o;
++		int flags;
++		GString *optstr;
++
++		optstr = g_string_new("");
++		flags = mtab->mounts[mtab->iter].f_flags & MNT_VISFLAGMASK;
++
++		for (o = optnames; flags && o->o_opt; o++) {
++			if (flags & o->o_opt) {
++				g_string_append_printf(optstr, ", %s", o->o_name);
++				flags &= ~o->o_opt;
++			}
++		}
++		*device_file = mtab->mounts[mtab->iter].f_mntfromname;
++		*mount_options = g_string_free(optstr, FALSE);
++		*mount_fstype = mtab->mounts[mtab->iter++].f_fstypename;
++		return TRUE;
++	} else {
++		return FALSE;
++	}
+ #else
+ 	struct mntent *mnt;
+ 
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
index ad32f4a52a73..1f36b1259710 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount-properties.c
@@ -1,5 +1,5 @@
---- src/gnome-mount-properties.c.orig	Sun Dec  3 02:25:59 2006
-+++ src/gnome-mount-properties.c	Sun Dec  3 02:30:25 2006
+--- src/gnome-mount-properties.c.orig	Sun Dec  3 02:38:14 2006
++++ src/gnome-mount-properties.c	Sun Dec  3 02:39:27 2006
 @@ -27,6 +27,8 @@
  #include <libhal.h>
  #include <libhal-storage.h>
diff --git a/sysutils/gnome-mount/files/patch-src_gnome-mount.c b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
index eb78bab377f5..19de73ccd87b 100644
--- a/sysutils/gnome-mount/files/patch-src_gnome-mount.c
+++ b/sysutils/gnome-mount/files/patch-src_gnome-mount.c
@@ -1,29 +1,118 @@
---- src/gnome-mount.c.orig	Mon Sep  4 21:41:09 2006
-+++ src/gnome-mount.c	Mon Sep  4 21:45:53 2006
-@@ -42,7 +42,7 @@
+--- src/gnome-mount.c.orig	Sun Sep 17 01:17:54 2006
++++ src/gnome-mount.c	Sun Feb 11 01:03:16 2007
+@@ -51,9 +51,14 @@
  #include <libhal.h>
  #include <libhal-storage.h>
  
--#include <mntent.h>
-+#include "mntent.h"
+-#ifndef sun
++#if !defined(sun) && !defined(__FreeBSD__)
+ #include <mntent.h>
+-#else
++#elif defined(__FreeBSD__)
++#include <fstab.h>
++#include <sys/param.h>
++#include <sys/ucred.h>
++#include <sys/mount.h>
++#elif defined(sun)
+ #include <sys/mnttab.h>
+ #endif
  
- static DBusConnection *dbus_connection;
- static LibHalContext *hal_ctx;
-@@ -477,7 +477,7 @@
+@@ -380,7 +385,7 @@ show_error_dialog_mount (LibHalVolume *v
+ 		} else if (strcmp (error_name, "org.freedesktop.Hal.Device.Volume.AlreadyMounted") == 0) {
  
- 		mount_point = NULL;
- 		device_file = get_dev_file (volume, drive);
--
-+#ifdef __linux__
- 		if (device_file != NULL) {
- 			FILE *f;
- 			struct mntent mnt;
-@@ -497,7 +497,7 @@
- 				endmntent (f);
- 			}
+ 			/* don't show any dialog for this */
+-			gtk_widget_unref (w);
++			gtk_widget_destroy (w);
+ 			w = NULL;
+ 
+ #if 0
+@@ -399,7 +404,7 @@ show_error_dialog_mount (LibHalVolume *v
+ 			 *
+ 			 * Don't show any dialog for this.
+ 			 */
+-			gtk_widget_unref (w);
++			gtk_widget_destroy (w);
+ 			w = NULL;
+ 			 
+ 		} else {
+@@ -582,19 +587,24 @@ static char *
+ get_mntent_mount_point(const char *device_file)
+ {
+ 	char *mount_point;
++#if! defined(sun) && !defined(__FreeBSD__)
+ 	FILE *f;
+-#ifndef sun
+ 	struct mntent mnt;
+ 	struct mntent *mnte;
+ 	char buf[512];
+-#else
++#elif defined(__FreeBSD__)
++	struct statfs *mounts;
++	int n_mounts;
++	int i;
++#elif defined(sun)
++	FILE *f;
+ 	struct mnttab mnt;
+ 	struct mnttab mpref = { NULL, NULL, NULL, NULL, NULL };
+ #endif
+ 
+ 	mount_point = NULL;
+ 
+-#ifndef sun
++#if !defined(sun) && !defined(__FreeBSD__)
+ 	if ((f = setmntent ("/proc/mounts", "r")) != NULL) {
+ 		
+ 		while ((mnte = getmntent_r (f, &mnt, buf, sizeof(buf))) != NULL) {
+@@ -608,7 +618,7 @@ get_mntent_mount_point(const char *devic
+ 		endmntent (f);
+ 	}
+ 
+-#else /* sun */
++#elif defined(sun) /* sun */
+ 
+ 	if ((f = fopen(MNTTAB, "r")) != NULL) {
+ 		mpref.mnt_special = (char *)device_file;
+@@ -617,8 +627,13 @@ get_mntent_mount_point(const char *devic
  		}
+ 		fclose(f);
+ 	}
 -
+-#endif /* sun */
++#elif defined(__FreeBSD__)
++	n_mounts = getmntinfo(&mounts, MNT_NOWAIT);
++	for (i = 0; i < n_mounts; i++) {
++		if (!strcmp(mounts[i].f_mntfromname, device_file))
++			mount_point = g_strdup (mounts[i].f_mntonname);
++	}
++#endif /* sun && __FreeBSD__ */
+ 
+ out:
+ 	return (mount_point);
+@@ -1322,7 +1337,11 @@ volume_mount (const char *udi, LibHalVol
+ 	if (volume == NULL && (mount_options->len == 0)) {
+ 		/* volume from a non-pollable drive, just set uid.. */
+ 		
++#ifndef __FreeBSD__
+ 		snprintf (uidbuf, sizeof (uidbuf) - 1, "uid=%u", getuid ());
++#else
++		snprintf (uidbuf, sizeof (uidbuf) - 1, "-u=%u", getuid ());
 +#endif
- 		g_print (_("Mounted %s at \"%s\"\n"), device_file, mount_point);
- 		g_free (mount_point);
- 	}
+ 		g_ptr_array_add (mount_options, uidbuf);
+ 		
+ 	} else if (((fstype_override != NULL) || (fstype != NULL)) && (mount_options->len == 0)) {
+@@ -1349,9 +1368,15 @@ volume_mount (const char *udi, LibHalVol
+ 				g_debug ("read default option '%s' from gconf strlist key %s", option, key);
+ 
+ 				/* special workaround to replace "uid=" with "uid=<actual uid of caller>" */
++#ifndef __FreeBSD__
+ 				if (strcmp (option, "uid=") == 0) {
+ 					g_free (option);
+ 					option = g_strdup_printf ("uid=%u", getuid ());
++#else
++				if (strcmp (option, "-u=") == 0) {
++					g_free (option);
++					option = g_strdup_printf ("-u=%u", getuid ());
++#endif
+ 				}
+ 				g_ptr_array_add (mount_options, option);
+ 
diff --git a/sysutils/gnome-mount/pkg-plist b/sysutils/gnome-mount/pkg-plist
index 0ae3f4092a0a..685e8a43929e 100644
--- a/sysutils/gnome-mount/pkg-plist
+++ b/sysutils/gnome-mount/pkg-plist
@@ -6,7 +6,13 @@ lib/nautilus/extensions-1.0/libgnome-mount.la
 lib/nautilus/extensions-1.0/libgnome-mount.so
 libdata/pkgconfig/gnome-mount.pc
 share/gnome/gnome-mount/gnome-mount-properties.glade
+share/locale/en_GB/LC_MESSAGES/gnome-mount.mo
+share/locale/es/LC_MESSAGES/gnome-mount.mo
 share/locale/it/LC_MESSAGES/gnome-mount.mo
 share/locale/ja/LC_MESSAGES/gnome-mount.mo
+share/locale/mk/LC_MESSAGES/gnome-mount.mo
 share/locale/nb/LC_MESSAGES/gnome-mount.mo
+share/locale/ru/LC_MESSAGES/gnome-mount.mo
+share/locale/sv/LC_MESSAGES/gnome-mount.mo
+share/locale/vi/LC_MESSAGES/gnome-mount.mo
 @dirrm share/gnome/gnome-mount
diff --git a/sysutils/gnome-power-manager/Makefile b/sysutils/gnome-power-manager/Makefile
index f4b05443df88..26edbc31dd75 100644
--- a/sysutils/gnome-power-manager/Makefile
+++ b/sysutils/gnome-power-manager/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.13 2006/09/29 23:25:32 marcus Exp $
+#   $MCom: ports/sysutils/gnome-power-manager/Makefile,v 1.23 2007/03/13 00:33:21 mezz Exp $
 #
 
 PORTNAME=	gnome-power-manager
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -16,6 +16,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Power management system for the GNOME Desktop
 
+BUILD_DEPENDS=	docbook2html:${PORTSDIR}/textproc/docbook-utils \
+    		${LOCALBASE}/share/sgml/docbook/4.1/catalog:${PORTSDIR}/textproc/docbook-410
 LIB_DEPENDS=	hal.1:${PORTSDIR}/sysutils/hal \
 		notify.1:${PORTSDIR}/devel/libnotify
 
@@ -27,18 +29,19 @@ INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui libwnck \
-		gnomedocutils
+		gnomedocutils gnomepanel
 CONFIGURE_ARGS=	--disable-icon-framing \
 		--with-doc-dir=${PREFIX}/share/doc \
-		--disable-docbook-docs \
-		--mandir=${PREFIX}/man
+		--disable-docbook-docs
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 GCONF_SCHEMAS=	gnome-power-manager.schemas
 
+MAN1=		gnome-power-manager.1 gnome-power-preferences.1
+
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lresolv||' \
-	    	${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lresolv|| ; s|-Werror||g' \
+		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/sysutils/gnome-power-manager/distinfo b/sysutils/gnome-power-manager/distinfo
index 9cee6e481740..2c017716d0c7 100644
--- a/sysutils/gnome-power-manager/distinfo
+++ b/sysutils/gnome-power-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-power-manager-2.16.3.tar.bz2) = 48166c6aaf41f2225090517ae655d05d
-SHA256 (gnome2/gnome-power-manager-2.16.3.tar.bz2) = e19f473e4ed4d36607a8f92ac730026526951c6fedb93181e0badc9f07bb98b5
-SIZE (gnome2/gnome-power-manager-2.16.3.tar.bz2) = 1858954
+MD5 (gnome2/gnome-power-manager-2.18.0.tar.bz2) = 089cfb86af712cacce16ac9617ab2b1c
+SHA256 (gnome2/gnome-power-manager-2.18.0.tar.bz2) = 6ae1d7c6c417c30bcde7985c80ea0690a73ba5c6709e100a12b657b8e872026c
+SIZE (gnome2/gnome-power-manager-2.18.0.tar.bz2) = 1961914
diff --git a/sysutils/gnome-power-manager/pkg-plist b/sysutils/gnome-power-manager/pkg-plist
index 5ad8c3fa774e..2761cbef1e97 100644
--- a/sysutils/gnome-power-manager/pkg-plist
+++ b/sysutils/gnome-power-manager/pkg-plist
@@ -1,66 +1,118 @@
-bin/gnome-power-inhibit-test
+bin/gnome-brightness-applet
+bin/gnome-inhibit-applet
+bin/gnome-power-bugreport.sh
+bin/gnome-power-cmd.sh
 bin/gnome-power-manager
 bin/gnome-power-preferences
+bin/gnome-power-statistics
 etc/dbus-1/system.d/gnome-power-manager.conf
+libdata/bonobo/servers/GNOME_BrightnessApplet.server
+libdata/bonobo/servers/GNOME_InhibitApplet.server
 share/dbus-1/services/gnome-power-manager.service
 share/gnome/applications/gnome-power-preferences.desktop
+share/gnome/applications/gnome-power-statistics.desktop
 share/gnome/autostart/gnome-power-manager.desktop
+share/gnome/gnome-2.0/ui/GNOME_BrightnessApplet.xml
+share/gnome/gnome-2.0/ui/GNOME_InhibitApplet.xml
+share/gnome/gnome-power-manager/gpm-critical-power.wav
 share/gnome/gnome-power-manager/gpm-feedback-widget.glade
-share/gnome/gnome-power-manager/gpm-info.glade
+share/gnome/gnome-power-manager/gpm-graph.glade
 share/gnome/gnome-power-manager/gpm-inhibit-test.glade
 share/gnome/gnome-power-manager/gpm-prefs.glade
+share/gnome/gnome-power-manager/gpm-suspend-failure.wav
+share/gnome/gnome-power-manager/gpm-unplugged.wav
+share/gnome/help/gnome-power-manager/C/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-devices.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-event-log.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-percentage.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-rate.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-info-time.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/C/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/C/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/C/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/C/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/C/gnome-power-manager.xml
 share/gnome/help/gnome-power-manager/C/legal.xml
+share/gnome/help/gnome-power-manager/es/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/es/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/es/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/es/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/fr/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/fr/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/fr/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/fr/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/hu/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/hu/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/hu/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/hu/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/pa/figures/gpm-cell-capacity.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-charged.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-critical.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-low.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-stats-graph.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-suspend-problem.png
+share/gnome/help/gnome-power-manager/pa/figures/gpm-unplugged.png
+share/gnome/help/gnome-power-manager/pa/figures/gs-prefs.png
+share/gnome/help/gnome-power-manager/pa/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/ru/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-devices.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-event-log.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-percentage.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-rate.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-info-time.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/ru/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/ru/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/ru/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/ru/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/ru/gnome-power-manager.xml
+share/gnome/help/gnome-power-manager/sv/figures/gpm-cell-capacity.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-charged.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-critical.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-devices.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-event-log.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-percentage.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-rate.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-info-time.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-low.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-ac.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-battery.png
-share/gnome/help/gnome-power-manager/sv/figures/gpm-prefs-options.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-mouse-left.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-mouse-right.png
+share/gnome/help/gnome-power-manager/sv/figures/gpm-stats-graph.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-suspend-problem.png
 share/gnome/help/gnome-power-manager/sv/figures/gpm-unplugged.png
 share/gnome/help/gnome-power-manager/sv/figures/gs-prefs.png
 share/gnome/help/gnome-power-manager/sv/gnome-power-manager.xml
 share/gnome/omf/gnome-power-manager/gnome-power-manager-C.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-es.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-fr.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-hu.omf
+share/gnome/omf/gnome-power-manager/gnome-power-manager-pa.omf
 share/gnome/omf/gnome-power-manager/gnome-power-manager-ru.omf
 share/gnome/omf/gnome-power-manager/gnome-power-manager-sv.omf
 share/icons/hicolor/16x16/apps/gpm-ac-adapter.png
-share/icons/hicolor/16x16/apps/gpm-brightness.png
+share/icons/hicolor/16x16/apps/gpm-brightness-kbd-disabled.png
+share/icons/hicolor/16x16/apps/gpm-brightness-kbd.png
+share/icons/hicolor/16x16/apps/gpm-brightness-lcd-disabled.png
+share/icons/hicolor/16x16/apps/gpm-brightness-lcd.png
 share/icons/hicolor/16x16/apps/gpm-hibernate.png
+share/icons/hicolor/16x16/apps/gpm-inhibit.png
 share/icons/hicolor/16x16/apps/gpm-keyboard-000.png
 share/icons/hicolor/16x16/apps/gpm-keyboard-030.png
 share/icons/hicolor/16x16/apps/gpm-keyboard-060.png
@@ -83,6 +135,7 @@ share/icons/hicolor/16x16/apps/gpm-primary-100-charging.png
 share/icons/hicolor/16x16/apps/gpm-primary-100.png
 share/icons/hicolor/16x16/apps/gpm-primary-charged.png
 share/icons/hicolor/16x16/apps/gpm-primary-missing.png
+share/icons/hicolor/16x16/apps/gpm-statistics.png
 share/icons/hicolor/16x16/apps/gpm-suspend.png
 share/icons/hicolor/16x16/apps/gpm-ups-000-charging.png
 share/icons/hicolor/16x16/apps/gpm-ups-000.png
@@ -99,8 +152,12 @@ share/icons/hicolor/16x16/apps/gpm-ups-100.png
 share/icons/hicolor/16x16/apps/gpm-ups-charged.png
 share/icons/hicolor/16x16/apps/gpm-ups-missing.png
 share/icons/hicolor/22x22/apps/gpm-ac-adapter.png
-share/icons/hicolor/22x22/apps/gpm-brightness.png
+share/icons/hicolor/22x22/apps/gpm-brightness-kbd-disabled.png
+share/icons/hicolor/22x22/apps/gpm-brightness-kbd.png
+share/icons/hicolor/22x22/apps/gpm-brightness-lcd-disabled.png
+share/icons/hicolor/22x22/apps/gpm-brightness-lcd.png
 share/icons/hicolor/22x22/apps/gpm-hibernate.png
+share/icons/hicolor/22x22/apps/gpm-inhibit.png
 share/icons/hicolor/22x22/apps/gpm-keyboard-000.png
 share/icons/hicolor/22x22/apps/gpm-keyboard-030.png
 share/icons/hicolor/22x22/apps/gpm-keyboard-060.png
@@ -123,6 +180,7 @@ share/icons/hicolor/22x22/apps/gpm-primary-100-charging.png
 share/icons/hicolor/22x22/apps/gpm-primary-100.png
 share/icons/hicolor/22x22/apps/gpm-primary-charged.png
 share/icons/hicolor/22x22/apps/gpm-primary-missing.png
+share/icons/hicolor/22x22/apps/gpm-statistics.png
 share/icons/hicolor/22x22/apps/gpm-suspend.png
 share/icons/hicolor/22x22/apps/gpm-ups-000-charging.png
 share/icons/hicolor/22x22/apps/gpm-ups-000.png
@@ -139,8 +197,12 @@ share/icons/hicolor/22x22/apps/gpm-ups-100.png
 share/icons/hicolor/22x22/apps/gpm-ups-charged.png
 share/icons/hicolor/22x22/apps/gpm-ups-missing.png
 share/icons/hicolor/24x24/apps/gpm-ac-adapter.png
-share/icons/hicolor/24x24/apps/gpm-brightness.png
+share/icons/hicolor/24x24/apps/gpm-brightness-kbd-disabled.png
+share/icons/hicolor/24x24/apps/gpm-brightness-kbd.png
+share/icons/hicolor/24x24/apps/gpm-brightness-lcd-disabled.png
+share/icons/hicolor/24x24/apps/gpm-brightness-lcd.png
 share/icons/hicolor/24x24/apps/gpm-hibernate.png
+share/icons/hicolor/24x24/apps/gpm-inhibit.png
 share/icons/hicolor/24x24/apps/gpm-keyboard-000.png
 share/icons/hicolor/24x24/apps/gpm-keyboard-030.png
 share/icons/hicolor/24x24/apps/gpm-keyboard-060.png
@@ -163,6 +225,7 @@ share/icons/hicolor/24x24/apps/gpm-primary-100-charging.png
 share/icons/hicolor/24x24/apps/gpm-primary-100.png
 share/icons/hicolor/24x24/apps/gpm-primary-charged.png
 share/icons/hicolor/24x24/apps/gpm-primary-missing.png
+share/icons/hicolor/24x24/apps/gpm-statistics.png
 share/icons/hicolor/24x24/apps/gpm-suspend.png
 share/icons/hicolor/24x24/apps/gpm-ups-000-charging.png
 share/icons/hicolor/24x24/apps/gpm-ups-000.png
@@ -179,8 +242,12 @@ share/icons/hicolor/24x24/apps/gpm-ups-100.png
 share/icons/hicolor/24x24/apps/gpm-ups-charged.png
 share/icons/hicolor/24x24/apps/gpm-ups-missing.png
 share/icons/hicolor/scalable/apps/gpm-ac-adapter.svg
-share/icons/hicolor/scalable/apps/gpm-brightness.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-kbd-disabled.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-kbd.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-lcd-disabled.svg
+share/icons/hicolor/scalable/apps/gpm-brightness-lcd.svg
 share/icons/hicolor/scalable/apps/gpm-hibernate.svg
+share/icons/hicolor/scalable/apps/gpm-inhibit.svg
 share/icons/hicolor/scalable/apps/gpm-keyboard-000.svg
 share/icons/hicolor/scalable/apps/gpm-keyboard-030.svg
 share/icons/hicolor/scalable/apps/gpm-keyboard-060.svg
@@ -203,6 +270,7 @@ share/icons/hicolor/scalable/apps/gpm-primary-100-charging.svg
 share/icons/hicolor/scalable/apps/gpm-primary-100.svg
 share/icons/hicolor/scalable/apps/gpm-primary-charged.svg
 share/icons/hicolor/scalable/apps/gpm-primary-missing.svg
+share/icons/hicolor/scalable/apps/gpm-statistics.svg
 share/icons/hicolor/scalable/apps/gpm-suspend.svg
 share/icons/hicolor/scalable/apps/gpm-ups-000-charging.svg
 share/icons/hicolor/scalable/apps/gpm-ups-000.svg
@@ -253,7 +321,6 @@ share/locale/mk/LC_MESSAGES/gnome-power-manager.mo
 share/locale/ml/LC_MESSAGES/gnome-power-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-power-manager.mo
 share/locale/nl/LC_MESSAGES/gnome-power-manager.mo
-share/locale/or/LC_MESSAGES/gnome-power-manager.mo
 share/locale/pa/LC_MESSAGES/gnome-power-manager.mo
 share/locale/pl/LC_MESSAGES/gnome-power-manager.mo
 share/locale/pt/LC_MESSAGES/gnome-power-manager.mo
@@ -276,6 +343,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-power-manager.mo
 @dirrm share/gnome/help/gnome-power-manager/sv
 @dirrm share/gnome/help/gnome-power-manager/ru/figures
 @dirrm share/gnome/help/gnome-power-manager/ru
+@dirrm share/gnome/help/gnome-power-manager/pa/figures
+@dirrm share/gnome/help/gnome-power-manager/pa
+@dirrm share/gnome/help/gnome-power-manager/hu/figures
+@dirrm share/gnome/help/gnome-power-manager/hu
+@dirrm share/gnome/help/gnome-power-manager/fr/figures
+@dirrm share/gnome/help/gnome-power-manager/fr
+@dirrm share/gnome/help/gnome-power-manager/es/figures
+@dirrm share/gnome/help/gnome-power-manager/es
 @dirrm share/gnome/help/gnome-power-manager/C/figures
 @dirrm share/gnome/help/gnome-power-manager/C
 @dirrm share/gnome/help/gnome-power-manager
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 536b338648a1..3702dd447f2c 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -3,12 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.76 2006/10/02 23:31:11 ahze Exp $
+#   $MCom: ports/sysutils/gnome-system-monitor/Makefile,v 1.95 2007/03/12 23:11:28 marcus Exp $
 #
 
 PORTNAME=	gnome-system-monitor
-PORTVERSION=	2.16.1
-PORTREVISION=	1
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,14 +17,17 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 system monitor program
 
-LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop
+BUILD_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
+LIB_DEPENDS=	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
+    		pcre.0:${PORTSDIR}/devel/pcre
+RUN_DEPENDS=	${LOCALBASE}/libdata/pkgconfig/gnome-icon-theme.pc:${PORTSDIR}/misc/gnome-icon-theme
 
 USE_BZIP2=	yes
 USE_GETTEXT=	yes
 USE_XLIB=	yes
 INSTALLS_OMF=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix intlhack gnomehack libgnomeui libwnck
+USE_GNOME=	gnomeprefix intlhack gnomehack libwnck gnomevfs2 gnomedocutils
 GNU_CONFIGURE=	yes
 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 8a66b02dd773..c34703923c5c 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 37b44e0e84865fc0aba8bfd4bbdf2338
-SHA256 (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1be70e1ae696e3607dfeda186298e7034cca4e0c8020bf92c7485b8c6450504c
-SIZE (gnome2/gnome-system-monitor-2.16.1.tar.bz2) = 1480061
+MD5 (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 5b4256a20710c8431290ea27238c0905
+SHA256 (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 2aab8f003bf5373e4a68cb04a1c5942faf8b1ae0be49296b670877a954e5a6c9
+SIZE (gnome2/gnome-system-monitor-2.18.0.tar.bz2) = 1669066
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
deleted file mode 100644
index 0d99406504e3..000000000000
--- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/proctable.c.orig	Wed Aug 30 14:11:01 2006
-+++ src/proctable.c	Tue Oct 24 13:39:29 2006
-@@ -923,6 +923,12 @@ static void cb_exclude(ProcInfo* info, G
- }
- 
- 
-+static int
-+pid_compare(const void* first, const void* second)
-+{
-+	return *(unsigned*)first - *(unsigned*)second;
-+}
-+
- static void
- refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n)
- {
-@@ -1015,10 +1021,16 @@ proctable_update_list (ProcData * const 
- 
- 	pid_list = glibtop_get_proclist (&proclist, which, arg);
- 
-+	qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare);
-+
- 	/* FIXME: total cpu time elapsed should be calculated on an individual basis here
- 	** should probably have a total_time_last gint in the ProcInfo structure */
- 	glibtop_get_cpu (&cpu);
--	total_time = MAX(cpu.total - total_time_last, 1);
-+	total_time = cpu.total - total_time_last;
-+	if (cpu.frequency) {
-+		total_time /= (cpu.frequency/100);
-+	}
-+	total_time = MAX(total_time, 1);
- 	total_time_last = cpu.total;
- 
- 	refresh_list (procdata, pid_list, proclist.number);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
deleted file mode 100644
index 971e718b2101..000000000000
--- a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/openfiles.c.orig	Mon Apr 11 03:50:49 2005
-+++ src/openfiles.c	Mon Apr 11 03:52:13 2005
-@@ -8,6 +8,7 @@
- #include <netdb.h>
- #include <sys/types.h>
- #include <sys/socket.h>
-+#include <netinet/in.h>
- #include <arpa/inet.h>
- #include "procman.h"
- #include "openfiles.h"
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index 3adab4f7d10e..b251815c687b 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -29,9 +29,54 @@ share/gnome/help/gnome-system-monitor/bg/figures/sortMenu2.png
 share/gnome/help/gnome-system-monitor/bg/figures/systemMonitor.png
 share/gnome/help/gnome-system-monitor/bg/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/bg/gnome-system-monitor.xml
-share/gnome/help/gnome-system-monitor/bg/legal.xml
+share/gnome/help/gnome-system-monitor/fr/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/fr/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/fr/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/fr/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/fr/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/fr/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/fr/figures/processListing.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/fr/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/fr/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/fr/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/fr/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/pa/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/pa/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/pa/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/pa/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/pa/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/pa/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/pa/figures/processListing.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/pa/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/pa/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/pa/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/pa/gnome-system-monitor.xml
+share/gnome/help/gnome-system-monitor/sv/figures/addColumn.png
+share/gnome/help/gnome-system-monitor/sv/figures/changePriority.png
+share/gnome/help/gnome-system-monitor/sv/figures/colorPanel.png
+share/gnome/help/gnome-system-monitor/sv/figures/columnContextMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/gnome-system-monitor_window.png
+share/gnome/help/gnome-system-monitor/sv/figures/memoryMaps.png
+share/gnome/help/gnome-system-monitor/sv/figures/moreInfo.png
+share/gnome/help/gnome-system-monitor/sv/figures/processListing.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortButton.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu.png
+share/gnome/help/gnome-system-monitor/sv/figures/sortMenu2.png
+share/gnome/help/gnome-system-monitor/sv/figures/systemMonitor.png
+share/gnome/help/gnome-system-monitor/sv/figures/viewMenu.png
+share/gnome/help/gnome-system-monitor/sv/gnome-system-monitor.xml
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-bg.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-fr.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-pa.omf
+share/gnome/omf/gnome-system-monitor/gnome-system-monitor-sv.omf
+share/gnome/pixmaps/gnome-system-monitor/side.png
 share/locale/am/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ar/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/az/LC_MESSAGES/gnome-system-monitor.mo
@@ -104,12 +149,6 @@ share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
-@dirrm share/gnome/omf/gnome-system-monitor
-@dirrm share/gnome/help/gnome-system-monitor/bg/figures
-@dirrm share/gnome/help/gnome-system-monitor/bg
-@dirrm share/gnome/help/gnome-system-monitor/C/figures
-@dirrm share/gnome/help/gnome-system-monitor/C
-@dirrm share/gnome/help/gnome-system-monitor
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -164,3 +203,16 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-monitor.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be/LC_MESSAGES
 @dirrmtry share/locale/be
+@dirrm share/gnome/pixmaps/gnome-system-monitor
+@dirrm share/gnome/omf/gnome-system-monitor
+@dirrm share/gnome/help/gnome-system-monitor/sv/figures
+@dirrm share/gnome/help/gnome-system-monitor/sv
+@dirrm share/gnome/help/gnome-system-monitor/pa/figures
+@dirrm share/gnome/help/gnome-system-monitor/pa
+@dirrm share/gnome/help/gnome-system-monitor/fr/figures
+@dirrm share/gnome/help/gnome-system-monitor/fr
+@dirrm share/gnome/help/gnome-system-monitor/bg/figures
+@dirrm share/gnome/help/gnome-system-monitor/bg
+@dirrm share/gnome/help/gnome-system-monitor/C/figures
+@dirrm share/gnome/help/gnome-system-monitor/C
+@dirrm share/gnome/help/gnome-system-monitor
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index a6a3b87785cf..1881e1d49faa 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -3,12 +3,10 @@
 # Whom:					Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.45 2006/07/27 00:40:38 marcus Exp $
-#
+#    $MCom: ports/sysutils/gnome-system-tools/Makefile,v 1.59 2007/03/12 12:55:31 ahze Exp $
 
 PORTNAME=	gnome-system-tools
-PORTVERSION=	2.14.0
-PORTREVISION=	1
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-system-tools/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -18,12 +16,13 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
 
-BUILD_DEPENDS=	${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
-RUN_DEPENDS=	${LOCALBASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+LIB_DEPENDS=	oobs-1.3:${PORTSDIR}/devel/liboobs
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+INSTALLS_ICONS=	yes
 USE_GETTEXT=	yes
+USE_LDCONFIG=	yes
 USE_XLIB=	yes
 GNOME_DESKTOP_VERSION=2
 USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
@@ -35,10 +34,8 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 
 GCONF_SCHEMAS=	gnome-system-tools.schemas
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-IGNORE=	uses symbols not present in 4.X
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e 's|$${prefix}/$${DATADIRNAME}|$${datadir}|g' \
+	    	${WRKSRC}/configure
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index dea2f0713697..f774a5b8f0f8 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 3aded3a37f4f5b4962bf253d25cebea1
-SHA256 (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 39f37363001b1cc2f5d2f5d2d7024a7a36e7dd227862b1dd9ce8c3325157ea7c
-SIZE (gnome2/gnome-system-tools-2.14.0.tar.bz2) = 2120911
+MD5 (gnome2/gnome-system-tools-2.18.0.tar.bz2) = af305872b4bd72802915b007a7015010
+SHA256 (gnome2/gnome-system-tools-2.18.0.tar.bz2) = de4667c8a95c55e1936b19d3bed85507a37f0eabcaa1f2eadd3c7ef89e39c480
+SIZE (gnome2/gnome-system-tools-2.18.0.tar.bz2) = 2815588
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
deleted file mode 100644
index 712bb1defc9f..000000000000
--- a/sysutils/gnome-system-tools/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.orig	Thu Jan 13 17:15:39 2005
-+++ configure	Thu Jan 13 17:17:13 2005
-@@ -22990,7 +22990,7 @@
- GST_CFLAGS="$GST_DEPENDS_CFLAGS $GST_CRACK_LIB_CFLAGS $GST_DEPRECATED_FLAGS"
- 
- GST_TOOL_LIBS="$GST_LIBS -lutil \$(top_builddir)/src/common/libsetuptool.a"
--GST_TOOL_CFLAGS="$GST_CFLAGS -I\$(top_srcdir)/src/common"
-+GST_TOOL_CFLAGS="-I\$(top_srcdir)/src/common $GST_CFLAGS"
- 
- GST_TOOL_CLEANFILES="\$(desktop) \$(desktop).in"
- GST_TOOL_EXTRA_DIST="\$(toolpixmaps) \$(desktop).in.in"
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
deleted file mode 100644
index f73b28ae4d10..000000000000
--- a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
+++ /dev/null
@@ -1,110 +0,0 @@
---- src/common/gst-auth.c.orig	Mon Aug  8 15:00:01 2005
-+++ src/common/gst-auth.c	Sat Sep 10 01:47:35 2005
-@@ -55,6 +55,82 @@
- static int root;			/* if we are root, no password is
- 					   required */
- 
-+#ifdef __FreeBSD__
-+static int
-+_forkpty (int *amaster, char *name,
-+	  struct termios *termp, struct winsize *winp)
-+{
-+	int master, slave;
-+	char *line;
-+	pid_t pid;
-+
-+	master = posix_openpt (O_RDWR);
-+	if (master == -1)
-+		return (-1);
-+
-+	if (grantpt (master) == -1)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	if (unlockpt (master) == -1)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	line = ptsname (master);
-+	if (line == NULL)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	slave = open (line, O_RDWR);
-+	if (slave < 0)
-+	{
-+		(void) close (master);
-+		return (-1);
-+	}
-+
-+	if (amaster)
-+		*amaster = master;
-+
-+	if (name)
-+		strcpy (name, line);
-+
-+	if (termp)
-+		(void) tcsetattr(slave, TCSAFLUSH, termp);
-+
-+	if (winp)
-+		(void) ioctl(slave, TIOCSWINSZ, (char *) winp);
-+
-+	pid = fork ();
-+	switch (pid)
-+	{
-+		case -1:
-+			(void) close (slave);
-+			(void) close (master);
-+			return (-1);
-+		case 0:
-+			(void) close (master);
-+			dup2 (slave, STDIN_FILENO);
-+			dup2 (slave, STDOUT_FILENO);
-+			dup2 (slave, STDERR_FILENO);
-+			return (0);
-+		default:
-+			(void) close (slave);
-+			return (pid);
-+	}
-+
-+	(void) close (master);
-+	return (-1);
-+}
-+#else
-+#define _forkpty forkpty
-+#endif
-+
- static void
- gst_auth_display_error_message (GstTool *tool, gchar *primary_text, gchar *secondary_text)
- {
-@@ -125,7 +201,7 @@ gst_auth_run_term (GstTool *tool, gchar 
- 	int p[2];
- 
- 	pipe (p);
--	tool->backend_pid = forkpty (&tool->write_fd, NULL, NULL, NULL);
-+	tool->backend_pid = _forkpty (&tool->write_fd, NULL, NULL, NULL);
- 
- 	if (tool->backend_pid < 0) {
- 		gst_auth_display_error_message (tool,
-@@ -142,12 +218,12 @@ gst_auth_run_term (GstTool *tool, gchar 
- 		unsetenv("LANG");
- 		unsetenv("LANGUAGE");
- 
--		dup2 (p[1], 1);
--		dup2 (p[1], 2);
-+		dup2 (p[1], STDOUT_FILENO);
-+		dup2 (p[1], STDERR_FILENO);
- 		close (p[0]);
- 
- 		execv (args[0], args);
--		exit (255);
-+		_exit (255);
- 	} else {
- #ifndef __FreeBSD__
- 		/* Linux's su works ok with echo disabling */
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
deleted file mode 100644
index 9aaef15031fd..000000000000
--- a/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/common/gst-tool.c.orig	Tue Jun 21 15:07:05 2005
-+++ src/common/gst-tool.c	Wed Jul  6 01:28:22 2005
-@@ -598,7 +598,14 @@ gst_tool_kill_backend_cb (GstDirectiveEn
- 		if (tool->root_access == ROOT_ACCESS_SIMULATED_DISABLED)
- 			tool->root_access = ROOT_ACCESS_SIMULATED;
- 
-+#if 0
-+		/*
-+		 * We do not need to wait for the tool,
-+		 * as it will get SIGPIPE anyway.
-+		 * This waitpid causes problems on FreeBSD.
-+		 */
- 		waitpid (tool->backend_pid, NULL, 0);
-+#endif
- 	}
- }
- 
-@@ -1655,7 +1662,7 @@ poll_backend (GstTool *tool)
- 	struct pollfd fd;
- 
- 	fd.fd = tool->read_fd;
--	fd.events = POLLIN || POLLPRI;
-+	fd.events = POLLIN | POLLPRI;
- 
- 	while (poll (&fd, 1, 100) <= 0) {
- 		while (gtk_events_pending ())
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 3f9b6a1a9832..48f75de4614a 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -7,137 +7,133 @@ lib/nautilus/extensions-1.0/libnautilus-gst-shares.a
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.la
 lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
 libdata/pkgconfig/gnome-system-tools.pc
-%%DATADIR%%/interfaces/boot.glade
-%%DATADIR%%/interfaces/common.glade
-%%DATADIR%%/interfaces/disks.glade
-%%DATADIR%%/interfaces/network.glade
-%%DATADIR%%/interfaces/services.glade
-%%DATADIR%%/interfaces/shares.glade
-%%DATADIR%%/interfaces/time.glade
-%%DATADIR%%/interfaces/users.glade
-%%DATADIR%%/pixmaps/16_ethernet.xpm
-%%DATADIR%%/pixmaps/16_loopback.xpm
-%%DATADIR%%/pixmaps/16_plip.xpm
-%%DATADIR%%/pixmaps/16_ppp.xpm
-%%DATADIR%%/pixmaps/archlinux.png
-%%DATADIR%%/pixmaps/black_panther.png
-%%DATADIR%%/pixmaps/boot.png
-%%DATADIR%%/pixmaps/computer.png
-%%DATADIR%%/pixmaps/conectiva.png
-%%DATADIR%%/pixmaps/connection-ethernet.png
-%%DATADIR%%/pixmaps/connection-modem.png
-%%DATADIR%%/pixmaps/debian.png
-%%DATADIR%%/pixmaps/disks.png
-%%DATADIR%%/pixmaps/fedora.png
-%%DATADIR%%/pixmaps/freebsd.png
-%%DATADIR%%/pixmaps/gentoo.png
-%%DATADIR%%/pixmaps/gnome-dev-cdrom-data.png
-%%DATADIR%%/pixmaps/gnome-dev-cdrom-mixed.png
-%%DATADIR%%/pixmaps/irda-16.png
-%%DATADIR%%/pixmaps/irda-48.png
-%%DATADIR%%/pixmaps/mandrake.png
-%%DATADIR%%/pixmaps/nameresolution.png
-%%DATADIR%%/pixmaps/nameresolution_alias.png
-%%DATADIR%%/pixmaps/nameresolution_id.png
-%%DATADIR%%/pixmaps/network.png
-%%DATADIR%%/pixmaps/openna.png
-%%DATADIR%%/pixmaps/pld.png
-%%DATADIR%%/pixmaps/plip-48.png
-%%DATADIR%%/pixmaps/ppp.png
-%%DATADIR%%/pixmaps/reading.png
-%%DATADIR%%/pixmaps/redhat.png
-%%DATADIR%%/pixmaps/server.png
-%%DATADIR%%/pixmaps/services.png
-%%DATADIR%%/pixmaps/settings.png
-%%DATADIR%%/pixmaps/shares.png
-%%DATADIR%%/pixmaps/slackware.png
-%%DATADIR%%/pixmaps/specifix.png
-%%DATADIR%%/pixmaps/suse.png
-%%DATADIR%%/pixmaps/talk-userlist.png
-%%DATADIR%%/pixmaps/time.png
-%%DATADIR%%/pixmaps/timezone.png
-%%DATADIR%%/pixmaps/turbolinux.png
-%%DATADIR%%/pixmaps/unsupported-distro.png
-%%DATADIR%%/pixmaps/users-groups.png
-%%DATADIR%%/pixmaps/users.png
-%%DATADIR%%/pixmaps/vidalinux.png
-%%DATADIR%%/pixmaps/vine.png
-%%DATADIR%%/pixmaps/wavelan-16.png
-%%DATADIR%%/pixmaps/wavelan-48.png
-%%DATADIR%%/pixmaps/world_map-960.png
 share/gnome/applications/network.desktop
 share/gnome/applications/services.desktop
 share/gnome/applications/shares.desktop
 share/gnome/applications/time.desktop
 share/gnome/applications/users.desktop
-share/gnome/help/boot-admin/C/boot-admin.xml
-share/gnome/help/boot-admin/C/figures/boot-tool.png
-share/gnome/help/boot-admin/C/legal.xml
-share/gnome/help/boot-admin/es/boot-admin.xml
-share/gnome/help/boot-admin/es/figures/boot-tool.png
+share/gnome/gnome-system-tools/interfaces/boot.glade
+share/gnome/gnome-system-tools/interfaces/common.glade
+share/gnome/gnome-system-tools/interfaces/disks.glade
+share/gnome/gnome-system-tools/interfaces/network.glade
+share/gnome/gnome-system-tools/interfaces/services.glade
+share/gnome/gnome-system-tools/interfaces/shares.glade
+share/gnome/gnome-system-tools/interfaces/time.glade
+share/gnome/gnome-system-tools/interfaces/users.glade
+share/gnome/gnome-system-tools/pixmaps/world_map-960.png
 share/gnome/help/network-admin/C/figures/network-tool.png
 share/gnome/help/network-admin/C/legal.xml
 share/gnome/help/network-admin/C/network-admin.xml
 share/gnome/help/network-admin/es/figures/network-tool.png
 share/gnome/help/network-admin/es/network-admin.xml
-share/gnome/help/services-admin/C/figures/service-properties.png
+share/gnome/help/network-admin/fr/figures/network-tool.png
+share/gnome/help/network-admin/fr/network-admin.xml
+share/gnome/help/network-admin/sv/figures/network-tool.png
+share/gnome/help/network-admin/sv/network-admin.xml
 share/gnome/help/services-admin/C/figures/services-tool.png
 share/gnome/help/services-admin/C/legal.xml
 share/gnome/help/services-admin/C/services-admin.xml
-share/gnome/help/services-admin/es/figures/service-properties.png
 share/gnome/help/services-admin/es/figures/services-tool.png
 share/gnome/help/services-admin/es/services-admin.xml
+share/gnome/help/services-admin/fr/figures/services-tool.png
+share/gnome/help/services-admin/fr/services-admin.xml
 share/gnome/help/services-admin/nl/figures/service-properties.png
 share/gnome/help/services-admin/nl/figures/services-tool.png
 share/gnome/help/services-admin/nl/legal.xml
 share/gnome/help/services-admin/nl/services-admin.xml
+share/gnome/help/services-admin/sv/figures/services-tool.png
+share/gnome/help/services-admin/sv/services-admin.xml
+share/gnome/help/shares-admin/C/figures/shares-tool.png
+share/gnome/help/shares-admin/C/legal.xml
+share/gnome/help/shares-admin/C/shares-admin.xml
+share/gnome/help/shares-admin/sv/figures/shares-tool.png
+share/gnome/help/shares-admin/sv/shares-admin.xml
 share/gnome/help/time-admin/C/figures/time-map.png
 share/gnome/help/time-admin/C/figures/time-servers.png
-share/gnome/help/time-admin/C/figures/time-tool.png
+share/gnome/help/time-admin/C/figures/time-tool-automatic.png
+share/gnome/help/time-admin/C/figures/time-tool-manual.png
 share/gnome/help/time-admin/C/legal.xml
 share/gnome/help/time-admin/C/time-admin.xml
 share/gnome/help/time-admin/es/figures/time-map.png
 share/gnome/help/time-admin/es/figures/time-servers.png
-share/gnome/help/time-admin/es/figures/time-tool.png
+share/gnome/help/time-admin/es/figures/time-tool-automatic.png
+share/gnome/help/time-admin/es/figures/time-tool-manual.png
 share/gnome/help/time-admin/es/time-admin.xml
+share/gnome/help/time-admin/fr/figures/time-map.png
+share/gnome/help/time-admin/fr/figures/time-servers.png
+share/gnome/help/time-admin/fr/figures/time-tool-automatic.png
+share/gnome/help/time-admin/fr/figures/time-tool-manual.png
+share/gnome/help/time-admin/fr/time-admin.xml
 share/gnome/help/time-admin/nl/figures/time-map.png
 share/gnome/help/time-admin/nl/figures/time-servers.png
 share/gnome/help/time-admin/nl/figures/time-tool.png
 share/gnome/help/time-admin/nl/legal.xml
 share/gnome/help/time-admin/nl/time-admin.xml
+share/gnome/help/time-admin/ru/figures/time-map.png
+share/gnome/help/time-admin/ru/figures/time-servers.png
+share/gnome/help/time-admin/ru/figures/time-tool-automatic.png
+share/gnome/help/time-admin/ru/figures/time-tool-manual.png
+share/gnome/help/time-admin/ru/time-admin.xml
+share/gnome/help/time-admin/sv/figures/time-map.png
+share/gnome/help/time-admin/sv/figures/time-servers.png
+share/gnome/help/time-admin/sv/figures/time-tool-automatic.png
+share/gnome/help/time-admin/sv/figures/time-tool-manual.png
+share/gnome/help/time-admin/sv/time-admin.xml
 share/gnome/help/users-admin/C/figures/users-tool.png
 share/gnome/help/users-admin/C/legal.xml
 share/gnome/help/users-admin/C/users-admin.xml
 share/gnome/help/users-admin/es/figures/users-tool.png
 share/gnome/help/users-admin/es/users-admin.xml
-share/gnome/omf/boot-admin/boot-admin-C.omf
-share/gnome/omf/boot-admin/boot-admin-es.omf
+share/gnome/help/users-admin/fr/figures/users-tool.png
+share/gnome/help/users-admin/fr/users-admin.xml
+share/gnome/help/users-admin/ru/figures/users-tool.png
+share/gnome/help/users-admin/ru/users-admin.xml
+share/gnome/help/users-admin/sv/figures/users-tool.png
+share/gnome/help/users-admin/sv/users-admin.xml
 share/gnome/omf/gnome-system-tools/services-admin-nl.omf
 share/gnome/omf/gnome-system-tools/time-admin-nl.omf
 share/gnome/omf/network-admin/network-admin-C.omf
 share/gnome/omf/network-admin/network-admin-es.omf
+share/gnome/omf/network-admin/network-admin-fr.omf
+share/gnome/omf/network-admin/network-admin-sv.omf
 share/gnome/omf/services-admin/services-admin-C.omf
 share/gnome/omf/services-admin/services-admin-es.omf
+share/gnome/omf/services-admin/services-admin-fr.omf
+share/gnome/omf/services-admin/services-admin-sv.omf
+share/gnome/omf/shares-admin/shares-admin-C.omf
+share/gnome/omf/shares-admin/shares-admin-sv.omf
 share/gnome/omf/time-admin/time-admin-C.omf
 share/gnome/omf/time-admin/time-admin-es.omf
+share/gnome/omf/time-admin/time-admin-fr.omf
+share/gnome/omf/time-admin/time-admin-ru.omf
+share/gnome/omf/time-admin/time-admin-sv.omf
 share/gnome/omf/users-admin/users-admin-C.omf
 share/gnome/omf/users-admin/users-admin-es.omf
+share/gnome/omf/users-admin/users-admin-fr.omf
+share/gnome/omf/users-admin/users-admin-ru.omf
+share/gnome/omf/users-admin/users-admin-sv.omf
+share/icons/hicolor/48x48/devices/irda.png
+share/icons/hicolor/48x48/devices/plip.png
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
+share/locale/be/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
+share/locale/bn_IN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cy/LC_MESSAGES/gnome-system-tools.mo
 share/locale/da/LC_MESSAGES/gnome-system-tools.mo
 share/locale/de/LC_MESSAGES/gnome-system-tools.mo
+share/locale/dz/LC_MESSAGES/gnome-system-tools.mo
 share/locale/el/LC_MESSAGES/gnome-system-tools.mo
 share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
 share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
 share/locale/es/LC_MESSAGES/gnome-system-tools.mo
 share/locale/et/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
+share/locale/fa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
@@ -150,10 +146,12 @@ share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/id/LC_MESSAGES/gnome-system-tools.mo
 share/locale/it/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ja/LC_MESSAGES/gnome-system-tools.mo
+share/locale/ka/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ku/LC_MESSAGES/gnome-system-tools.mo
 share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
 share/locale/lv/LC_MESSAGES/gnome-system-tools.mo
+share/locale/mg/LC_MESSAGES/gnome-system-tools.mo
 share/locale/mk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ml/LC_MESSAGES/gnome-system-tools.mo
 share/locale/mn/LC_MESSAGES/gnome-system-tools.mo
@@ -162,7 +160,7 @@ share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ne/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/no/LC_MESSAGES/gnome-system-tools.mo
+share/locale/or/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
@@ -185,44 +183,112 @@ share/locale/xh/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
+@dirrm share/locale/zh_TW/LC_MESSAGES
+@dirrm share/locale/zh_TW
+@dirrm share/locale/zh_HK/LC_MESSAGES
+@dirrm share/locale/zh_HK
+@dirrm share/locale/zh_CN/LC_MESSAGES
+@dirrm share/locale/zh_CN
+@dirrm share/locale/xh/LC_MESSAGES
+@dirrm share/locale/xh
+@dirrm share/locale/uk/LC_MESSAGES
+@dirrm share/locale/uk
+@dirrm share/locale/sr/LC_MESSAGES
+@dirrm share/locale/sr
+@dirrm share/locale/sk/LC_MESSAGES
+@dirrm share/locale/sk
+@dirrm share/locale/rw/LC_MESSAGES
+@dirrm share/locale/rw
+@dirrm share/locale/ro/LC_MESSAGES
+@dirrm share/locale/ro
+@dirrm share/locale/pt/LC_MESSAGES
+@dirrm share/locale/pt
+@dirrm share/locale/pl/LC_MESSAGES
+@dirrm share/locale/pl
+@dirrm share/locale/nn/LC_MESSAGES
+@dirrm share/locale/nn
+@dirrm share/locale/ne/LC_MESSAGES
+@dirrm share/locale/ne
+@dirrm share/locale/mg/LC_MESSAGES
+@dirrm share/locale/mg
+@dirrm share/locale/ku/LC_MESSAGES
+@dirrm share/locale/ku
+@dirrm share/locale/ko/LC_MESSAGES
+@dirrm share/locale/ko
+@dirrm share/locale/gl/LC_MESSAGES
+@dirrm share/locale/gl
+@dirrm share/locale/fi/LC_MESSAGES
+@dirrm share/locale/fi
+@dirrm share/locale/el/LC_MESSAGES
+@dirrm share/locale/el
+@dirrm share/locale/dz/LC_MESSAGES
+@dirrm share/locale/dz
+@dirrm share/locale/cs/LC_MESSAGES
+@dirrm share/locale/cs
+@dirrm share/locale/ca/LC_MESSAGES
+@dirrm share/locale/ca
+@dirrm share/locale/bn_IN/LC_MESSAGES
+@dirrm share/locale/bn_IN
+@dirrm share/locale/be/LC_MESSAGES
+@dirrm share/locale/be
 @dirrm share/gnome/omf/users-admin
 @dirrm share/gnome/omf/time-admin
+@dirrm share/gnome/omf/shares-admin
 @dirrm share/gnome/omf/services-admin
 @dirrm share/gnome/omf/network-admin
 @dirrm share/gnome/omf/gnome-system-tools
-@dirrm share/gnome/omf/boot-admin
-@dirrm share/gnome/help/users-admin/C/figures
-@dirrm share/gnome/help/users-admin/C
+@dirrm share/gnome/help/users-admin/sv/figures
+@dirrm share/gnome/help/users-admin/sv
+@dirrm share/gnome/help/users-admin/ru/figures
+@dirrm share/gnome/help/users-admin/ru
+@dirrm share/gnome/help/users-admin/fr/figures
+@dirrm share/gnome/help/users-admin/fr
 @dirrm share/gnome/help/users-admin/es/figures
 @dirrm share/gnome/help/users-admin/es
+@dirrm share/gnome/help/users-admin/C/figures
+@dirrm share/gnome/help/users-admin/C
 @dirrm share/gnome/help/users-admin
+@dirrm share/gnome/help/time-admin/sv/figures
+@dirrm share/gnome/help/time-admin/sv
+@dirrm share/gnome/help/time-admin/ru/figures
+@dirrm share/gnome/help/time-admin/ru
 @dirrm share/gnome/help/time-admin/nl/figures
 @dirrm share/gnome/help/time-admin/nl
+@dirrm share/gnome/help/time-admin/fr/figures
+@dirrm share/gnome/help/time-admin/fr
 @dirrm share/gnome/help/time-admin/es/figures
 @dirrm share/gnome/help/time-admin/es
 @dirrm share/gnome/help/time-admin/C/figures
 @dirrm share/gnome/help/time-admin/C
 @dirrm share/gnome/help/time-admin
+@dirrm share/gnome/help/shares-admin/sv/figures
+@dirrm share/gnome/help/shares-admin/sv
+@dirrm share/gnome/help/shares-admin/C/figures
+@dirrm share/gnome/help/shares-admin/C
+@dirrm share/gnome/help/shares-admin
+@dirrm share/gnome/help/services-admin/sv/figures
+@dirrm share/gnome/help/services-admin/sv
 @dirrm share/gnome/help/services-admin/nl/figures
 @dirrm share/gnome/help/services-admin/nl
+@dirrm share/gnome/help/services-admin/fr/figures
+@dirrm share/gnome/help/services-admin/fr
 @dirrm share/gnome/help/services-admin/es/figures
 @dirrm share/gnome/help/services-admin/es
 @dirrm share/gnome/help/services-admin/C/figures
 @dirrm share/gnome/help/services-admin/C
 @dirrm share/gnome/help/services-admin
+@dirrm share/gnome/help/network-admin/sv/figures
+@dirrm share/gnome/help/network-admin/sv
+@dirrm share/gnome/help/network-admin/fr/figures
+@dirrm share/gnome/help/network-admin/fr
 @dirrm share/gnome/help/network-admin/es/figures
 @dirrm share/gnome/help/network-admin/es
 @dirrm share/gnome/help/network-admin/C/figures
 @dirrm share/gnome/help/network-admin/C
 @dirrm share/gnome/help/network-admin
-@dirrm share/gnome/help/boot-admin/es/figures
-@dirrm share/gnome/help/boot-admin/es
-@dirrm share/gnome/help/boot-admin/C/figures
-@dirrm share/gnome/help/boot-admin/C
-@dirrm share/gnome/help/boot-admin
-@dirrm %%DATADIR%%/pixmaps
-@dirrm %%DATADIR%%/interfaces
-@dirrm %%DATADIR%%
+@dirrm share/gnome/gnome-system-tools/pixmaps
+@dirrm share/gnome/gnome-system-tools/interfaces
+@dirrm share/gnome/gnome-system-tools
 @dirrmtry share/locale/zh_TW/LC_MESSAGES
 @dirrmtry share/locale/zh_TW
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
@@ -245,12 +311,12 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrmtry share/locale/pt
 @dirrmtry share/locale/pl/LC_MESSAGES
 @dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
 @dirrmtry share/locale/nn/LC_MESSAGES
 @dirrmtry share/locale/nn
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/ko/LC_MESSAGES
@@ -261,7 +327,13 @@ share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
 @dirrmtry share/locale/fi
 @dirrmtry share/locale/el/LC_MESSAGES
 @dirrmtry share/locale/el
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz
 @dirrmtry share/locale/cs/LC_MESSAGES
 @dirrmtry share/locale/cs
 @dirrmtry share/locale/ca/LC_MESSAGES
 @dirrmtry share/locale/ca
+@dirrmtry share/locale/bn_IN/LC_MESSAGES
+@dirrmtry share/locale/bn_IN
+@dirrmtry share/locale/be/LC_MESSAGES
+@dirrmtry share/locale/be
diff --git a/sysutils/gnome-volume-manager/Makefile b/sysutils/gnome-volume-manager/Makefile
index 2700067e62dc..a78e6438b437 100644
--- a/sysutils/gnome-volume-manager/Makefile
+++ b/sysutils/gnome-volume-manager/Makefile
@@ -3,12 +3,12 @@
 # Whom:				Jean-Yves Lefort <jylefort@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.7 2006/09/15 05:50:19 marcus Exp $
+#   $MCom: ports/sysutils/gnome-volume-manager/Makefile,v 1.13 2007/03/09 22:15:17 mezz Exp $
 #
 
 PORTNAME=	gnome-volume-manager
-PORTVERSION=	2.15.0
-PORTREVISION=	2
+PORTVERSION=	2.17.0
+PORTREVISION=	3
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
diff --git a/sysutils/gnome-volume-manager/distinfo b/sysutils/gnome-volume-manager/distinfo
index 9b0f0ca3ddf3..a3b7541f3610 100644
--- a/sysutils/gnome-volume-manager/distinfo
+++ b/sysutils/gnome-volume-manager/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome-volume-manager-2.15.0.tar.bz2) = d723bc2069fd19cf1c31961fbc1cf3c8
-SHA256 (gnome-volume-manager-2.15.0.tar.bz2) = f3d2ce3e2f2a4b757d4688bae7f6b8418d11340618f15d34871a002516ab8e0e
-SIZE (gnome-volume-manager-2.15.0.tar.bz2) = 318479
+MD5 (gnome-volume-manager-2.17.0.tar.bz2) = 104cec26e721e0bba69debd392367195
+SHA256 (gnome-volume-manager-2.17.0.tar.bz2) = 5517cf5d6a70227d66afb9a8b97a704f0d8e29098cec98bcbf68da77133537a9
+SIZE (gnome-volume-manager-2.17.0.tar.bz2) = 341241
diff --git a/sysutils/gnome-volume-manager/files/patch-src_manager.c b/sysutils/gnome-volume-manager/files/patch-src_manager.c
index 753b495ef6f4..a847dd404b6b 100644
--- a/sysutils/gnome-volume-manager/files/patch-src_manager.c
+++ b/sysutils/gnome-volume-manager/files/patch-src_manager.c
@@ -1,5 +1,5 @@
---- src/manager.c.orig	Mon Jul 31 16:37:36 2006
-+++ src/manager.c	Wed Dec 20 14:59:45 2006
+--- src/manager.c.orig	Tue Nov  7 13:01:17 2006
++++ src/manager.c	Sun Dec 31 15:33:44 2006
 @@ -23,9 +23,12 @@
  #include <sys/types.h>
  #include <sys/stat.h>
@@ -13,54 +13,220 @@
  
  #include <locale.h>
  
-@@ -3088,10 +3091,17 @@ gvm_local_user (void)
- 	struct utmp *utmp;
- 	const char *user;
- 	size_t ulen;
+@@ -1556,12 +1559,27 @@ enum {
+ 	MOUNT_UID        = (1 << 15),
+ 	MOUNT_UMASK      = (1 << 16),
+ 	MOUNT_UTF8       = (1 << 17),
++	MOUNT_LOCALE     = (1 << 18),
++	MOUNT_LONGNAME   = (1 << 19),
+ };
+ 
+ static struct {
+ 	const char *name;
+ 	guint32 flag;
+ } mount_options[] = {
++#ifdef __FreeBSD__
++	{ "-D=",	MOUNT_CODEPAGE   },  /* vfat */
++	{ "-M=",	MOUNT_DMASK      },  /* vfat */
++	{ "-m=",	MOUNT_FMASK      },  /* vfat, ntfs */
++	{ "-L=",	MOUNT_LOCALE     },  /* vfat */
++	{ "-C=",	MOUNT_IOCHARSET  },  /* ntfs, ios9660 */
++	{ "noatime",	MOUNT_NOATIME    },
++	{ "noexec",	MOUNT_NOEXEC     },
++	{ "ro",		MOUNT_READ_ONLY  },
++	{ "longnames",	MOUNT_LONGNAME   },  /* vfat */
++	{ "sync",	MOUNT_SYNC       },
++	{ "-u=",	MOUNT_UID        },  /* vfat, ntfs */
++#else
+ 	{ "codepage=",  MOUNT_CODEPAGE   },  /* vfat */
+ 	{ "data=",      MOUNT_DATA       },  /* ext3 */
+ 	{ "dirsync",    MOUNT_DIRSYNC    },
+@@ -1580,6 +1598,7 @@ static struct {
+ 	{ "uid=",       MOUNT_UID        },  /* vfat, ntfs, udf, iso9660 */
+ 	{ "umask=",     MOUNT_UMASK      },  /* vfat, ntfs, udf */
+ 	{ "utf8",       MOUNT_UTF8       },  /* vfat, iso9660 */
++#endif
+ };
+ 
+ 
+@@ -1760,10 +1779,17 @@ gvm_mount_options (GPtrArray *options, g
+ 		g_slist_free_1 (l);
+ 	}
+ 	
++#ifndef __FreeBSD__
+ 	if (opts & MOUNT_UID) {
+ 		option = g_strdup_printf ("uid=%u", getuid ());
+ 		g_ptr_array_add (options, option);
+ 	}
++#else
++	if (opts & MOUNT_UID && (!strcmp (where, "vfat") || !strcmp (where, "ntfs"))) {
++		option = g_strdup_printf ("u=%u", getuid ());
++		g_ptr_array_add (options, option);
++	}
++#endif
+ 	
+ 	return TRUE;
+ }
+@@ -1813,7 +1839,7 @@ gvm_device_mount (const char *udi, gbool
+ 		
+ 		return retval;
+ 	} else {
+-		char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL;
++		char *mount_point, *fstype, *drive, **moptions, fmask_opt[12], *charset_opt = NULL, *locale_opt = NULL;
+ 		DBusMessage *dmesg, *reply;
+ 		gboolean freev = FALSE;
+ 		GPtrArray *options;
+@@ -1893,21 +1919,86 @@ gvm_device_mount (const char *udi, gbool
+ 				
+ 				if (opts & MOUNT_FMASK) {
+ 					mask = umask (0);
++#ifdef __FreeBSD__
++					snprintf (fmask_opt, sizeof (fmask_opt), "-m=%#o", mask | 0111);
++#else
+ 					snprintf (fmask_opt, sizeof (fmask_opt), "fmask=%#o", mask | 0111);
++#endif
+ 					g_ptr_array_add (options, fmask_opt);
+ 					umask (mask);
+ 				}
+ 				
+ 				if (opts & MOUNT_SHORTNAME)
+ 					g_ptr_array_add (options, "shortname=lower");
++				if (opts & MOUNT_LONGNAME)
++					g_ptr_array_add (options, "longnames");
++
++				if (opts & MOUNT_LOCALE) {
++					char *locale;
++
++					locale = setlocale(LC_ALL, NULL);
++					if (!locale)
++						locale = getenv("LANG");
++					if (locale) {
++
++						locale_opt = g_strdup_printf ("-L=%s", locale);
++						g_ptr_array_add (options, locale_opt);
++					}
++				}
++
++#ifdef __FreeBSD__
++				if (opts & MOUNT_CODEPAGE) {
++					if ((iocharset = gvm_iocharset ())) {
++						charset_opt = g_strdup_printf ("-D=%s", iocharset);
++						g_ptr_array_add (options, charset_opt);
++					}
++				}
++
++				if (opts & MOUNT_UID) {
++					snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
++					g_ptr_array_add (options, uid);
++				}
++#endif
+ 			} else if (!strcmp (fstype, "iso9660")) {
+ 				/* only care about uid= and iocharset= */
++#ifdef __FreeBSD__
++				if (opts & MOUNT_IOCHARSET) {
++					if ((iocharset = gvm_iocharset ())) {
++						charset_opt = g_strdup_printf ("-C=%s", iocharset);
++						g_ptr_array_add (options, charset_opt);
++					}
++				}
++#endif
+ 			} else if (!strcmp (fstype, "udf")) {
+ 				/* also care about uid= and iocharset= */
+ 				if (opts & MOUNT_NOATIME)
+ 					g_ptr_array_add (options, "noatime");
++#ifdef __FreeBSD__
++				if (opts & MOUNT_IOCHARSET) {
++					if ((iocharset = gvm_iocharset ())) {
++						charset_opt = g_strdup_printf ("-C=%s", iocharset);
++						g_ptr_array_add (options, charset_opt);
++					}
++				}
++#endif
++			} else if (!strcmp (fstype, "ntfs")) {
++				/* only care about uid= and iocharset= */
++#ifdef __FreeBSD__
++				if (opts & MOUNT_IOCHARSET) {
++					if ((iocharset = gvm_iocharset ())) {
++						charset_opt = g_strdup_printf ("-C=%s", iocharset);
++						g_ptr_array_add (options, charset_opt);
++					}
++				}
++
++				if (opts & MOUNT_UID) {
++					snprintf (uid, sizeof (uid) - 1, "-u=%s", getuid ());
++					g_ptr_array_add (options, uid);
++				}
++#endif
+ 			}
+ 			
++#ifndef __FreeBSD__
+ 			if (opts & (MOUNT_IOCHARSET|MOUNT_UTF8)) {
+ 				if ((iocharset = gvm_iocharset ())) {
+ 					if ((opts & MOUNT_UTF8) && !strcmp (iocharset, "utf8")) {
+@@ -1923,6 +2014,7 @@ gvm_device_mount (const char *udi, gbool
+ 				snprintf (uid, sizeof (uid) - 1, "uid=%u", getuid ());
+ 				g_ptr_array_add (options, uid);
+ 			}
++#endif
+ 			
+ 			libhal_free_string (fstype);
+ 		}
+@@ -1947,6 +2039,7 @@ gvm_device_mount (const char *udi, gbool
+ 		
+ 		g_ptr_array_free (options, TRUE);
+ 		g_free (charset_opt);
++		g_free (locale_opt);
+ 		
+ 		policy = g_new (struct _MountPolicy, 1);
+ 		policy->udi = g_strdup (udi);
+@@ -3185,6 +3278,12 @@ gvm_local_user (void)
+ 	size_t n;
+ 	DIR *dir;
+ 	int vt;
 +#ifndef __linux__
 +	int bytes, fd;
 +	struct stat sb;
 +	struct utmp buf[1024];
-+	long len;
++	size_t len;
 +#endif
  	
- 	user = g_get_user_name ();
- 	ulen = strlen (user);
+ 	if (local & LOCAL_USER_CHECKED)
+ 		return (local & LOCAL_USER_FOUND);
+@@ -3208,6 +3307,7 @@ gvm_local_user (void)
  	
-+#ifdef __linux__
- 	setutent ();
+  fallback:
  	
- 	while (!local && (utmp = getutent ())) {
-@@ -3103,7 +3113,31 @@ gvm_local_user (void)
++#ifdef __linux__
+ 	if (!(local & LOCAL_USER_FOUND)) {
+ 		setutent ();
+ 		
+@@ -3222,6 +3322,29 @@ gvm_local_user (void)
+ 		
+ 		endutent ();
  	}
- 	
- 	endutent ();
--	
 +#else
 +	if ((fd = open (_PATH_WTMP, O_RDONLY, 0)) < 0 || fstat(fd, &sb) == -1) {
 +		close (fd);
 +		return TRUE;
 +	}
++
 +	len = (sb.st_size + sizeof(buf) - 1) / sizeof(buf);
 +
 +	while (!local && --len >= 0) {
 +		if (lseek(fd, (off_t) (len * sizeof(buf)), L_SET) == -1 ||
-+			(bytes = read (fd, buf, sizeof(buf))) == -1) {
++				(bytes = read (fd, buf, sizeof(buf))) == -1) {
 +			close (fd);
 +			return TRUE;
 +		}
 +		for (utmp = &buf[bytes / sizeof(buf[0]) - 1]; !local && utmp >= buf; --utmp) {
-+			if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, ulen) != 0)
++			if (!utmp->ut_name[0] || strncmp (utmp->ut_name, user, n) != 0)
 +				continue;
-+			local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9';
-+			if (!local)
-+				/* Handle vty logins */
-+				local = strlen(utmp->ut_line) > 4 && strncmp(utmp->ut_line, "ttyv", 4) == 0 && utmp->ut_line[4] >= '0' && utmp->ut_line[4] <= '9';
++			local = utmp->ut_line[0] == ':' && utmp->ut_line[1] >= '0' && utmp->ut_line[1] <= '9' || !strncmp (utmp->ut_line, "ttyv", 4) ? LOCAL_USER_FOUND : 0;
 +		}
 +	}
 +
 +	close (fd);
 +#endif
- 	return local;
- }
- 
+ 	
+ 	local |= LOCAL_USER_CHECKED;
+ 	
diff --git a/sysutils/gnome-volume-manager/pkg-plist b/sysutils/gnome-volume-manager/pkg-plist
index c26bce96f36f..03aa400ce488 100644
--- a/sysutils/gnome-volume-manager/pkg-plist
+++ b/sysutils/gnome-volume-manager/pkg-plist
@@ -38,9 +38,12 @@ share/locale/it/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ja/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ka/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ko/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ku/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/lt/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/lv/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/mg/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/mk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/ml/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/mn/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ms/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/nb/LC_MESSAGES/gnome-volume-manager.mo
@@ -56,6 +59,7 @@ share/locale/ro/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/ru/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/rw/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/sk/LC_MESSAGES/gnome-volume-manager.mo
+share/locale/sl/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/sq/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/sr/LC_MESSAGES/gnome-volume-manager.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-volume-manager.mo
@@ -84,6 +88,8 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
 @dirrmtry share/locale/uk
 @dirrmtry share/locale/sr/LC_MESSAGES
 @dirrmtry share/locale/sr
+@dirrmtry share/locale/sl/LC_MESSAGES
+@dirrmtry share/locale/sl
 @dirrmtry share/locale/sk/LC_MESSAGES
 @dirrmtry share/locale/sk
 @dirrmtry share/locale/rw/LC_MESSAGES
@@ -98,6 +104,10 @@ share/locale/zh_TW/LC_MESSAGES/gnome-volume-manager.mo
 @dirrmtry share/locale/nn
 @dirrmtry share/locale/ne/LC_MESSAGES
 @dirrmtry share/locale/ne
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/gl/LC_MESSAGES
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index b5d283d87451..8191ee8e8485 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.114 2006/10/03 13:26:18 ahze Exp $
+#   $MCom: ports/sysutils/nautilus-cd-burner/Makefile,v 1.128 2007/03/12 20:33:36 mezz Exp $
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.16.3
+PORTVERSION=	2.18.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index eca8e99532ba..d82a3dca90a5 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/nautilus-cd-burner-2.16.3.tar.bz2) = 6e3653c849e24aacd7e29b4030327b4e
-SHA256 (gnome2/nautilus-cd-burner-2.16.3.tar.bz2) = 9a71004a13a9fd63d3e0de05da1f3bc49f9d70e15dab59e4ac4c66ad33db987d
-SIZE (gnome2/nautilus-cd-burner-2.16.3.tar.bz2) = 719549
+MD5 (gnome2/nautilus-cd-burner-2.18.0.tar.bz2) = 90b71393db1d78c7d5ab2e740f2f1678
+SHA256 (gnome2/nautilus-cd-burner-2.18.0.tar.bz2) = 2d79ba86263e2ae79d90e589276ff502632192ef21c28223ca2d9555d80d4249
+SIZE (gnome2/nautilus-cd-burner-2.18.0.tar.bz2) = 732896
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index 37773d417e48..47a18e696bd0 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -71,6 +71,7 @@ share/locale/it/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ka/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ku/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/mg/LC_MESSAGES/nautilus-cd-burner.mo
@@ -145,6 +146,8 @@ share/locale/zh_TW/LC_MESSAGES/nautilus-cd-burner.mo
 @dirrmtry share/locale/ne
 @dirrmtry share/locale/mg/LC_MESSAGES
 @dirrmtry share/locale/mg
+@dirrmtry share/locale/ku/LC_MESSAGES
+@dirrmtry share/locale/ku
 @dirrmtry share/locale/ko/LC_MESSAGES
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/hy/LC_MESSAGES
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 00d03fe0c4d9..990ed3bd290f 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,26 +3,32 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.21 2006/07/27 03:59:24 marcus Exp $
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.34 2007/03/12 12:25:41 ahze Exp $
 #
 
 PORTNAME=	system-tools-backends
-PORTVERSION=	1.4.2
-PORTREVISION=	3
+PORTVERSION=	2.2.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Backend system admin scripts for gnome-system-tools
 
+BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_PERL5=	yes
-USE_GETTEXT=	yes
-USE_GNOME=	gnomehack gnometarget intlhack
+USE_GNOME=	gnomehack intlhack glib20
 GNU_CONFIGURE=	yes
+USE_RC_SUBR=	system-tools-backends
+USE_GNOME_SUBR=	yes
+CONFIGURE_ARGS=	--with-stb-group=wheel \
+		--localstatedir=/var
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -32,10 +38,4 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 RUN_DEPENDS+=	${SITE_PERL}/File/Temp.pm:${PORTSDIR}/devel/p5-File-Temp
 .endif
 
-.if ${PERL_LEVEL} < 500600
-post-configure:
-	@${FIND} ${WRKSRC} \( -name "*.pl" -or -name "*-conf" \) | \
-		${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g'
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
index 44f78389f3f3..845364ee9e4c 100644
--- a/sysutils/system-tools-backends/distinfo
+++ b/sysutils/system-tools-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/system-tools-backends-1.4.2.tar.bz2) = a0af1513becdf3b9bfed3535ad8f7dab
-SHA256 (gnome2/system-tools-backends-1.4.2.tar.bz2) = 32762567ece8c0ab59dc1b2186ee8cfeac6d1f92574dfb3011483431135d8940
-SIZE (gnome2/system-tools-backends-1.4.2.tar.bz2) = 708733
+MD5 (gnome2/system-tools-backends-2.2.0.tar.bz2) = c22888cd0d6de02601d014215959f4d0
+SHA256 (gnome2/system-tools-backends-2.2.0.tar.bz2) = 76f9e9dc58324bc24944b321593a85e518467fa7a77c8fe7ad96ff4a5aff0c36
+SIZE (gnome2/system-tools-backends-2.2.0.tar.bz2) = 409025
diff --git a/sysutils/system-tools-backends/files/patch-network-conf.in b/sysutils/system-tools-backends/files/patch-network-conf.in
deleted file mode 100644
index 51f4ac249e2a..000000000000
--- a/sysutils/system-tools-backends/files/patch-network-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- network-conf.in.orig	Sun Nov 20 20:27:32 2005
-+++ network-conf.in	Mon Nov 28 13:34:34 2005
-@@ -75,7 +75,7 @@
-               "conectiva-9", "conectiva-10",
-               "vine-3.0", "vine-3.1",
-               "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
--              "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6");
-+              "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7");
- 
- $description =<<"end_of_description;";
-        Configures all network parameters and interfaces.
diff --git a/sysutils/system-tools-backends/files/patch-network.pl.in b/sysutils/system-tools-backends/files/patch-network.pl.in
deleted file mode 100644
index 9820ac4113e3..000000000000
--- a/sysutils/system-tools-backends/files/patch-network.pl.in
+++ /dev/null
@@ -1,97 +0,0 @@
---- network.pl.in.orig	Thu Jul  6 16:43:53 2006
-+++ network.pl.in	Thu Jul  6 16:48:47 2006
-@@ -94,7 +94,7 @@
-   my ($fd, $line, $iface);
-   my (@ifaces, $command);
- 
--  $command = &gst_file_get_cmd_path ("iwconfig");
-+  $command = &gst_file_get_cmd_path ("ifconfig");
-   open $fd, "$command |";
-   return @ifaces if $fd eq undef;
- 
-@@ -117,6 +117,38 @@
-   return \@ifaces;
- }
- 
-+sub gst_network_get_freebsd_ethernet_ifaces
-+{
-+  my ($fd, $line, $iface);
-+  my (@ifaces, $command);
-+
-+  $command = &gst_file_get_cmd_path ("ifconfig");
-+  open $fd, "$command |";
-+  return @ifaces if $fd eq undef;
-+
-+  while (<$fd>)
-+  {
-+    if (/^([a-zA-Z]+[0-9]+):/)
-+    {
-+      $iface = $1;
-+    }
-+
-+    if (/media:.*ethernet.*/i)
-+    {
-+      push @ifaces, $iface;
-+    }
-+    elsif (/ether:*/i)
-+    {
-+      push @ifaces, $iface;
-+    }
-+  }
-+
-+  &gst_file_close ($fd);
-+  &gst_report_leave ();
-+
-+  return \@ifaces;
-+}
-+
- # Returns an array with the wireless devices found
- sub gst_network_get_wireless_ifaces
- {
-@@ -126,6 +158,13 @@
-   return &gst_network_get_freebsd_wireless_ifaces if ($plat eq "FreeBSD");
- }
- 
-+sub gst_network_get_ethernet_ifaces
-+{
-+  my ($plat) = $$tool{"system"};
-+
-+  return &gst_network_get_freebsd_ethernet_ifaces if ($plat eq "FreeBSD");
-+}
-+
- # set of functions for enabling an interface
- sub gst_network_config_wireless
- {
-@@ -778,9 +817,21 @@
- {
-   my ($dev) = @_;
-   my (@wireless_ifaces, $wi, $type);
-+  my (@ethernet_ifaces, $eth, $type);
- 
-   return $types_cache{$dev} if (exists $types_cache{$dev});
- 
-+  #check whether interface is ethernet
-+  $ethernet_ifaces = &gst_network_get_ethernet_ifaces ();
-+  foreach $eth (@$ethernet_ifaces)
-+  {
-+    if ($dev eq $eth)
-+    {
-+      $types_cache{$dev} = "ethernet";
-+      return $types_cache{$dev};
-+    }
-+  }
-+
-   #check whether interface is wireless
-   $wireless_ifaces = &gst_network_get_wireless_ifaces ();
-   foreach $wi (@$wireless_ifaces)
-@@ -803,10 +854,6 @@
-     {
-       $types_cache{$dev} = "modem";
-     }
--  }
--  elsif ($dev =~ /^(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wlaue|axe|cue|kue|rue|fwe|nve)[0-9]/)
--  {
--    $types_cache{$dev} = "ethernet";
-   }
-   elsif ($dev =~ /^irlan[0-9]/)
-   {
diff --git a/sysutils/system-tools-backends/files/patch-platform.pl.in b/sysutils/system-tools-backends/files/patch-platform.pl.in
deleted file mode 100644
index 81ad3b2e927c..000000000000
--- a/sysutils/system-tools-backends/files/patch-platform.pl.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- platform.pl.in.orig	Fri Aug 26 00:56:21 2005
-+++ platform.pl.in	Fri Aug 26 00:56:36 2005
-@@ -77,6 +77,7 @@
-   "freebsd-4"       => "FreeBSD 4",
-   "freebsd-5"       => "FreeBSD 5",
-   "freebsd-6"       => "FreeBSD 6",
-+  "freebsd-7"       => "FreeBSD 7",
-   "gentoo"          => "Gentoo Linux",
-   "vlos-1.2"        => "Vida Linux OS 1.2",
-   "archlinux-0.7"   => "Arch Linux 0.7",
diff --git a/sysutils/system-tools-backends/files/patch-replace.pl.in b/sysutils/system-tools-backends/files/patch-replace.pl.in
deleted file mode 100644
index 9487b290dd52..000000000000
--- a/sysutils/system-tools-backends/files/patch-replace.pl.in
+++ /dev/null
@@ -1,29 +0,0 @@
---- replace.pl.in.orig	Tue Dec 21 11:17:14 2004
-+++ replace.pl.in	Thu Dec 23 13:14:41 2004
-@@ -1128,7 +1128,7 @@
- 
-   while ($line_no < $line_end)
-   {
--    delete $$buff[$line_no];
-+    splice @{$buff},$line_no,1;
-     $line_no++;
-   }
-   
-@@ -1140,7 +1140,7 @@
- 
-     while ($line_no < $line_end)
-     {
--      delete $$buff[$line_no];
-+      splice @{$buff},$line_no,1;
-       $line_no++;
-     }
-   }
-@@ -1680,7 +1680,7 @@
-         }
-         else
-         {
--          delete $$buff[$i];
-+	  splice @{$buff},$i,1;
-         }
-       }
-     }
diff --git a/sysutils/system-tools-backends/files/patch-service-list.pl.in b/sysutils/system-tools-backends/files/patch-service-list.pl.in
deleted file mode 100644
index 5590c56379c4..000000000000
--- a/sysutils/system-tools-backends/files/patch-service-list.pl.in
+++ /dev/null
@@ -1,20 +0,0 @@
---- service-list.pl.in.orig	Mon Aug  8 13:59:07 2005
-+++ service-list.pl.in	Sun Nov 13 17:11:02 2005
-@@ -105,6 +105,7 @@
-      "atm3\.sh",
-      "ccd",
-      "cleanvar",
-+     "cleartmp",
-      "devdb",
-      "devfs",
-      "dhclient",
-@@ -139,7 +140,9 @@
-      "swap1",
-      "syscons",
-      "sysctl",
-+     "tmp",
-      "ttys",
-+     "var",
-      "virecover",
-      # These are the services found in SuSE
-      "rc[sS0-9]\.d",
diff --git a/sysutils/system-tools-backends/files/patch-service.pl.in b/sysutils/system-tools-backends/files/patch-service.pl.in
deleted file mode 100644
index 1162f2730695..000000000000
--- a/sysutils/system-tools-backends/files/patch-service.pl.in
+++ /dev/null
@@ -1,18 +0,0 @@
---- service.pl.in.orig	Fri Aug 26 00:57:01 2005
-+++ service.pl.in	Fri Aug 26 00:57:13 2005
-@@ -227,6 +227,7 @@
- 
-      "freebsd-5"      => "freebsd-5",
-      "freebsd-6"      => "freebsd-5",
-+     "freebsd-7"      => "freebsd-5",
-     );
- 
-   %runlevels=
-@@ -1571,6 +1572,7 @@
- 
-        "freebsd-5"    => \&gst_service_rcng_get_status,
-        "freebsd-6"    => \&gst_service_rcng_get_status,
-+       "freebsd-7"    => \&gst_service_rcng_get_status,
-       );
-   my $proc;
- 
diff --git a/sysutils/system-tools-backends/files/patch-services-conf.in b/sysutils/system-tools-backends/files/patch-services-conf.in
deleted file mode 100644
index d66514307c4e..000000000000
--- a/sysutils/system-tools-backends/files/patch-services-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- services-conf.in.orig	Mon Jan  2 10:32:34 2006
-+++ services-conf.in	Fri Jan  6 01:08:21 2006
-@@ -55,7 +55,7 @@
-               "pld-1.0", "pld-1.1", "pld-1.99",
-               "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
-               "vine-3.0", "vine-3.1",
--              "gentoo", "archlinux", "vlos-1.2", "freebsd-5", "freebsd-6", "suse-9.0", "suse-9.1");
-+              "gentoo", "archlinux", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7", "suse-9.0", "suse-9.1");
- 
- $description =<<"end_of_description;";
-        Configures which services are to be started or stopped at which runlevels
diff --git a/sysutils/system-tools-backends/files/patch-shares-conf.in b/sysutils/system-tools-backends/files/patch-shares-conf.in
deleted file mode 100644
index 5fa1e78a5911..000000000000
--- a/sysutils/system-tools-backends/files/patch-shares-conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- shares-conf.in.orig	Fri Aug 26 00:57:50 2005
-+++ shares-conf.in	Fri Aug 26 00:57:57 2005
-@@ -557,6 +557,7 @@
-      "vlos-1.2"     => "gentoo",
-      "freebsd-5"    => "freebsd-5",
-      "freebsd-6"    => "freebsd-5",
-+     "freebsd-7"    => "freebsd-5",
-     );
- 
-   my %dist_table =
diff --git a/sysutils/system-tools-backends/files/patch-time-conf.in b/sysutils/system-tools-backends/files/patch-time-conf.in
deleted file mode 100644
index 716bd5ac4070..000000000000
--- a/sysutils/system-tools-backends/files/patch-time-conf.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- time-conf.in.orig	Mon Jan  2 10:47:30 2006
-+++ time-conf.in	Fri Jan  6 01:09:09 2006
-@@ -72,7 +72,7 @@
-               "gentoo", "vlos-1.2", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "rpath",
-               "vine-3.0", "vine-3.1",
- 	      "archlinux",
--              "freebsd-5", "freebsd-6");
-+              "freebsd-5", "freebsd-6", "freebsd-7");
- 
- $description =<<"end_of_description;";
-        Configures your system clock, timezone and time server list.
-@@ -591,6 +591,7 @@
- 
-    "freebsd-5"       => "freebsd-5",
-    "freebsd-6"       => "freebsd-5",
-+   "freebsd-7"       => "freebsd-5",
-    );
- 
-   my %dist_tables =
-@@ -842,6 +843,7 @@
- 
-    "freebsd-5"       => "freebsd-5",
-    "freebsd-6"       => "freebsd-5",
-+   "freebsd-7"       => "freebsd-5",
-    );
- 
-   my %dist_tables =
diff --git a/sysutils/system-tools-backends/files/patch-users-conf.in b/sysutils/system-tools-backends/files/patch-users-conf.in
deleted file mode 100644
index eaa6b3739c79..000000000000
--- a/sysutils/system-tools-backends/files/patch-users-conf.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- users-conf.in.orig	Sun Nov 20 20:27:32 2005
-+++ users-conf.in	Mon Nov 28 13:35:33 2005
-@@ -76,7 +76,7 @@
-               "debian-2.2", "debian-3.0", "debian-sarge",
-               "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0",
-               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0", "slackware-10.2.0",
--              "freebsd-4", "freebsd-5", "freebsd-6",
-+              "freebsd-4", "freebsd-5", "freebsd-6", "freebsd-7",
-               "gentoo", "vlos-1.2",
-               "archlinux-0.7",
-               "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "rpath", "vine-3.0", "vine-3.1");
-@@ -374,6 +374,7 @@
-   'freebsd-4'       => $freebsd_logindefs_defaults,
-   'freebsd-5'       => $freebsd_logindefs_defaults,
-   'freebsd-6'       => $freebsd_logindefs_defaults,
-+  'freebsd-7'       => $freebsd_logindefs_defaults,
-   'suse-7.0'        => $gentoo_logindefs_defaults,
-   'suse-9.0'        => $gentoo_logindefs_defaults,
-   'suse-9.1'        => $gentoo_logindefs_defaults,
diff --git a/sysutils/system-tools-backends/files/system-tools-backends.in b/sysutils/system-tools-backends/files/system-tools-backends.in
new file mode 100644
index 000000000000..dcaff5e34e54
--- /dev/null
+++ b/sysutils/system-tools-backends/files/system-tools-backends.in
@@ -0,0 +1,26 @@
+#!/bin/sh
+# $FreeBSD$
+#    $MCom: ports/sysutils/system-tools-backends/files/system-tools-backends.in,v 1.3 2006/12/06 19:31:12 marcus Exp $
+
+# PROVIDE: system-tools-backends
+# REQUIRE: DAEMON dbus
+#
+# Add the following to /etc/rc.conf to start SystemToolsBackends at boot time:
+#
+# system_tools_backends_enable="YES"
+#
+
+. %%RC_SUBR%%
+. %%GNOME_SUBR%%
+
+export PATH=${PATH}:%%PREFIX%%/bin
+
+system_tools_backends_enable=${system_tools_backends_enable-${gnome_enable}}
+
+name=system_tools_backends
+rcvar=`set_rcvar`
+command="%%PREFIX%%/bin/system-tools-backends"
+pidfile="/var/run/system-tools-backends.pid"
+
+load_rc_config ${name}
+run_rc_command "$1"
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index e6bc30c63021..257e1ef96fce 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -1,133 +1,56 @@
-libdata/pkgconfig/system-tools-backends.pc
-share/aclocal/system-tools-backends.m4
-share/locale/ar/LC_MESSAGES/system-tools-backends.mo
-share/locale/az/LC_MESSAGES/system-tools-backends.mo
-share/locale/bg/LC_MESSAGES/system-tools-backends.mo
-share/locale/bn/LC_MESSAGES/system-tools-backends.mo
-share/locale/bs/LC_MESSAGES/system-tools-backends.mo
-share/locale/ca/LC_MESSAGES/system-tools-backends.mo
-share/locale/cs/LC_MESSAGES/system-tools-backends.mo
-share/locale/da/LC_MESSAGES/system-tools-backends.mo
-share/locale/de/LC_MESSAGES/system-tools-backends.mo
-share/locale/el/LC_MESSAGES/system-tools-backends.mo
-share/locale/en_CA/LC_MESSAGES/system-tools-backends.mo
-share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo
-share/locale/es/LC_MESSAGES/system-tools-backends.mo
-share/locale/eu/LC_MESSAGES/system-tools-backends.mo
-share/locale/fi/LC_MESSAGES/system-tools-backends.mo
-share/locale/fr/LC_MESSAGES/system-tools-backends.mo
-share/locale/gu/LC_MESSAGES/system-tools-backends.mo
-share/locale/hi/LC_MESSAGES/system-tools-backends.mo
-share/locale/hr/LC_MESSAGES/system-tools-backends.mo
-share/locale/hu/LC_MESSAGES/system-tools-backends.mo
-share/locale/id/LC_MESSAGES/system-tools-backends.mo
-share/locale/it/LC_MESSAGES/system-tools-backends.mo
-share/locale/ja/LC_MESSAGES/system-tools-backends.mo
-share/locale/ko/LC_MESSAGES/system-tools-backends.mo
-share/locale/lt/LC_MESSAGES/system-tools-backends.mo
-share/locale/ms/LC_MESSAGES/system-tools-backends.mo
-share/locale/nb/LC_MESSAGES/system-tools-backends.mo
-share/locale/ne/LC_MESSAGES/system-tools-backends.mo
-share/locale/nl/LC_MESSAGES/system-tools-backends.mo
-share/locale/no/LC_MESSAGES/system-tools-backends.mo
-share/locale/pa/LC_MESSAGES/system-tools-backends.mo
-share/locale/pl/LC_MESSAGES/system-tools-backends.mo
-share/locale/pt/LC_MESSAGES/system-tools-backends.mo
-share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo
-share/locale/ro/LC_MESSAGES/system-tools-backends.mo
-share/locale/rw/LC_MESSAGES/system-tools-backends.mo
-share/locale/sk/LC_MESSAGES/system-tools-backends.mo
-share/locale/sq/LC_MESSAGES/system-tools-backends.mo
-share/locale/sr/LC_MESSAGES/system-tools-backends.mo
-share/locale/sr@Latn/LC_MESSAGES/system-tools-backends.mo
-share/locale/sv/LC_MESSAGES/system-tools-backends.mo
-share/locale/ta/LC_MESSAGES/system-tools-backends.mo
-share/locale/th/LC_MESSAGES/system-tools-backends.mo
-share/locale/tr/LC_MESSAGES/system-tools-backends.mo
-share/locale/uk/LC_MESSAGES/system-tools-backends.mo
-share/locale/vi/LC_MESSAGES/system-tools-backends.mo
-share/locale/xh/LC_MESSAGES/system-tools-backends.mo
-share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo
-share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo
-share/setup-tool-backends/files/general_isdn_ppp_options
-share/setup-tool-backends/scripts/boot-conf
-share/setup-tool-backends/scripts/boot-grub.pl
-share/setup-tool-backends/scripts/boot-lilo.pl
-share/setup-tool-backends/scripts/boot-yaboot.pl
-share/setup-tool-backends/scripts/boot.pl
-share/setup-tool-backends/scripts/debug.pl
-share/setup-tool-backends/scripts/dhcpd-conf
-share/setup-tool-backends/scripts/dhcpd.pl
-share/setup-tool-backends/scripts/disks-conf
-share/setup-tool-backends/scripts/display-conf
-share/setup-tool-backends/scripts/file.pl
-share/setup-tool-backends/scripts/filesys.pl
-share/setup-tool-backends/scripts/font-conf
-share/setup-tool-backends/scripts/font.pl
-share/setup-tool-backends/scripts/general.pl
-share/setup-tool-backends/scripts/guess_system.sh
-share/setup-tool-backends/scripts/internetsharing-conf
-share/setup-tool-backends/scripts/ishare.pl
-share/setup-tool-backends/scripts/media.pl
-share/setup-tool-backends/scripts/memory-conf
-share/setup-tool-backends/scripts/mouse-conf
-share/setup-tool-backends/scripts/network-conf
-share/setup-tool-backends/scripts/network.pl
-share/setup-tool-backends/scripts/package-conf
-share/setup-tool-backends/scripts/parse.pl
-share/setup-tool-backends/scripts/partition.pl
-share/setup-tool-backends/scripts/platform.pl
-share/setup-tool-backends/scripts/print-conf
-share/setup-tool-backends/scripts/print.pl
-share/setup-tool-backends/scripts/process.pl
-share/setup-tool-backends/scripts/replace.pl
-share/setup-tool-backends/scripts/report.pl
-share/setup-tool-backends/scripts/service-list.pl
-share/setup-tool-backends/scripts/service.pl
-share/setup-tool-backends/scripts/services-conf
-share/setup-tool-backends/scripts/share.pl
-share/setup-tool-backends/scripts/shares-conf
-share/setup-tool-backends/scripts/time-conf
-share/setup-tool-backends/scripts/tokenizer.pl
-share/setup-tool-backends/scripts/type1inst
-share/setup-tool-backends/scripts/users-conf
-share/setup-tool-backends/scripts/util.pl
-share/setup-tool-backends/scripts/x.pl
-share/setup-tool-backends/scripts/xml.pl
-@dirrm share/setup-tool-backends/scripts
-@dirrm share/setup-tool-backends/files
-@dirrm share/setup-tool-backends
-@dirrmtry share/locale/zh_TW/LC_MESSAGES
-@dirrmtry share/locale/zh_TW
-@dirrmtry share/locale/zh_CN/LC_MESSAGES
-@dirrmtry share/locale/zh_CN
-@dirrmtry share/locale/xh/LC_MESSAGES
-@dirrmtry share/locale/xh
-@dirrmtry share/locale/uk/LC_MESSAGES
-@dirrmtry share/locale/uk
-@dirrmtry share/locale/sr/LC_MESSAGES
-@dirrmtry share/locale/sr
-@dirrmtry share/locale/sk/LC_MESSAGES
-@dirrmtry share/locale/sk
-@dirrmtry share/locale/rw/LC_MESSAGES
-@dirrmtry share/locale/rw
-@dirrmtry share/locale/ro/LC_MESSAGES
-@dirrmtry share/locale/ro
-@dirrmtry share/locale/pt/LC_MESSAGES
-@dirrmtry share/locale/pt
-@dirrmtry share/locale/pl/LC_MESSAGES
-@dirrmtry share/locale/pl
-@dirrmtry share/locale/no/LC_MESSAGES
-@dirrmtry share/locale/no
-@dirrmtry share/locale/ne/LC_MESSAGES
-@dirrmtry share/locale/ne
-@dirrmtry share/locale/ko/LC_MESSAGES
-@dirrmtry share/locale/ko
-@dirrmtry share/locale/fi/LC_MESSAGES
-@dirrmtry share/locale/fi
-@dirrmtry share/locale/el/LC_MESSAGES
-@dirrmtry share/locale/el
-@dirrmtry share/locale/cs/LC_MESSAGES
-@dirrmtry share/locale/cs
-@dirrmtry share/locale/ca/LC_MESSAGES
-@dirrmtry share/locale/ca
+bin/system-tools-backends
+etc/dbus-1/system.d/system-tools-backends.conf
+libdata/pkgconfig/system-tools-backends-2.0.pc
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.HostsConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.IfacesConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.NFSConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.NTPConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.Platform.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.SMBConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.ServicesConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.TimeConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.UsersConfig.service
+share/dbus-1/services/org.freedesktop.SystemToolsBackends.service
+share/system-tools-backends-2.0/files/general_isdn_ppp_options
+share/system-tools-backends-2.0/scripts/GroupsConfig.pm
+share/system-tools-backends-2.0/scripts/HostsConfig.pm
+share/system-tools-backends-2.0/scripts/IfacesConfig.pm
+share/system-tools-backends-2.0/scripts/Init/Services.pm
+share/system-tools-backends-2.0/scripts/Init/ServicesList.pm
+share/system-tools-backends-2.0/scripts/NFSConfig.pm
+share/system-tools-backends-2.0/scripts/NTPConfig.pm
+share/system-tools-backends-2.0/scripts/Network/Hosts.pm
+share/system-tools-backends-2.0/scripts/Network/Ifaces.pm
+share/system-tools-backends-2.0/scripts/Platform.pm
+share/system-tools-backends-2.0/scripts/SMBConfig.pm
+share/system-tools-backends-2.0/scripts/ServicesConfig.pm
+share/system-tools-backends-2.0/scripts/Shares/NFS.pm
+share/system-tools-backends-2.0/scripts/Shares/SMB.pm
+share/system-tools-backends-2.0/scripts/StbObject.pm
+share/system-tools-backends-2.0/scripts/SystemToolsBackends.pl
+share/system-tools-backends-2.0/scripts/Time/NTP.pm
+share/system-tools-backends-2.0/scripts/Time/TimeDate.pm
+share/system-tools-backends-2.0/scripts/TimeConfig.pm
+share/system-tools-backends-2.0/scripts/Users/Groups.pm
+share/system-tools-backends-2.0/scripts/Users/Shells.pm
+share/system-tools-backends-2.0/scripts/Users/Users.pm
+share/system-tools-backends-2.0/scripts/UsersConfig.pm
+share/system-tools-backends-2.0/scripts/Utils/Backend.pm
+share/system-tools-backends-2.0/scripts/Utils/File.pm
+share/system-tools-backends-2.0/scripts/Utils/Monitor.pm
+share/system-tools-backends-2.0/scripts/Utils/Parse.pm
+share/system-tools-backends-2.0/scripts/Utils/Platform.pm
+share/system-tools-backends-2.0/scripts/Utils/Replace.pm
+share/system-tools-backends-2.0/scripts/Utils/Report.pm
+share/system-tools-backends-2.0/scripts/Utils/Util.pm
+share/system-tools-backends-2.0/scripts/Utils/XML.pm
+@dirrm share/system-tools-backends-2.0/scripts/Utils
+@dirrm share/system-tools-backends-2.0/scripts/Users
+@dirrm share/system-tools-backends-2.0/scripts/Time
+@dirrm share/system-tools-backends-2.0/scripts/Shares
+@dirrm share/system-tools-backends-2.0/scripts/Network
+@dirrm share/system-tools-backends-2.0/scripts/Init
+@dirrm share/system-tools-backends-2.0/scripts
+@dirrm share/system-tools-backends-2.0/files
+@dirrm share/system-tools-backends-2.0
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2007-03-19 05:14:07 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2007-03-19 05:14:07 +0000
commit	951c257ea3655de6e80c26a36c18c69ee8047ea8 (patch)
tree	249b59a23d9c6fae8db5e5639385f6273d237705 /sysutils
parent	91926e92b73e3751382216a16044c5d8b24ad126 (diff)
download	ports-951c257ea3655de6e80c26a36c18c69ee8047ea8.tar.gz ports-951c257ea3655de6e80c26a36c18c69ee8047ea8.zip