author: Joe Marcus Clarke <marcus@FreeBSD.org> 2005-03-12 10:39:38 +0000
committer: Joe Marcus Clarke <marcus@FreeBSD.org> 2005-03-12 10:39:38 +0000
commit: 190418a078b1eb7ea3c5d38a08bdab3cbd422086 (patch)
tree: bb336ccecde7052d26d3d8d8c97238744a373aad /sysutils
parent: 6b0c40606cac591d75b88d05c7276bd16c369035 (diff)
download: ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.tar.gz
ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.zip
66 files changed, 720 insertions, 749 deletions
diff --git a/sysutils/Makefile b/sysutils/Makefile
index 2826535d46ba..82719d1b17b6 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -438,6 +438,7 @@
     SUBDIR += symlinks
     SUBDIR += synergy
     SUBDIR += syslog-ng
+    SUBDIR += system-tools-backends
     SUBDIR += tcplist
     SUBDIR += tct
     SUBDIR += tdir
diff --git a/sysutils/gconf-editor/Makefile b/sysutils/gconf-editor/Makefile
index a38998eadd35..e1eb4d78c2d0 100644
--- a/sysutils/gconf-editor/Makefile
+++ b/sysutils/gconf-editor/Makefile
@@ -6,12 +6,11 @@
 #
 
 PORTNAME=	gconf-editor
-PORTVERSION=	2.8.2
-PORTREVISION=	1
+PORTVERSION=	2.10.0
 PORTEPOCH=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/gconf-editor/distinfo b/sysutils/gconf-editor/distinfo
index 31bf7e95fecc..c8cc01673e98 100644
--- a/sysutils/gconf-editor/distinfo
+++ b/sysutils/gconf-editor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gconf-editor-2.8.2.tar.bz2) = 193d5970b570366fd435b2b7ebdd8047
-SIZE (gnome2/gconf-editor-2.8.2.tar.bz2) = 510014
+MD5 (gnome2/gconf-editor-2.10.0.tar.bz2) = 651a18f7eb5af91761521aa4f04ccc07
+SIZE (gnome2/gconf-editor-2.10.0.tar.bz2) = 543405
diff --git a/sysutils/gconf-editor/pkg-plist b/sysutils/gconf-editor/pkg-plist
index 0a6b2d232ef9..b24a6c9a4c40 100644
--- a/sysutils/gconf-editor/pkg-plist
+++ b/sysutils/gconf-editor/pkg-plist
@@ -10,7 +10,6 @@ share/gnome/help/gconf-editor/C/figures/gconf_editor_anno_window.png
 share/gnome/help/gconf-editor/C/gconf-editor.xml
 share/gnome/help/gconf-editor/C/legal.xml
 share/gnome/omf/gconf-editor/gconf-editor-C.omf
-share/gnome/pixmaps/gconf-editor.png
 share/gnome/pixmaps/gconf-editor/entry-blank.png
 share/gnome/pixmaps/gconf-editor/entry-bool.png
 share/gnome/pixmaps/gconf-editor/entry-list.png
@@ -19,6 +18,7 @@ share/gnome/pixmaps/gconf-editor/entry-schema.png
 share/gnome/pixmaps/gconf-editor/entry-string.png
 share/gnome/pixmaps/gconf-editor/folder-closed.png
 share/gnome/pixmaps/gconf-editor/folder-open.png
+share/icons/hicolor/48x48/apps/gconf-editor.png
 share/locale/am/LC_MESSAGES/gconf-editor.mo
 share/locale/ar/LC_MESSAGES/gconf-editor.mo
 share/locale/az/LC_MESSAGES/gconf-editor.mo
diff --git a/sysutils/gnome-control-center/Makefile b/sysutils/gnome-control-center/Makefile
index acbe1f0c2451..075ee3b879d6 100644
--- a/sysutils/gnome-control-center/Makefile
+++ b/sysutils/gnome-control-center/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.2
-PORTREVISION=	2
+PORTVERSION=	2.10.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.8
+MASTER_SITE_SUBDIR=	sources/control-center/2.10
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
-LIB_DEPENDS=	xklavier.8:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \
-		desktopfileutils
 USE_GSTREAMER=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
+		gnomemenus desktopfileutils
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -42,6 +41,8 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
+	@${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
+		${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
 
 post-install:
 	@-update-desktop-database
diff --git a/sysutils/gnome-control-center/distinfo b/sysutils/gnome-control-center/distinfo
index e5ac6888440c..e8ada3e49980 100644
--- a/sysutils/gnome-control-center/distinfo
+++ b/sysutils/gnome-control-center/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.8.2.tar.bz2) = 898ef25391c0330a31f36812fdc8a02f
-SIZE (gnome2/control-center-2.8.2.tar.bz2) = 2806342
+MD5 (gnome2/control-center-2.10.0.tar.bz2) = 23ee64b8e559cce4aa6beb70ad675130
+SIZE (gnome2/control-center-2.10.0.tar.bz2) = 2617716
diff --git a/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c b/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
deleted file mode 100644
index c6b38bd4daa6..000000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- capplets/default-applications/gnome-default-applications-properties-structs.c.orig	Sun Feb 20 16:18:03 2005
-+++ capplets/default-applications/gnome-default-applications-properties-structs.c	Mon Feb 21 15:52:04 2005
-@@ -12,6 +12,7 @@
-         { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
-         { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
-         { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firefox %s",	FALSE, FALSE },
-+        { N_("Firebird/FireFox"),  	"firefox",	"firefox %s",	FALSE, FALSE },
-         { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
-         { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
-         { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
-@@ -40,6 +41,7 @@
- 	{ N_("Balsa"),        			"balsa",		"balsa -m %s",		FALSE, FALSE },
- 	{ N_("KMail"),        			"kmail",		"kmail %s",		FALSE, FALSE },
- 	{ N_("Mozilla Mail"), 			"mozilla",		"mozilla -mail %s",	FALSE, FALSE},
-+	{ N_("Thunderbird"), 			"thunderbird",		"thunderbird %s",	FALSE, FALSE},
-         { N_("Mutt") , 	  			"mutt",			"mutt %s",		TRUE,  FALSE },
- 
- };
diff --git a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
deleted file mode 100644
index 5a6b0ba8f2d6..000000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_desktop-links_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/desktop-links/Makefile.in.orig	Tue Dec 30 15:55:28 2003
-+++ capplets/desktop-links/Makefile.in	Tue Dec 30 15:55:49 2003
-@@ -190,7 +190,7 @@
- 
- pixmaps_pre = $(capplets:=-capplet.png)
- pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
--pixmapsdir = $(datadir)/icons/gnome/48x48/apps
-+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
- 
- desktop_files = $(capplets:=.desktop)
- desktop_in_files = $(desktop_files:.desktop=.desktop.in)
diff --git a/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
new file mode 100644
index 000000000000..02374b23ac45
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -0,0 +1,33 @@
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
+@@ -242,21 +242,25 @@
+                                          Bool allowMultipleSelection,
+                                          GladeXML * dialog)
+ {
++  gchar *utfGroupName, *titlemarkup;
++  GtkWidget *expander;
++  GtkWidget *vbox;
++  GtkWidget *align;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+ 
+   current1stLevelId = configItem->name;
+ 
+-  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+-  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++  utfGroupName = xci_desc_to_utf8 (configItem);
++  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+ 
+-  GtkWidget *expander = gtk_expander_new (titlemarkup);
++  expander = gtk_expander_new (titlemarkup);
+   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
+ 
+   g_free (titlemarkup);
+   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
+-  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
++  align = gtk_alignment_new (0, 0, 1, 1);
+   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+-  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
++  vbox = gtk_vbox_new (TRUE, 6);
+   gtk_container_add (GTK_CONTAINER (align), vbox);
+   gtk_container_add (GTK_CONTAINER (expander), align);
+   currentVbox = vbox;
diff --git a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
deleted file mode 100644
index 9c487d7b8e9d..000000000000
--- a/sysutils/gnome-control-center/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
-+++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
-@@ -591,7 +591,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -633,7 +633,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnome-control-center/files/patch-configure b/sysutils/gnome-control-center/files/patch-configure
index f97758e10ba0..d8e861724bd3 100644
--- a/sysutils/gnome-control-center/files/patch-configure
+++ b/sysutils/gnome-control-center/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Feb 21 15:53:01 2005
-+++ configure	Mon Feb 21 15:53:01 2005
-@@ -21286,6 +21286,7 @@
+--- configure.orig	Thu Jan 13 02:39:28 2005
++++ configure	Thu Jan 13 02:39:28 2005
+@@ -22221,6 +22221,7 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,7 +8,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26646,7 +26647,7 @@
+@@ -27490,7 +27491,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
new file mode 100644
index 000000000000..52a627fb20df
--- /dev/null
+++ b/sysutils/gnome-control-center/files/patch-gnome-settings-daemon_actions_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 20 19:19:31 2004
++++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 20 19:20:45 2004
+@@ -296,7 +296,7 @@
+ Datadir = $(datadir)/control-center-2.0/interfaces/
+ Data_DATA = acme.glade
+ 
+-pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
+ pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png
+ 
+ EXTRA_DIST = \
diff --git a/sysutils/gnome-control-center/pkg-plist b/sysutils/gnome-control-center/pkg-plist
index 423c553037a3..8787f4495677 100644
--- a/sysutils/gnome-control-center/pkg-plist
+++ b/sysutils/gnome-control-center/pkg-plist
@@ -22,39 +22,36 @@ etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
-lib/bonobo/libthemus-theme-properties-view.so
 lib/gnome-vfs-2.0/modules/libfont-method.so
 lib/gnome-vfs-2.0/modules/libtheme-method.so
 lib/libgnome-window-settings.a
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
+lib/nautilus/extensions-1.0/libnautilus-fontilus.so
+lib/nautilus/extensions-1.0/libnautilus-themus.so
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
-libdata/bonobo/servers/Themus_Properties_View.server
-libdata/bonobo/servers/fontilus.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
-libexec/fontilus-context-menu
 libexec/gnome-settings-daemon
-share/gnome/application-registry/fontilus.applications
-share/gnome/application-registry/themus.applications
+share/gnome/applications/accessibility-keyboard.desktop
+share/gnome/applications/at-properties.desktop
+share/gnome/applications/background.desktop
+share/gnome/applications/default-applications.desktop
+share/gnome/applications/display-properties.desktop
+share/gnome/applications/font-properties.desktop
 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-ui-properties.desktop
 share/gnome/applications/gnomecc.desktop
+share/gnome/applications/gtk-theme-selector.desktop
+share/gnome/applications/keybinding.desktop
+share/gnome/applications/keyboard.desktop
+share/gnome/applications/themus-theme-applier.desktop
+share/gnome/applications/window-properties.desktop
 @exec update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
-share/gnome/control-center-2.0/capplets/at-properties.desktop
-share/gnome/control-center-2.0/capplets/background.desktop
-share/gnome/control-center-2.0/capplets/default-applications.desktop
-share/gnome/control-center-2.0/capplets/display-properties.desktop
-share/gnome/control-center-2.0/capplets/font-properties.desktop
-share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
-share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop
-share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop
-share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop
-share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop
-share/gnome/control-center-2.0/capplets/keybinding.desktop
-share/gnome/control-center-2.0/capplets/keyboard.desktop
-share/gnome/control-center-2.0/capplets/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
@@ -69,6 +66,7 @@ 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-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
@@ -77,8 +75,6 @@ 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-brightness.png
-share/gnome/control-center-2.0/pixmaps/acme-eject.png
 share/gnome/control-center-2.0/pixmaps/at-startup.png
 share/gnome/control-center-2.0/pixmaps/at-support.png
 share/gnome/control-center-2.0/pixmaps/bar-disabled.png
@@ -88,8 +84,6 @@ share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
@@ -117,23 +111,16 @@ share/gnome/control-center-2.0/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/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
-share/gnome/mime-info/fontilus.keys
-share/gnome/mime-info/fontilus.mime
-share/gnome/mime-info/themus.keys
-share/gnome/pixmaps/control-center2.png
 share/gnome/pixmaps/display-capplet.png
-share/gnome/pixmaps/gnomecc-2/active.png
-share/gnome/pixmaps/gnomecc-2/bcg_top.png
-share/gnome/pixmaps/gnomecc-2/blank.png
-share/gnome/pixmaps/gnomecc-2/title.png
-share/gnome/vfolders/Accessibility.directory
-share/gnome/vfolders/Advanced.directory
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
-share/icons/gnome/48x48/apps/accessibility-directory.png
+share/icons/gnome/48x48/apps/acme-brightness.png
+share/icons/gnome/48x48/apps/acme-eject.png
+share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png
+share/icons/gnome/48x48/apps/gnome-speakernotes.png
+share/icons/hicolor/48x48/apps/gnome-control-center.png
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
@@ -175,6 +162,7 @@ share/locale/ml/LC_MESSAGES/control-center-2.0.mo
 share/locale/mn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/control-center-2.0.mo
 share/locale/nb/LC_MESSAGES/control-center-2.0.mo
+share/locale/ne/LC_MESSAGES/control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/control-center-2.0.mo
 share/locale/no/LC_MESSAGES/control-center-2.0.mo
@@ -200,17 +188,14 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso 2> /dev/null || true
-@dirrm share/gnome/pixmaps/gnomecc-2
 @dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
-@dirrm share/gnome/control-center-2.0/icons
+@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
 @unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnome-system-monitor/Makefile b/sysutils/gnome-system-monitor/Makefile
index 224e9f1a5756..7650bd4087ab 100644
--- a/sysutils/gnome-system-monitor/Makefile
+++ b/sysutils/gnome-system-monitor/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.10
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnome-system-monitor/distinfo b/sysutils/gnome-system-monitor/distinfo
index 73b0b9a93148..7919d4274b50 100644
--- a/sysutils/gnome-system-monitor/distinfo
+++ b/sysutils/gnome-system-monitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 3d4564b2d0b49a5826ae212b23d234df
-SIZE (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 690661
+MD5 (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 6dc606f13600e49a52b669fb97e789e0
+SIZE (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 752223
diff --git a/sysutils/gnome-system-monitor/files/patch-src::proctable.c b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
index 30ef6303d397..49a699641476 100644
--- a/sysutils/gnome-system-monitor/files/patch-src::proctable.c
+++ b/sysutils/gnome-system-monitor/files/patch-src::proctable.c
@@ -1,28 +1,7 @@
---- src/proctable.c.orig	Sun Nov 21 18:03:12 2004
-+++ src/proctable.c	Mon Dec  6 22:10:55 2004
-@@ -535,6 +535,9 @@
- 	glibtop_get_proc_uid (&procuid, pid);
- 	glibtop_get_proc_time (&proctime, pid);
- 	newcputime = proctime.utime + proctime.stime;
-+	if (proctime.frequency) {
-+		newcputime /= (proctime.frequency/100);
-+	}
- 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
+--- src/proctable.c.orig	Tue Nov 30 01:28:31 2004
++++ src/proctable.c	Wed Dec  1 13:25:55 2004
+@@ -772,6 +772,12 @@
  
- 	wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
-@@ -645,6 +648,10 @@
- 	glibtop_get_proc_uid (&procuid, pid);
- 	glibtop_get_proc_time (&proctime, pid);
- 	newcputime = proctime.utime + proctime.stime;
-+	if (proctime.frequency) {
-+		newcputime /= (proctime.frequency/100);
-+	}
-+
- 
- 	wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
- 				      pid,
-@@ -745,6 +752,12 @@
- }
  
  
 +static int
@@ -32,18 +11,15 @@
 +}
 +
  static void
- refresh_list (ProcData *data, const unsigned *pid_list, guint n)
+ refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n)
  {
-@@ -754,6 +767,8 @@
- 	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
- 	guint i;
+@@ -863,10 +869,15 @@
+ 
+ 	pid_list = glibtop_get_proclist (&proclist, which, arg);
  
-+	qsort (pid_list, n, sizeof (*pid_list), pid_compare);
++	qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare);
 +
- 	/* Add or update processes */
- 	for(i = 0; i < n; ++i) {
- 		ProcInfo *info;
-@@ -837,6 +852,9 @@
+ 	/* 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 = cpu.total - total_time_last;
diff --git a/sysutils/gnome-system-monitor/files/patch-src_interface.c b/sysutils/gnome-system-monitor/files/patch-src_interface.c
new file mode 100644
index 000000000000..1b4276e7ee56
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_interface.c
@@ -0,0 +1,21 @@
+--- src/interface.c.orig	Wed Dec  1 13:23:26 2004
++++ src/interface.c	Wed Dec  1 13:24:00 2004
+@@ -529,12 +529,12 @@
+ 
+ 	model = gtk_tree_store_new (10,
+ 				    GDK_TYPE_PIXBUF,
+-				    G_TYPE_STRING, // device name
+-				    G_TYPE_STRING, // directory
+-				    G_TYPE_STRING, // type
+-				    G_TYPE_STRING, // total
+-				    G_TYPE_STRING, // free
+-				    G_TYPE_STRING, // used
++				    G_TYPE_STRING, /* device name */
++				    G_TYPE_STRING, /* directory */
++				    G_TYPE_STRING, /* type */
++				    G_TYPE_STRING, /* total */
++				    G_TYPE_STRING, /* free */
++				    G_TYPE_STRING, /* used */
+ 				    G_TYPE_FLOAT,
+ 				    G_TYPE_FLOAT,
+ 				    G_TYPE_FLOAT);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_openfiles.c b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
new file mode 100644
index 000000000000..efdcef5f7882
--- /dev/null
+++ b/sysutils/gnome-system-monitor/files/patch-src_openfiles.c
@@ -0,0 +1,32 @@
+--- src/openfiles.c.orig	Fri Jan 21 18:35:43 2005
++++ src/openfiles.c	Tue Jan 25 19:02:29 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"
+@@ -143,7 +144,7 @@
+ 	const glibtop_open_files_entry *o2 = b;
+ 
+ 	/* Falta manejar los diferentes tipos! */
+-	return (o1->fd == o2->fd) && (o1->type == o1->type); // XXX!
++	return (o1->fd == o2->fd) && (o1->type == o1->type); /* XXX! */
+ }
+ 
+ 
+@@ -152,10 +153,10 @@
+ {
+ 	ProcInfo *info;
+ 	GtkTreeModel *model;
+-	glibtop_open_files_entry *openfiles;
+-	glibtop_proc_open_files procmap;
+ 	GHashTable *new_maps;
+ 	gint i;
++	glibtop_open_files_entry *openfiles;
++	glibtop_proc_open_files procmap;
+ 
+ 	info = g_object_get_data (G_OBJECT (tree), "selected_info");
+ 	g_return_if_fail (info);
diff --git a/sysutils/gnome-system-monitor/files/patch-src_util.c b/sysutils/gnome-system-monitor/files/patch-src_util.c
deleted file mode 100644
index 288ccc26adc0..000000000000
--- a/sysutils/gnome-system-monitor/files/patch-src_util.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/util.c.orig	Fri Dec 12 02:26:57 2003
-+++ src/util.c	Fri Dec 12 02:35:38 2003
-@@ -16,6 +16,7 @@
- 
- #ifdef __FreeBSD__
- # include <errno.h>
-+# include <termios.h>
- # include <libutil.h>
- #endif
- 
-@@ -181,7 +182,11 @@
- 	 * Make su think we're sending the password from a terminal:
- 	 */
- 
-+#ifndef __FreeBSD__
- 	if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
-+#else
-+	if ((t_fd = OPEN_TTY()) < 0) {
-+#endif
- 		fprintf (stderr, "Unable to open a terminal\n");
- 		ABORT (root);
- 	}
-@@ -259,7 +264,11 @@
- 			}
- 		}
- 
-+#ifndef __FreeBSD__
- 		if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
-+#else
-+		if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
-+#endif
- 			perror ("Unable to open pseudo slave terminal");
- 			_exit (-1);
- 		}
diff --git a/sysutils/gnome-system-monitor/pkg-plist b/sysutils/gnome-system-monitor/pkg-plist
index b0fa0b688925..9d8082a83d19 100644
--- a/sysutils/gnome-system-monitor/pkg-plist
+++ b/sysutils/gnome-system-monitor/pkg-plist
@@ -16,7 +16,6 @@ share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/C/legal.xml
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/gnome/pixmaps/procman.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
@@ -33,6 +32,7 @@ share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
@@ -56,6 +56,7 @@ share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
@@ -71,6 +72,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/th/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index f1ce787bb4c6..1dca8a647c5c 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -6,23 +6,27 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	1.0.2
+PORTVERSION=	1.2.0
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.0
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.2
 DISTNAME=	gnome-system-tools-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
 
+BUILD_DEPENDS=	${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+RUN_DEPENDS=	${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_PERL5=	yes
 USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui
+GNOME_DESKTOP_VERSION=2
+USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
 USE_LIBTOOL_VER=15
+INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -30,17 +34,11 @@ GCONF_SCHEMAS=	gnome-system-tools.schemas
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500000
+.if ${OSVERSION} >= 500000
 CONFIGURE_ARGS+=	--enable-services
 PLIST_SUB+=		SERVICES=""
 .else
 PLIST_SUB+=		SERVICES="@comment "
 .endif
 
-.if ${PERL_LEVEL} < 500600
-post-configure:
-	@${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \
-		${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g'
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 6b2fb5abceac..6eb37fa99a84 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 674611d3fb195fde940223821cfa6dda
-SIZE (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 2766787
+MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e
+SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677
diff --git a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in b/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in
deleted file mode 100644
index 7f7cce28ee37..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_replace.pl.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- backends/replace.pl.in.orig	Fri Oct 22 02:41:56 2004
-+++ backends/replace.pl.in	Fri Oct 22 02:42:48 2004
-@@ -1113,19 +1113,19 @@
- 
-   return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface));
- 
--  delete $$buff[$line_no];
-+  splice @{$buff},$line_no,1;
-   $line_no ++;
-   
-   while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1)
-   {
--    delete $$buff[$line_no];
-+    splice @{$buff},$line_no,1;
-     $line_no ++;
-   }
- 
-   $line_no = 0;
-   if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface))
-   {
--    delete $$buff[$line_no];
-+   splice @{$buff},$line_no,1;
-   }
-   
-   &gst_file_buffer_clean ($buff);
-@@ -1663,7 +1663,7 @@
-         }
-         else
-         {
--          delete $$buff[$i];
-+	  splice @{$buff},$i,1;
-         }
-       }
-     }
diff --git a/sysutils/gnome-system-tools/files/patch-configure b/sysutils/gnome-system-tools/files/patch-configure
index b854cde3a70f..712bb1defc9f 100644
--- a/sysutils/gnome-system-tools/files/patch-configure
+++ b/sysutils/gnome-system-tools/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 26 12:02:51 2004
-+++ configure	Wed May 26 12:03:23 2004
-@@ -22623,7 +22623,7 @@
+--- 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"
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
new file mode 100644
index 000000000000..9272d918136c
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
@@ -0,0 +1,18 @@
+--- src/common/gst-auth.c.orig	Thu Mar 10 14:39:18 2005
++++ src/common/gst-auth.c	Thu Mar 10 14:39:50 2005
+@@ -142,12 +142,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], 2);*/
+ 		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
new file mode 100644
index 000000000000..5134f30e581b
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_common_gst-tool.c
@@ -0,0 +1,11 @@
+--- src/common/gst-tool.c.orig	Thu Mar 10 14:39:54 2005
++++ src/common/gst-tool.c	Thu Mar 10 14:40:00 2005
+@@ -1653,7 +1653,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/files/patch-src_network_location.c b/sysutils/gnome-system-tools/files/patch-src_network_location.c
new file mode 100644
index 000000000000..e2577a6a49e0
--- /dev/null
+++ b/sysutils/gnome-system-tools/files/patch-src_network_location.c
@@ -0,0 +1,11 @@
+--- src/network/location.c.orig	Thu Dec 23 13:16:33 2004
++++ src/network/location.c	Thu Dec 23 13:16:40 2004
+@@ -687,7 +687,7 @@
+ static void
+ copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[])
+ {
+-  gchar **string = (gchar **) list;;
++  gchar **string = (gchar **) list;
+   gchar  *value;
+ 
+   while (*string)
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 6a980fb7574e..a52125a51fcd 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -1,24 +1,23 @@
 bin/network-admin
 %%SERVICES%%bin/services-admin
+bin/shares-admin
 bin/time-admin
 bin/users-admin
-etc/X11/sysconfig/network.desktop
-%%SERVICES%%etc/X11/sysconfig/services.desktop
-etc/X11/sysconfig/time.desktop
-etc/X11/sysconfig/users.desktop
+lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
 libdata/pkgconfig/gnome-system-tools.pc
-libdata/pkgconfig/system-tools-backends.pc
 share/gnome-system-tools/interfaces/boot.glade
 share/gnome-system-tools/interfaces/common.glade
 share/gnome-system-tools/interfaces/disks.glade
 share/gnome-system-tools/interfaces/network.glade
 share/gnome-system-tools/interfaces/services.glade
+share/gnome-system-tools/interfaces/shares.glade
 share/gnome-system-tools/interfaces/time.glade
 share/gnome-system-tools/interfaces/users.glade
 share/gnome-system-tools/pixmaps/16_ethernet.xpm
 share/gnome-system-tools/pixmaps/16_loopback.xpm
 share/gnome-system-tools/pixmaps/16_plip.xpm
 share/gnome-system-tools/pixmaps/16_ppp.xpm
+share/gnome-system-tools/pixmaps/archlinux.png
 share/gnome-system-tools/pixmaps/black_panther.png
 share/gnome-system-tools/pixmaps/boot.png
 share/gnome-system-tools/pixmaps/computer.png
@@ -26,6 +25,7 @@ share/gnome-system-tools/pixmaps/conectiva.png
 share/gnome-system-tools/pixmaps/connection-ethernet.png
 share/gnome-system-tools/pixmaps/connection-modem.png
 share/gnome-system-tools/pixmaps/debian.png
+share/gnome-system-tools/pixmaps/disks.png
 share/gnome-system-tools/pixmaps/fedora.png
 share/gnome-system-tools/pixmaps/freebsd.png
 share/gnome-system-tools/pixmaps/gentoo.png
@@ -47,6 +47,7 @@ share/gnome-system-tools/pixmaps/redhat.png
 share/gnome-system-tools/pixmaps/server.png
 share/gnome-system-tools/pixmaps/services.png
 share/gnome-system-tools/pixmaps/settings.png
+share/gnome-system-tools/pixmaps/shares.png
 share/gnome-system-tools/pixmaps/slackware.png
 share/gnome-system-tools/pixmaps/specifix.png
 share/gnome-system-tools/pixmaps/suse.png
@@ -63,6 +64,7 @@ share/gnome-system-tools/pixmaps/wavelan-48.png
 share/gnome-system-tools/pixmaps/world_map-960.png
 share/gnome/applications/network.desktop
 %%SERVICES%%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
@@ -90,145 +92,59 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf
 share/gnome/omf/gnome-system-tools/users-admin-C.omf
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ar/LC_MESSAGES/setup-tools-backends.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
-share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bg/LC_MESSAGES/setup-tools-backends.mo
-share/locale/bn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ca/LC_MESSAGES/setup-tools-backends.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
-share/locale/cs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/da/LC_MESSAGES/gnome-system-tools.mo
-share/locale/da/LC_MESSAGES/setup-tools-backends.mo
 share/locale/de/LC_MESSAGES/gnome-system-tools.mo
-share/locale/de/LC_MESSAGES/setup-tools-backends.mo
 share/locale/el/LC_MESSAGES/gnome-system-tools.mo
-share/locale/el/LC_MESSAGES/setup-tools-backends.mo
 share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo
 share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo
 share/locale/es/LC_MESSAGES/gnome-system-tools.mo
-share/locale/es/LC_MESSAGES/setup-tools-backends.mo
 share/locale/et/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/eu/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fi/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/gu/LC_MESSAGES/setup-tools-backends.mo
 share/locale/gu/LC_MESSAGES/gnome-system-tools.mo
+share/locale/hi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/hr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/id/LC_MESSAGES/gnome-system-tools.mo
-share/locale/id/LC_MESSAGES/setup-tools-backends.mo
 share/locale/it/LC_MESSAGES/gnome-system-tools.mo
-share/locale/it/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ja/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ja/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ko/LC_MESSAGES/setup-tools-backends.mo
 share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/lt/LC_MESSAGES/setup-tools-backends.mo
 share/locale/lv/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
 share/locale/ms/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ms/LC_MESSAGES/setup-tools-backends.mo
-share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nb/LC_MESSAGES/setup-tools-backends.mo
 share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/no/LC_MESSAGES/gnome-system-tools.mo
-share/locale/no/LC_MESSAGES/setup-tools-backends.mo
-share/locale/pa/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ro/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sq/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sv/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sv/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ta/LC_MESSAGES/setup-tools-backends.mo
+share/locale/th/LC_MESSAGES/gnome-system-tools.mo
 share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/uk/LC_MESSAGES/setup-tools-backends.mo
 share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo
-share/setup-tool-backends/files/debian_ipchains
-share/setup-tool-backends/scripts/boot-conf
-share/setup-tool-backends/scripts/boot-grub.pl
-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/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
 @dirrm share/gnome/omf/gnome-system-tools
 @dirrm share/gnome/help/users-admin/C/figures
 @dirrm share/gnome/help/users-admin/C
diff --git a/sysutils/gnomecontrolcenter2/Makefile b/sysutils/gnomecontrolcenter2/Makefile
index acbe1f0c2451..075ee3b879d6 100644
--- a/sysutils/gnomecontrolcenter2/Makefile
+++ b/sysutils/gnomecontrolcenter2/Makefile
@@ -6,27 +6,26 @@
 #
 
 PORTNAME=	gnomecontrolcenter2
-PORTVERSION=	2.8.2
-PORTREVISION=	2
+PORTVERSION=	2.10.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/control-center/2.8
+MASTER_SITE_SUBDIR=	sources/control-center/2.10
 DISTNAME=	control-center-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Control center for GNOME 2 project
 
-LIB_DEPENDS=	xklavier.8:${PORTSDIR}/x11/libxklavier
+LIB_DEPENDS=	xklavier.10:${PORTSDIR}/x11/libxklavier
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNOME_DESKTOP_VERSION=2
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack metacity nautilus2 \
-		desktopfileutils
 USE_GSTREAMER=	yes
+USE_GNOME=	gnomeprefix gnomehack intlhack metacity nautilus2 \
+		gnomemenus desktopfileutils
 USE_LIBTOOL_VER=15
 INSTALLS_SHLIB=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
@@ -42,6 +41,8 @@ GCONF_SCHEMAS=	apps_gnome_settings_daemon_default_editor.schemas \
 post-patch:
 	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|[{]prefix[}]/share/pixmaps|{datadir}/pixmaps|g'
+	@${REINPLACE_CMD} -e 's|mozilla-thunderbird|thunderbird|g' \
+		${WRKSRC}/capplets/default-applications/gnome-default-applications-properties-structs.c
 
 post-install:
 	@-update-desktop-database
diff --git a/sysutils/gnomecontrolcenter2/distinfo b/sysutils/gnomecontrolcenter2/distinfo
index e5ac6888440c..e8ada3e49980 100644
--- a/sysutils/gnomecontrolcenter2/distinfo
+++ b/sysutils/gnomecontrolcenter2/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/control-center-2.8.2.tar.bz2) = 898ef25391c0330a31f36812fdc8a02f
-SIZE (gnome2/control-center-2.8.2.tar.bz2) = 2806342
+MD5 (gnome2/control-center-2.10.0.tar.bz2) = 23ee64b8e559cce4aa6beb70ad675130
+SIZE (gnome2/control-center-2.10.0.tar.bz2) = 2617716
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
deleted file mode 100644
index c6b38bd4daa6..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_default-applications_gnome-default-applications-properies-structs.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- capplets/default-applications/gnome-default-applications-properties-structs.c.orig	Sun Feb 20 16:18:03 2005
-+++ capplets/default-applications/gnome-default-applications-properties-structs.c	Mon Feb 21 15:52:04 2005
-@@ -12,6 +12,7 @@
-         { N_("Firebird/FireFox"),  "mozilla-firebird",  "mozilla-firebird %s",  FALSE, FALSE },
-         { N_("Firebird/FireFox"),  "mozilla-firefox",	"mozilla-firebird %s",  FALSE, FALSE },
-         { N_("Firebird/FireFox"),  	"firefox",	"mozilla-firefox %s",	FALSE, FALSE },
-+        { N_("Firebird/FireFox"),  	"firefox",	"firefox %s",	FALSE, FALSE },
-         { N_("Mozilla/Netscape 6"), 	"mozilla-1.6",	"mozilla-1.6 %s",	FALSE, FALSE },
-         { N_("Mozilla/Netscape 6"), 	"mozilla",	"mozilla %s",		FALSE, FALSE },
-         { N_("Netscape Communicator"), 	"netscape",	"netscape %s",		FALSE, FALSE },
-@@ -40,6 +41,7 @@
- 	{ N_("Balsa"),        			"balsa",		"balsa -m %s",		FALSE, FALSE },
- 	{ N_("KMail"),        			"kmail",		"kmail %s",		FALSE, FALSE },
- 	{ N_("Mozilla Mail"), 			"mozilla",		"mozilla -mail %s",	FALSE, FALSE},
-+	{ N_("Thunderbird"), 			"thunderbird",		"thunderbird %s",	FALSE, FALSE},
-         { N_("Mutt") , 	  			"mutt",			"mutt %s",		TRUE,  FALSE },
- 
- };
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in
deleted file mode 100644
index 5a6b0ba8f2d6..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_desktop-links_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- capplets/desktop-links/Makefile.in.orig	Tue Dec 30 15:55:28 2003
-+++ capplets/desktop-links/Makefile.in	Tue Dec 30 15:55:49 2003
-@@ -190,7 +190,7 @@
- 
- pixmaps_pre = $(capplets:=-capplet.png)
- pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png
--pixmapsdir = $(datadir)/icons/gnome/48x48/apps
-+pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
- 
- desktop_files = $(capplets:=.desktop)
- desktop_in_files = $(desktop_files:.desktop=.desktop.in)
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
new file mode 100644
index 000000000000..02374b23ac45
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-capplets_gnome-keyboard-properties-xkbot.c
@@ -0,0 +1,33 @@
+--- capplets/keyboard/gnome-keyboard-properties-xkbot.c.orig	Wed Jan 19 18:16:13 2005
++++ capplets/keyboard/gnome-keyboard-properties-xkbot.c	Wed Feb  9 21:33:00 2005
+@@ -242,21 +242,25 @@
+                                          Bool allowMultipleSelection,
+                                          GladeXML * dialog)
+ {
++  gchar *utfGroupName, *titlemarkup;
++  GtkWidget *expander;
++  GtkWidget *vbox;
++  GtkWidget *align;
+   GSList * expanders_list = g_object_get_data (G_OBJECT (dialog), EXPANDERS_PROP);
+ 
+   current1stLevelId = configItem->name;
+ 
+-  gchar *utfGroupName = xci_desc_to_utf8 (configItem);
+-  gchar *titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
++  utfGroupName = xci_desc_to_utf8 (configItem);
++  titlemarkup = g_strconcat ("<span>", utfGroupName, "</span>", NULL);
+ 
+-  GtkWidget *expander = gtk_expander_new (titlemarkup);
++  expander = gtk_expander_new (titlemarkup);
+   g_object_set_data_full (G_OBJECT (expander), "utfGroupName", utfGroupName, g_free);
+ 
+   g_free (titlemarkup);
+   gtk_expander_set_use_markup (GTK_EXPANDER (expander), TRUE);
+-  GtkWidget *align = gtk_alignment_new (0, 0, 1, 1);
++  align = gtk_alignment_new (0, 0, 1, 1);
+   gtk_alignment_set_padding (GTK_ALIGNMENT (align), 6, 12, 12, 0);
+-  GtkWidget *vbox = gtk_vbox_new (TRUE, 6);
++  vbox = gtk_vbox_new (TRUE, 6);
+   gtk_container_add (GTK_CONTAINER (align), vbox);
+   gtk_container_add (GTK_CONTAINER (expander), align);
+   currentVbox = vbox;
diff --git a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c b/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
deleted file mode 100644
index 9c487d7b8e9d..000000000000
--- a/sysutils/gnomecontrolcenter2/files/patch-capplets_mouse_gnome-mouse-properties.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- capplets/mouse/gnome-mouse-properties.c.orig	Sat Nov  2 13:40:22 2002
-+++ capplets/mouse/gnome-mouse-properties.c	Sun Dec 22 16:33:36 2002
-@@ -591,7 +591,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -612,7 +612,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-normal-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
-@@ -633,7 +633,7 @@
- 	filename = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_APP_PIXMAP, "mouse-cursor-white-large.png", TRUE, NULL);
- 	pixbuf = gdk_pixbuf_new_from_file (filename, NULL);
- 	g_free (filename);
--	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "gnome/cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
-+	font_path = gnome_program_locate_file (program, GNOME_FILE_DOMAIN_DATADIR, "cursor-fonts/cursor-large-white.pcf", FALSE, NULL);
- 
- 	gtk_list_store_append (GTK_LIST_STORE (model), &iter);
- 	if (cursor_font && ! strcmp (cursor_font, font_path)) {
diff --git a/sysutils/gnomecontrolcenter2/files/patch-configure b/sysutils/gnomecontrolcenter2/files/patch-configure
index f97758e10ba0..d8e861724bd3 100644
--- a/sysutils/gnomecontrolcenter2/files/patch-configure
+++ b/sysutils/gnomecontrolcenter2/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Feb 21 15:53:01 2005
-+++ configure	Mon Feb 21 15:53:01 2005
-@@ -21286,6 +21286,7 @@
+--- configure.orig	Thu Jan 13 02:39:28 2005
++++ configure	Thu Jan 13 02:39:28 2005
+@@ -22221,6 +22221,7 @@
  if eval "test \"\${$as_ac_var+set}\" = set"; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -8,7 +8,7 @@
    cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -26646,7 +26647,7 @@
+@@ -27490,7 +27491,7 @@
  
  
  cat >>confdefs.h <<_ACEOF
diff --git a/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
new file mode 100644
index 000000000000..52a627fb20df
--- /dev/null
+++ b/sysutils/gnomecontrolcenter2/files/patch-gnome-settings-daemon_actions_Makefile.in
@@ -0,0 +1,11 @@
+--- gnome-settings-daemon/actions/Makefile.in.orig	Mon Dec 20 19:19:31 2004
++++ gnome-settings-daemon/actions/Makefile.in	Mon Dec 20 19:20:45 2004
+@@ -296,7 +296,7 @@
+ Datadir = $(datadir)/control-center-2.0/interfaces/
+ Data_DATA = acme.glade
+ 
+-pixmapsdir = $(GNOMECC_PIXMAPS_DIR)
++pixmapsdir = $(prefix)/share/icons/gnome/48x48/apps
+ pixmaps_DATA = acme-brightness.png acme-eject.png gnome-speakernotes-muted.png gnome-speakernotes.png
+ 
+ EXTRA_DIST = \
diff --git a/sysutils/gnomecontrolcenter2/pkg-plist b/sysutils/gnomecontrolcenter2/pkg-plist
index 423c553037a3..8787f4495677 100644
--- a/sysutils/gnomecontrolcenter2/pkg-plist
+++ b/sysutils/gnomecontrolcenter2/pkg-plist
@@ -22,39 +22,36 @@ etc/gnome-vfs-2.0/modules/font-method.conf
 etc/gnome-vfs-2.0/modules/theme-method.conf
 include/gnome-window-settings-2.0/gnome-window-manager.h
 include/gnome-window-settings-2.0/gnome-wm-manager.h
-lib/bonobo/libthemus-theme-properties-view.so
 lib/gnome-vfs-2.0/modules/libfont-method.so
 lib/gnome-vfs-2.0/modules/libtheme-method.so
 lib/libgnome-window-settings.a
 lib/libgnome-window-settings.so
 lib/libgnome-window-settings.so.1
+lib/nautilus/extensions-1.0/libnautilus-fontilus.so
+lib/nautilus/extensions-1.0/libnautilus-themus.so
 lib/window-manager-settings/libmetacity.a
 lib/window-manager-settings/libmetacity.so
 libdata/bonobo/servers/GNOME_SettingsDaemon.server
-libdata/bonobo/servers/Themus_Properties_View.server
-libdata/bonobo/servers/fontilus.server
 libdata/pkgconfig/gnome-window-settings-2.0.pc
-libexec/fontilus-context-menu
 libexec/gnome-settings-daemon
-share/gnome/application-registry/fontilus.applications
-share/gnome/application-registry/themus.applications
+share/gnome/applications/accessibility-keyboard.desktop
+share/gnome/applications/at-properties.desktop
+share/gnome/applications/background.desktop
+share/gnome/applications/default-applications.desktop
+share/gnome/applications/display-properties.desktop
+share/gnome/applications/font-properties.desktop
 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-ui-properties.desktop
 share/gnome/applications/gnomecc.desktop
+share/gnome/applications/gtk-theme-selector.desktop
+share/gnome/applications/keybinding.desktop
+share/gnome/applications/keyboard.desktop
+share/gnome/applications/themus-theme-applier.desktop
+share/gnome/applications/window-properties.desktop
 @exec update-desktop-database > /dev/null || /usr/bin/true
-share/gnome/control-center-2.0/capplets/accessibility-keyboard.desktop
-share/gnome/control-center-2.0/capplets/at-properties.desktop
-share/gnome/control-center-2.0/capplets/background.desktop
-share/gnome/control-center-2.0/capplets/default-applications.desktop
-share/gnome/control-center-2.0/capplets/display-properties.desktop
-share/gnome/control-center-2.0/capplets/font-properties.desktop
-share/gnome/control-center-2.0/capplets/gnome-network-preferences.desktop
-share/gnome/control-center-2.0/capplets/gnome-settings-mouse.desktop
-share/gnome/control-center-2.0/capplets/gnome-settings-sound.desktop
-share/gnome/control-center-2.0/capplets/gnome-ui-properties.desktop
-share/gnome/control-center-2.0/capplets/gtk-theme-selector.desktop
-share/gnome/control-center-2.0/capplets/keybinding.desktop
-share/gnome/control-center-2.0/capplets/keyboard.desktop
-share/gnome/control-center-2.0/capplets/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
@@ -69,6 +66,7 @@ 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-install.glade
 share/gnome/control-center-2.0/interfaces/theme-properties.glade
@@ -77,8 +75,6 @@ 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-brightness.png
-share/gnome/control-center-2.0/pixmaps/acme-eject.png
 share/gnome/control-center-2.0/pixmaps/at-startup.png
 share/gnome/control-center-2.0/pixmaps/at-support.png
 share/gnome/control-center-2.0/pixmaps/bar-disabled.png
@@ -88,8 +84,6 @@ share/gnome/control-center-2.0/pixmaps/bar.png
 share/gnome/control-center-2.0/pixmaps/double-click-maybe.png
 share/gnome/control-center-2.0/pixmaps/double-click-off.png
 share/gnome/control-center-2.0/pixmaps/double-click-on.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes-muted.png
-share/gnome/control-center-2.0/pixmaps/gnome-speakernotes.png
 share/gnome/control-center-2.0/pixmaps/keyboard-bell.png
 share/gnome/control-center-2.0/pixmaps/keyboard-cursor.png
 share/gnome/control-center-2.0/pixmaps/keyboard-repeat.png
@@ -117,23 +111,16 @@ share/gnome/control-center-2.0/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/gnome-2.0/ui/gnomecc-ui.xml
 share/gnome/idl/ConfigArchiver.idl
 share/gnome/idl/GNOME_SettingsDaemon.idl
-share/gnome/mime-info/fontilus.keys
-share/gnome/mime-info/fontilus.mime
-share/gnome/mime-info/themus.keys
-share/gnome/pixmaps/control-center2.png
 share/gnome/pixmaps/display-capplet.png
-share/gnome/pixmaps/gnomecc-2/active.png
-share/gnome/pixmaps/gnomecc-2/bcg_top.png
-share/gnome/pixmaps/gnomecc-2/blank.png
-share/gnome/pixmaps/gnomecc-2/title.png
-share/gnome/vfolders/Accessibility.directory
-share/gnome/vfolders/Advanced.directory
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
-share/icons/gnome/48x48/apps/accessibility-directory.png
+share/icons/gnome/48x48/apps/acme-brightness.png
+share/icons/gnome/48x48/apps/acme-eject.png
+share/icons/gnome/48x48/apps/gnome-speakernotes-muted.png
+share/icons/gnome/48x48/apps/gnome-speakernotes.png
+share/icons/hicolor/48x48/apps/gnome-control-center.png
 share/locale/af/LC_MESSAGES/control-center-2.0.mo
 share/locale/am/LC_MESSAGES/control-center-2.0.mo
 share/locale/ar/LC_MESSAGES/control-center-2.0.mo
@@ -175,6 +162,7 @@ share/locale/ml/LC_MESSAGES/control-center-2.0.mo
 share/locale/mn/LC_MESSAGES/control-center-2.0.mo
 share/locale/ms/LC_MESSAGES/control-center-2.0.mo
 share/locale/nb/LC_MESSAGES/control-center-2.0.mo
+share/locale/ne/LC_MESSAGES/control-center-2.0.mo
 share/locale/nl/LC_MESSAGES/control-center-2.0.mo
 share/locale/nn/LC_MESSAGES/control-center-2.0.mo
 share/locale/no/LC_MESSAGES/control-center-2.0.mo
@@ -200,17 +188,14 @@ share/locale/wa/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 share/locale/zu/LC_MESSAGES/control-center-2.0.mo
-@unexec rmdir %D/share/locale/zu/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/zu 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso/LC_MESSAGES 2> /dev/null || true
 @unexec rmdir %D/share/locale/nso 2> /dev/null || true
-@dirrm share/gnome/pixmaps/gnomecc-2
 @dirrm share/gnome/gnome-background-properties
 @dirrm share/gnome/cursor-fonts
 @dirrm share/gnome/control-center-2.0/xrdb
 @dirrm share/gnome/control-center-2.0/pixmaps
 @dirrm share/gnome/control-center-2.0/interfaces
-@dirrm share/gnome/control-center-2.0/icons
+@unexec rmdir %D/share/gnome/control-center-2.0/icons 2> /dev/null || true
 @dirrm lib/window-manager-settings
 @dirrm include/gnome-window-settings-2.0
 @unexec update-desktop-database > /dev/null || /usr/bin/true
diff --git a/sysutils/gnomesystemmonitor/Makefile b/sysutils/gnomesystemmonitor/Makefile
index 224e9f1a5756..7650bd4087ab 100644
--- a/sysutils/gnomesystemmonitor/Makefile
+++ b/sysutils/gnomesystemmonitor/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	gnomesystemmonitor
-PORTVERSION=	2.8.3
+PORTVERSION=	2.10.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.8
+MASTER_SITE_SUBDIR=	sources/gnome-system-monitor/2.10
 DISTNAME=	gnome-system-monitor-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/sysutils/gnomesystemmonitor/distinfo b/sysutils/gnomesystemmonitor/distinfo
index 73b0b9a93148..7919d4274b50 100644
--- a/sysutils/gnomesystemmonitor/distinfo
+++ b/sysutils/gnomesystemmonitor/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 3d4564b2d0b49a5826ae212b23d234df
-SIZE (gnome2/gnome-system-monitor-2.8.3.tar.bz2) = 690661
+MD5 (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 6dc606f13600e49a52b669fb97e789e0
+SIZE (gnome2/gnome-system-monitor-2.10.0.tar.bz2) = 752223
diff --git a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
index 30ef6303d397..49a699641476 100644
--- a/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
+++ b/sysutils/gnomesystemmonitor/files/patch-src::proctable.c
@@ -1,28 +1,7 @@
---- src/proctable.c.orig	Sun Nov 21 18:03:12 2004
-+++ src/proctable.c	Mon Dec  6 22:10:55 2004
-@@ -535,6 +535,9 @@
- 	glibtop_get_proc_uid (&procuid, pid);
- 	glibtop_get_proc_time (&proctime, pid);
- 	newcputime = proctime.utime + proctime.stime;
-+	if (proctime.frequency) {
-+		newcputime /= (proctime.frequency/100);
-+	}
- 	model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
+--- src/proctable.c.orig	Tue Nov 30 01:28:31 2004
++++ src/proctable.c	Wed Dec  1 13:25:55 2004
+@@ -772,6 +772,12 @@
  
- 	wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
-@@ -645,6 +648,10 @@
- 	glibtop_get_proc_uid (&procuid, pid);
- 	glibtop_get_proc_time (&proctime, pid);
- 	newcputime = proctime.utime + proctime.stime;
-+	if (proctime.frequency) {
-+		newcputime /= (proctime.frequency/100);
-+	}
-+
- 
- 	wnck_pid_read_resource_usage (gdk_screen_get_display (gdk_screen_get_default ()),
- 				      pid,
-@@ -745,6 +752,12 @@
- }
  
  
 +static int
@@ -32,18 +11,15 @@
 +}
 +
  static void
- refresh_list (ProcData *data, const unsigned *pid_list, guint n)
+ refresh_list (ProcData *procdata, const unsigned *pid_list, const guint n)
  {
-@@ -754,6 +767,8 @@
- 	GtkTreeModel *model = gtk_tree_view_get_model (GTK_TREE_VIEW (procdata->tree));
- 	guint i;
+@@ -863,10 +869,15 @@
+ 
+ 	pid_list = glibtop_get_proclist (&proclist, which, arg);
  
-+	qsort (pid_list, n, sizeof (*pid_list), pid_compare);
++	qsort(pid_list, proclist.number, sizeof (*pid_list), pid_compare);
 +
- 	/* Add or update processes */
- 	for(i = 0; i < n; ++i) {
- 		ProcInfo *info;
-@@ -837,6 +852,9 @@
+ 	/* 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 = cpu.total - total_time_last;
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_interface.c b/sysutils/gnomesystemmonitor/files/patch-src_interface.c
new file mode 100644
index 000000000000..1b4276e7ee56
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/files/patch-src_interface.c
@@ -0,0 +1,21 @@
+--- src/interface.c.orig	Wed Dec  1 13:23:26 2004
++++ src/interface.c	Wed Dec  1 13:24:00 2004
+@@ -529,12 +529,12 @@
+ 
+ 	model = gtk_tree_store_new (10,
+ 				    GDK_TYPE_PIXBUF,
+-				    G_TYPE_STRING, // device name
+-				    G_TYPE_STRING, // directory
+-				    G_TYPE_STRING, // type
+-				    G_TYPE_STRING, // total
+-				    G_TYPE_STRING, // free
+-				    G_TYPE_STRING, // used
++				    G_TYPE_STRING, /* device name */
++				    G_TYPE_STRING, /* directory */
++				    G_TYPE_STRING, /* type */
++				    G_TYPE_STRING, /* total */
++				    G_TYPE_STRING, /* free */
++				    G_TYPE_STRING, /* used */
+ 				    G_TYPE_FLOAT,
+ 				    G_TYPE_FLOAT,
+ 				    G_TYPE_FLOAT);
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
new file mode 100644
index 000000000000..efdcef5f7882
--- /dev/null
+++ b/sysutils/gnomesystemmonitor/files/patch-src_openfiles.c
@@ -0,0 +1,32 @@
+--- src/openfiles.c.orig	Fri Jan 21 18:35:43 2005
++++ src/openfiles.c	Tue Jan 25 19:02:29 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"
+@@ -143,7 +144,7 @@
+ 	const glibtop_open_files_entry *o2 = b;
+ 
+ 	/* Falta manejar los diferentes tipos! */
+-	return (o1->fd == o2->fd) && (o1->type == o1->type); // XXX!
++	return (o1->fd == o2->fd) && (o1->type == o1->type); /* XXX! */
+ }
+ 
+ 
+@@ -152,10 +153,10 @@
+ {
+ 	ProcInfo *info;
+ 	GtkTreeModel *model;
+-	glibtop_open_files_entry *openfiles;
+-	glibtop_proc_open_files procmap;
+ 	GHashTable *new_maps;
+ 	gint i;
++	glibtop_open_files_entry *openfiles;
++	glibtop_proc_open_files procmap;
+ 
+ 	info = g_object_get_data (G_OBJECT (tree), "selected_info");
+ 	g_return_if_fail (info);
diff --git a/sysutils/gnomesystemmonitor/files/patch-src_util.c b/sysutils/gnomesystemmonitor/files/patch-src_util.c
deleted file mode 100644
index 288ccc26adc0..000000000000
--- a/sysutils/gnomesystemmonitor/files/patch-src_util.c
+++ /dev/null
@@ -1,34 +0,0 @@
---- src/util.c.orig	Fri Dec 12 02:26:57 2003
-+++ src/util.c	Fri Dec 12 02:35:38 2003
-@@ -16,6 +16,7 @@
- 
- #ifdef __FreeBSD__
- # include <errno.h>
-+# include <termios.h>
- # include <libutil.h>
- #endif
- 
-@@ -181,7 +182,11 @@
- 	 * Make su think we're sending the password from a terminal:
- 	 */
- 
-+#ifndef __FreeBSD__
- 	if (((t_fd = OPEN_TTY()) < 0) || (grantpt(t_fd) < 0) || (unlockpt(t_fd) < 0)) {
-+#else
-+	if ((t_fd = OPEN_TTY()) < 0) {
-+#endif
- 		fprintf (stderr, "Unable to open a terminal\n");
- 		ABORT (root);
- 	}
-@@ -259,7 +264,11 @@
- 			}
- 		}
- 
-+#ifndef __FreeBSD__
- 		if(((pts = ptsname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
-+#else
-+		if (((pts = ttyname(t_fd)) == NULL) || ((t_fd = open(pts, O_RDWR | O_NOCTTY)) < 0)) {
-+#endif
- 			perror ("Unable to open pseudo slave terminal");
- 			_exit (-1);
- 		}
diff --git a/sysutils/gnomesystemmonitor/pkg-plist b/sysutils/gnomesystemmonitor/pkg-plist
index b0fa0b688925..9d8082a83d19 100644
--- a/sysutils/gnomesystemmonitor/pkg-plist
+++ b/sysutils/gnomesystemmonitor/pkg-plist
@@ -16,7 +16,6 @@ share/gnome/help/gnome-system-monitor/C/figures/viewMenu.png
 share/gnome/help/gnome-system-monitor/C/gnome-system-monitor.xml
 share/gnome/help/gnome-system-monitor/C/legal.xml
 share/gnome/omf/gnome-system-monitor/gnome-system-monitor-C.omf
-share/gnome/pixmaps/procman.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
@@ -33,6 +32,7 @@ share/locale/el/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/en_CA/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/en_GB/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/es/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/et/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/eu/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fa/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/fi/LC_MESSAGES/gnome-system-monitor.mo
@@ -56,6 +56,7 @@ share/locale/ml/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/mn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ms/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nb/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/ne/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/nl/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/no/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/pa/LC_MESSAGES/gnome-system-monitor.mo
@@ -71,6 +72,7 @@ share/locale/sr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/sv/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/ta/LC_MESSAGES/gnome-system-monitor.mo
+share/locale/th/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/tr/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/uk/LC_MESSAGES/gnome-system-monitor.mo
 share/locale/vi/LC_MESSAGES/gnome-system-monitor.mo
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index f1ce787bb4c6..1dca8a647c5c 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -6,23 +6,27 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	1.0.2
+PORTVERSION=	1.2.0
+PORTREVISION=	2
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.0
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/1.2
 DISTNAME=	gnome-system-tools-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
 
+BUILD_DEPENDS=	${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+RUN_DEPENDS=	${X11BASE}/share/setup-tool-backends/scripts/xml.pl:${PORTSDIR}/sysutils/system-tools-backends
+
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_PERL5=	yes
 USE_X_PREFIX=	yes
-INSTALLS_OMF=	yes
-USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack libgnomeui
+GNOME_DESKTOP_VERSION=2
+USE_GNOME=	gnomehack gnomeprefix gnometarget intlhack nautilus2
 USE_LIBTOOL_VER=15
+INSTALLS_OMF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
@@ -30,17 +34,11 @@ GCONF_SCHEMAS=	gnome-system-tools.schemas
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} > 500000
+.if ${OSVERSION} >= 500000
 CONFIGURE_ARGS+=	--enable-services
 PLIST_SUB+=		SERVICES=""
 .else
 PLIST_SUB+=		SERVICES="@comment "
 .endif
 
-.if ${PERL_LEVEL} < 500600
-post-configure:
-	@${FIND} ${WRKSRC}/backends \( -name "*.pl" -or -name "*-conf" \) | \
-		${XARGS} ${REINPLACE_CMD} -e 's|@scriptsdir|[@]scriptsdir|g'
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index 6b2fb5abceac..6eb37fa99a84 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 674611d3fb195fde940223821cfa6dda
-SIZE (gnome2/gnome-system-tools-1.0.2.tar.bz2) = 2766787
+MD5 (gnome2/gnome-system-tools-1.2.0.tar.bz2) = fbcf8866ecea8b330cbe53cf8b0df55e
+SIZE (gnome2/gnome-system-tools-1.2.0.tar.bz2) = 1780677
diff --git a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in b/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in
deleted file mode 100644
index 7f7cce28ee37..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_replace.pl.in
+++ /dev/null
@@ -1,34 +0,0 @@
---- backends/replace.pl.in.orig	Fri Oct 22 02:41:56 2004
-+++ backends/replace.pl.in	Fri Oct 22 02:42:48 2004
-@@ -1113,19 +1113,19 @@
- 
-   return -1 if (!&gst_replace_interfaces_iface_stanza_locate ($buff, \$line_no, $iface));
- 
--  delete $$buff[$line_no];
-+  splice @{$buff},$line_no,1;
-   $line_no ++;
-   
-   while (&gst_replace_interfaces_get_next_option ($buff, \$line_no) != -1)
-   {
--    delete $$buff[$line_no];
-+    splice @{$buff},$line_no,1;
-     $line_no ++;
-   }
- 
-   $line_no = 0;
-   if (&gst_replace_interfaces_auto_stanza_locate ($buff, \$line_no, $iface))
-   {
--    delete $$buff[$line_no];
-+   splice @{$buff},$line_no,1;
-   }
-   
-   &gst_file_buffer_clean ($buff);
-@@ -1663,7 +1663,7 @@
-         }
-         else
-         {
--          delete $$buff[$i];
-+	  splice @{$buff},$i,1;
-         }
-       }
-     }
diff --git a/sysutils/gnomesystemtools/files/patch-backends_service-list.pl.in b/sysutils/gnomesystemtools/files/patch-backends_service-list.pl.in
deleted file mode 100644
index 16861791c1ca..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_service-list.pl.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- backends/service-list.pl.in.orig	Sun Sep 19 13:20:02 2004
-+++ backends/service-list.pl.in	Sun Sep 19 13:20:10 2004
-@@ -225,6 +225,7 @@
-      "atm3\.sh",
-      "ccd",
-      "cleanvar",
-+     "cleartmp",
-      "devdb",
-      "devfs",
-      "dhclient",
diff --git a/sysutils/gnomesystemtools/files/patch-configure b/sysutils/gnomesystemtools/files/patch-configure
index b854cde3a70f..712bb1defc9f 100644
--- a/sysutils/gnomesystemtools/files/patch-configure
+++ b/sysutils/gnomesystemtools/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Wed May 26 12:02:51 2004
-+++ configure	Wed May 26 12:03:23 2004
-@@ -22623,7 +22623,7 @@
+--- 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"
diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c
new file mode 100644
index 000000000000..9272d918136c
--- /dev/null
+++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c
@@ -0,0 +1,18 @@
+--- src/common/gst-auth.c.orig	Thu Mar 10 14:39:18 2005
++++ src/common/gst-auth.c	Thu Mar 10 14:39:50 2005
+@@ -142,12 +142,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], 2);*/
+ 		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/gnomesystemtools/files/patch-src_common_gst-tool.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c
new file mode 100644
index 000000000000..5134f30e581b
--- /dev/null
+++ b/sysutils/gnomesystemtools/files/patch-src_common_gst-tool.c
@@ -0,0 +1,11 @@
+--- src/common/gst-tool.c.orig	Thu Mar 10 14:39:54 2005
++++ src/common/gst-tool.c	Thu Mar 10 14:40:00 2005
+@@ -1653,7 +1653,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/gnomesystemtools/files/patch-src_network_location.c b/sysutils/gnomesystemtools/files/patch-src_network_location.c
new file mode 100644
index 000000000000..e2577a6a49e0
--- /dev/null
+++ b/sysutils/gnomesystemtools/files/patch-src_network_location.c
@@ -0,0 +1,11 @@
+--- src/network/location.c.orig	Thu Dec 23 13:16:33 2004
++++ src/network/location.c	Thu Dec 23 13:16:40 2004
+@@ -687,7 +687,7 @@
+ static void
+ copy_tag_list (xmlNodePtr source, xmlNodePtr dest, const gchar *list[])
+ {
+-  gchar **string = (gchar **) list;;
++  gchar **string = (gchar **) list;
+   gchar  *value;
+ 
+   while (*string)
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index 6a980fb7574e..a52125a51fcd 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -1,24 +1,23 @@
 bin/network-admin
 %%SERVICES%%bin/services-admin
+bin/shares-admin
 bin/time-admin
 bin/users-admin
-etc/X11/sysconfig/network.desktop
-%%SERVICES%%etc/X11/sysconfig/services.desktop
-etc/X11/sysconfig/time.desktop
-etc/X11/sysconfig/users.desktop
+lib/nautilus/extensions-1.0/libnautilus-gst-shares.so
 libdata/pkgconfig/gnome-system-tools.pc
-libdata/pkgconfig/system-tools-backends.pc
 share/gnome-system-tools/interfaces/boot.glade
 share/gnome-system-tools/interfaces/common.glade
 share/gnome-system-tools/interfaces/disks.glade
 share/gnome-system-tools/interfaces/network.glade
 share/gnome-system-tools/interfaces/services.glade
+share/gnome-system-tools/interfaces/shares.glade
 share/gnome-system-tools/interfaces/time.glade
 share/gnome-system-tools/interfaces/users.glade
 share/gnome-system-tools/pixmaps/16_ethernet.xpm
 share/gnome-system-tools/pixmaps/16_loopback.xpm
 share/gnome-system-tools/pixmaps/16_plip.xpm
 share/gnome-system-tools/pixmaps/16_ppp.xpm
+share/gnome-system-tools/pixmaps/archlinux.png
 share/gnome-system-tools/pixmaps/black_panther.png
 share/gnome-system-tools/pixmaps/boot.png
 share/gnome-system-tools/pixmaps/computer.png
@@ -26,6 +25,7 @@ share/gnome-system-tools/pixmaps/conectiva.png
 share/gnome-system-tools/pixmaps/connection-ethernet.png
 share/gnome-system-tools/pixmaps/connection-modem.png
 share/gnome-system-tools/pixmaps/debian.png
+share/gnome-system-tools/pixmaps/disks.png
 share/gnome-system-tools/pixmaps/fedora.png
 share/gnome-system-tools/pixmaps/freebsd.png
 share/gnome-system-tools/pixmaps/gentoo.png
@@ -47,6 +47,7 @@ share/gnome-system-tools/pixmaps/redhat.png
 share/gnome-system-tools/pixmaps/server.png
 share/gnome-system-tools/pixmaps/services.png
 share/gnome-system-tools/pixmaps/settings.png
+share/gnome-system-tools/pixmaps/shares.png
 share/gnome-system-tools/pixmaps/slackware.png
 share/gnome-system-tools/pixmaps/specifix.png
 share/gnome-system-tools/pixmaps/suse.png
@@ -63,6 +64,7 @@ share/gnome-system-tools/pixmaps/wavelan-48.png
 share/gnome-system-tools/pixmaps/world_map-960.png
 share/gnome/applications/network.desktop
 %%SERVICES%%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
@@ -90,145 +92,59 @@ share/gnome/omf/gnome-system-tools/time-admin-C.omf
 share/gnome/omf/gnome-system-tools/users-admin-C.omf
 share/locale/am/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ar/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ar/LC_MESSAGES/setup-tools-backends.mo
 share/locale/az/LC_MESSAGES/gnome-system-tools.mo
-share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bg/LC_MESSAGES/setup-tools-backends.mo
-share/locale/bn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/bs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ca/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ca/LC_MESSAGES/setup-tools-backends.mo
 share/locale/cs/LC_MESSAGES/gnome-system-tools.mo
-share/locale/cs/LC_MESSAGES/setup-tools-backends.mo
 share/locale/da/LC_MESSAGES/gnome-system-tools.mo
-share/locale/da/LC_MESSAGES/setup-tools-backends.mo
 share/locale/de/LC_MESSAGES/gnome-system-tools.mo
-share/locale/de/LC_MESSAGES/setup-tools-backends.mo
 share/locale/el/LC_MESSAGES/gnome-system-tools.mo
-share/locale/el/LC_MESSAGES/setup-tools-backends.mo
 share/locale/en_CA/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo
 share/locale/en_GB/LC_MESSAGES/gnome-system-tools.mo
-share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo
 share/locale/es/LC_MESSAGES/gnome-system-tools.mo
-share/locale/es/LC_MESSAGES/setup-tools-backends.mo
 share/locale/et/LC_MESSAGES/gnome-system-tools.mo
 share/locale/eu/LC_MESSAGES/gnome-system-tools.mo
-share/locale/eu/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fi/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fi/LC_MESSAGES/setup-tools-backends.mo
 share/locale/fr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/fr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/gu/LC_MESSAGES/setup-tools-backends.mo
 share/locale/gu/LC_MESSAGES/gnome-system-tools.mo
+share/locale/hi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/hr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/hr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/hu/LC_MESSAGES/gnome-system-tools.mo
 share/locale/id/LC_MESSAGES/gnome-system-tools.mo
-share/locale/id/LC_MESSAGES/setup-tools-backends.mo
 share/locale/it/LC_MESSAGES/gnome-system-tools.mo
-share/locale/it/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ja/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ja/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ko/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ko/LC_MESSAGES/setup-tools-backends.mo
 share/locale/lt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/lt/LC_MESSAGES/setup-tools-backends.mo
 share/locale/lv/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
 share/locale/ms/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ms/LC_MESSAGES/setup-tools-backends.mo
-share/locale/nb/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nb/LC_MESSAGES/setup-tools-backends.mo
 share/locale/nl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/nl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/nn/LC_MESSAGES/gnome-system-tools.mo
 share/locale/no/LC_MESSAGES/gnome-system-tools.mo
-share/locale/no/LC_MESSAGES/setup-tools-backends.mo
-share/locale/pa/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/pl/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pl/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt/LC_MESSAGES/setup-tools-backends.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-system-tools.mo
-share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ro/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ro/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ru/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sk/LC_MESSAGES/gnome-system-tools.mo
 share/locale/sq/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sq/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sr/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo
 share/locale/sv/LC_MESSAGES/gnome-system-tools.mo
-share/locale/sv/LC_MESSAGES/setup-tools-backends.mo
 share/locale/ta/LC_MESSAGES/gnome-system-tools.mo
-share/locale/ta/LC_MESSAGES/setup-tools-backends.mo
+share/locale/th/LC_MESSAGES/gnome-system-tools.mo
 share/locale/tr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/uk/LC_MESSAGES/gnome-system-tools.mo
-share/locale/uk/LC_MESSAGES/setup-tools-backends.mo
 share/locale/vi/LC_MESSAGES/gnome-system-tools.mo
 share/locale/wa/LC_MESSAGES/gnome-system-tools.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-system-tools.mo
-share/locale/zh_TW/LC_MESSAGES/setup-tools-backends.mo
-share/setup-tool-backends/files/debian_ipchains
-share/setup-tool-backends/scripts/boot-conf
-share/setup-tool-backends/scripts/boot-grub.pl
-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/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
 @dirrm share/gnome/omf/gnome-system-tools
 @dirrm share/gnome/help/users-admin/C/figures
 @dirrm share/gnome/help/users-admin/C
diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile
index f8eeb746a317..88badb5387fe 100644
--- a/sysutils/nautilus-cd-burner/Makefile
+++ b/sysutils/nautilus-cd-burner/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	nautilus-cd-burner
-PORTVERSION=	2.8.7
+PORTVERSION=	2.10.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.8
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.10
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/nautilus-cd-burner/distinfo b/sysutils/nautilus-cd-burner/distinfo
index 723521ada8e0..960dd8c03871 100644
--- a/sysutils/nautilus-cd-burner/distinfo
+++ b/sysutils/nautilus-cd-burner/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/nautilus-cd-burner-2.8.7.tar.bz2) = b5b4b0074e5fa73d8e79a5cb221e0ca4
-SIZE (gnome2/nautilus-cd-burner-2.8.7.tar.bz2) = 561727
+MD5 (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = eba87e8b043cbd0a94d3371aa869bcf1
+SIZE (gnome2/nautilus-cd-burner-2.10.0.tar.bz2) = 623320
diff --git a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c b/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c
deleted file mode 100644
index a684ac82a0de..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-bacon-cd-selection.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- bacon-cd-selection.c.orig	Thu Nov  4 00:25:43 2004
-+++ bacon-cd-selection.c	Thu Nov  4 00:25:57 2004
-@@ -177,10 +177,10 @@
- static void
- bacon_cd_selection_init (BaconCdSelection *bcs)
- {
--	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
--  
- 	GtkCellRenderer *cell;
- 	GtkListStore *store;
-+	bcs->priv = g_new0 (BaconCdSelectionPrivate, 1);
-+  
- 
-   store = gtk_list_store_new (1, G_TYPE_STRING);
- 	gtk_combo_box_set_model (GTK_COMBO_BOX (bcs),
diff --git a/sysutils/nautilus-cd-burner/files/patch-make-iso.c b/sysutils/nautilus-cd-burner/files/patch-make-iso.c
deleted file mode 100644
index 87cd0836b813..000000000000
--- a/sysutils/nautilus-cd-burner/files/patch-make-iso.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- make-iso.c.orig	Fri Dec 19 13:06:34 2003
-+++ make-iso.c	Mon Dec 29 16:18:15 2003
-@@ -571,6 +571,7 @@
- 	argv[i++] = "-r";
- 	if (use_joliet) {
- 		argv[i++] = "-J";
-+		argv[i++] = "-joliet-long";
- 	}
- 	argv[i++] = "-q";
- 	argv[i++] = "-graft-points";
-@@ -650,6 +651,7 @@
- 	argv[i++] = "-r";
- 	if (use_joliet) {
- 		argv[i++] = "-J";
-+		argv[i++] = "-joliet-long";
- 	}
- 	argv[i++] = "-graft-points";
- 	argv[i++] = "-path-list";
diff --git a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
index c666b1c2923c..c2299e5721cb 100644
--- a/sysutils/nautilus-cd-burner/files/patch-cd-drive.c
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-burn-drive.c
@@ -1,6 +1,29 @@
---- cd-drive.c.orig	Thu Feb 10 14:39:59 2005
-+++ cd-drive.c	Tue Feb 15 03:34:40 2005
-@@ -261,9 +261,21 @@
+--- nautilus-burn-drive.c.orig	Tue Feb 22 19:34:17 2005
++++ nautilus-burn-drive.c	Tue Mar  1 00:46:50 2005
+@@ -62,6 +62,13 @@
+ 
+ #define CD_ROM_SPEED 176
+ 
++#if !defined(__linux)
++static int get_device_max_read_speed (char *device);
++#endif
++#if defined(__linux__) || defined(__FreeBSD__)
++static int get_device_max_write_speed (char *device);
++#endif
++
+ static struct {
+ 	const char *name;
+ 	gboolean can_write_cdr;
+@@ -149,7 +156,7 @@
+ 		   int                   *max_wr_speed,
+ 		   NautilusBurnDriveType *type)
+ {
+-	char *stdout_data, *rd_speed, *wr_speed, *drive_cap;
++	char *stdout_data, *drive_cap;
+ 
+ 	*max_rd_speed = -1;
+ 	*max_wr_speed = -1;
+@@ -278,6 +285,9 @@
  {
  	int fd;
  	int mmc_profile;
@@ -8,12 +31,16 @@
 +	struct cam_device *cam;
 +#endif
  
- 	g_return_val_if_fail (device != NULL, CD_MEDIA_TYPE_ERROR);
+ 	g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_TYPE_ERROR);
+ 
+@@ -286,6 +296,15 @@
+ 	if (has_data) *has_data = FALSE;
+ 	if (has_audio) *has_audio = FALSE;
  
 +#ifdef __FreeBSD__
 +	cam = cam_open_device (device, O_RDWR);
 +	if (cam == NULL) {
-+		return CD_MEDIA_TYPE_ERROR;
++		return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
 +	}
 +
 +	fd = cam->fd;
@@ -22,15 +49,45 @@
  	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
  	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
  		if (errno == EBUSY) {
-@@ -271,6 +283,7 @@
+@@ -293,6 +312,7 @@
  		}
- 		return CD_MEDIA_TYPE_ERROR;
+ 		return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
  	}
 +#endif
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -298,7 +311,11 @@
+@@ -303,12 +323,20 @@
+ 		opened = nautilus_burn_drive_door_open (mmc_profile, fd);
+ 
+ 		if (opened != FALSE) {
++#ifdef __FreeBSD__
++			cam_close_device (cam);
++#else
+ 			close (fd);
++#endif
+ 			return NAUTILUS_BURN_MEDIA_TYPE_ERROR;
+ 		} else {
+ 			int blank, rewrite, empty;
+ 			if (get_disc_status (fd, &empty, &rewrite, &blank) == 0) {
++#ifdef __FreeBSD__
++				cam_close_device (cam);
++#else
+ 				close (fd);
++#endif
+ 
+ 				if (is_rewritable)
+ 					*is_rewritable = rewrite;
+@@ -325,12 +353,20 @@
+ 				else
+ 					return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN;
+ 			}
++#ifdef __FreeBSD__
++			cam_close_device (cam);
++#else
+ 			close (fd);
++#endif
+ 			return NAUTILUS_BURN_MEDIA_TYPE_UNKNOWN;
  		}
  	}
  
@@ -40,40 +97,40 @@
  	close (fd);
 +#endif
  
- 	switch (mmc_profile) {
- 	case -1:
-@@ -433,10 +450,21 @@
- 	int secs;
- 	int mmc_profile;
+ 	if (is_blank)
+ 		*is_blank = mmc_profile & 0x10000;
+@@ -569,11 +605,21 @@
+ 	int    secs;
+ 	int    mmc_profile;
  	gint64 size;
 +#ifdef __FreeBSD__
 +	struct cam_device *cam;
 +#endif
  
- 	g_return_val_if_fail (device != NULL, CD_MEDIA_SIZE_UNKNOWN);
+ 	g_return_val_if_fail (device != NULL, NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN);
  
  	secs = 0;
 +#ifdef __FreeBSD__
 +	cam = cam_open_device (device, O_RDWR);
 +	if (cam == NULL) {
-+		return CD_MEDIA_SIZE_UNKNOWN;
++		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
 +	}
-+
+ 
 +	fd = cam->fd;
 +#else
- 
  	if ((fd = open (device, O_RDWR | O_EXCL | O_NONBLOCK)) < 0
  	    && (fd = open (device, O_RDONLY | O_EXCL | O_NONBLOCK)) < 0) {
-@@ -445,6 +473,7 @@
+ 		if (errno == EBUSY) {
+@@ -581,6 +627,7 @@
  		}
- 		return CD_MEDIA_SIZE_UNKNOWN;
+ 		return NAUTILUS_BURN_MEDIA_SIZE_UNKNOWN;
  	}
 +#endif
  
  	mmc_profile = get_mmc_profile (fd);
  
-@@ -467,7 +496,11 @@
- 		size = CD_MEDIA_SIZE_NA;
+@@ -603,7 +650,11 @@
+ 		size = NAUTILUS_BURN_MEDIA_SIZE_NA;
  	}
  
 +#ifdef __FreeBSD__
@@ -84,7 +141,7 @@
  
  	return size;
  }
-@@ -586,9 +619,81 @@
+@@ -896,9 +947,81 @@
  #endif /* USE_HAL */
  
  #if defined(__linux__) || defined(__FreeBSD__)
@@ -113,7 +170,7 @@
 +		return -1;
 +	}
 +#endif
- 
++
 +	get_read_write_speed (fd, &read_speed, &write_speed);
 +#ifdef __FreeBSD__
 +	cam_close_device (cam);
@@ -121,7 +178,7 @@
 +	close (fd);
 +#endif
 +	max_speed = (int)floor  (write_speed) / CD_ROM_SPEED;
- 
++
 +	return max_speed;
 +}
  
@@ -135,23 +192,23 @@
 +#ifdef __FreeBSD__
 +	struct cam_device *cam;
 +#endif
-+
+ 
 +	max_speed = -1;
 +#ifdef __FreeBSD__
 +	cam = cam_open_device (device, O_RDWR);
 +	if (cam == NULL) {
 +		return -1;
 +	}
-+
++ 
 +	fd = cam->fd;
 +#else
-+
++ 
 +	fd = open (device, O_RDWR|O_EXCL|O_NONBLOCK);
 +	if (fd < 0) {
 +		return -1;
 +	}
 +#endif
-+
+ 
 +	get_read_write_speed (fd, &read_speed, &write_speed);
 +#ifdef __FreeBSD__
 +	cam_close_device (cam);
@@ -159,14 +216,14 @@
 +	close (fd);
 +#endif
 +	max_speed = (int)floor  (read_speed) / CD_ROM_SPEED;
-+
++ 
 +	return max_speed;
 +}
 +#endif
  #endif /* __linux__ || __FreeBSD__ */
  
  #if defined (__linux__)
-@@ -791,50 +896,6 @@
+@@ -1111,50 +1234,6 @@
  		}
  	}
  	return NULL;
diff --git a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
index 3b8b07293043..c545be7d5513 100644
--- a/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
+++ b/sysutils/nautilus-cd-burner/files/patch-nautilus-cd-burner.c
@@ -1,18 +1,18 @@
---- nautilus-cd-burner.c.orig	Sun Sep 19 18:44:15 2004
-+++ nautilus-cd-burner.c	Sun Oct 31 13:06:08 2004
-@@ -21,6 +21,8 @@
-   
-    Authors: Alexander Larsson <alexl@redhat.com>
- */
+--- nautilus-cd-burner.c.orig	Mon Feb 28 19:40:05 2005
++++ nautilus-cd-burner.c	Mon Feb 28 20:05:56 2005
+@@ -23,6 +23,8 @@
+  *          Bastien Nocera <hadess@hadess.net>
+  */
+ 
 +#include <sys/types.h>
 +#include <sys/stat.h>
  #include <gtk/gtk.h>
  #include <gtk/gtkfilesel.h>
  #include <gtk/gtkseparatormenuitem.h>
-@@ -632,8 +634,19 @@
+@@ -843,8 +845,19 @@
  		}
  
- 		if (res == RESULT_RETRY) {
+ 		if (res == NAUTILUS_BURN_RECORDER_RESULT_RETRY) {
 -			g_free (filename);
 -			filename = g_build_filename (g_get_tmp_dir (), "image.iso.XXXXXX", NULL);
 +			gchar *path1;
diff --git a/sysutils/nautilus-cd-burner/pkg-plist b/sysutils/nautilus-cd-burner/pkg-plist
index c73c94fd94d0..3c9bbef70ddb 100644
--- a/sysutils/nautilus-cd-burner/pkg-plist
+++ b/sysutils/nautilus-cd-burner/pkg-plist
@@ -1,12 +1,12 @@
 bin/nautilus-cd-burner
 etc/gnome-vfs-2.0/modules/mapping-modules.conf
-include/libnautilus-burn/bacon-cd-selection.h
-include/libnautilus-burn/cd-drive.h
-include/libnautilus-burn/cd-recorder.h
+include/libnautilus-burn/nautilus-burn-drive-selection.h
+include/libnautilus-burn/nautilus-burn-drive.h
+include/libnautilus-burn/nautilus-burn-recorder.h
 lib/gnome-vfs-2.0/modules/libmapping.so
 lib/libnautilus-burn.a
 lib/libnautilus-burn.so
-lib/libnautilus-burn.so.0
+lib/libnautilus-burn.so.1
 lib/nautilus/extensions-1.0/libnautilus-burn-extension.so
 libdata/pkgconfig/libnautilus-burn.pc
 libexec/mapping-daemon
@@ -53,10 +53,12 @@ share/locale/ja/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ko/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lt/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/lv/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/mk/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/mn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/ms/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nb/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/nl/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/nn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/no/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/or/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/pa/LC_MESSAGES/nautilus-cd-burner.mo
@@ -71,6 +73,7 @@ share/locale/sq/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sr@Latn/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/sv/LC_MESSAGES/nautilus-cd-burner.mo
+share/locale/ta/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/th/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/tr/LC_MESSAGES/nautilus-cd-burner.mo
 share/locale/uk/LC_MESSAGES/nautilus-cd-burner.mo
diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
new file mode 100644
index 000000000000..d4133bcff47f
--- /dev/null
+++ b/sysutils/system-tools-backends/Makefile
@@ -0,0 +1,45 @@
+# New ports collection makefile for:	system-tools-backends
+# Date created:				11 February 2005
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	system-tools-backends
+PORTVERSION=	1.2.0
+CATEGORIES=	sysutils gnome
+MASTER_SITES=	${MASTER_SITE_GNOME}
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+DIST_SUBDIR=	gnome2
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Backend system admin scripts for gnome-system-tools
+
+USE_BZIP2=	yes
+USE_GMAKE=	yes
+USE_PERL5=	yes
+PREFIX?=	${X11BASE}
+USE_GNOME=	gnomehack gnometarget intlhack
+GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+.include <bsd.port.pre.mk>
+
+.if ${X_WINDOW_SYSTEM:L} == xfree86-3
+MTREE_FILE=	/etc/mtree/BSD.x11.dist
+.else
+MTREE_FILE=	/etc/mtree/BSD.x11-4.dist
+.endif
+
+.if ${PERL_LEVEL} <= 500800
+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
new file mode 100644
index 000000000000..1fd288819b40
--- /dev/null
+++ b/sysutils/system-tools-backends/distinfo
@@ -0,0 +1,2 @@
+MD5 (gnome2/system-tools-backends-1.2.0.tar.bz2) = 96b00eb0f800c1b5346be2f71d4dc3b2
+SIZE (gnome2/system-tools-backends-1.2.0.tar.bz2) = 532611
diff --git a/sysutils/system-tools-backends/files/patch-replace.pl.in b/sysutils/system-tools-backends/files/patch-replace.pl.in
new file mode 100644
index 000000000000..9487b290dd52
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-replace.pl.in
@@ -0,0 +1,29 @@
+--- 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/gnome-system-tools/files/patch-backends_service-list.pl.in b/sysutils/system-tools-backends/files/patch-service-list.pl.in
index 16861791c1ca..8020a0e52c1e 100644
--- a/sysutils/gnome-system-tools/files/patch-backends_service-list.pl.in
+++ b/sysutils/system-tools-backends/files/patch-service-list.pl.in
@@ -1,5 +1,5 @@
---- backends/service-list.pl.in.orig	Sun Sep 19 13:20:02 2004
-+++ backends/service-list.pl.in	Sun Sep 19 13:20:10 2004
+--- service-list.pl.in.orig	Sun Sep 19 13:20:02 2004
++++ service-list.pl.in	Sun Sep 19 13:20:10 2004
 @@ -225,6 +225,7 @@
       "atm3\.sh",
       "ccd",
diff --git a/sysutils/system-tools-backends/pkg-descr b/sysutils/system-tools-backends/pkg-descr
new file mode 100644
index 000000000000..c92b12768beb
--- /dev/null
+++ b/sysutils/system-tools-backends/pkg-descr
@@ -0,0 +1,4 @@
+System-tools-backends is a collection of scripts (mostly Perl) used by
+gnome-sytem-tools to perform system administration tasks.
+
+WWW: http://www.gnome.org/projects/gst/
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
new file mode 100644
index 000000000000..da943e8f93fd
--- /dev/null
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -0,0 +1,96 @@
+libdata/pkgconfig/system-tools-backends.pc
+share/aclocal/system-tools-backends.m4
+share/locale/ar/LC_MESSAGES/setup-tools-backends.mo
+share/locale/az/LC_MESSAGES/setup-tools-backends.mo
+share/locale/bg/LC_MESSAGES/setup-tools-backends.mo
+share/locale/bn/LC_MESSAGES/setup-tools-backends.mo
+share/locale/bs/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ca/LC_MESSAGES/setup-tools-backends.mo
+share/locale/cs/LC_MESSAGES/setup-tools-backends.mo
+share/locale/da/LC_MESSAGES/setup-tools-backends.mo
+share/locale/de/LC_MESSAGES/setup-tools-backends.mo
+share/locale/el/LC_MESSAGES/setup-tools-backends.mo
+share/locale/en_CA/LC_MESSAGES/setup-tools-backends.mo
+share/locale/en_GB/LC_MESSAGES/setup-tools-backends.mo
+share/locale/es/LC_MESSAGES/setup-tools-backends.mo
+share/locale/eu/LC_MESSAGES/setup-tools-backends.mo
+share/locale/fi/LC_MESSAGES/setup-tools-backends.mo
+share/locale/fr/LC_MESSAGES/setup-tools-backends.mo
+share/locale/gu/LC_MESSAGES/setup-tools-backends.mo
+share/locale/hi/LC_MESSAGES/setup-tools-backends.mo
+share/locale/hr/LC_MESSAGES/setup-tools-backends.mo
+share/locale/hu/LC_MESSAGES/setup-tools-backends.mo
+share/locale/id/LC_MESSAGES/setup-tools-backends.mo
+share/locale/it/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ja/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ko/LC_MESSAGES/setup-tools-backends.mo
+share/locale/lt/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ms/LC_MESSAGES/setup-tools-backends.mo
+share/locale/nb/LC_MESSAGES/setup-tools-backends.mo
+share/locale/nl/LC_MESSAGES/setup-tools-backends.mo
+share/locale/no/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pa/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pl/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pt/LC_MESSAGES/setup-tools-backends.mo
+share/locale/pt_BR/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ro/LC_MESSAGES/setup-tools-backends.mo
+share/locale/sk/LC_MESSAGES/setup-tools-backends.mo
+share/locale/sq/LC_MESSAGES/setup-tools-backends.mo
+share/locale/sr/LC_MESSAGES/setup-tools-backends.mo
+share/locale/sr@Latn/LC_MESSAGES/setup-tools-backends.mo
+share/locale/sv/LC_MESSAGES/setup-tools-backends.mo
+share/locale/ta/LC_MESSAGES/setup-tools-backends.mo
+share/locale/th/LC_MESSAGES/setup-tools-backends.mo
+share/locale/tr/LC_MESSAGES/setup-tools-backends.mo
+share/locale/uk/LC_MESSAGES/setup-tools-backends.mo
+share/locale/vi/LC_MESSAGES/setup-tools-backends.mo
+share/locale/zh_CN/LC_MESSAGES/setup-tools-backends.mo
+share/locale/zh_TW/LC_MESSAGES/setup-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
author	Joe Marcus Clarke <marcus@FreeBSD.org>	2005-03-12 10:39:38 +0000
committer	Joe Marcus Clarke <marcus@FreeBSD.org>	2005-03-12 10:39:38 +0000
commit	190418a078b1eb7ea3c5d38a08bdab3cbd422086 (patch)
tree	bb336ccecde7052d26d3d8d8c97238744a373aad /sysutils
parent	6b0c40606cac591d75b88d05c7276bd16c369035 (diff)
download	ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.tar.gz ports-190418a078b1eb7ea3c5d38a08bdab3cbd422086.zip