[pkgsrc/trunk]: pkgsrc/sysutils/dbus Recreate the VARBASE/run/dbus directory ...

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cc8a26589f7d
branches:  trunk
changeset: 481775:cc8a26589f7d
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Tue Oct 12 08:15:35 2004 +0000

description:
Recreate the VARBASE/run/dbus directory before starting the daemon, in case
it does not exist; this directory is removed at boot time by another script.
Also, don't bother to create it with an OWN_DIRS_PERMS line, because the
rc.d script will do it for us.
Bump PKGREVISION to 1.

diffstat:

 sysutils/dbus/Makefile      |   5 +++--
 sysutils/dbus/files/dbus.sh |  12 ++++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r 3cb73ce8cdf3 -r cc8a26589f7d sysutils/dbus/Makefile
--- a/sysutils/dbus/Makefile    Tue Oct 12 07:54:30 2004 +0000
+++ b/sysutils/dbus/Makefile    Tue Oct 12 08:15:35 2004 +0000
@@ -1,14 +1,15 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/10/11 17:45:26 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/10/12 08:15:35 jmmv Exp $
 #
 
 .include "Makefile.common"
 
+PKGREVISION=   1
+
 PKG_USERS=     messagebus:messagebus::System\\ message\\ bus:${VARBASE}/run/dbus:/sbin/nologin
 PKG_GROUPS=    messagebus
 
 MAKE_DIRS=     ${PKG_SYSCONFDIR}/event.d
 MAKE_DIRS+=    ${PKG_SYSCONFDIR}/system.d
-OWN_DIRS_PERMS=        ${VARBASE}/run/dbus messagebus messagebus 0755
 
 RCD_SCRIPTS=   dbus
 
diff -r 3cb73ce8cdf3 -r cc8a26589f7d sysutils/dbus/files/dbus.sh
--- a/sysutils/dbus/files/dbus.sh       Tue Oct 12 07:54:30 2004 +0000
+++ b/sysutils/dbus/files/dbus.sh       Tue Oct 12 08:15:35 2004 +0000
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dbus.sh,v 1.1.1.1 2004/10/11 17:45:27 jmmv Exp $
+# $NetBSD: dbus.sh,v 1.2 2004/10/12 08:15:35 jmmv Exp $
 #
 # PROVIDE: dbus
 # REQUIRE: DAEMON
@@ -12,10 +12,18 @@
 rcvar=$name
 command="@PREFIX@/bin/dbus-daemon-1"
 command_args="--system"
-required_dirs="@VARBASE@/run/dbus"
 pidfile="@VARBASE@/run/dbus/pid"
+start_precmd=dbus_prestart
 dbus_user=messagebus
 dbus_group=messagebus
 
+dbus_prestart() {
+       if @TEST@ ! -d "@VARBASE@/run/dbus"; then
+               @MKDIR@ "@VARBASE@/run/dbus"
+               @CHMOD@ 0755 "@VARBASE@/run/dbus"
+               @CHOWN@ ${dbus_user}:${dbus_group} "@VARBASE@/run/dbus"
+       fi
+}
+
 load_rc_config $name
 run_rc_command "$1"