From 47499ad8422e8c80a849e6664e6db30d43233fd8 Mon Sep 17 00:00:00 2001
From: Joe Marcus Clarke <marcus@FreeBSD.org>
Date: Wed, 3 May 2006 06:22:17 +0000
Subject: Teach dbus to look in ${X11BASE}/etc/dbus-1/system.d for system bus
 configuration files.

---
 devel/dbus/Makefile                       |  6 ++++--
 devel/dbus/files/patch-bus_system.conf.in | 10 ++++++++++
 devel/dbus/pkg-plist                      |  2 ++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 devel/dbus/files/patch-bus_system.conf.in

(limited to 'devel/dbus')

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index 4d8b9cabdd3c..ec287c2bdf43 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	dbus
 PORTVERSION=	0.61
-PORTREVISION?=	2
+PORTREVISION?=	3
 CATEGORIES?=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/
 
@@ -59,7 +59,8 @@ PLIST_SUB+=	QT="@comment "
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|' \
-		${WRKSRC}/bus/session.conf.in
+		${WRKSRC}/bus/session.conf.in \
+		${WRKSRC}/bus/system.conf.in
 
 .if !defined(DBUS_SLAVE)
 pre-su-install:
@@ -78,6 +79,7 @@ post-install:
 .if !defined(PACKAGE_BUILDING)
 	@${SETENV} PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 .endif
+	${MKDIR} ${X11BASE}/etc/dbus-1/system.d
 	${MKDIR} ${X11BASE}/share/dbus-1/services
 .else
 .if defined(PKGNAMEPREFIX)
diff --git a/devel/dbus/files/patch-bus_system.conf.in b/devel/dbus/files/patch-bus_system.conf.in
new file mode 100644
index 000000000000..cfb3f879ec79
--- /dev/null
+++ b/devel/dbus/files/patch-bus_system.conf.in
@@ -0,0 +1,10 @@
+--- bus/system.conf.in.orig	Wed May  3 02:08:16 2006
++++ bus/system.conf.in	Wed May  3 02:09:58 2006
+@@ -52,6 +52,7 @@
+   <!-- Config files are placed here that among other things, punch 
+        holes in the above policy for specific services. -->
+   <includedir>system.d</includedir>
++  <includedir>%%X11BASE%%/etc/dbus-1/system.d</includedir>
+ 
+   <!-- This is included last so local configuration can override what's 
+        in this standard file -->
diff --git a/devel/dbus/pkg-plist b/devel/dbus/pkg-plist
index e8b82e028dc5..f79c94508aa6 100644
--- a/devel/dbus/pkg-plist
+++ b/devel/dbus/pkg-plist
@@ -45,12 +45,14 @@ lib/libdbus-glib-1.so.2
 libdata/pkgconfig/dbus-1.pc
 libdata/pkgconfig/dbus-glib-1.pc
 @exec mkdir -p %D/etc/dbus-1/system.d
+@exec mkdir -p %%X11BASE%%/etc/dbus-1/system.d
 @exec mkdir -p %D/share/dbus-1/services
 @exec mkdir -p %%X11BASE%%/share/dbus-1/services
 @dirrmtry share/dbus-1/services
 @dirrmtry share/dbus-1
 @unexec rmdir %%X11BASE%%/share/dbus-1/services 2>/dev/null || true
 @unexec rmdir %%X11BASE%%/share/dbus-1 2>/dev/null || true
+@unexec rmdir %%X11BASE%%/etc/dbus-1/system.d 2>/dev/null || true
 @dirrm include/dbus-%%VERSION%%/include/dbus
 @dirrm include/dbus-%%VERSION%%/include
 @dirrm include/dbus-%%VERSION%%/dbus
-- 
cgit v1.2.3