7 files changed, 75 insertions, 5 deletions

diff --git a/misc/kdehier4/Makefile b/misc/kdehier4/Makefile
index 24df48025cd2..c4add6ef93c8 100644
--- a/misc/kdehier4/Makefile
+++ b/misc/kdehier4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdehier4
-PORTVERSION=	1.0.4
+PORTVERSION=	1.0.6
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -23,8 +23,10 @@ USE_KDE4=	kdeprefix
 .if ${KDE4_PREFIX} != ${LOCALBASE}
 PLIST_SUB+=	MTREE="" \
 		LDCONFIG_DIR="${LDCONFIG_DIR}" \
-		LDCONFIG32_DIR="${LDCONFIG32_DIR}" \
-		KDE4_PREFIX="${KDE4_PREFIX}"
+		LDCONFIG32_DIR="${LDCONFIG32_DIR}"
+SUB_FILES=	session-kde4.conf \
+		system-kde4.conf
+SUB_LIST=	KDE4_PREFIX="${KDE4_PREFIX}"
 .else
 PLIST_SUB+=	MTREE="@comment "
 .endif
@@ -45,8 +47,15 @@ do-install:
 	${LN} -sf ${LOCALBASE}/${LDCONFIG_DIR} ${KDE4_PREFIX}/libdata/
 	${LN} -sf ${LOCALBASE}/${LDCONFIG32_DIR} ${KDE4_PREFIX}/libdata/
 	${LN} -sf ${LOCALBASE}/libdata/pkgconfig ${KDE4_PREFIX}/libdata/
+	${LN} -sf ${LOCALBASE}/share/PolicyKit/policy ${KDE4_PREFIX}/share/PolicyKit/
 	${ECHO_CMD} ${KDE4_PREFIX}/lib > \
 		${LOCALBASE}/${LDCONFIG_DIR}/kdehier4
+	${MKDIR} ${LOCALBASE}/etc/dbus-1
+	${INSTALL_DATA} ${WRKDIR}/session-kde4.conf ${LOCALBASE}/etc/dbus-1
+	${INSTALL_DATA} ${WRKDIR}/system-kde4.conf ${LOCALBASE}/etc/dbus-1
 .endif
 
+maintainer-generate-plist:
+	cd ${FILESDIR} && ${SH} make-plist.sh
+
 .include <bsd.port.post.mk>
diff --git a/misc/kdehier4/files/dirlist b/misc/kdehier4/files/dirlist
index 1451c2af573f..1d08a98b428a 100644
--- a/misc/kdehier4/files/dirlist
+++ b/misc/kdehier4/files/dirlist
@@ -1,3 +1,6 @@
+etc/dbus-1
+etc/dbus-1/session.d
+etc/dbus-1/system.d
 include/KDE
 lib/kconf_update_bin
 lib/kde4
@@ -53,6 +56,7 @@ share/config.kcfg
 share/dbus-1
 share/dbus-1/interfaces
 share/dbus-1/services
+share/dbus-1/system-services
 share/doc/HTML
 share/doc/HTML/bg
 share/doc/HTML/ca
@@ -635,6 +639,10 @@ share/locale/se
 share/locale/se/LC_MESSAGES
 share/locale/sr@ijekavian
 share/locale/sr@ijekavian/LC_MESSAGES
+share/locale/sr@ijekavianlatin
+share/locale/sr@ijekavianlatin/LC_MESSAGES
+share/locale/sr@latin
+share/locale/sr@latin/LC_MESSAGES
 share/locale/uz@cyrillic
 share/locale/uz@cyrillic/LC_MESSAGES
 share/locale/xh
diff --git a/misc/kdehier4/files/make-plist.sh b/misc/kdehier4/files/make-plist.sh
index 2a054325efce..7116a9bcec65 100644
--- a/misc/kdehier4/files/make-plist.sh
+++ b/misc/kdehier4/files/make-plist.sh
@@ -1,14 +1,21 @@
 #!/bin/sh
 if [ ! -e dirlist -o ! -e ../Makefile ]; then
 	echo "Wrong directory; this script needs to be called from"
-	echo "/usr/ports/misc/kde4hier/files !"
+	echo "${PORTSDIR}/misc/kdehier4/files"
+	echo "directory!"
 	exit 1
 fi
 
+echo "%%MTREE%%@cwd %%LOCALBASE%%
+%%MTREE%%etc/dbus-1/session-kde4.conf
+%%MTREE%%etc/dbus-1/system-kde4.conf
+%%MTREE%%@dirrmtry etc/dbus-1
+%%MTREE%%@cwd %%KDE4_PREFIX%%" > ../pkg-plist
 
 echo "%%MTREE%%%%LDCONFIG_DIR%%
 %%MTREE%%%%LDCONFIG32_DIR%%
-%%MTREE%%libdata/pkgconfig" > ../pkg-plist
+%%MTREE%%libdata/pkgconfig
+%%MTREE%%share/PolicyKit/policy" >> ../pkg-plist
 
 (
 grep -v "^@comment" dirlist | sed -e "s,^,@exec mkdir -p %D/," ;
diff --git a/misc/kdehier4/files/mtree-dirlist b/misc/kdehier4/files/mtree-dirlist
index ee17a88ecace..7e68dcdd729e 100644
--- a/misc/kdehier4/files/mtree-dirlist
+++ b/misc/kdehier4/files/mtree-dirlist
@@ -126,6 +126,12 @@ man/ru.KOI8-R/manl
 man/ru.KOI8-R/mann
 sbin
 share
+@comment ---------------------------------------------------------------------
+@comment -- PolicyKit does not support files in different prefixes,
+@comment -- share/PolicyKit/policy will be linked from LOCALBASE
+share/PolicyKit
+@comment share/PolicyKit/policy
+@comment ---------------------------------------------------------------------
 share/aclocal
 share/dict
 share/doc
diff --git a/misc/kdehier4/files/session-kde4.conf.in b/misc/kdehier4/files/session-kde4.conf.in
new file mode 100644
index 000000000000..9f7341036232
--- /dev/null
+++ b/misc/kdehier4/files/session-kde4.conf.in
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <includedir>%%KDE4_PREFIX%%/etc/dbus-1/session.d</includedir>
+  <servicedir>%%KDE4_PREFIX%%/share/dbus-1/services</servicedir>
+
+</busconfig>
diff --git a/misc/kdehier4/files/system-kde4.conf.in b/misc/kdehier4/files/system-kde4.conf.in
new file mode 100644
index 000000000000..a6f4246bd472
--- /dev/null
+++ b/misc/kdehier4/files/system-kde4.conf.in
@@ -0,0 +1,8 @@
+<!DOCTYPE busconfig PUBLIC "-//freedesktop//DTD D-Bus Bus Configuration 1.0//EN"
+ "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
+<busconfig>
+
+  <includedir>%%KDE4_PREFIX%%/etc/dbus-1/system.d</includedir>
+  <servicedir>%%KDE4_PREFIX%%/share/dbus-1/system-services</servicedir>
+
+</busconfig>
diff --git a/misc/kdehier4/pkg-plist b/misc/kdehier4/pkg-plist
index b367c7dab283..d07289443964 100644
--- a/misc/kdehier4/pkg-plist
+++ b/misc/kdehier4/pkg-plist
@@ -1,6 +1,12 @@
+%%MTREE%%@cwd %%LOCALBASE%%
+%%MTREE%%etc/dbus-1/session-kde4.conf
+%%MTREE%%etc/dbus-1/system-kde4.conf
+%%MTREE%%@dirrmtry etc/dbus-1
+%%MTREE%%@cwd %%KDE4_PREFIX%%
 %%MTREE%%%%LDCONFIG_DIR%%
 %%MTREE%%%%LDCONFIG32_DIR%%
 %%MTREE%%libdata/pkgconfig
+%%MTREE%%share/PolicyKit/policy
 %%MTREE%%@exec mkdir -p %D/bin
 %%MTREE%%@exec mkdir -p %D/etc
 %%MTREE%%@exec mkdir -p %D/etc/pam.d
@@ -124,6 +130,7 @@
 %%MTREE%%@exec mkdir -p %D/man/ru.KOI8-R/mann
 %%MTREE%%@exec mkdir -p %D/sbin
 %%MTREE%%@exec mkdir -p %D/share
+%%MTREE%%@exec mkdir -p %D/share/PolicyKit
 %%MTREE%%@exec mkdir -p %D/share/aclocal
 %%MTREE%%@exec mkdir -p %D/share/dict
 %%MTREE%%@exec mkdir -p %D/share/doc
@@ -467,6 +474,9 @@
 %%MTREE%%@exec mkdir -p %D/share/skel
 %%MTREE%%@exec mkdir -p %D/share/xml
 %%MTREE%%@exec mkdir -p %D/www
+@exec mkdir -p %D/etc/dbus-1
+@exec mkdir -p %D/etc/dbus-1/session.d
+@exec mkdir -p %D/etc/dbus-1/system.d
 @exec mkdir -p %D/include/KDE
 @exec mkdir -p %D/lib/kconf_update_bin
 @exec mkdir -p %D/lib/kde4
@@ -522,6 +532,7 @@
 @exec mkdir -p %D/share/dbus-1
 @exec mkdir -p %D/share/dbus-1/interfaces
 @exec mkdir -p %D/share/dbus-1/services
+@exec mkdir -p %D/share/dbus-1/system-services
 @exec mkdir -p %D/share/doc/HTML
 @exec mkdir -p %D/share/doc/HTML/bg
 @exec mkdir -p %D/share/doc/HTML/ca
@@ -1095,6 +1106,10 @@
 @exec mkdir -p %D/share/locale/se/LC_MESSAGES
 @exec mkdir -p %D/share/locale/sr@ijekavian
 @exec mkdir -p %D/share/locale/sr@ijekavian/LC_MESSAGES
+@exec mkdir -p %D/share/locale/sr@ijekavianlatin
+@exec mkdir -p %D/share/locale/sr@ijekavianlatin/LC_MESSAGES
+@exec mkdir -p %D/share/locale/sr@latin
+@exec mkdir -p %D/share/locale/sr@latin/LC_MESSAGES
 @exec mkdir -p %D/share/locale/uz@cyrillic
 @exec mkdir -p %D/share/locale/uz@cyrillic/LC_MESSAGES
 @exec mkdir -p %D/share/locale/xh
@@ -1121,6 +1136,10 @@
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
 @dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/sr@latin/LC_MESSAGES
+@dirrmtry share/locale/sr@latin
+@dirrmtry share/locale/sr@ijekavianlatin/LC_MESSAGES
+@dirrmtry share/locale/sr@ijekavianlatin
 @dirrmtry share/locale/sr@ijekavian/LC_MESSAGES
 @dirrmtry share/locale/sr@ijekavian
 @dirrmtry share/locale/se/LC_MESSAGES
@@ -1694,6 +1713,7 @@
 @dirrmtry share/doc/HTML/ca
 @dirrmtry share/doc/HTML/bg
 @dirrmtry share/doc/HTML
+@dirrmtry share/dbus-1/system-services
 @dirrmtry share/dbus-1/services
 @dirrmtry share/dbus-1/interfaces
 @dirrmtry share/dbus-1
@@ -1749,6 +1769,9 @@
 @dirrmtry lib/kde4
 @dirrmtry lib/kconf_update_bin
 @dirrmtry include/KDE
+@dirrmtry etc/dbus-1/system.d
+@dirrmtry etc/dbus-1/session.d
+@dirrmtry etc/dbus-1
 %%MTREE%%@dirrm www
 %%MTREE%%@dirrm share/xml
 %%MTREE%%@dirrm share/skel
@@ -2092,6 +2115,7 @@
 %%MTREE%%@dirrm share/doc
 %%MTREE%%@dirrm share/dict
 %%MTREE%%@dirrm share/aclocal
+%%MTREE%%@dirrm share/PolicyKit
 %%MTREE%%@dirrm share
 %%MTREE%%@dirrm sbin
 %%MTREE%%@dirrm man/ru.KOI8-R/mann