Indirect the installation of dbus files into ${PKG_SYSCONFDIR}.

Bump PKGREVISION.

7 files changed, 50 insertions, 5 deletions

diff --git a/x11/kdebase-workspace4/Makefile b/x11/kdebase-workspace4/Makefile
index 1343ffae002..974307f216c 100644
--- a/x11/kdebase-workspace4/Makefile
+++ b/x11/kdebase-workspace4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2010/04/10 02:45:04 markd Exp $
+# $NetBSD: Makefile,v 1.12 2010/04/11 13:56:14 markd Exp $
 
 DISTNAME=	kdebase-workspace-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	base workspace for the KDE 4 integrated X11 desktop
 
@@ -32,6 +33,12 @@ OWN_DIRS=		${PKG_SYSCONFDIR}/kdm
 
 CONF_FILES+=		${PREFIX}/share/examples/kdebase-workspace4/ksysguarddrc \
 			${PKG_SYSCONFDIR}/ksysguarddrc
+CONF_FILES+=		${PREFIX}/share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf \
+			${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.ksysguard.processlisthelper.conf
+CONF_FILES+=		${PREFIX}/share/examples/kde4-dbus/org.kde.fontinst.conf \
+			${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.fontinst.conf
+CONF_FILES+=		${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf \
+			${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmclock.conf
 
 REPLACE_PERL+= \
 	kcontrol/keys/convertShortcuts.pl \
diff --git a/x11/kdebase-workspace4/PLIST b/x11/kdebase-workspace4/PLIST
index 3632fb43fcf..633758ef410 100644
--- a/x11/kdebase-workspace4/PLIST
+++ b/x11/kdebase-workspace4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2010/04/10 02:45:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2010/04/11 13:56:14 markd Exp $
 bin/genkdmconf
 bin/kaccess
 bin/kapplymousetheme
@@ -594,6 +594,9 @@ share/doc/kde/HTML/en/plasma-desktop/taskbar-settings.png
 share/doc/kde/HTML/en/systemsettings/common
 share/doc/kde/HTML/en/systemsettings/index.cache.bz2
 share/doc/kde/HTML/en/systemsettings/index.docbook
+share/examples/kde4-dbus/org.kde.fontinst.conf
+share/examples/kde4-dbus/org.kde.kcontrol.kcmclock.conf
+share/examples/kde4-dbus/org.kde.ksysguard.processlisthelper.conf
 share/examples/kdebase-workspace4/ksysguarddrc
 share/examples/rc.d/kdm
 share/icons/Daemon.png
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index bc044d48613..f61165bbef0 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2010/04/10 02:45:05 markd Exp $
+# $NetBSD: Makefile,v 1.7 2010/04/11 13:55:49 markd Exp $
 
 DISTNAME=	kdelibs-${_KDE_VERSION}
+PKGREVISION=	1
 CATEGORIES=	x11
 COMMENT=	Support libraries for the KDE integrated X11 desktop
 
@@ -24,6 +25,10 @@ CMAKE_ARGS+=	-DWITH_Avahi:BOOL=off
 MAKE_DIRS+=	${PKG_SYSCONFDIR}/xdg/menus
 CONF_FILES+=	${PREFIX}/share/examples/kdelibs4/applications.menu \
 		${PKG_SYSCONFDIR}/xdg/menus/applications.menu
+CONF_FILES+=	${PREFIX}/share/examples/kde4-dbus/org.kde.auth.conf \
+		${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.auth.conf
+CONF_FILES+=	${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf \
+		${PKG_SYSCONFDIR}/dbus-1/system.d/org.kde.kcontrol.kcmremotewidgets.conf
 
 INSTALLATION_DIRS+=	${PKGMANDIR}/man1 ${PKGMANDIR}/man7 ${PKGMANDIR}/man8
 
diff --git a/x11/kdelibs4/PLIST b/x11/kdelibs4/PLIST
index fb0965e2f6b..f7c66b3ed6d 100644
--- a/x11/kdelibs4/PLIST
+++ b/x11/kdelibs4/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/04/10 02:45:05 markd Exp $
+@comment $NetBSD: PLIST,v 1.6 2010/04/11 13:55:49 markd Exp $
 bin/checkXML
 bin/kbuildsycoca4
 bin/kconfig_compiler
@@ -2044,6 +2044,8 @@ share/doc/kde/HTML/en/kioslave/webdav/index.docbook
 share/doc/kde/HTML/en/sonnet/common
 share/doc/kde/HTML/en/sonnet/index.cache.bz2
 share/doc/kde/HTML/en/sonnet/index.docbook
+share/examples/kde4-dbus/org.kde.auth.conf
+share/examples/kde4-dbus/org.kde.kcontrol.kcmremotewidgets.conf
 share/examples/kdelibs4/applications.menu
 share/icons/hicolor/16x16/actions/presence_away.png
 share/icons/hicolor/16x16/actions/presence_offline.png
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 76d3007ece2..2057fe48241 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2010/04/10 02:45:05 markd Exp $
+$NetBSD: distinfo,v 1.7 2010/04/11 13:55:49 markd Exp $
 
 SHA1 (kdelibs-4.4.2.tar.bz2) = 25df6bdd8839af234f6871ebce395ca890098d90
 RMD160 (kdelibs-4.4.2.tar.bz2) = 7506f87bc098aedb84b3b50707065a4f8060a3ce
@@ -10,3 +10,5 @@ SHA1 (patch-ad) = 2a0dfd3dda071654c89b8dda3db8885e2a55ba2b
 SHA1 (patch-ag) = af1e58512984726a4efaf315bb958a9a529638b8
 SHA1 (patch-ah) = b583dbe1b712984bbe002cc9143352729fba94ed
 SHA1 (patch-aj) = 8520c322d4579e9485253c8e8b130669b0f8b618
+SHA1 (patch-ak) = 03883c05a2a600737d98a889034a2fb9984a5d58
+SHA1 (patch-al) = a3c48e8552ca39496134696f3d415a7b6a4db7d8
diff --git a/x11/kdelibs4/patches/patch-ak b/x11/kdelibs4/patches/patch-ak
new file mode 100644
index 00000000000..7563e01a641
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-ak
@@ -0,0 +1,13 @@
+$NetBSD: patch-ak,v 1.3 2010/04/11 13:55:49 markd Exp $
+
+--- kdecore/auth/ConfigureChecks.cmake.orig	2010-03-26 17:24:30.000000000 +0000
++++ kdecore/auth/ConfigureChecks.cmake
+@@ -198,7 +198,7 @@ if(KDE4_AUTH_HELPER_BACKEND_NAME STREQUA
+ 
+     # Install some files as well
+     install( FILES auth/backends/dbus/org.kde.auth.conf
+-             DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d )
++             DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/kde4-dbus )
+ 
+     install( FILES auth/backends/dbus/dbus_policy.stub
+                    auth/backends/dbus/dbus_service.stub
diff --git a/x11/kdelibs4/patches/patch-al b/x11/kdelibs4/patches/patch-al
new file mode 100644
index 00000000000..25f84d2779a
--- /dev/null
+++ b/x11/kdelibs4/patches/patch-al
@@ -0,0 +1,13 @@
+$NetBSD: patch-al,v 1.1 2010/04/11 13:55:49 markd Exp $
+
+--- cmake/modules/KDE4Macros.cmake.orig	2010-03-26 17:24:24.000000000 +0000
++++ cmake/modules/KDE4Macros.cmake
+@@ -1254,7 +1254,7 @@ function(KDE4_INSTALL_AUTH_HELPER_FILES 
+         configure_file(${_stubFilesDir}/dbus_policy.stub
+                         ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf)
+         install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.conf
+-                DESTINATION ${SYSCONF_INSTALL_DIR}/dbus-1/system.d/)
++                DESTINATION ${CMAKE_INSTALL_PREFIX}/share/examples/kde4-dbus/)
+ 
+         configure_file(${_stubFilesDir}/dbus_service.stub
+                         ${CMAKE_CURRENT_BINARY_DIR}/${HELPER_ID}.service)