From 830a25df1eb72acd0afcccd535667850bf408961 Mon Sep 17 00:00:00 2001
From: Jean-Yves Lefort <jylefort@FreeBSD.org>
Date: Fri, 28 Apr 2006 01:37:06 +0000
Subject: [PATCH] The system daemon is running as messagebus:messagebus, so it
 does not have the permission to remove its pid file and socket on exit. Put
 these files in the /var/run/dbus directory, owned by messagebus:messagebus.

Remove the files and directory on package deinstall.
---
 devel/dbus/Makefile      | 17 +++++++----------
 devel/dbus/files/dbus.in |  2 +-
 devel/dbus/pkg-install   |  2 ++
 devel/dbus/pkg-plist     |  4 ++++
 devel/py-dbus/Makefile   |  4 ++--
 5 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index ce0521c9bc59..7903165e0264 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	0.61
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES?=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/
 
@@ -27,8 +27,8 @@ CONFIGURE_ARGS?=--disable-gtk \
 		--disable-mono \
 		--disable-mono-docs \
 		--localstatedir=/var \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/run/dbus.pipe \
+		--with-system-pid-file=/var/run/dbus/dbus.pid \
+		--with-system-socket=/var/run/dbus/dbus.pipe \
 		--with-session-socket-dir=/var/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs
@@ -64,16 +64,13 @@ post-patch:
 .if !defined(DBUS_SLAVE)
 pre-su-install:
 	@for i in 15 9 ; do \
-		if [ -f /var/run/dbus.pid ]; then \
-			kill -$${i} $$(${CAT} /var/run/dbus.pid) 2>/dev/null || ${TRUE} ; \
+		if [ -f /var/run/dbus/dbus.pid ]; then \
+			kill -$${i} $$(${CAT} /var/run/dbus/dbus.pid) 2>/dev/null || ${TRUE} ; \
 			sleep 3 ; \
 		fi ; \
 	done
-	@if [ -f /var/run/dbus.pid ]; then \
-		${RM} -f /var/run/dbus.pid ; \
-	fi
-	@if [ -S /var/run/dbus ]; then \
-		${RM} -f /var/run/dbus ; \
+	@if [ -f /var/run/dbus/dbus.pid ]; then \
+		${RM} -f /var/run/dbus/dbus.pid ; \
 	fi
 .endif
 
diff --git a/devel/dbus/files/dbus.in b/devel/dbus/files/dbus.in
index 704cb1d7eb92..02d9c577595d 100644
--- a/devel/dbus/files/dbus.in
+++ b/devel/dbus/files/dbus.in
@@ -19,7 +19,7 @@ name=dbus
 rcvar=`set_rcvar`
 
 command="%%PREFIX%%/bin/dbus-daemon"
-pidfile="/var/run/${name}.pid"
+pidfile="/var/run/dbus/${name}.pid"
 
 stop_postcmd=stop_postcmd
 
diff --git a/devel/dbus/pkg-install b/devel/dbus/pkg-install
index f6cb61f297be..06f47528d264 100644
--- a/devel/dbus/pkg-install
+++ b/devel/dbus/pkg-install
@@ -31,6 +31,8 @@ POST-INSTALL)
 			exit 1
 		fi
 	fi
+
+	/usr/bin/install -d -o ${USER} -g ${GROUP} /var/run/dbus
 	exit 0
 	;;
 esac
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index 1ce77d44dfa5..e8b82e028dc5 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -57,3 +57,7 @@ libdata/pkgconfig/dbus-glib-1.pc
 @dirrm include/dbus-%%VERSION%%
 @dirrm etc/dbus-1/system.d
 @dirrm etc/dbus-1
+@cwd /var/run
+@unexec rm -f %D/dbus/dbus.pid
+@unexec rm -f %D/dbus/dbus.pipe
+@dirrm dbus
diff --git a/devel/py-dbus/Makefile b/devel/py-dbus/Makefile
index fce1f94c1f8b..b57ff76ce0f2 100644
--- a/devel/py-dbus/Makefile
+++ b/devel/py-dbus/Makefile
@@ -35,8 +35,8 @@ CONFIGURE_ARGS=	--enable-python \
 		--disable-gtk \
 		--disable-qt3 \
 		--localstatedir=/var \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/run/dbus.pipe \
+		--with-system-pid-file=/var/run/dbus/dbus.pid \
+		--with-system-socket=/var/run/dbus/dbus.pipe \
 		--with-session-socket-dir=/var/tmp \
 		--disable-doxygen-docs \
 		--disable-xml-docs