Presenting GNOME 2.12 for FreeBSD. The release is chock full of bug fixes

and new features.  Don't believe me?  Then see for yourself at
http://www.gnome.org/start/2.12/notes/en/.

DO NOT USE portupgrade by itself to upgrade to GNOME 2.12.  Instead, use
the gnome_upgrade.sh script from
http://www.marcuscom.com/downloads/gnome_upgrade212.sh.  This script will
circumvent some potential pitfalls users can see if they use portupgrade
by itself.

In keeping with tradition, GNOME 2.12 for FreeBSD comes with a special
splash screen.  The winner of this release's contest is
Dominique Goncalves <dominique.goncalves@gmail.com>.  His splash screen
was inspired by http://art.gnome.org/contests/2.12-splash/83.

The FreeBSD GNOME Team would lank to thank the following users for
their contributions to this release:

Matthew Luckie <mjl@luckie.org.nz>
ade
sajd on #freebsd-gnome
Caelian on #freebsd-gnome
mnag
Yasuda Keisuke <kysd@po.harenet.ne.jp>
Mark Hobden <markhobden@gmail.com>
Sergey Akifyev <asa@agava.com>
Andreas Kohn

For more information on GNOME on FreeBSD, checkout
http://www.FreeBSD.org/gnome/.  The 2.12 documentation will be
posted shortly.

11 files changed, 224 insertions, 64 deletions

diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 1e2e4537cd61..54bde9d493db 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,14 +3,14 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.12 2005/09/04 18:51:49 marcus Exp $
 #
 
 PORTNAME=	system-tools-backends
-PORTVERSION=	1.2.0
-PORTREVISION=	2
+PORTVERSION=	1.4.0
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.2
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/1.4
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
index 1fd288819b40..da6f030f7bf0 100644
--- a/sysutils/system-tools-backends/distinfo
+++ b/sysutils/system-tools-backends/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/system-tools-backends-1.2.0.tar.bz2) = 96b00eb0f800c1b5346be2f71d4dc3b2
-SIZE (gnome2/system-tools-backends-1.2.0.tar.bz2) = 532611
+MD5 (gnome2/system-tools-backends-1.4.0.tar.bz2) = 71c9f6fc393ff05d29c7e6883e83c1b4
+SIZE (gnome2/system-tools-backends-1.4.0.tar.bz2) = 706880
diff --git a/sysutils/system-tools-backends/files/patch-network-conf.in b/sysutils/system-tools-backends/files/patch-network-conf.in
new file mode 100644
index 000000000000..e23863c28b89
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-network-conf.in
@@ -0,0 +1,11 @@
+--- network-conf.in.orig	Fri Aug 26 00:54:38 2005
++++ network-conf.in	Fri Aug 26 00:55:10 2005
+@@ -75,7 +75,7 @@
+               "conectiva-9", "conectiva-10",
+               "vine-3.0", "vine-3.1",
+               "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0",
+-              "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6");
++              "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7");
+ 
+ $description =<<"end_of_description;";
+        Configures all network parameters and interfaces.
diff --git a/sysutils/system-tools-backends/files/patch-network.pl.in b/sysutils/system-tools-backends/files/patch-network.pl.in
index 29bde7d15901..22a06fbb3c73 100644
--- a/sysutils/system-tools-backends/files/patch-network.pl.in
+++ b/sysutils/system-tools-backends/files/patch-network.pl.in
@@ -1,20 +1,67 @@
---- network.pl.in.orig	Mon Mar  7 17:33:59 2005
-+++ network.pl.in	Sun Apr 24 02:36:51 2005
-@@ -777,7 +777,7 @@
+--- network.pl.in.orig	Tue Aug 23 05:58:01 2005
++++ network.pl.in	Fri Aug 26 00:56:03 2005
+@@ -522,6 +522,7 @@
+        "vlos-1.2"     => "debian-2.2",
+        "freebsd-5"    => "debian-2.2",
+        "freebsd-6"    => "debian-2.2",
++       "freebsd-7"    => "debian-2.2",
+        );
+ 
+   return $cmd_map{$dist_map{$gst_dist}};
+@@ -791,7 +792,7 @@
        $types_cache{$dev} = "modem";
      }
    }
--  elsif ($dev =~ /(eth|dc|ed|bfe)[0-9]/)
+-  elsif ($dev =~ /^(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wlaue|axe|cue|kue|rue|fwe|nve)[0-9]/)
 +  elsif ($dev =~ /(eth|dc|ed|bfe|em|fxp|bge|de|xl|ixgb|txp|vx|lge|nge|pcn|re|rl|sf|sis|sk|ste|ti|tl|tx|vge|vr|wb|cs|ex|ep|fe|ie|lnc|sn|xe|le|an|awi|wi|ndis|wl|aue|axe|cue|kue|rue|fwe|nve|hme|ath|iwi|ipw|ral|ural|my)[0-9]/)
    {
      $types_cache{$dev} = "ethernet";
    }
-@@ -4285,7 +4285,7 @@
-       table =>
-       [
-        [ "hostname",      \&gst_parse_sh_re,                          RC_CONF, hostname, "^([^\.]*)\." ],
--       [ "domain",        \&gst_parse_sh_re,                          RC_CONF, hostname, "\.([^\.]*)\$" ],
-+       [ "domain",        \&gst_parse_split_first_str,                RESOLV_CONF, "domain", "[ \t]+" ],
-        [ "nameserver",    \&gst_parse_split_all_unique_hash_comment,  RESOLV_CONF,  "nameserver", "[ \t]+" ],
-        [ "searchdomain",  \&gst_parse_split_first_array_unique,       RESOLV_CONF,  "search", "[ \t]+", "[ \t]+" ],
-        [ "statichost",    \&gst_parse_split_hash,                     HOSTS,        "[ \t]+", "[ \t]+" ],
+@@ -1803,6 +1804,7 @@
+     "gentoo"       => \&gst_network_deb22_get_file,
+     "freebsd-5"    => \&gst_network_deb22_get_file,
+     "freebsd-6"    => \&gst_network_deb22_get_file,
++    "freebsd-7"    => \&gst_network_deb22_get_file,
+ 	  );
+ 
+   $proc = $dist_map{$gst_dist};
+@@ -3906,6 +3908,7 @@
+     "vlos-1.2"     => "",
+     "freebsd-5"    => "",
+     "freebsd-6"    => "",
++    "freebsd-7"    => "",
+ 	  );
+ 
+   $dev = $dist_map {$gst_dist};
+@@ -4034,6 +4037,7 @@
+     "vlos-1.2"     => "vlos-1.2",
+     "freebsd-5"    => "freebsd-5",
+     "freebsd-6"    => "freebsd-5",
++    "freebsd-7"    => "freebsd-5",
+ 	  );
+ 
+   my %dist_tables =
+@@ -4478,6 +4482,7 @@
+     "vlos-1.2"     => "vlos-1.2",
+     "freebsd-5"    => "freebsd-5",
+     "freebsd-6"    => "freebsd-5",
++    "freebsd-7"    => "freebsd-5",
+ 	  );
+   
+   my %dist_tables =
+@@ -5352,6 +5357,7 @@
+     "vlos-1.2"     => "vlos-1.2",
+     "freebsd-5"    => "freebsd-5",
+     "freebsd-6"    => "freebsd-5",
++    "freebsd-7"    => "freebsd-5",
+ 	  );
+ 
+   my %dist_tables =
+@@ -5782,6 +5788,7 @@
+     "vlos-1.2"     => "vlos-1.2",
+     "freebsd-5"    => "freebsd-5",
+     "freebsd-6"    => "freebsd-5",
++    "freebsd-7"    => "freebsd-5",
+ 	  );
+ 
+   my %dist_tables =
diff --git a/sysutils/system-tools-backends/files/patch-platform.pl.in b/sysutils/system-tools-backends/files/patch-platform.pl.in
new file mode 100644
index 000000000000..81ad3b2e927c
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-platform.pl.in
@@ -0,0 +1,10 @@
+--- platform.pl.in.orig	Fri Aug 26 00:56:21 2005
++++ platform.pl.in	Fri Aug 26 00:56:36 2005
+@@ -77,6 +77,7 @@
+   "freebsd-4"       => "FreeBSD 4",
+   "freebsd-5"       => "FreeBSD 5",
+   "freebsd-6"       => "FreeBSD 6",
++  "freebsd-7"       => "FreeBSD 7",
+   "gentoo"          => "Gentoo Linux",
+   "vlos-1.2"        => "Vida Linux OS 1.2",
+   "archlinux-0.7"   => "Arch Linux 0.7",
diff --git a/sysutils/system-tools-backends/files/patch-service.pl.in b/sysutils/system-tools-backends/files/patch-service.pl.in
new file mode 100644
index 000000000000..1162f2730695
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-service.pl.in
@@ -0,0 +1,18 @@
+--- service.pl.in.orig	Fri Aug 26 00:57:01 2005
++++ service.pl.in	Fri Aug 26 00:57:13 2005
+@@ -227,6 +227,7 @@
+ 
+      "freebsd-5"      => "freebsd-5",
+      "freebsd-6"      => "freebsd-5",
++     "freebsd-7"      => "freebsd-5",
+     );
+ 
+   %runlevels=
+@@ -1571,6 +1572,7 @@
+ 
+        "freebsd-5"    => \&gst_service_rcng_get_status,
+        "freebsd-6"    => \&gst_service_rcng_get_status,
++       "freebsd-7"    => \&gst_service_rcng_get_status,
+       );
+   my $proc;
+ 
diff --git a/sysutils/system-tools-backends/files/patch-services-conf.in b/sysutils/system-tools-backends/files/patch-services-conf.in
new file mode 100644
index 000000000000..5a05ce27136e
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-services-conf.in
@@ -0,0 +1,11 @@
+--- services-conf.in.orig	Fri Aug 26 00:57:28 2005
++++ services-conf.in	Fri Aug 26 00:57:37 2005
+@@ -55,7 +55,7 @@
+               "pld-1.0", "pld-1.1", "pld-1.99",
+               "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0",
+               "vine-3.0", "vine-3.1",
+-              "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "suse-9.0", "suse-9.1");
++              "gentoo", "vlos-1.2", "freebsd-5", "freebsd-6", "freebsd-7", "suse-9.0", "suse-9.1");
+ 
+ $description =<<"end_of_description;";
+        Configures which services are to be started or stopped at which runlevels
diff --git a/sysutils/system-tools-backends/files/patch-shares-conf.in b/sysutils/system-tools-backends/files/patch-shares-conf.in
new file mode 100644
index 000000000000..5fa1e78a5911
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-shares-conf.in
@@ -0,0 +1,10 @@
+--- shares-conf.in.orig	Fri Aug 26 00:57:50 2005
++++ shares-conf.in	Fri Aug 26 00:57:57 2005
+@@ -557,6 +557,7 @@
+      "vlos-1.2"     => "gentoo",
+      "freebsd-5"    => "freebsd-5",
+      "freebsd-6"    => "freebsd-5",
++     "freebsd-7"    => "freebsd-5",
+     );
+ 
+   my %dist_table =
diff --git a/sysutils/system-tools-backends/files/patch-time-conf.in b/sysutils/system-tools-backends/files/patch-time-conf.in
new file mode 100644
index 000000000000..1fe69aaf8fb2
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-time-conf.in
@@ -0,0 +1,27 @@
+--- time-conf.in.orig	Fri Aug 26 00:58:10 2005
++++ time-conf.in	Fri Aug 26 00:58:28 2005
+@@ -71,7 +71,7 @@
+               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0",
+               "gentoo", "vlos-1.2", "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "specifix",
+               "vine-3.0", "vine-3.1",
+-              "freebsd-5", "freebsd-6");
++              "freebsd-5", "freebsd-6", "freebsd-7");
+ 
+ $description =<<"end_of_description;";
+        Configures your system clock, timezone and time server list.
+@@ -551,6 +551,7 @@
+ 
+    "freebsd-5"       => "freebsd-5",
+    "freebsd-6"       => "freebsd-5",
++   "freebsd-7"       => "freebsd-5",
+    );
+ 
+   my %dist_tables =
+@@ -782,6 +783,7 @@
+ 
+    "freebsd-5"       => "freebsd-5",
+    "freebsd-6"       => "freebsd-5",
++   "freebsd-7"       => "freebsd-5",
+    );
+ 
+   my %dist_tables =
diff --git a/sysutils/system-tools-backends/files/patch-users-conf.in b/sysutils/system-tools-backends/files/patch-users-conf.in
new file mode 100644
index 000000000000..11f70159358f
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-users-conf.in
@@ -0,0 +1,19 @@
+--- users-conf.in.orig	Fri Aug 26 00:58:40 2005
++++ users-conf.in	Fri Aug 26 00:58:54 2005
+@@ -76,7 +76,7 @@
+               "debian-2.2", "debian-3.0", "debian-sarge",
+               "suse-7.0", "suse-9.0", "suse-9.1", "turbolinux-7.0",
+               "slackware-8.0.0", "slackware-8.1", "slackware-9.0.0", "slackware-9.1.0", "slackware-10.0.0", "slackware-10.1.0",
+-              "freebsd-4", "freebsd-5", "freebsd-6",
++              "freebsd-4", "freebsd-5", "freebsd-6", "freebsd-7",
+               "gentoo", "vlos-1.2",
+               "archlinux-0.7",
+               "pld-1.0", "pld-1.1", "pld-1.99", "fedora-1", "fedora-2", "fedora-3", "specifix", "vine-3.0", "vine-3.1");
+@@ -373,6 +373,7 @@
+   'freebsd-4'       => $freebsd_logindefs_defaults,
+   'freebsd-5'       => $freebsd_logindefs_defaults,
+   'freebsd-6'       => $freebsd_logindefs_defaults,
++  'freebsd-7'       => $freebsd_logindefs_defaults,
+   'suse-7.0'        => $gentoo_logindefs_defaults,
+   'suse-9.0'        => $gentoo_logindefs_defaults,
+   'suse-9.1'        => $gentoo_logindefs_defaults,
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index da943e8f93fd..02ed2d8a7879 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -1,51 +1,54 @@
 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/locale/ar/LC_MESSAGES/system-tools-backends.mo
+share/locale/az/LC_MESSAGES/system-tools-backends.mo
+share/locale/bg/LC_MESSAGES/system-tools-backends.mo
+share/locale/bn/LC_MESSAGES/system-tools-backends.mo
+share/locale/bs/LC_MESSAGES/system-tools-backends.mo
+share/locale/ca/LC_MESSAGES/system-tools-backends.mo
+share/locale/cs/LC_MESSAGES/system-tools-backends.mo
+share/locale/da/LC_MESSAGES/system-tools-backends.mo
+share/locale/de/LC_MESSAGES/system-tools-backends.mo
+share/locale/el/LC_MESSAGES/system-tools-backends.mo
+share/locale/en_CA/LC_MESSAGES/system-tools-backends.mo
+share/locale/en_GB/LC_MESSAGES/system-tools-backends.mo
+share/locale/es/LC_MESSAGES/system-tools-backends.mo
+share/locale/eu/LC_MESSAGES/system-tools-backends.mo
+share/locale/fi/LC_MESSAGES/system-tools-backends.mo
+share/locale/fr/LC_MESSAGES/system-tools-backends.mo
+share/locale/gu/LC_MESSAGES/system-tools-backends.mo
+share/locale/hi/LC_MESSAGES/system-tools-backends.mo
+share/locale/hr/LC_MESSAGES/system-tools-backends.mo
+share/locale/hu/LC_MESSAGES/system-tools-backends.mo
+share/locale/id/LC_MESSAGES/system-tools-backends.mo
+share/locale/it/LC_MESSAGES/system-tools-backends.mo
+share/locale/ja/LC_MESSAGES/system-tools-backends.mo
+share/locale/ko/LC_MESSAGES/system-tools-backends.mo
+share/locale/lt/LC_MESSAGES/system-tools-backends.mo
+share/locale/ms/LC_MESSAGES/system-tools-backends.mo
+share/locale/nb/LC_MESSAGES/system-tools-backends.mo
+share/locale/ne/LC_MESSAGES/system-tools-backends.mo
+share/locale/nl/LC_MESSAGES/system-tools-backends.mo
+share/locale/no/LC_MESSAGES/system-tools-backends.mo
+share/locale/pa/LC_MESSAGES/system-tools-backends.mo
+share/locale/pl/LC_MESSAGES/system-tools-backends.mo
+share/locale/pt/LC_MESSAGES/system-tools-backends.mo
+share/locale/pt_BR/LC_MESSAGES/system-tools-backends.mo
+share/locale/ro/LC_MESSAGES/system-tools-backends.mo
+share/locale/rw/LC_MESSAGES/system-tools-backends.mo
+share/locale/sk/LC_MESSAGES/system-tools-backends.mo
+share/locale/sq/LC_MESSAGES/system-tools-backends.mo
+share/locale/sr/LC_MESSAGES/system-tools-backends.mo
+share/locale/sr@Latn/LC_MESSAGES/system-tools-backends.mo
+share/locale/sv/LC_MESSAGES/system-tools-backends.mo
+share/locale/ta/LC_MESSAGES/system-tools-backends.mo
+share/locale/th/LC_MESSAGES/system-tools-backends.mo
+share/locale/tr/LC_MESSAGES/system-tools-backends.mo
+share/locale/uk/LC_MESSAGES/system-tools-backends.mo
+share/locale/vi/LC_MESSAGES/system-tools-backends.mo
+share/locale/xh/LC_MESSAGES/system-tools-backends.mo
+share/locale/zh_CN/LC_MESSAGES/system-tools-backends.mo
+share/locale/zh_TW/LC_MESSAGES/system-tools-backends.mo
 share/setup-tool-backends/files/general_isdn_ppp_options
 share/setup-tool-backends/scripts/boot-conf
 share/setup-tool-backends/scripts/boot-grub.pl
@@ -94,3 +97,7 @@ share/setup-tool-backends/scripts/xml.pl
 @dirrm share/setup-tool-backends/scripts
 @dirrm share/setup-tool-backends/files
 @dirrm share/setup-tool-backends
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true