From 9f77ba3e09270156a15e0ff9694b49b084857a06 Mon Sep 17 00:00:00 2001
From: marcus <marcus@df743ca5-7f9a-e211-a948-0013205c9059>
Date: Fri, 16 Jun 2006 05:19:02 +0000
Subject: Force dbus to start if polkitd_enable="YES".

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6453 df743ca5-7f9a-e211-a948-0013205c9059
---
 sysutils/policykit/Makefile         |  3 ++-
 sysutils/policykit/files/polkitd.in | 29 +++++++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 3 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/policykit/Makefile b/sysutils/policykit/Makefile
index 37c25d380..55d851b3a 100644
--- a/sysutils/policykit/Makefile
+++ b/sysutils/policykit/Makefile
@@ -3,11 +3,12 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/sysutils/policykit/Makefile,v 1.7 2006/05/02 05:53:21 marcus Exp $
+#   $MCom: ports/sysutils/policykit/Makefile,v 1.8 2006/05/14 20:55:52 marcus Exp $
 #
 
 PORTNAME=	policykit
 PORTVERSION=	0.1.20060514
+PORTREVISION=	1
 CATEGORIES=	sysutils gnome
 MASTER_SITES=	http://www.marcuscom.com/downloads/
 DISTNAME=	PolicyKit-${PORTVERSION}
diff --git a/sysutils/policykit/files/polkitd.in b/sysutils/policykit/files/polkitd.in
index ec82cc7b2..3ded54522 100644
--- a/sysutils/policykit/files/polkitd.in
+++ b/sysutils/policykit/files/polkitd.in
@@ -20,9 +20,34 @@ rcvar=`set_rcvar`
 command="%%PREFIX%%/sbin/polkitd"
 pidfile="/var/run/${name}/${name}.pid"
 
-stop_postcmd=stop_postcmd
+start_precmd="polkitd_precmd"
+stop_postcmd="polkitd_postcmd"
 
-stop_postcmd()
+local_force_depend()
+{
+    _depend="$1"
+    if [ -f %%LOCALBASE%%/etc/rc.d/${_depend}.sh ]; then
+	_depend="${_depend}.sh"
+    fi
+
+    if ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestatus 1>/dev/null 2>&1 &&
+       ! %%LOCALBASE%%/etc/rc.d/${_depend} forcestart; then
+       return 1
+   fi
+   return 0
+}
+
+polkitd_precmd()
+{
+    if ! checkyesno dbus_enable
+    then
+	local_force_depend dbus || return 1
+    fi
+
+    mkdir -p $(dirname $pidfile)
+}
+
+polkitd_postcmd()
 {
     	rm -f $pidfile
 }
-- 
cgit v1.2.3