summaryrefslogtreecommitdiffstats
path: root/sysutils/consolekit
diff options
context:
space:
mode:
authormarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-11-30 04:05:12 +0800
committermarcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>2009-11-30 04:05:12 +0800
commita3b5135851621cb514e7708d11f9dc82f851ea5c (patch)
treeb2b32cc424aeb8dc4d13263958511bf8ca92bc34 /sysutils/consolekit
parent095098375dd5bb1d27d533ffc7dc27305e105c95 (diff)
downloadmarcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.gz
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.bz2
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.lz
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.xz
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.tar.zst
marcuscom-ports-a3b5135851621cb514e7708d11f9dc82f851ea5c.zip
Remove these ports now that they are in the ports tree.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@13266 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'sysutils/consolekit')
-rw-r--r--sysutils/consolekit/Makefile41
-rw-r--r--sysutils/consolekit/distinfo3
-rw-r--r--sysutils/consolekit/files/ck-get-x11-display-device35
-rw-r--r--sysutils/consolekit/files/ck-get-x11-server-pid17
-rw-r--r--sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c198
-rw-r--r--sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c18
-rw-r--r--sysutils/consolekit/files/patch-src_main.c33
-rw-r--r--sysutils/consolekit/files/patch-src_test-vt-monitor.c33
-rw-r--r--sysutils/consolekit/files/patch-tools_Makefile.in77
-rw-r--r--sysutils/consolekit/files/patch-tools_ck-log-system-start.c60
-rw-r--r--sysutils/consolekit/pkg-descr6
-rw-r--r--sysutils/consolekit/pkg-plist42
12 files changed, 0 insertions, 563 deletions
diff --git a/sysutils/consolekit/Makefile b/sysutils/consolekit/Makefile
deleted file mode 100644
index d5de5d745..000000000
--- a/sysutils/consolekit/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-# New ports collection makefile for: ConsoleKit
-# Date Created: 26 Aug 2006
-# Whom: Florent Thoumie <flz@FreeBSD.org>
-#
-# $FreeBSD$
-# $MCom: ports/sysutils/consolekit/Makefile,v 1.22 2009/09/26 05:44:11 marcus Exp $
-
-PORTNAME= consolekit
-PORTVERSION= 0.4.1
-PORTREVISION= 1
-CATEGORIES= sysutils gnome
-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-gobject-1.0:${PORTSDIR}/sysutils/polkit
-
-WRKSRC= ${WRKDIR}/ConsoleKit-${PORTVERSION}
-USE_BZIP2= yes
-USE_XORG= x11
-USE_GNOME= gnomehack
-USE_GMAKE= yes
-GNU_CONFIGURE= yes
-USE_LDCONFIG= yes
-CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
- LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS= --with-pid-file=/var/run/${PORTNAME}.pid \
- --localstatedir=/var
-
-post-install:
- ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-display-device \
- ${PREFIX}/libexec/ck-get-x11-display-device
- ${INSTALL_SCRIPT} ${FILESDIR}/ck-get-x11-server-pid \
- ${PREFIX}/libexec/ck-get-x11-server-pid
- ${MKDIR} /var/log/ConsoleKit
- ${TOUCH} /var/log/ConsoleKit/history
-
-.include <bsd.port.mk>
diff --git a/sysutils/consolekit/distinfo b/sysutils/consolekit/distinfo
deleted file mode 100644
index 0dbdd04a2..000000000
--- a/sysutils/consolekit/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-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/ck-get-x11-display-device b/sysutils/consolekit/files/ck-get-x11-display-device
deleted file mode 100644
index 6fc508360..000000000
--- a/sysutils/consolekit/files/ck-get-x11-display-device
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-FSTAT="/usr/bin/fstat"
-GREP="/usr/bin/grep"
-AWK="/usr/bin/awk"
-SED="/usr/bin/sed"
-CAT="/bin/cat"
-HEAD="/usr/bin/head"
-
-dispnum=0
-if [ x"$1" = x"--display" ]; then
- if [ $# != 2 ]; then
- echo "usage: $0 [--display DISPLAY]"
- exit 1
- fi
- DISPLAY=$2
-fi
-if [ ! -z "${DISPLAY}" ]; then
- dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|')
-fi
-
-if [ ! -f "/tmp/.X${dispnum}-lock" ]; then
- echo "ERROR: Failed to find X lock file for display ${dispnum}"
- exit 1
-fi
-pid=$(${CAT} "/tmp/.X${dispnum}-lock")
-
-device=$(${FSTAT} -p ${pid} | ${GREP} ttyv | ${HEAD} -1 | ${AWK} '{print $8}')
-
-if [ -z "${device}" ]; then
- echo "ERROR: Failed to find TTY device for X server on display ${dispnum}"
- exit 1
-fi
-
-echo "/dev/${device}"
diff --git a/sysutils/consolekit/files/ck-get-x11-server-pid b/sysutils/consolekit/files/ck-get-x11-server-pid
deleted file mode 100644
index 05c433e01..000000000
--- a/sysutils/consolekit/files/ck-get-x11-server-pid
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-SED="/usr/bin/sed"
-CAT="/bin/cat"
-
-dispnum=0
-if [ ! -z "${DISPLAY}" ]; then
- dispnum=$(echo ${DISPLAY} | ${SED} -E -e 's|:([0-9]+).*|\1|')
-fi
-
-if [ ! -f "/tmp/.X${dispnum}-lock" ]; then
- echo "ERROR: Failed to find X lock file for display ${dispnum}"
- exit 1
-fi
-pid=$(${CAT} "/tmp/.X${dispnum}-lock")
-
-echo ${pid}
diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c
deleted file mode 100644
index d57649345..000000000
--- a/sysutils/consolekit/files/patch-src_ck-sysdeps-freebsd.c
+++ /dev/null
@@ -1,198 +0,0 @@
---- src/ck-sysdeps-freebsd.c.orig 2008-04-03 20:36:21.000000000 -0400
-+++ src/ck-sysdeps-freebsd.c 2009-04-18 18:04:39.000000000 -0400
-@@ -27,6 +27,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <errno.h>
-+#include <glob.h>
- #include <paths.h>
- #include <ttyent.h>
- #include <kvm.h>
-@@ -202,7 +203,6 @@ ck_process_stat_new_for_unix_pid (pid_t
- GError **error)
- {
- gboolean res;
-- GError *local_error;
- CkProcessStat *proc;
-
- g_return_val_if_fail (pid > 1, FALSE);
-@@ -217,7 +217,6 @@ ck_process_stat_new_for_unix_pid (pid_t
- if (res) {
- *stat = proc;
- } else {
-- g_propagate_error (error, local_error);
- *stat = NULL;
- }
-
-@@ -233,24 +232,28 @@ ck_process_stat_free (CkProcessStat *sta
- GHashTable *
- ck_unix_pid_get_env_hash (pid_t pid)
- {
-- GHashTable *hash;
-+ GHashTable *hash = NULL;
- char **penv;
-+ char errbuf[_POSIX2_LINE_MAX];
- kvm_t *kd;
- struct kinfo_proc p;
- int i;
-
-- kd = kvm_openfiles (_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, NULL);
-+ kd = kvm_openfiles (_PATH_DEVNULL, _PATH_DEVNULL, NULL, O_RDONLY, errbuf);
- if (kd == NULL) {
-+ g_warning ("kvm_openfiles failed: %s", errbuf);
- return NULL;
- }
-
- if (! get_kinfo_proc (pid, &p)) {
-- return NULL;
-+ g_warning ("get_kinfo_proc failed: %s", g_strerror (errno));
-+ goto fail;
- }
-
- penv = kvm_getenvv (kd, &p, 0);
- if (penv == NULL) {
-- return NULL;
-+ g_warning ("kvm_getenvv failed: %s", kvm_geterr (kd));
-+ goto fail;
- }
-
- hash = g_hash_table_new_full (g_str_hash,
-@@ -270,6 +273,7 @@ ck_unix_pid_get_env_hash (pid_t pid)
- }
- }
-
-+fail:
- kvm_close (kd);
-
- return hash;
-@@ -280,7 +284,7 @@ ck_unix_pid_get_env (pid_t pid,
- const char *var)
- {
- GHashTable *hash;
-- char *val;
-+ char *val = NULL;
-
- /*
- * Would probably be more efficient to just loop through the
-@@ -288,6 +292,8 @@ ck_unix_pid_get_env (pid_t pid,
- * table, but this works for now.
- */
- hash = ck_unix_pid_get_env_hash (pid);
-+ if (hash == NULL)
-+ return val;
- val = g_strdup (g_hash_table_lookup (hash, var));
- g_hash_table_destroy (hash);
-
-@@ -327,38 +333,38 @@ gboolean
- ck_get_max_num_consoles (guint *num)
- {
- int max_consoles;
-- int res;
-- gboolean ret;
-- struct ttyent *t;
-+ int i;
-+ glob_t g;
-
-- ret = FALSE;
- max_consoles = 0;
-
-- res = setttyent ();
-- if (res == 0) {
-- goto done;
-- }
-+ g.gl_offs = 0;
-+ glob ("/dev/ttyv*", GLOB_DOOFFS | GLOB_NOSORT, NULL, &g);
-+ for (i = 0; i < g.gl_pathc && g.gl_pathv[i] != NULL; i++) {
-+ struct stat sb;
-+ char *cdev;
-
-- while ((t = getttyent ()) != NULL) {
-- if (t->ty_status & TTY_ON && strncmp (t->ty_name, "ttyv", 4) == 0)
-+ cdev = g.gl_pathv[i];
-+ if (stat (cdev, &sb) > -1 && S_ISCHR (sb.st_mode)) {
- max_consoles++;
-+ } else {
-+ break;
-+ }
- }
-
-- /* Increment one more so that all consoles are properly counted
-+ globfree (&g);
-+
-+ /*
-+ * Increment one more so that all consoles are properly counted
- * this is arguable a bug in vt_add_watches().
- */
- max_consoles++;
-
-- ret = TRUE;
--
-- endttyent ();
--
--done:
- if (num != NULL) {
- *num = max_consoles;
- }
-
-- return ret;
-+ return TRUE;
- }
-
- char *
-@@ -369,7 +375,12 @@ ck_get_console_device_for_num (guint num
- /* The device number is always one less than the VT number. */
- num--;
-
-- device = g_strdup_printf ("/dev/ttyv%u", num);
-+ if (num < 10)
-+ device = g_strdup_printf ("/dev/ttyv%i", num);
-+ else if (num < 32)
-+ device = g_strdup_printf ("/dev/ttyv%c", num - 10 + 'a');
-+ else
-+ device = NULL;
-
- return device;
- }
-@@ -379,6 +390,7 @@ ck_get_console_num_from_device (const ch
- guint *num)
- {
- guint n;
-+ char c;
- gboolean ret;
-
- n = 0;
-@@ -388,7 +400,11 @@ ck_get_console_num_from_device (const ch
- return FALSE;
- }
-
-- if (sscanf (device, "/dev/ttyv%u", &n) == 1) {
-+ if (sscanf (device, "/dev/ttyv%c", &c) == 1) {
-+ if (c < 58)
-+ n = c - 48;
-+ else
-+ n = c - 'a' + 10;
- /* The VT number is always one more than the device number. */
- n++;
- ret = TRUE;
-@@ -408,6 +424,7 @@ ck_get_active_console_num (int consol
- gboolean ret;
- int res;
- int active;
-+ char ttyn;
-
- g_assert (console_fd != -1);
-
-@@ -420,7 +437,12 @@ ck_get_active_console_num (int consol
- goto out;
- }
-
-- g_debug ("Active VT is: %d (ttyv%d)", active, active - 1);
-+ if (active - 1 < 10)
-+ ttyn = active - 1 + '0';
-+ else
-+ ttyn = active - 11 + 'a';
-+
-+ g_debug ("Active VT is: %d (ttyv%c)", active, ttyn);
- ret = TRUE;
-
- out:
diff --git a/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c b/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c
deleted file mode 100644
index e256e9f36..000000000
--- a/sysutils/consolekit/files/patch-src_ck-sysdeps-unix.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/ck-sysdeps-unix.c.orig 2008-02-06 22:59:55.000000000 -0500
-+++ src/ck-sysdeps-unix.c 2008-02-06 22:52:34.000000000 -0500
-@@ -172,6 +172,15 @@ ck_get_a_console_fd (void)
-
- fd = -1;
-
-+#ifdef __FreeBSD__
-+ /* On FreeBSD, try /dev/consolectl first as this will survive
-+ * /etc/ttys initialization. */
-+ fd = open_a_console ("/dev/consolectl");
-+ if (fd >= 0) {
-+ goto done;
-+ }
-+#endif
-+
- #ifdef __sun
- /* On Solaris, first try Sun VT device. */
- fd = open_a_console ("/dev/vt/active");
diff --git a/sysutils/consolekit/files/patch-src_main.c b/sysutils/consolekit/files/patch-src_main.c
deleted file mode 100644
index a791db0f9..000000000
--- a/sysutils/consolekit/files/patch-src_main.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/main.c.orig 2007-11-08 15:05:55.000000000 -0500
-+++ src/main.c 2007-11-08 15:07:39.000000000 -0500
-@@ -226,6 +226,21 @@ sigusr1_handler (int sig)
- }
-
- static void
-+setup_termination_signals (void)
-+{
-+ struct sigaction sa;
-+
-+ sa.sa_handler = SIG_DFL;
-+ sigemptyset (&sa.sa_mask);
-+ sa.sa_flags = 0;
-+
-+ sigaction (SIGTERM, &sa, NULL);
-+ sigaction (SIGQUIT, &sa, NULL);
-+ sigaction (SIGINT, &sa, NULL);
-+ sigaction (SIGHUP, &sa, NULL);
-+}
-+
-+static void
- setup_debug_log_signals (void)
- {
- struct sigaction sa;
-@@ -300,6 +315,8 @@ main (int argc,
-
- setup_debug_log (debug);
-
-+ setup_termination_signals ();
-+
- connection = get_system_bus ();
- if (connection == NULL) {
- goto out;
diff --git a/sysutils/consolekit/files/patch-src_test-vt-monitor.c b/sysutils/consolekit/files/patch-src_test-vt-monitor.c
deleted file mode 100644
index 6fb9740f5..000000000
--- a/sysutils/consolekit/files/patch-src_test-vt-monitor.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/test-vt-monitor.c.orig 2007-08-17 13:08:55.000000000 -0400
-+++ src/test-vt-monitor.c 2007-11-08 15:11:37.000000000 -0500
-@@ -31,6 +31,7 @@
- #include <pwd.h>
- #include <string.h>
- #include <errno.h>
-+#include <signal.h>
-
- #include <locale.h>
-
-@@ -55,12 +56,22 @@ main (int argc, char **argv)
- GError *error;
- guint num;
- gboolean res;
-+ struct sigaction sa;
-
- if (! g_thread_supported ()) {
- g_thread_init (NULL);
- }
- g_type_init ();
-
-+ sa.sa_handler = SIG_DFL;
-+ sigemptyset (&sa.sa_mask);
-+ sa.sa_flags = 0;
-+
-+ sigaction (SIGINT, &sa, NULL);
-+ sigaction (SIGTERM, &sa, NULL);
-+ sigaction (SIGQUIT, &sa, NULL);
-+ sigaction (SIGHUP, &sa, NULL);
-+
- if (! ck_is_root_user ()) {
- g_warning ("Must be run as root");
- exit (1);
diff --git a/sysutils/consolekit/files/patch-tools_Makefile.in b/sysutils/consolekit/files/patch-tools_Makefile.in
deleted file mode 100644
index b818fd931..000000000
--- a/sysutils/consolekit/files/patch-tools_Makefile.in
+++ /dev/null
@@ -1,77 +0,0 @@
---- tools/Makefile.in.orig 2008-01-31 16:09:08.000000000 -0500
-+++ tools/Makefile.in 2008-01-31 16:10:21.000000000 -0500
-@@ -39,8 +39,7 @@ bin_PROGRAMS = ck-list-sessions$(EXEEXT)
- $(am__EXEEXT_1)
- sbin_PROGRAMS = ck-log-system-start$(EXEEXT) $(am__EXEEXT_1)
- libexec_PROGRAMS = ck-collect-session-info$(EXEEXT) \
-- ck-get-x11-server-pid$(EXEEXT) \
-- ck-get-x11-display-device$(EXEEXT) $(am__EXEEXT_1)
-+ $(am__EXEEXT_1)
- subdir = tools
- DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-@@ -66,17 +65,6 @@ ck_collect_session_info_OBJECTS = \
- am__DEPENDENCIES_1 =
- ck_collect_session_info_DEPENDENCIES = $(am__DEPENDENCIES_1) \
- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
--am_ck_get_x11_display_device_OBJECTS = \
-- ck-get-x11-display-device.$(OBJEXT) $(am__objects_1)
--ck_get_x11_display_device_OBJECTS = \
-- $(am_ck_get_x11_display_device_OBJECTS)
--ck_get_x11_display_device_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
--am_ck_get_x11_server_pid_OBJECTS = ck-get-x11-server-pid.$(OBJEXT) \
-- $(am__objects_1)
--ck_get_x11_server_pid_OBJECTS = $(am_ck_get_x11_server_pid_OBJECTS)
--ck_get_x11_server_pid_DEPENDENCIES = $(am__DEPENDENCIES_1) \
-- $(top_builddir)/src/libck.la $(am__DEPENDENCIES_1)
- am_ck_history_OBJECTS = ck-history.$(OBJEXT) $(am__objects_1)
- ck_history_OBJECTS = $(am_ck_history_OBJECTS)
- ck_history_DEPENDENCIES = $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
-@@ -335,24 +323,6 @@ ck_collect_session_info_LDADD = \
- $(top_builddir)/src/libck.la \
- $(NULL)
-
--ck_get_x11_server_pid_SOURCES = \
-- ck-get-x11-server-pid.c \
-- $(NULL)
--
--ck_get_x11_server_pid_LDADD = \
-- $(TOOLS_LIBS) \
-- $(top_builddir)/src/libck.la \
-- $(NULL)
--
--ck_get_x11_display_device_SOURCES = \
-- ck-get-x11-display-device.c \
-- $(NULL)
--
--ck_get_x11_display_device_LDADD = \
-- $(TOOLS_LIBS) \
-- $(top_builddir)/src/libck.la \
-- $(NULL)
--
- EXTRA_DIST = \
- $(NULL)
-
-@@ -480,12 +450,6 @@ clean-sbinPROGRAMS:
- ck-collect-session-info$(EXEEXT): $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_DEPENDENCIES)
- @rm -f ck-collect-session-info$(EXEEXT)
- $(LINK) $(ck_collect_session_info_OBJECTS) $(ck_collect_session_info_LDADD) $(LIBS)
--ck-get-x11-display-device$(EXEEXT): $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_DEPENDENCIES)
-- @rm -f ck-get-x11-display-device$(EXEEXT)
-- $(LINK) $(ck_get_x11_display_device_OBJECTS) $(ck_get_x11_display_device_LDADD) $(LIBS)
--ck-get-x11-server-pid$(EXEEXT): $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_DEPENDENCIES)
-- @rm -f ck-get-x11-server-pid$(EXEEXT)
-- $(LINK) $(ck_get_x11_server_pid_OBJECTS) $(ck_get_x11_server_pid_LDADD) $(LIBS)
- ck-history$(EXEEXT): $(ck_history_OBJECTS) $(ck_history_DEPENDENCIES)
- @rm -f ck-history$(EXEEXT)
- $(LINK) $(ck_history_OBJECTS) $(ck_history_LDADD) $(LIBS)
-@@ -503,8 +467,6 @@ distclean-compile:
- -rm -f *.tab.c
-
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-collect-session-info.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-display-device.Po@am__quote@
--@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-get-x11-server-pid.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-history.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ck-log-system-start.Po@am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/list-sessions.Po@am__quote@
diff --git a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c b/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
deleted file mode 100644
index 0e125ef26..000000000
--- a/sysutils/consolekit/files/patch-tools_ck-log-system-start.c
+++ /dev/null
@@ -1,60 +0,0 @@
---- 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-descr b/sysutils/consolekit/pkg-descr
deleted file mode 100644
index db13002ab..000000000
--- a/sysutils/consolekit/pkg-descr
+++ /dev/null
@@ -1,6 +0,0 @@
-ConsoleKit is a framework for defining and tracking users, login
-sessions, and seats. The primary motivations for this framework are to
-facilitate fast-user-switching and multi-seat capabilities, and to
-enable more sophisticated policy decisions for desktop sessions.
-
-WWW: http://www.freedesktop.org/wiki/Software/ConsoleKit
diff --git a/sysutils/consolekit/pkg-plist b/sysutils/consolekit/pkg-plist
deleted file mode 100644
index 52e05ed98..000000000
--- a/sysutils/consolekit/pkg-plist
+++ /dev/null
@@ -1,42 +0,0 @@
-bin/ck-history
-bin/ck-launch-session
-bin/ck-list-sessions
-sbin/ck-log-system-restart
-sbin/ck-log-system-start
-sbin/ck-log-system-stop
-etc/ConsoleKit/seats.d/00-primary.seat
-etc/dbus-1/system.d/ConsoleKit.conf
-include/ConsoleKit/ck-connector/ck-connector.h
-lib/ConsoleKit/scripts/ck-system-restart
-lib/ConsoleKit/scripts/ck-system-stop
-lib/libck-connector.la
-lib/libck-connector.so
-lib/libck-connector.so.0
-libdata/pkgconfig/ck-connector.pc
-libexec/ck-collect-session-info
-libexec/ck-get-x11-display-device
-libexec/ck-get-x11-server-pid
-sbin/console-kit-daemon
-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
-@exec touch -f /var/log/ConsoleKit/history
-@unexec rm -rf /var/run/ConsoleKit 2>/dev/null || true
-@unexec rm -rf /var/log/ConsoleKit 2>/dev/null || true