The FreeBSD GNOME team is proud to annunce the release of GNOME 2.22.0 for

FreeBSD.  The official GNOME 2.22 release notes can be found at
http://library.gnome.org/misc/release-notes/2.22/ .  On the FreeBSD front,
this release features an updated hal port with support for video4linux
devices, DRM (Direct Rendering), and better support of removable media.  Work
is also underway to tie webkit more closely into GNOME.  As part of the
GNOME 2.22 upgrade, GStreamer received a rather large upgrade as well.
Be sure to consult UPDATING on the proper steps to upgrade all of your
GNOME ports.

This release would not have been possible without the contributions and
testing efforts of the following people:

Pawel Worach
kan
edwin
Peter Ulrich Kruppa
J. W. Ballantine
Yasuda Keisuke
Andriy Gapon

6 files changed, 35 insertions, 57 deletions

diff --git a/sysutils/system-tools-backends/Makefile b/sysutils/system-tools-backends/Makefile
index 008b7aee13b7..d9d941992d35 100644
--- a/sysutils/system-tools-backends/Makefile
+++ b/sysutils/system-tools-backends/Makefile
@@ -3,21 +3,21 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.40 2007/10/04 11:32:48 ahze Exp $
+#   $MCom: ports/sysutils/system-tools-backends/Makefile,v 1.51 2008/03/09 18:48:33 mezz Exp $
 #
 
 PORTNAME=	system-tools-backends
-PORTVERSION=	2.4.1
+PORTVERSION=	2.6.0
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
+MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Backend system admin scripts for gnome-system-tools
 
 BUILD_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
-LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib
+LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
+		polkit-dbus.2:${PORTSDIR}/sysutils/policykit
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Net/DBus.pm:${PORTSDIR}/devel/p5-Net-DBus
 
 USE_BZIP2=	yes
@@ -25,7 +25,6 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 USE_GNOME=	gnomehack intlhack glib20
 GNU_CONFIGURE=	yes
-USE_RC_SUBR=	system-tools-backends
 USE_GNOME_SUBR=	yes
 CONFIGURE_ARGS=	--with-stb-group=wheel \
 		--localstatedir=/var
diff --git a/sysutils/system-tools-backends/distinfo b/sysutils/system-tools-backends/distinfo
index ccad604a0755..3e804006bda3 100644
--- a/sysutils/system-tools-backends/distinfo
+++ b/sysutils/system-tools-backends/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/system-tools-backends-2.4.1.tar.bz2) = 063f38e6014c8f7ba9b92b0f94255652
-SHA256 (gnome2/system-tools-backends-2.4.1.tar.bz2) = c0aea44c58d32870b429337751bf3f41cd471b8c8849a373c46999fd63d583e8
-SIZE (gnome2/system-tools-backends-2.4.1.tar.bz2) = 411012
+MD5 (gnome2/system-tools-backends-2.6.0.tar.bz2) = faf321012e92b72305878cd684547c54
+SHA256 (gnome2/system-tools-backends-2.6.0.tar.bz2) = 5c35820a7a3d7fc3af5c6e3ce7c7529359809e486fdafecb68601ac4d2bfa6f0
+SIZE (gnome2/system-tools-backends-2.6.0.tar.bz2) = 421806
diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c b/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c
deleted file mode 100644
index f1f49929e772..000000000000
--- a/sysutils/system-tools-backends/files/patch-dispatcher_dispatcher.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- dispatcher/dispatcher.c.orig	Thu Apr 12 23:55:38 2007
-+++ dispatcher/dispatcher.c	Thu Apr 12 23:57:40 2007
-@@ -203,7 +203,7 @@ daemonize (void)
- 
-       setsid ();
- 
--      if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1)
-+      if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1)
- 	{
- 	  str = g_strdup_printf ("%d", getpid ());
- 	  write (pidfile_fd, str, strlen (str));
diff --git a/sysutils/system-tools-backends/files/patch-dispatcher_main.c b/sysutils/system-tools-backends/files/patch-dispatcher_main.c
new file mode 100644
index 000000000000..b575cbfd46fa
--- /dev/null
+++ b/sysutils/system-tools-backends/files/patch-dispatcher_main.c
@@ -0,0 +1,11 @@
+--- dispatcher/main.c.orig	2007-10-29 20:36:16.890317344 -0400
++++ dispatcher/main.c	2007-10-29 20:37:02.584773483 -0400
+@@ -47,7 +47,7 @@
+ 
+   setsid ();
+ 
+-  if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY)) != -1)
++  if ((pidfile_fd = open (LOCALSTATEDIR "/run/system-tools-backends.pid", O_CREAT | O_WRONLY, 0600)) != -1)
+     {
+       str = g_strdup_printf ("%d", getpid ());
+       write (pidfile_fd, str, strlen (str));
diff --git a/sysutils/system-tools-backends/files/system-tools-backends.in b/sysutils/system-tools-backends/files/system-tools-backends.in
deleted file mode 100644
index b23f16bb2648..000000000000
--- a/sysutils/system-tools-backends/files/system-tools-backends.in
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/sh
-# $FreeBSD$
-#    $MCom: ports/sysutils/system-tools-backends/files/system-tools-backends.in,v 1.5 2007/07/10 16:47:46 ahze Exp $
-
-# PROVIDE: system-tools-backends
-# REQUIRE: DAEMON dbus
-#
-# Add the following to /etc/rc.conf to start SystemToolsBackends at boot time:
-#
-# system_tools_backends_enable="YES"
-#
-
-. %%RC_SUBR%%
-. %%GNOME_SUBR%%
-
-export PATH=${PATH}:%%PREFIX%%/bin
-
-system_tools_backends_enable=${system_tools_backends_enable-${gnome_enable}}
-
-name=system_tools_backends
-rcvar=`set_rcvar`
-command="%%PREFIX%%/bin/system-tools-backends"
-pidfile="/var/run/system-tools-backends.pid"
-
-load_rc_config ${name}
-run_rc_command "$1"
diff --git a/sysutils/system-tools-backends/pkg-plist b/sysutils/system-tools-backends/pkg-plist
index 31f146f16b1f..c679607233eb 100644
--- a/sysutils/system-tools-backends/pkg-plist
+++ b/sysutils/system-tools-backends/pkg-plist
@@ -1,18 +1,22 @@
 bin/system-tools-backends
 etc/dbus-1/system.d/system-tools-backends.conf
 libdata/pkgconfig/system-tools-backends-2.0.pc
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.HostsConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.IfacesConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.NFSConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.NTPConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.Platform.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.SMBConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.ServicesConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.TimeConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.UsersConfig.service
-share/dbus-1/services/org.freedesktop.SystemToolsBackends.service
+share/PolicyKit/policy/system-tools-backends.policy
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.GroupsConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.HostsConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.IfacesConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NFSConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.NTPConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.Platform.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.SMBConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.ServicesConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.TimeConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UserConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.UsersConfig.service
+share/dbus-1/system-services/org.freedesktop.SystemToolsBackends.service
+share/system-tools-backends-2.0/files/general_gprs_chatscript
 share/system-tools-backends-2.0/files/general_isdn_ppp_options
+share/system-tools-backends-2.0/files/general_pppoe_ppp_options
 share/system-tools-backends-2.0/scripts/GroupsConfig.pm
 share/system-tools-backends-2.0/scripts/HostsConfig.pm
 share/system-tools-backends-2.0/scripts/IfacesConfig.pm
@@ -32,6 +36,7 @@ share/system-tools-backends-2.0/scripts/SystemToolsBackends.pl
 share/system-tools-backends-2.0/scripts/Time/NTP.pm
 share/system-tools-backends-2.0/scripts/Time/TimeDate.pm
 share/system-tools-backends-2.0/scripts/TimeConfig.pm
+share/system-tools-backends-2.0/scripts/UserConfig.pm
 share/system-tools-backends-2.0/scripts/Users/Groups.pm
 share/system-tools-backends-2.0/scripts/Users/Shells.pm
 share/system-tools-backends-2.0/scripts/Users/Users.pm