From 2ea1dace93324b058b8a38ab56683f9a7f8157ae Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Fri, 9 Nov 2012 16:05:13 +0000
Subject: [PATCH] Re-introduce pkg-readmes for people using their own .xsession
 / .xinitrc.

---
 x11/dbus/Makefile   |  4 ++--
 x11/dbus/pkg/PLIST  |  3 ++-
 x11/dbus/pkg/README | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 3 deletions(-)
 create mode 100644 x11/dbus/pkg/README

diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
index 9af496cdc11..c44a2b830ba 100644
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.92 2012/10/11 07:25:20 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.93 2012/11/09 16:05:13 ajacoutot Exp $
 
 # DPB: not parallel-safe
 
@@ -6,7 +6,7 @@ COMMENT=	message bus system
 
 DISTNAME=	dbus-1.6.8
 EPOCH=		0
-REVISION=	1
+REVISION=	2
 
 SHARED_LIBS +=  dbus-1               10.2     # 10.2
 
diff --git a/x11/dbus/pkg/PLIST b/x11/dbus/pkg/PLIST
index 4436e27fae4..4873d7cb654 100644
--- a/x11/dbus/pkg/PLIST
+++ b/x11/dbus/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.15 2012/09/07 12:41:35 ajacoutot Exp $
+@comment $OpenBSD: PLIST,v 1.16 2012/11/09 16:05:13 ajacoutot Exp $
 @newgroup _dbus:572
 @newuser _dbus:572:_dbus:daemon:dbus user:/nonexistent:/sbin/nologin
 @extra /var/db/dbus/machine-id
@@ -59,6 +59,7 @@ share/doc/dbus/dbus-tutorial.html
 share/doc/dbus/diagram.png
 share/doc/dbus/diagram.svg
 share/doc/dbus/system-activation.txt
+share/doc/pkg-readmes/${FULLPKGNAME}
 share/examples/dbus/
 share/examples/dbus/dbus-1/
 @sample ${SYSCONFDIR}/dbus-1/
diff --git a/x11/dbus/pkg/README b/x11/dbus/pkg/README
new file mode 100644
index 00000000000..caa807a89d5
--- /dev/null
+++ b/x11/dbus/pkg/README
@@ -0,0 +1,17 @@
+$OpenBSD: README,v 1.5 2012/11/09 16:05:13 ajacoutot Exp $
+
++-----------------------------------------------------------------------
+| Running ${FULLPKGNAME} on OpenBSD
++-----------------------------------------------------------------------
+
+To start a session bus instance of dbus-daemon (needed by applications
+installing ${PREFIX}/share/dbus-1/services/*.service files), add the
+following lines in .xinitrc or .xsession before starting the window
+manager (see dbus-launch(1) for more info) -- note that the default
+xinitrc and Xsession in OpenBSD (as well as some session/login managers,
+e.g. gnome-session(1)) already do this for you in which case these lines
+are not needed.
+
+if [ -z "${DBUS_SESSION_BUS_ADDRESS}" ]; then
+	eval `dbus-launch --sh-syntax --exit-with-session`
+fi