3 files changed, 60 insertions, 30 deletions
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