Update to 0.4.1.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13025 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 67 insertions, 5 deletions

diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
index 9a3ef7912..c07a0dc5c 100644
--- a/sysutils/consolekit/Makefile
+++ b/sysutils/consolekit/Makefile
@@ -3,10 +3,10 @@
 # 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.21 2009/08/26 18:51:44 marcus Exp $
 
 PORTNAME=	consolekit
-PORTVERSION=	0.3.1
+PORTVERSION=	0.4.1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.freedesktop.org/software/ConsoleKit/dist/
 DISTFILES=	ConsoleKit-${PORTVERSION}${EXTRACT_SUFX}
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
index 05255f7b0..0dbdd04a2 100644
--- a/sysutils/consolekit/distinfo
+++ b/sysutils/consolekit/distinfo
@@ -1,3 +1,3 @@
-MD5 (ConsoleKit-0.3.1.tar.bz2) = 3ee89345f610c462806aaaae9a997683
-SHA256 (ConsoleKit-0.3.1.tar.bz2) = 60369f800d49396752d47640e2a283341a16c7efc25e91b93287226a3c25032d
-SIZE (ConsoleKit-0.3.1.tar.bz2) = 403673
+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-tools_ck-log-system-start.c b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
new file mode 100644
index 000000000..0e125ef26
--- /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 67f6dbeaa..33b24c38a 100644
--- a/sysutils/consolekit/pkg-plist
+++ b/sysutils/consolekit/pkg-plist
@@ -23,6 +23,7 @@ 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
@@ -31,6 +32,7 @@ share/polkit-1/actions/org.freedesktop.consolekit.policy
 @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