summaryrefslogtreecommitdiff
path: root/sysutils/dbus
diff options
context:
space:
mode:
authornia <nia@pkgsrc.org>2021-03-14 08:31:17 +0000
committernia <nia@pkgsrc.org>2021-03-14 08:31:17 +0000
commit3d28386f2dffc1d05afbd71c3245654a5c5386a4 (patch)
tree274e43dc3e93c9b612515102b7059a33f97266ef /sysutils/dbus
parent6edc211d004e1b7c25efdcabd376528e959abfda (diff)
downloadpkgsrc-3d28386f2dffc1d05afbd71c3245654a5c5386a4.tar.gz
dbus: Simplify MESSAGE, make it only appear for INIT_SYSTEM=rc.d
Diffstat (limited to 'sysutils/dbus')
-rw-r--r--sysutils/dbus/MESSAGE14
-rw-r--r--sysutils/dbus/MESSAGE.rcd10
-rw-r--r--sysutils/dbus/Makefile8
3 files changed, 15 insertions, 17 deletions
diff --git a/sysutils/dbus/MESSAGE b/sysutils/dbus/MESSAGE
deleted file mode 100644
index a7d875b0110..00000000000
--- a/sysutils/dbus/MESSAGE
+++ /dev/null
@@ -1,14 +0,0 @@
-===========================================================================
-$NetBSD: MESSAGE,v 1.3 2020/12/17 20:18:52 maya Exp $
-
-You should enable the dbus system-wide daemon for correct operation. You
-can do this by using one of the three start-up scripts installed by the
-package. Use:
-
-* ${PREFIX}/share/examples/rc.d/dbus:
- if you are using NetBSD's and pkgsrc's rc.subr start-up framework.
-
-* ${PREFIX}/share/examples/rc.d/rc.messagebus.slackware:
- if you are using a Slackware-like system.
-
-===========================================================================
diff --git a/sysutils/dbus/MESSAGE.rcd b/sysutils/dbus/MESSAGE.rcd
new file mode 100644
index 00000000000..50709f80694
--- /dev/null
+++ b/sysutils/dbus/MESSAGE.rcd
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE.rcd,v 1.1 2021/03/14 08:31:17 nia Exp $
+
+You should enable the dbus system-wide daemon for correct operation. Use:
+
+$ cp ${PREFIX}/share/examples/rc.d/dbus /etc/rc.d/dbus
+
+Edit /etc/rc.conf to set dbus=YES.
+
+===========================================================================
diff --git a/sysutils/dbus/Makefile b/sysutils/dbus/Makefile
index f38c3aa972d..e279a98d764 100644
--- a/sysutils/dbus/Makefile
+++ b/sysutils/dbus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.122 2020/07/17 23:38:56 wiz Exp $
+# $NetBSD: Makefile,v 1.123 2021/03/14 08:31:17 nia Exp $
DISTNAME= dbus-1.12.20
CATEGORIES= sysutils
@@ -28,10 +28,12 @@ SPECIAL_PERMS+= libexec/dbus-daemon-launch-helper ${REAL_ROOT_USER} ${DBUS_GROU
SMF_METHODS= dbus
SMF_NAME= dbus
-MESSAGE_SRC+= MESSAGE
-
.include "../../mk/bsd.prefs.mk"
+.if ${INIT_SYSTEM} == "rc.d"
+MESSAGE_SRC+= MESSAGE.rcd
+.endif
+
CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q}
# Prevent the configure script from picking up a per-user tmp