24 files changed, 28 insertions, 456 deletions

diff --git a/sysutils/gnome-system-tools/Makefile b/sysutils/gnome-system-tools/Makefile
index 2610cc45f270..3ab9af515080 100644
--- a/sysutils/gnome-system-tools/Makefile
+++ b/sysutils/gnome-system-tools/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	0.91.0
-PORTREVISION=	3
+PORTVERSION=	0.92.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.91
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.92
 DISTNAME=	gnome-system-tools-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
diff --git a/sysutils/gnome-system-tools/distinfo b/sysutils/gnome-system-tools/distinfo
index 78c8bd7796a2..3a6b3da6e230 100644
--- a/sysutils/gnome-system-tools/distinfo
+++ b/sysutils/gnome-system-tools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-system-tools-0.91.0.tar.bz2) = 51678f1b479a10a731deef7c27d82e35
-SIZE (gnome-system-tools-0.91.0.tar.bz2) = 2483587
+MD5 (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 1c2e3ae388e179b669ffa8d293bd17f1
+SIZE (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 2614845
diff --git a/sysutils/gnome-system-tools/files/patch-backends_network-conf.in b/sysutils/gnome-system-tools/files/patch-backends_network-conf.in
deleted file mode 100644
index b9b453c232c5..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_network-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- backends/network-conf.in.orig	Mon Aug 23 12:31:32 2004
-+++ backends/network-conf.in	Mon Aug 23 12:31:50 2004
-@@ -79,7 +79,7 @@
-               "conectiva-9", "conectiva-10",
-               "vine-3.0", "vine-3.1",
-               "slackware-9.1.0", "slackware-10.0.0",
--              "gentoo", "freebsd-5");
-+              "gentoo", "freebsd-5", "freebsd-6");
- 
- $description =<<"end_of_description;";
-        Configures all network parameters and interfaces.
diff --git a/sysutils/gnome-system-tools/files/patch-backends_network.pl.in b/sysutils/gnome-system-tools/files/patch-backends_network.pl.in
deleted file mode 100644
index ef2eaf191442..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_network.pl.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- backends/network.pl.in.orig	Fri Aug 20 05:25:46 2004
-+++ backends/network.pl.in	Mon Aug 23 12:50:25 2004
-@@ -285,7 +285,8 @@
-        "slackware-9.1.0" => "redhat-6.2",
-        "slackware-10.0.0" => "redhat-6.2",
-        "gentoo"       => "debian-2.2",
--       "freebsd-5"    => "debian-2.2"
-+       "freebsd-5"    => "debian-2.2",
-+       "freebsd-6"    => "debian-2.2"
-        );
- 
-   return $cmd_map{$dist_map{$gst_dist}};
-@@ -1450,6 +1451,7 @@
-     "slackware-10.0.0" => \&gst_network_deb22_get_file,
-     "gentoo"       => \&gst_network_deb22_get_file,
-     "freebsd-5"    => \&gst_network_deb22_get_file,
-+    "freebsd-6"    => \&gst_network_deb22_get_file,
- 	  );
- 
-   $proc = $dist_map{$gst_dist};
-@@ -3426,6 +3428,7 @@
-     "slackware-10.0.0" => "",
-     "gentoo"       => "",
-     "freebsd-5"    => "",
-+    "freebsd-6"    => "",
- 	  );
- 
-   $dev = $dist_map {$gst_dist};
-@@ -3548,7 +3551,8 @@
-     "slackware-9.1.0" => "slackware-9.1.0",
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
--    "freebsd-5"    => "freebsd-5"
-+    "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5"
- 	  );
- 
-   my %dist_tables =
-@@ -3960,6 +3964,7 @@
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
-     "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5",
- 	  );
-   
-   my %dist_tables =
-@@ -4691,6 +4696,7 @@
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
-     "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5",
- 	  );
- 
-   my %dist_tables =
-@@ -5088,7 +5094,8 @@
-     "slackware-9.1.0" => "slackware-9.1.0",
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
--    "freebsd-5"    => "freebsd-5"
-+    "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5"
- 	  );
- 
-   my %dist_tables =
diff --git a/sysutils/gnome-system-tools/files/patch-backends_platform.pl.in b/sysutils/gnome-system-tools/files/patch-backends_platform.pl.in
deleted file mode 100644
index d0c35e7a1ccf..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_platform.pl.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- backends/platform.pl.in.orig	Mon Aug 23 12:33:17 2004
-+++ backends/platform.pl.in	Mon Aug 23 12:33:28 2004
-@@ -72,6 +72,7 @@
-   "slackware-10.0.0" => "Slackware 10.0.0",
-   "freebsd-4"       => "FreeBSD 4",
-   "freebsd-5"       => "FreeBSD 5",
-+  "freebsd-6"       => "FreeBSD 6",
-   "gentoo"          => "Gentoo Linux",
-   "pld-1.0"         => "PLD 1.0 Ra",
-   "pld-1.1"         => "PLD 1.1 Ra",
diff --git a/sysutils/gnome-system-tools/files/patch-backends_service.pl.in b/sysutils/gnome-system-tools/files/patch-backends_service.pl.in
deleted file mode 100644
index fc9e5b1f5380..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_service.pl.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- backends/service.pl.in.orig	Fri Aug 20 05:31:12 2004
-+++ backends/service.pl.in	Mon Aug 23 12:51:28 2004
-@@ -215,7 +215,8 @@
- 
-      "gentoo"         => "gentoo",
- 
--     "freebsd-5"      => "freebsd-5"
-+     "freebsd-5"      => "freebsd-5",
-+     "freebsd-6"      => "freebsd-5"
-     );
- 
-   %runlevels=
-@@ -235,6 +236,7 @@
-                       "nonetwork" => _("Networkless runlevel")
-                      },
-      "freebsd-5"  => {"rc" => "dude, FreeBSD has no runlevels" },
-+     "freebsd-6"  => {"rc" => "dude, FreeBSD has no runlevels" },
-      "slackware-9.1.0" => {"4" => _("Graphical mode") }
-     );
- 
-@@ -1095,6 +1097,10 @@
-   {
-     return "rcng";
-   }
-+  elsif ($gst_dist =~ /freebsd-6/)
-+  {
-+    return "rcng";
-+  }
-   elsif ($gst_dist =~ /gentoo/)
-   {
-     return "gentoo";
-@@ -1591,7 +1597,8 @@
- 
-        "gentoo"       => \&gst_service_gentoo_get_status,
- 
--       "freebsd-5"    => \&gst_service_rcng_get_status
-+       "freebsd-5"    => \&gst_service_rcng_get_status,
-+       "freebsd-6"    => \&gst_service_rcng_get_status
-       );
-   my $proc;
- 
diff --git a/sysutils/gnome-system-tools/files/patch-backends_services-conf.in b/sysutils/gnome-system-tools/files/patch-backends_services-conf.in
deleted file mode 100644
index 052b39456c6a..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_services-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- backends/services-conf.in.orig	Tue Aug 24 14:06:32 2004
-+++ backends/services-conf.in	Tue Aug 24 14:06:53 2004
-@@ -55,7 +55,7 @@
-               "pld-1.0", "pld-1.1", "pld-1.99",
-               "slackware-9.1.0", "slackware-10.0.0",
-               "vine-3.0", "vine-3.1",
--              "gentoo", "freebsd-5", "suse-9.0");
-+              "gentoo", "freebsd-5", "freebsd-6", "suse-9.0");
- 
- $description =<<"end_of_description;";
-        Configures which services are to be started or stopped at which runlevels
diff --git a/sysutils/gnome-system-tools/files/patch-backends_shares-conf.in b/sysutils/gnome-system-tools/files/patch-backends_shares-conf.in
deleted file mode 100644
index e600de2e747d..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_shares-conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- backends/shares-conf.in.orig	Mon Aug 23 12:34:42 2004
-+++ backends/shares-conf.in	Mon Aug 23 12:34:54 2004
-@@ -92,6 +92,7 @@
-   "suse-7.0"     => "redhat-6.2",
-   "freebsd-4"    => "freebsd-4",
-   "freebsd-5"    => "freebsd-4",
-+  "freebsd-6"    => "freebsd-4",
-   "turbolinux-7.0"   => "redhat-7.0"
- };
- 
diff --git a/sysutils/gnome-system-tools/files/patch-backends_time-conf.in b/sysutils/gnome-system-tools/files/patch-backends_time-conf.in
deleted file mode 100644
index 4e483f9190aa..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_time-conf.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- backends/time-conf.in.orig	Fri Aug 20 05:32:03 2004
-+++ backends/time-conf.in	Mon Aug 23 12:53:52 2004
-@@ -71,7 +71,7 @@
-               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
-               "gentoo", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix",
-               "vine-3.0", "vine-3.1",
--              "freebsd-5" );
-+              "freebsd-5", "freebsd-6" );
- 
- $description =<<"end_of_description;";
-        Configures your system clock, timezone and time server list.
-@@ -478,7 +478,8 @@
-    "vine-3.0"        => "redhat-7.0",
-    "vine-3.1"        => "redhat-7.0",
- 
--   "freebsd-5"       => "freebsd-5"
-+   "freebsd-5"       => "freebsd-5",
-+   "freebsd-6"       => "freebsd-5"
-    );
- 
-   my %dist_tables =
-@@ -704,7 +705,8 @@
-    "vine-3.0"        => "redhat-7.0",
-    "vine-3.1"        => "redhat-7.0",
- 
--   "freebsd-5"       => "freebsd-5"
-+   "freebsd-5"       => "freebsd-5",
-+   "freebsd-6"       => "freebsd-5"
-    );
- 
-   my %dist_tables =
diff --git a/sysutils/gnome-system-tools/files/patch-backends_users-conf.in b/sysutils/gnome-system-tools/files/patch-backends_users-conf.in
deleted file mode 100644
index 41d524021e37..000000000000
--- a/sysutils/gnome-system-tools/files/patch-backends_users-conf.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- backends/users-conf.in.orig	Mon Aug 23 12:35:34 2004
-+++ backends/users-conf.in	Mon Aug 23 12:35:53 2004
-@@ -76,7 +76,7 @@
-               "debian-2.2", "debian-3.0", "debian-sarge",
-               "suse-7.0", "suse-9.0", "turbolinux-7.0",
-               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
--              "freebsd-4", "freebsd-5",
-+              "freebsd-4", "freebsd-5", "freebsd-6",
-               "gentoo",
-               "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix", "vine-3.0", "vine-3.1");
- 
-@@ -350,6 +350,7 @@
-   'slackware-10.0.0' => $gentoo_logindefs_defaults,
-   'freebsd-4'       => $freebsd_logindefs_defaults,
-   'freebsd-5'       => $freebsd_logindefs_defaults,
-+  'freebsd-6'       => $freebsd_logindefs_defaults,
-   'suse-7.0'        => $gentoo_logindefs_defaults,
-   'suse-9.0'        => $gentoo_logindefs_defaults,
- 
diff --git a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c b/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
deleted file mode 100644
index 5bb343172b5f..000000000000
--- a/sysutils/gnome-system-tools/files/patch-src_common_gst-auth.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/common/gst-auth.c.orig	Sun Aug  1 20:04:13 2004
-+++ src/common/gst-auth.c	Mon Aug 23 13:00:40 2004
-@@ -300,14 +300,16 @@
- 	lc_all      = getenv ("LC_ALL");
- 	lang        = getenv ("LANG");
- 
-+	g_string_append (command, "env ");
-+
- 	if (lc_all)
--		g_string_append_printf (command, "export LC_ALL=\"%s\" && ", lc_all);
--	else if (lc_messages)
--		g_string_append_printf (command, "export LC_MESSAGES=\"%s\" && ", lc_messages);
--	else if (lang)
--		g_string_append_printf (command, "export LANG=\"%s\" && ", lang);
--	else if (language)
--		g_string_append_printf (command, "export LANGUAGE=\"%s\" && ", language);
-+		g_string_append_printf (command, "LC_ALL=\"%s\" ", lc_all);
-+	if (lc_messages)
-+		g_string_append_printf (command, "LC_MESSAGES=\"%s\" ", lc_messages);
-+	if (lang)
-+		g_string_append_printf (command, "LANG=\"%s\" ", lang);
-+	if (language)
-+		g_string_append_printf (command, "LANGUAGE=\"%s\" ", language);
- }
- 
- void
diff --git a/sysutils/gnome-system-tools/pkg-plist b/sysutils/gnome-system-tools/pkg-plist
index 27ff45f90a50..fabe1da2680f 100644
--- a/sysutils/gnome-system-tools/pkg-plist
+++ b/sysutils/gnome-system-tools/pkg-plist
@@ -102,6 +102,7 @@ share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.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/cs/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/setup-tools-backends.mo
@@ -110,6 +111,7 @@ 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
@@ -118,6 +120,8 @@ 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/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
@@ -138,6 +142,8 @@ 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/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
@@ -154,14 +160,17 @@ share/locale/pt_BR/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/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
diff --git a/sysutils/gnomesystemtools/Makefile b/sysutils/gnomesystemtools/Makefile
index 2610cc45f270..3ab9af515080 100644
--- a/sysutils/gnomesystemtools/Makefile
+++ b/sysutils/gnomesystemtools/Makefile
@@ -6,12 +6,12 @@
 #
 
 PORTNAME=	gnomesystemtools
-PORTVERSION=	0.91.0
-PORTREVISION=	3
+PORTVERSION=	0.92.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.91
+MASTER_SITE_SUBDIR=	sources/gnome-system-tools/0.92
 DISTNAME=	gnome-system-tools-${PORTVERSION}
+DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Tools to configure workstations
diff --git a/sysutils/gnomesystemtools/distinfo b/sysutils/gnomesystemtools/distinfo
index 78c8bd7796a2..3a6b3da6e230 100644
--- a/sysutils/gnomesystemtools/distinfo
+++ b/sysutils/gnomesystemtools/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome-system-tools-0.91.0.tar.bz2) = 51678f1b479a10a731deef7c27d82e35
-SIZE (gnome-system-tools-0.91.0.tar.bz2) = 2483587
+MD5 (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 1c2e3ae388e179b669ffa8d293bd17f1
+SIZE (gnome2/gnome-system-tools-0.92.0.tar.bz2) = 2614845
diff --git a/sysutils/gnomesystemtools/files/patch-backends_network-conf.in b/sysutils/gnomesystemtools/files/patch-backends_network-conf.in
deleted file mode 100644
index b9b453c232c5..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_network-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- backends/network-conf.in.orig	Mon Aug 23 12:31:32 2004
-+++ backends/network-conf.in	Mon Aug 23 12:31:50 2004
-@@ -79,7 +79,7 @@
-               "conectiva-9", "conectiva-10",
-               "vine-3.0", "vine-3.1",
-               "slackware-9.1.0", "slackware-10.0.0",
--              "gentoo", "freebsd-5");
-+              "gentoo", "freebsd-5", "freebsd-6");
- 
- $description =<<"end_of_description;";
-        Configures all network parameters and interfaces.
diff --git a/sysutils/gnomesystemtools/files/patch-backends_network.pl.in b/sysutils/gnomesystemtools/files/patch-backends_network.pl.in
deleted file mode 100644
index ef2eaf191442..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_network.pl.in
+++ /dev/null
@@ -1,64 +0,0 @@
---- backends/network.pl.in.orig	Fri Aug 20 05:25:46 2004
-+++ backends/network.pl.in	Mon Aug 23 12:50:25 2004
-@@ -285,7 +285,8 @@
-        "slackware-9.1.0" => "redhat-6.2",
-        "slackware-10.0.0" => "redhat-6.2",
-        "gentoo"       => "debian-2.2",
--       "freebsd-5"    => "debian-2.2"
-+       "freebsd-5"    => "debian-2.2",
-+       "freebsd-6"    => "debian-2.2"
-        );
- 
-   return $cmd_map{$dist_map{$gst_dist}};
-@@ -1450,6 +1451,7 @@
-     "slackware-10.0.0" => \&gst_network_deb22_get_file,
-     "gentoo"       => \&gst_network_deb22_get_file,
-     "freebsd-5"    => \&gst_network_deb22_get_file,
-+    "freebsd-6"    => \&gst_network_deb22_get_file,
- 	  );
- 
-   $proc = $dist_map{$gst_dist};
-@@ -3426,6 +3428,7 @@
-     "slackware-10.0.0" => "",
-     "gentoo"       => "",
-     "freebsd-5"    => "",
-+    "freebsd-6"    => "",
- 	  );
- 
-   $dev = $dist_map {$gst_dist};
-@@ -3548,7 +3551,8 @@
-     "slackware-9.1.0" => "slackware-9.1.0",
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
--    "freebsd-5"    => "freebsd-5"
-+    "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5"
- 	  );
- 
-   my %dist_tables =
-@@ -3960,6 +3964,7 @@
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
-     "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5",
- 	  );
-   
-   my %dist_tables =
-@@ -4691,6 +4696,7 @@
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
-     "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5",
- 	  );
- 
-   my %dist_tables =
-@@ -5088,7 +5094,8 @@
-     "slackware-9.1.0" => "slackware-9.1.0",
-     "slackware-10.0.0" => "slackware-9.1.0",
-     "gentoo"       => "gentoo",
--    "freebsd-5"    => "freebsd-5"
-+    "freebsd-5"    => "freebsd-5",
-+    "freebsd-6"    => "freebsd-5"
- 	  );
- 
-   my %dist_tables =
diff --git a/sysutils/gnomesystemtools/files/patch-backends_platform.pl.in b/sysutils/gnomesystemtools/files/patch-backends_platform.pl.in
deleted file mode 100644
index d0c35e7a1ccf..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_platform.pl.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- backends/platform.pl.in.orig	Mon Aug 23 12:33:17 2004
-+++ backends/platform.pl.in	Mon Aug 23 12:33:28 2004
-@@ -72,6 +72,7 @@
-   "slackware-10.0.0" => "Slackware 10.0.0",
-   "freebsd-4"       => "FreeBSD 4",
-   "freebsd-5"       => "FreeBSD 5",
-+  "freebsd-6"       => "FreeBSD 6",
-   "gentoo"          => "Gentoo Linux",
-   "pld-1.0"         => "PLD 1.0 Ra",
-   "pld-1.1"         => "PLD 1.1 Ra",
diff --git a/sysutils/gnomesystemtools/files/patch-backends_service.pl.in b/sysutils/gnomesystemtools/files/patch-backends_service.pl.in
deleted file mode 100644
index fc9e5b1f5380..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_service.pl.in
+++ /dev/null
@@ -1,41 +0,0 @@
---- backends/service.pl.in.orig	Fri Aug 20 05:31:12 2004
-+++ backends/service.pl.in	Mon Aug 23 12:51:28 2004
-@@ -215,7 +215,8 @@
- 
-      "gentoo"         => "gentoo",
- 
--     "freebsd-5"      => "freebsd-5"
-+     "freebsd-5"      => "freebsd-5",
-+     "freebsd-6"      => "freebsd-5"
-     );
- 
-   %runlevels=
-@@ -235,6 +236,7 @@
-                       "nonetwork" => _("Networkless runlevel")
-                      },
-      "freebsd-5"  => {"rc" => "dude, FreeBSD has no runlevels" },
-+     "freebsd-6"  => {"rc" => "dude, FreeBSD has no runlevels" },
-      "slackware-9.1.0" => {"4" => _("Graphical mode") }
-     );
- 
-@@ -1095,6 +1097,10 @@
-   {
-     return "rcng";
-   }
-+  elsif ($gst_dist =~ /freebsd-6/)
-+  {
-+    return "rcng";
-+  }
-   elsif ($gst_dist =~ /gentoo/)
-   {
-     return "gentoo";
-@@ -1591,7 +1597,8 @@
- 
-        "gentoo"       => \&gst_service_gentoo_get_status,
- 
--       "freebsd-5"    => \&gst_service_rcng_get_status
-+       "freebsd-5"    => \&gst_service_rcng_get_status,
-+       "freebsd-6"    => \&gst_service_rcng_get_status
-       );
-   my $proc;
- 
diff --git a/sysutils/gnomesystemtools/files/patch-backends_services-conf.in b/sysutils/gnomesystemtools/files/patch-backends_services-conf.in
deleted file mode 100644
index 052b39456c6a..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_services-conf.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- backends/services-conf.in.orig	Tue Aug 24 14:06:32 2004
-+++ backends/services-conf.in	Tue Aug 24 14:06:53 2004
-@@ -55,7 +55,7 @@
-               "pld-1.0", "pld-1.1", "pld-1.99",
-               "slackware-9.1.0", "slackware-10.0.0",
-               "vine-3.0", "vine-3.1",
--              "gentoo", "freebsd-5", "suse-9.0");
-+              "gentoo", "freebsd-5", "freebsd-6", "suse-9.0");
- 
- $description =<<"end_of_description;";
-        Configures which services are to be started or stopped at which runlevels
diff --git a/sysutils/gnomesystemtools/files/patch-backends_shares-conf.in b/sysutils/gnomesystemtools/files/patch-backends_shares-conf.in
deleted file mode 100644
index e600de2e747d..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_shares-conf.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- backends/shares-conf.in.orig	Mon Aug 23 12:34:42 2004
-+++ backends/shares-conf.in	Mon Aug 23 12:34:54 2004
-@@ -92,6 +92,7 @@
-   "suse-7.0"     => "redhat-6.2",
-   "freebsd-4"    => "freebsd-4",
-   "freebsd-5"    => "freebsd-4",
-+  "freebsd-6"    => "freebsd-4",
-   "turbolinux-7.0"   => "redhat-7.0"
- };
- 
diff --git a/sysutils/gnomesystemtools/files/patch-backends_time-conf.in b/sysutils/gnomesystemtools/files/patch-backends_time-conf.in
deleted file mode 100644
index 4e483f9190aa..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_time-conf.in
+++ /dev/null
@@ -1,31 +0,0 @@
---- backends/time-conf.in.orig	Fri Aug 20 05:32:03 2004
-+++ backends/time-conf.in	Mon Aug 23 12:53:52 2004
-@@ -71,7 +71,7 @@
-               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
-               "gentoo", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix",
-               "vine-3.0", "vine-3.1",
--              "freebsd-5" );
-+              "freebsd-5", "freebsd-6" );
- 
- $description =<<"end_of_description;";
-        Configures your system clock, timezone and time server list.
-@@ -478,7 +478,8 @@
-    "vine-3.0"        => "redhat-7.0",
-    "vine-3.1"        => "redhat-7.0",
- 
--   "freebsd-5"       => "freebsd-5"
-+   "freebsd-5"       => "freebsd-5",
-+   "freebsd-6"       => "freebsd-5"
-    );
- 
-   my %dist_tables =
-@@ -704,7 +705,8 @@
-    "vine-3.0"        => "redhat-7.0",
-    "vine-3.1"        => "redhat-7.0",
- 
--   "freebsd-5"       => "freebsd-5"
-+   "freebsd-5"       => "freebsd-5",
-+   "freebsd-6"       => "freebsd-5"
-    );
- 
-   my %dist_tables =
diff --git a/sysutils/gnomesystemtools/files/patch-backends_users-conf.in b/sysutils/gnomesystemtools/files/patch-backends_users-conf.in
deleted file mode 100644
index 41d524021e37..000000000000
--- a/sysutils/gnomesystemtools/files/patch-backends_users-conf.in
+++ /dev/null
@@ -1,19 +0,0 @@
---- backends/users-conf.in.orig	Mon Aug 23 12:35:34 2004
-+++ backends/users-conf.in	Mon Aug 23 12:35:53 2004
-@@ -76,7 +76,7 @@
-               "debian-2.2", "debian-3.0", "debian-sarge",
-               "suse-7.0", "suse-9.0", "turbolinux-7.0",
-               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0",
--              "freebsd-4", "freebsd-5",
-+              "freebsd-4", "freebsd-5", "freebsd-6",
-               "gentoo",
-               "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "specifix", "vine-3.0", "vine-3.1");
- 
-@@ -350,6 +350,7 @@
-   'slackware-10.0.0' => $gentoo_logindefs_defaults,
-   'freebsd-4'       => $freebsd_logindefs_defaults,
-   'freebsd-5'       => $freebsd_logindefs_defaults,
-+  'freebsd-6'       => $freebsd_logindefs_defaults,
-   'suse-7.0'        => $gentoo_logindefs_defaults,
-   'suse-9.0'        => $gentoo_logindefs_defaults,
- 
diff --git a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c b/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c
deleted file mode 100644
index 5bb343172b5f..000000000000
--- a/sysutils/gnomesystemtools/files/patch-src_common_gst-auth.c
+++ /dev/null
@@ -1,26 +0,0 @@
---- src/common/gst-auth.c.orig	Sun Aug  1 20:04:13 2004
-+++ src/common/gst-auth.c	Mon Aug 23 13:00:40 2004
-@@ -300,14 +300,16 @@
- 	lc_all      = getenv ("LC_ALL");
- 	lang        = getenv ("LANG");
- 
-+	g_string_append (command, "env ");
-+
- 	if (lc_all)
--		g_string_append_printf (command, "export LC_ALL=\"%s\" && ", lc_all);
--	else if (lc_messages)
--		g_string_append_printf (command, "export LC_MESSAGES=\"%s\" && ", lc_messages);
--	else if (lang)
--		g_string_append_printf (command, "export LANG=\"%s\" && ", lang);
--	else if (language)
--		g_string_append_printf (command, "export LANGUAGE=\"%s\" && ", language);
-+		g_string_append_printf (command, "LC_ALL=\"%s\" ", lc_all);
-+	if (lc_messages)
-+		g_string_append_printf (command, "LC_MESSAGES=\"%s\" ", lc_messages);
-+	if (lang)
-+		g_string_append_printf (command, "LANG=\"%s\" ", lang);
-+	if (language)
-+		g_string_append_printf (command, "LANGUAGE=\"%s\" ", language);
- }
- 
- void
diff --git a/sysutils/gnomesystemtools/pkg-plist b/sysutils/gnomesystemtools/pkg-plist
index 27ff45f90a50..fabe1da2680f 100644
--- a/sysutils/gnomesystemtools/pkg-plist
+++ b/sysutils/gnomesystemtools/pkg-plist
@@ -102,6 +102,7 @@ share/locale/az/LC_MESSAGES/setup-tools-backends.mo
 share/locale/bg/LC_MESSAGES/gnome-system-tools.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/cs/LC_MESSAGES/gnome-system-tools.mo
 share/locale/cs/LC_MESSAGES/setup-tools-backends.mo
@@ -110,6 +111,7 @@ 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
@@ -118,6 +120,8 @@ 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/fr/LC_MESSAGES/gnome-system-tools.mo
 share/locale/ga/LC_MESSAGES/gnome-system-tools.mo
 share/locale/gl/LC_MESSAGES/gnome-system-tools.mo
@@ -138,6 +142,8 @@ 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/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
@@ -154,14 +160,17 @@ share/locale/pt_BR/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/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