Presenting GNOME 2.28.1 for FreeBSD. The official release notes for this

release can be found at http://library.gnome.org/misc/release-notes/2.28/ .
Officially, this is mostly a polishing release in preparation for GNOME 3.0
due in about a year.

On the FreeBSD front, though, a lot went into this release.  Major thanks
goes to kwm and avl who did a lot of the porting work for this release.
In particular, kwm brought in Evolution MAPI support for better Microsoft
Exchange integration.  Avl made sure that the new gobject introspection
repository ports were nicely compartmentalized so that large dependencies
aren't brought in wholesale.

But, every GNOME team member (ahze, avl, bland, kwm, mezz, and myself)
contributed to this release.

Other major improvements include an updated HAL with better volume
probing code, ufsid integration, and support for volume names containing
spaces (big thanks to J.R. Oldroyd); a new WebKit; updated AbiWord;
an updated Gimp; and a preview of the new GNOME Shell project (thanks to
Pawel Worach).

The FreeBSD GNOME Team would like to that the following additional
contributors to this release whose patches and testing really helped
make it a success:

Andrius Morkunas
Dominique Goncalves
Eric L. Chen
J.R. Oldroyd
Joseph S. Atkinson
Li
Pawel Worach
Romain Tartière
Thomas Vogt
Yasuda Keisuke
Rui Paulo
Martin Wilke
(and an extra shout out to miwi and pav for pointyhat runs)

We would like to send this release out to Alexander Loginov (avl) in
hopes that he feels better soon.

PR:		136676
		136967
		138872 (obsolete with new epiphany-webkit)
		139160
		134737
		139941
		140097
		140838
		140929

6 files changed, 72 insertions, 39 deletions

diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 3e9e623fddb9..a4e9c69e7f53 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -3,20 +3,20 @@
 # Whom:					Florent Thoumie <flz@FreeBSD.org>
 #
 # $FreeBSD$
-#    $MCom: ports-stable/sysutils/consolekit/Makefile,v 1.2 2009/04/18 22:09:26 marcus Exp $
+#    $MCom: ports/sysutils/consolekit/Makefile,v 1.23 2009/09/26 12:32:45 kwm Exp $
 
 PORTNAME=	consolekit
-PORTVERSION=	0.3.0
-PORTREVISION=	8
+PORTVERSION=	0.4.1
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
-MASTER_SITES=	http://people.freedesktop.org/~mccann/dist/
+MASTER_SITES=	http://www.freedesktop.org/software/ConsoleKit/dist/
 DISTFILES=	ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Framework for defining and tracking users
 
 LIB_DEPENDS=	dbus-glib-1.2:${PORTSDIR}/devel/dbus-glib \
-    		polkit.2:${PORTSDIR}/sysutils/policykit
+    		polkit-gobject-1.0:${PORTSDIR}/sysutils/polkit
 
 WRKSRC=		${WRKDIR}/ConsoleKit-${PORTVERSION}
 USE_BZIP2=	yes
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index ef1243c68ef1..0dbdd04a2b42 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (ConsoleKit-0.3.0.tar.bz2) = 43b02a52212330b54cfb34c4044d9ce0
-SHA256 (ConsoleKit-0.3.0.tar.bz2) = cbcfbb3df2dc76855c99c1cdff04a257ec5270fa62e1d21b0d057b08d88c0fd4
-SIZE (ConsoleKit-0.3.0.tar.bz2) = 393694
+MD5 (ConsoleKit-0.4.1.tar.bz2) = 48eda4483cc97841d5f88e8e003eb6d7
+SHA256 (ConsoleKit-0.4.1.tar.bz2) = f032adc6146d745034315054c5822a7a09f30e20a40d6e802221fa977354403e
+SIZE (ConsoleKit-0.4.1.tar.bz2) = 398080
diff --git a/sysutils/consolekit/files/patch-data_ConsoleKit.conf b/sysutils/consolekit/files/patch-data_ConsoleKit.conf
deleted file mode 100644
index 9a3e97aa95c5..000000000000
--- a/sysutils/consolekit/files/patch-data_ConsoleKit.conf
+++ /dev/null
@@ -1,20 +0,0 @@
---- data/ConsoleKit.conf.orig	2008-04-19 01:39:49.000000000 -0400
-+++ data/ConsoleKit.conf	2009-04-17 01:51:54.000000000 -0400
-@@ -32,6 +32,8 @@
-     <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSeats"/>
-     <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-+           send_member="GetSessions"/>
-+    <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSessionForCookie"/>
-     <allow send_interface="org.freedesktop.ConsoleKit.Manager"
-            send_member="GetSessionForUnixProcess"/>
-@@ -91,6 +93,8 @@
-            send_member="GetIdleHint"/>
-     <allow send_interface="org.freedesktop.ConsoleKit.Session"
-            send_member="GetIdleSinceHint"/>
-+    <allow send_interface="org.freedesktop.ConsoleKit.Session"
-+           send_member="SetIdleHint"/>
-   </policy>
- 
- </busconfig>
diff --git a/sysutils/consolekit/files/patch-src_ck-run-programs.c b/sysutils/consolekit/files/patch-src_ck-run-programs.c
deleted file mode 100644
index f5de90d10e0c..000000000000
--- a/sysutils/consolekit/files/patch-src_ck-run-programs.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/ck-run-programs.c.orig	2009-04-04 20:55:11.000000000 -0400
-+++ src/ck-run-programs.c	2009-04-04 20:55:39.000000000 -0400
-@@ -225,6 +225,7 @@ ck_run_programs (const char *dirpath,
-         out_loop:
-                 g_free (child_argv[0]);
-         }
-+        g_dir_close (dir);
- out:
-         g_strfreev (env_for_child);
- }
diff --git a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
new file mode 100644
index 000000000000..0e125ef262d2
--- /dev/null
+++ b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
@@ -0,0 +1,60 @@
+--- tools/ck-log-system-start.c.orig	2009-09-14 20:08:10.000000000 -0400
++++ tools/ck-log-system-start.c	2009-09-26 01:35:37.000000000 -0400
+@@ -26,6 +26,9 @@
+ #include <unistd.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#ifdef __FreeBSD__
++#include <kenv.h>
++#endif
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <sys/utsname.h>
+@@ -41,7 +44,9 @@
+ 
+ #define DEFAULT_LOG_FILENAME LOCALSTATEDIR "/log/ConsoleKit/history"
+ 
++#ifdef __linux__
+ #define LINUX_KERNEL_CMDLINE "/proc/cmdline"
++#endif
+ 
+ /* Adapted from auditd auditd-event.c */
+ static gboolean
+@@ -162,6 +167,7 @@ write_log_for_event (CkLogEvent *event)
+ static char *
+ get_boot_arguments (void)
+ {
++#if defined(__linux__)
+         char *contents;
+         gboolean res;
+ 
+@@ -178,6 +184,29 @@ get_boot_arguments (void)
+         }
+ 
+         return contents;
++#elif defined(__FreeBSD__)
++        char kern_name[1024], root[1024], mopts[1024];
++        char *options;
++
++        options = NULL;
++        if (kenv(KENV_GET, "kernelname", kern_name, sizeof (kern_name)) == -1) {
++                return options;
++        }
++
++        if (kenv(KENV_GET, "vfs.root.mountfrom.options", mopts, sizeof (mopts)) == -1) {
++                g_strlcpy (mopts, "ro", sizeof (mopts));
++        }
++
++        if (kenv(KENV_GET, "vfs.root.mountfrom", root, sizeof (root)) == -1) {
++                g_strlcpy (root, "/", sizeof (root));
++        }
++
++        options = g_strdup_printf ("%s %s root=%s", mopts, kern_name, root);
++
++        return options;
++#else
++        return NULL;
++#endif
+ }
+ 
+ int
diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist
index 01d42a80cbdc..52e05ed984f2 100644
--- a/sysutils/consolekit/pkg-plist
+++ b/sysutils/consolekit/pkg-plist
@@ -17,20 +17,23 @@ libexec/ck-collect-session-info
 libexec/ck-get-x11-display-device
 libexec/ck-get-x11-server-pid
 sbin/console-kit-daemon
-share/PolicyKit/policy/org.freedesktop.consolekit.policy
 share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Manager.xml
 share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Seat.xml
 share/dbus-1/interfaces/org.freedesktop.ConsoleKit.Session.xml
 share/dbus-1/system-services/org.freedesktop.ConsoleKit.service
+share/polkit-1/actions/org.freedesktop.consolekit.policy
 @exec mkdir -p %D/etc/ConsoleKit/run-session.d
+@exec mkdir -p %D/etc/ConsoleKit/run-seat.d
 @exec mkdir -p %D/lib/ConsoleKit/run-session.d
 @dirrm lib/ConsoleKit/scripts
 @dirrmtry lib/ConsoleKit/run-session.d
+@dirrmtry lib/ConsoleKit/run-seat.d
 @dirrmtry lib/ConsoleKit
 @dirrm include/ConsoleKit/ck-connector
 @dirrm include/ConsoleKit
 @dirrm etc/ConsoleKit/seats.d
 @dirrmtry etc/ConsoleKit/run-session.d
+@dirrmtry etc/ConsoleKit/run-seat.d
 @dirrm etc/ConsoleKit
 @exec mkdir -p /var/run/ConsoleKit
 @exec mkdir -p /var/log/ConsoleKit