From ea9ddd24d72387243930a11156dddfe13f53653a Mon Sep 17 00:00:00 2001
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Wed, 1 Sep 2010 18:04:06 +0000
Subject: [PATCH] Populate configuration files with additional includes of kde4
 files. (in preparation for KDE 4.5.1 update)

Approved by:	kwm
---
 devel/dbus/Makefile                         |  2 +-
 devel/dbus/files/patch-bus__session.conf.in | 10 ++++++++++
 devel/dbus/files/patch-bus__system.conf.in  | 10 ++++++++++
 3 files changed, 21 insertions(+), 1 deletion(-)
 create mode 100644 devel/dbus/files/patch-bus__session.conf.in
 create mode 100644 devel/dbus/files/patch-bus__system.conf.in

diff --git a/devel/dbus/Makefile b/devel/dbus/Makefile
index b10aa5aec70b..e2aee1facea1 100644
--- a/devel/dbus/Makefile
+++ b/devel/dbus/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	dbus
 PORTVERSION?=	1.2.24
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	devel gnome
 MASTER_SITES=	http://dbus.freedesktop.org/releases/dbus/
 
diff --git a/devel/dbus/files/patch-bus__session.conf.in b/devel/dbus/files/patch-bus__session.conf.in
new file mode 100644
index 000000000000..65a834d63907
--- /dev/null
+++ b/devel/dbus/files/patch-bus__session.conf.in
@@ -0,0 +1,10 @@
+--- ./bus/session.conf.in.orig	2010-03-23 22:01:27.000000000 +0300
++++ ./bus/session.conf.in	2010-09-01 19:47:37.427994122 +0400
+@@ -32,6 +32,7 @@
+   <!-- This is included last so local configuration can override what's 
+        in this standard file -->
+   <include ignore_missing="yes">session-local.conf</include>
++  <include ignore_missing="yes">session-kde4.conf</include>
+ 
+   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+ 
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..30a18b953c51
--- /dev/null
+++ b/devel/dbus/files/patch-bus__system.conf.in
@@ -0,0 +1,10 @@
+--- ./bus/system.conf.in.orig	2009-07-11 02:27:40.000000000 +0400
++++ ./bus/system.conf.in	2010-09-01 19:47:19.745313755 +0400
+@@ -77,6 +77,7 @@
+   <!-- This is included last so local configuration can override what's 
+        in this standard file -->
+   <include ignore_missing="yes">system-local.conf</include>
++  <include ignore_missing="yes">system-kde4.conf</include>
+ 
+   <include if_selinux_enabled="yes" selinux_root_relative="yes">contexts/dbus_contexts</include>
+