From 4c746853a2b82f2de791ad44e8bc51efb7d26f9d Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Sat, 10 Aug 2013 15:47:06 +0000
Subject: [PATCH] Remove compat glue.

---
 x11/dbus/Makefile           | 4 ++--
 x11/dbus/pkg/dbus_daemon.rc | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/x11/dbus/Makefile b/x11/dbus/Makefile
index 0c80ab1418a..b5c9322ad5c 100644
--- a/x11/dbus/Makefile
+++ b/x11/dbus/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.102 2013/07/20 13:10:28 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.103 2013/08/10 15:47:06 ajacoutot Exp $
 
 # DPB: not parallel-safe
 
@@ -6,7 +6,7 @@ COMMENT=	message bus system
 
 DISTNAME=	dbus-1.6.12
 EPOCH=		0
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS +=  dbus-1               10.2     # 10.3
 
diff --git a/x11/dbus/pkg/dbus_daemon.rc b/x11/dbus/pkg/dbus_daemon.rc
index 98a68ff5e56..081d9b12d17 100755
--- a/x11/dbus/pkg/dbus_daemon.rc
+++ b/x11/dbus/pkg/dbus_daemon.rc
@@ -1,15 +1,12 @@
 #!/bin/sh
 #
-# $OpenBSD: dbus_daemon.rc,v 1.11 2013/01/01 14:36:11 ajacoutot Exp $
+# $OpenBSD: dbus_daemon.rc,v 1.12 2013/08/10 15:47:06 ajacoutot Exp $
 
 daemon="${TRUEPREFIX}/bin/dbus-daemon --system"
 
 . /etc/rc.d/rc.subr
 
 rc_pre() {
-	# XXX remove after OPENBSD_5_4 is branched
-	[ -f /var/db/dbus/machine-id -a ! -h /var/db/dbus/machine-id ] && \
-		mv /var/db/dbus/machine-id ${SYSCONFDIR}/machine-id
 	[ ! -h /var/db/dbus/machine-id ] && \
 		ln -sf ${SYSCONFDIR}/machine-id /var/db/dbus/machine-id
 	rm -f /var/run/dbus/pid