7 files changed, 28 insertions, 21 deletions

diff --git a/misc/kdehier4/Makefile b/misc/kdehier4/Makefile
index d2bd556475ae..b96d6ea2ad42 100644
--- a/misc/kdehier4/Makefile
+++ b/misc/kdehier4/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	kdehier4
-PORTVERSION=	1.0.9
+PORTVERSION=	1.0.10
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
@@ -44,15 +44,19 @@ do-install:
 	do \
 		${MKDIR} ${PREFIX}/$${dir}; \
 	done
+	${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
+	${LN} -sf ${LOCALBASE}/etc/pam.d ${KDE4_PREFIX}/etc/
+	${LN} -sf ${LOCALBASE}/etc/rc.d ${KDE4_PREFIX}/etc/
 	${LN} -sf ${LOCALBASE}/${LDCONFIG_DIR} ${KDE4_PREFIX}/libdata/
+	${ECHO_CMD} ${KDE4_PREFIX}/lib > ${LOCALBASE}/${LDCONFIG_DIR}/kdehier4
 	${LN} -sf ${LOCALBASE}/${LDCONFIG32_DIR} ${KDE4_PREFIX}/libdata/
 	${LN} -sf ${LOCALBASE}/libdata/pkgconfig ${KDE4_PREFIX}/libdata/
+.for dir in services system-services
+	${LN} -sf ${LOCALBASE}/share/dbus-1/${dir} ${KDE4_PREFIX}/share/dbus-1/
+.endfor
 	${LN} -sf ${LOCALBASE}/share/polkit-1/actions ${KDE4_PREFIX}/share/polkit-1/
-	${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:
diff --git a/misc/kdehier4/files/dirlist b/misc/kdehier4/files/dirlist
index 9927c732eb4c..4627b41a001b 100644
--- a/misc/kdehier4/files/dirlist
+++ b/misc/kdehier4/files/dirlist
@@ -55,8 +55,6 @@ share/config
 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
@@ -645,6 +643,8 @@ share/locale/sr@ijekavianlatin
 share/locale/sr@ijekavianlatin/LC_MESSAGES
 share/locale/sr@latin
 share/locale/sr@latin/LC_MESSAGES
+share/locale/ug
+share/locale/ug/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 8b7c0be857dd..ef632cbb457f 100644
--- a/misc/kdehier4/files/make-plist.sh
+++ b/misc/kdehier4/files/make-plist.sh
@@ -15,9 +15,13 @@ echo "%%MTREE%%@cwd %%LOCALBASE%%
 %%MTREE%%@dirrmtry etc/dbus-1
 %%MTREE%%@cwd %%KDE4_PREFIX%%" >> ../pkg-plist
 
-echo "%%MTREE%%%%LDCONFIG_DIR%%
+echo "%%MTREE%%etc/pam.d
+%%MTREE%%etc/rc.d
+%%MTREE%%%%LDCONFIG_DIR%%
 %%MTREE%%%%LDCONFIG32_DIR%%
 %%MTREE%%libdata/pkgconfig
+%%MTREE%%share/dbus-1/services
+%%MTREE%%share/dbus-1/system-services
 %%MTREE%%share/polkit-1/actions" >> ../pkg-plist
 
 (
diff --git a/misc/kdehier4/files/mtree-dirlist b/misc/kdehier4/files/mtree-dirlist
index f5eb57ec7d79..a6805d5d7d7f 100644
--- a/misc/kdehier4/files/mtree-dirlist
+++ b/misc/kdehier4/files/mtree-dirlist
@@ -1,8 +1,9 @@
 @comment BSD.local.dist mtree replacement (used only if KDE4_PREFIX != LOCALBASE)
 bin
 etc
-etc/pam.d
-etc/rc.d
+@comment the following commented dirs will be linked from the corresponding LOCALBASE dirs
+@comment etc/pam.d
+@comment etc/rc.d
 include
 include/X11
 info
diff --git a/misc/kdehier4/files/session-kde4.conf.in b/misc/kdehier4/files/session-kde4.conf.in
index 9f7341036232..44e4b4b62a16 100644
--- a/misc/kdehier4/files/session-kde4.conf.in
+++ b/misc/kdehier4/files/session-kde4.conf.in
@@ -3,6 +3,5 @@
 <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
index a6f4246bd472..c48e70c01d2c 100644
--- a/misc/kdehier4/files/system-kde4.conf.in
+++ b/misc/kdehier4/files/system-kde4.conf.in
@@ -3,6 +3,5 @@
 <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 38ab4f7a6470..71b40814cee6 100644
--- a/misc/kdehier4/pkg-plist
+++ b/misc/kdehier4/pkg-plist
@@ -5,14 +5,16 @@
 %%MTREE%%etc/dbus-1/system-kde4.conf
 %%MTREE%%@dirrmtry etc/dbus-1
 %%MTREE%%@cwd %%KDE4_PREFIX%%
+%%MTREE%%etc/pam.d
+%%MTREE%%etc/rc.d
 %%MTREE%%%%LDCONFIG_DIR%%
 %%MTREE%%%%LDCONFIG32_DIR%%
 %%MTREE%%libdata/pkgconfig
+%%MTREE%%share/dbus-1/services
+%%MTREE%%share/dbus-1/system-services
 %%MTREE%%share/polkit-1/actions
 %%MTREE%%@exec mkdir -p %D/bin
 %%MTREE%%@exec mkdir -p %D/etc
-%%MTREE%%@exec mkdir -p %D/etc/pam.d
-%%MTREE%%@exec mkdir -p %D/etc/rc.d
 %%MTREE%%@exec mkdir -p %D/include
 %%MTREE%%@exec mkdir -p %D/include/X11
 %%MTREE%%@exec mkdir -p %D/info
@@ -533,8 +535,6 @@
 @exec mkdir -p %D/share/config.kcfg
 @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
@@ -1114,6 +1114,8 @@
 @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/ug
+@exec mkdir -p %D/share/locale/ug/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
@@ -1140,6 +1142,8 @@
 @dirrmtry share/locale/xh
 @dirrmtry share/locale/uz@cyrillic/LC_MESSAGES
 @dirrmtry share/locale/uz@cyrillic
+@dirrmtry share/locale/ug/LC_MESSAGES
+@dirrmtry share/locale/ug
 @dirrmtry share/locale/sr@latin/LC_MESSAGES
 @dirrmtry share/locale/sr@latin
 @dirrmtry share/locale/sr@ijekavianlatin/LC_MESSAGES
@@ -1719,8 +1723,6 @@
 @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
 @dirrmtry share/config.kcfg
@@ -2241,8 +2243,6 @@
 %%MTREE%%@dirrm info
 %%MTREE%%@dirrm include/X11
 %%MTREE%%@dirrm include
-%%MTREE%%@dirrm etc/rc.d
-%%MTREE%%@dirrm etc/pam.d
 %%MTREE%%@dirrm etc
 %%MTREE%%@dirrm bin
 %%MTREE%%@exec echo %D/lib > %%LOCALBASE%%/%%LDCONFIG_DIR%%/kdehier4