Fix some more plist nits.

11 files changed, 184 insertions, 12 deletions

diff --git a/misc/kde3-i18n-af/pkg-plist b/misc/kde3-i18n-af/pkg-plist
index 3a357fd86c20..7bd9dda877c0 100644
--- a/misc/kde3-i18n-af/pkg-plist
+++ b/misc/kde3-i18n-af/pkg-plist
@@ -408,5 +408,3 @@ share/locale/af/LC_MESSAGES/webarchiver.mo
 share/locale/af/charset
 share/locale/af/entry.desktop
 share/locale/af/flag.png
-@dirrm share/locale/af/LC_MESSAGES
-@dirrm share/locale/af
diff --git a/misc/kde3-i18n-th/pkg-plist b/misc/kde3-i18n-th/pkg-plist
index 10269cdfc893..40bdcbf13dc5 100644
--- a/misc/kde3-i18n-th/pkg-plist
+++ b/misc/kde3-i18n-th/pkg-plist
@@ -339,5 +339,3 @@ share/locale/th/LC_MESSAGES/webarchiver.mo
 share/locale/th/charset
 share/locale/th/entry.desktop
 share/locale/th/flag.png
-@dirrm share/locale/th/LC_MESSAGES
-@dirrm share/locale/th
diff --git a/misc/kde4-l10n-th/pkg-plist b/misc/kde4-l10n-th/pkg-plist
index 10269cdfc893..40bdcbf13dc5 100644
--- a/misc/kde4-l10n-th/pkg-plist
+++ b/misc/kde4-l10n-th/pkg-plist
@@ -339,5 +339,3 @@ share/locale/th/LC_MESSAGES/webarchiver.mo
 share/locale/th/charset
 share/locale/th/entry.desktop
 share/locale/th/flag.png
-@dirrm share/locale/th/LC_MESSAGES
-@dirrm share/locale/th
diff --git a/misc/kdehier/Makefile b/misc/kdehier/Makefile
index c96c7187b440..f4da4473d5fb 100644
--- a/misc/kdehier/Makefile
+++ b/misc/kdehier/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdehier
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/kdehier/files/dirlist b/misc/kdehier/files/dirlist
index 4a44396f619f..dd2dc1b8291f 100644
--- a/misc/kdehier/files/dirlist
+++ b/misc/kdehier/files/dirlist
@@ -81,6 +81,8 @@ share/applnk/Utilities/XUtilities
 @comment share/apps/kate/pics
 @comment --------------------------------------------------------------------
 @comment -- There might be ports which install Kate scripts
+share/apps
+share/apps/kate
 share/apps/kate/scripts
 @comment share/apps/kbookmark
 @comment share/apps/kcmcss
@@ -117,6 +119,7 @@ share/apps/kdesktop/programs
 @comment share/apps/khelpcenter
 @comment -------------------------------------------------------------------
 @comment -- Hopefully we get more KHelpCenter plugins :-)
+share/apps/khelpcenter
 share/apps/khelpcenter/plugins
 @comment share/apps/khelpcenter/plugins/Applications
 @comment share/apps/khelpcenter/plugins/Manpages
@@ -146,9 +149,11 @@ share/apps/kicker/wallpapers
 @comment share/apps/konqlistview/kpartplugins
 @comment -------------------------------------------------------------------
 @comment -- Konqueror sidebar plugins could install stuff here.
+share/apps/konqsidebartng
 share/apps/konqsidebartng/add
 share/apps/konqsidebartng/dirtree
 share/apps/konqsidebartng/entries
+share/apps/konqsidebartng/virtual_folders
 share/apps/konqsidebartng/virtual_folders/remote
 share/apps/konqsidebartng/virtual_folders/remote/ftp
 share/apps/konqsidebartng/virtual_folders/remote/web
@@ -159,6 +164,7 @@ share/apps/konqsidebartng/virtual_folders/services
 @comment share/apps/konqueror/pic
 @comment -------------------------------------------------------------------
 @comment -- Konqueror profiles maybe, and additional service menus.
+share/apps/konqueror
 share/apps/konqueror/profiles
 share/apps/konqueror/servicemenus
 @comment share/apps/konqueror/tiles
@@ -175,6 +181,7 @@ share/apps/konsole/profiles
 @comment share/apps/kthememgr
 @comment -------------------------------------------------------------------
 @comment -- Additional kthememgr and kwin themes - not sure about kwin/pics
+share/apps/kthememgr
 share/apps/kthememgr/Themes
 share/apps/kwin
 share/apps/kwin/icewm-themes
@@ -189,6 +196,7 @@ share/config.kcfg
 @comment share/doc/HTML/en/kate
 @comment -------------------------------------------------------------------
 @comment -- Documentation for additional kcontrol modules could go here.
+share/doc/HTML/en
 share/doc/HTML/en/kcontrol
 @comment share/doc/HTML/en/kcontrol/arts
 @comment share/doc/HTML/en/kcontrol/background
@@ -410,106 +418,129 @@ share/wallpapers
 @comment -- Directories handpicked out of kdelibs
 lib/kde3
 share/applnk/Settings/Components
+share/apps
+share/apps/kabc
 share/apps/kabc/formats
 share/apps/kabc/plugins
+share/icons
 share/icons/crystalsvg
+share/icons/crystalsvg/128x128
 share/icons/crystalsvg/128x128/actions
 share/icons/crystalsvg/128x128/apps
 share/icons/crystalsvg/128x128/devices
 share/icons/crystalsvg/128x128/filesystems
 share/icons/crystalsvg/128x128/mimetypes
+share/icons/crystalsvg/16x16
 share/icons/crystalsvg/16x16/actions
 share/icons/crystalsvg/16x16/apps
 share/icons/crystalsvg/16x16/devices
 share/icons/crystalsvg/16x16/filesystems
 share/icons/crystalsvg/16x16/mimetypes
+share/icons/crystalsvg/22x22
 share/icons/crystalsvg/22x22/actions
 share/icons/crystalsvg/22x22/apps
 share/icons/crystalsvg/22x22/devices
 share/icons/crystalsvg/22x22/filesystems
 share/icons/crystalsvg/22x22/mimetypes
+share/icons/crystalsvg/32x32
 share/icons/crystalsvg/32x32/actions
 share/icons/crystalsvg/32x32/apps
 share/icons/crystalsvg/32x32/devices
 share/icons/crystalsvg/32x32/filesystems
 share/icons/crystalsvg/32x32/mimetypes
+share/icons/crystalsvg/48x48
 share/icons/crystalsvg/48x48/actions
 share/icons/crystalsvg/48x48/apps
 share/icons/crystalsvg/48x48/devices
 share/icons/crystalsvg/48x48/filesystems
 share/icons/crystalsvg/48x48/mimetypes
+share/icons/crystalsvg/64x64
 share/icons/crystalsvg/64x64/actions
 share/icons/crystalsvg/64x64/apps
 share/icons/crystalsvg/64x64/devices
 share/icons/crystalsvg/64x64/filesystems
 share/icons/crystalsvg/64x64/mimetypes
+share/icons/crystalsvg/scalable
 share/icons/crystalsvg/scalable/actions
 share/icons/crystalsvg/scalable/apps
 share/icons/crystalsvg/scalable/devices
 share/icons/crystalsvg/scalable/filesystems
 share/icons/crystalsvg/scalable/mimetype
 share/icons/hicolor
+share/icons/hicolor/128x128
 share/icons/hicolor/128x128/actions
 share/icons/hicolor/128x128/apps
 share/icons/hicolor/128x128/devices
 share/icons/hicolor/128x128/filesystems
 share/icons/hicolor/128x128/mimetypes
+share/icons/hicolor/16x16
 share/icons/hicolor/16x16/actions
 share/icons/hicolor/16x16/apps
 share/icons/hicolor/16x16/devices
 share/icons/hicolor/16x16/filesystems
 share/icons/hicolor/16x16/mimetypes
+share/icons/hicolor/22x22
 share/icons/hicolor/22x22/actions
 share/icons/hicolor/22x22/apps
 share/icons/hicolor/22x22/devices
 share/icons/hicolor/22x22/filesystems
 share/icons/hicolor/22x22/mimetypes
+share/icons/hicolor/32x32
 share/icons/hicolor/32x32/actions
 share/icons/hicolor/32x32/apps
 share/icons/hicolor/32x32/devices
 share/icons/hicolor/32x32/filesystems
 share/icons/hicolor/32x32/mimetypes
+share/icons/hicolor/48x48
 share/icons/hicolor/48x48/actions
 share/icons/hicolor/48x48/apps
 share/icons/hicolor/48x48/devices
 share/icons/hicolor/48x48/filesystems
 share/icons/hicolor/48x48/mimetypes
+share/icons/hicolor/64x64
 share/icons/hicolor/64x64/actions
 share/icons/hicolor/64x64/apps
 share/icons/hicolor/64x64/devices
 share/icons/hicolor/64x64/filesystems
 share/icons/hicolor/64x64/mimetypes
 share/icons/locolor
+share/icons/locolor/128x128
 share/icons/locolor/128x128/actions
 share/icons/locolor/128x128/apps
 share/icons/locolor/128x128/devices
 share/icons/locolor/128x128/filesystem
 share/icons/locolor/128x128/mimetypes
+share/icons/locolor/16x16
 share/icons/locolor/16x16/actions
 share/icons/locolor/16x16/apps
 share/icons/locolor/16x16/devices
 share/icons/locolor/16x16/filesystems
 share/icons/locolor/16x16/mimetypes
+share/icons/locolor/22x22
 share/icons/locolor/22x22/actions
 share/icons/locolor/22x22/apps
 share/icons/locolor/22x22/devices
 share/icons/locolor/22x22/filesystems
 share/icons/locolor/22x22/mimetypes
+share/icons/locolor/32x32
 share/icons/locolor/32x32/actions
 share/icons/locolor/32x32/apps
 share/icons/locolor/32x32/devices
 share/icons/locolor/32x32/filesystems
 share/icons/locolor/32x32/mimetypes
+share/icons/locolor/48x48
 share/icons/locolor/48x48/actions
 share/icons/locolor/48x48/apps
 share/icons/locolor/48x48/devices
 share/icons/locolor/48x48/filesystems
 share/icons/locolor/48x48/mimetypes
+share/icons/locolor/64x64
 share/icons/locolor/64x64/actions
 share/icons/locolor/64x64/apps
 share/icons/locolor/64x64/devices
 share/icons/locolor/64x64/filesystems
 share/icons/locolor/64x64/mimetypes
+share/mimelnk
 share/mimelnk/all
 share/mimelnk/application
 share/mimelnk/audio
diff --git a/misc/kdehier/pkg-plist b/misc/kdehier/pkg-plist
index 1df80552064a..c6ce195ef42e 100644
--- a/misc/kdehier/pkg-plist
+++ b/misc/kdehier/pkg-plist
@@ -47,14 +47,18 @@ share/applnk/Toys/.keep_me
 share/applnk/Utilities/.keep_me
 share/applnk/Utilities/More/.keep_me
 share/applnk/Utilities/XUtilities/.keep_me
+share/apps/.keep_me
+share/apps/kabc/.keep_me
 share/apps/kabc/formats/.keep_me
 share/apps/kabc/plugins/.keep_me
+share/apps/kate/.keep_me
 share/apps/kate/scripts/.keep_me
 share/apps/kdesktop/.keep_me
 share/apps/kdesktop/DesktopLinks/.keep_me
 share/apps/kdesktop/patterns/.keep_me
 share/apps/kdesktop/pics/.keep_me
 share/apps/kdesktop/programs/.keep_me
+share/apps/khelpcenter/.keep_me
 share/apps/khelpcenter/plugins/.keep_me
 share/apps/kicker/.keep_me
 share/apps/kicker/applets/.keep_me
@@ -63,123 +67,149 @@ share/apps/kicker/menuext/.keep_me
 share/apps/kicker/pics/.keep_me
 share/apps/kicker/tiles/.keep_me
 share/apps/kicker/wallpapers/.keep_me
+share/apps/konqsidebartng/.keep_me
 share/apps/konqsidebartng/add/.keep_me
 share/apps/konqsidebartng/dirtree/.keep_me
 share/apps/konqsidebartng/entries/.keep_me
+share/apps/konqsidebartng/virtual_folders/.keep_me
 share/apps/konqsidebartng/virtual_folders/remote/.keep_me
 share/apps/konqsidebartng/virtual_folders/remote/ftp/.keep_me
 share/apps/konqsidebartng/virtual_folders/remote/web/.keep_me
 share/apps/konqsidebartng/virtual_folders/services/.keep_me
+share/apps/konqueror/.keep_me
 share/apps/konqueror/profiles/.keep_me
 share/apps/konqueror/servicemenus/.keep_me
 share/apps/konsole/.keep_me
 share/apps/konsole/profiles/.keep_me
+share/apps/kthememgr/.keep_me
 share/apps/kthememgr/Themes/.keep_me
 share/apps/kwin/.keep_me
 share/apps/kwin/icewm-themes/.keep_me
 share/apps/kwin/pics/.keep_me
 share/config.kcfg/.keep_me
+share/doc/HTML/en/.keep_me
 share/doc/HTML/en/kcontrol/.keep_me
 share/fonts/.keep_me
 share/fonts/override/.keep_me
+share/icons/.keep_me
 share/icons/crystalsvg/.keep_me
+share/icons/crystalsvg/128x128/.keep_me
 share/icons/crystalsvg/128x128/actions/.keep_me
 share/icons/crystalsvg/128x128/apps/.keep_me
 share/icons/crystalsvg/128x128/devices/.keep_me
 share/icons/crystalsvg/128x128/filesystems/.keep_me
 share/icons/crystalsvg/128x128/mimetypes/.keep_me
+share/icons/crystalsvg/16x16/.keep_me
 share/icons/crystalsvg/16x16/actions/.keep_me
 share/icons/crystalsvg/16x16/apps/.keep_me
 share/icons/crystalsvg/16x16/devices/.keep_me
 share/icons/crystalsvg/16x16/filesystems/.keep_me
 share/icons/crystalsvg/16x16/mimetypes/.keep_me
+share/icons/crystalsvg/22x22/.keep_me
 share/icons/crystalsvg/22x22/actions/.keep_me
 share/icons/crystalsvg/22x22/apps/.keep_me
 share/icons/crystalsvg/22x22/devices/.keep_me
 share/icons/crystalsvg/22x22/filesystems/.keep_me
 share/icons/crystalsvg/22x22/mimetypes/.keep_me
+share/icons/crystalsvg/32x32/.keep_me
 share/icons/crystalsvg/32x32/actions/.keep_me
 share/icons/crystalsvg/32x32/apps/.keep_me
 share/icons/crystalsvg/32x32/devices/.keep_me
 share/icons/crystalsvg/32x32/filesystems/.keep_me
 share/icons/crystalsvg/32x32/mimetypes/.keep_me
+share/icons/crystalsvg/48x48/.keep_me
 share/icons/crystalsvg/48x48/actions/.keep_me
 share/icons/crystalsvg/48x48/apps/.keep_me
 share/icons/crystalsvg/48x48/devices/.keep_me
 share/icons/crystalsvg/48x48/filesystems/.keep_me
 share/icons/crystalsvg/48x48/mimetypes/.keep_me
+share/icons/crystalsvg/64x64/.keep_me
 share/icons/crystalsvg/64x64/actions/.keep_me
 share/icons/crystalsvg/64x64/apps/.keep_me
 share/icons/crystalsvg/64x64/devices/.keep_me
 share/icons/crystalsvg/64x64/filesystems/.keep_me
 share/icons/crystalsvg/64x64/mimetypes/.keep_me
+share/icons/crystalsvg/scalable/.keep_me
 share/icons/crystalsvg/scalable/actions/.keep_me
 share/icons/crystalsvg/scalable/apps/.keep_me
 share/icons/crystalsvg/scalable/devices/.keep_me
 share/icons/crystalsvg/scalable/filesystems/.keep_me
 share/icons/crystalsvg/scalable/mimetype/.keep_me
 share/icons/hicolor/.keep_me
+share/icons/hicolor/128x128/.keep_me
 share/icons/hicolor/128x128/actions/.keep_me
 share/icons/hicolor/128x128/apps/.keep_me
 share/icons/hicolor/128x128/devices/.keep_me
 share/icons/hicolor/128x128/filesystems/.keep_me
 share/icons/hicolor/128x128/mimetypes/.keep_me
+share/icons/hicolor/16x16/.keep_me
 share/icons/hicolor/16x16/actions/.keep_me
 share/icons/hicolor/16x16/apps/.keep_me
 share/icons/hicolor/16x16/devices/.keep_me
 share/icons/hicolor/16x16/filesystems/.keep_me
 share/icons/hicolor/16x16/mimetypes/.keep_me
+share/icons/hicolor/22x22/.keep_me
 share/icons/hicolor/22x22/actions/.keep_me
 share/icons/hicolor/22x22/apps/.keep_me
 share/icons/hicolor/22x22/devices/.keep_me
 share/icons/hicolor/22x22/filesystems/.keep_me
 share/icons/hicolor/22x22/mimetypes/.keep_me
+share/icons/hicolor/32x32/.keep_me
 share/icons/hicolor/32x32/actions/.keep_me
 share/icons/hicolor/32x32/apps/.keep_me
 share/icons/hicolor/32x32/devices/.keep_me
 share/icons/hicolor/32x32/filesystems/.keep_me
 share/icons/hicolor/32x32/mimetypes/.keep_me
+share/icons/hicolor/48x48/.keep_me
 share/icons/hicolor/48x48/actions/.keep_me
 share/icons/hicolor/48x48/apps/.keep_me
 share/icons/hicolor/48x48/devices/.keep_me
 share/icons/hicolor/48x48/filesystems/.keep_me
 share/icons/hicolor/48x48/mimetypes/.keep_me
+share/icons/hicolor/64x64/.keep_me
 share/icons/hicolor/64x64/actions/.keep_me
 share/icons/hicolor/64x64/apps/.keep_me
 share/icons/hicolor/64x64/devices/.keep_me
 share/icons/hicolor/64x64/filesystems/.keep_me
 share/icons/hicolor/64x64/mimetypes/.keep_me
 share/icons/locolor/.keep_me
+share/icons/locolor/128x128/.keep_me
 share/icons/locolor/128x128/actions/.keep_me
 share/icons/locolor/128x128/apps/.keep_me
 share/icons/locolor/128x128/devices/.keep_me
 share/icons/locolor/128x128/filesystem/.keep_me
 share/icons/locolor/128x128/mimetypes/.keep_me
+share/icons/locolor/16x16/.keep_me
 share/icons/locolor/16x16/actions/.keep_me
 share/icons/locolor/16x16/apps/.keep_me
 share/icons/locolor/16x16/devices/.keep_me
 share/icons/locolor/16x16/filesystems/.keep_me
 share/icons/locolor/16x16/mimetypes/.keep_me
+share/icons/locolor/22x22/.keep_me
 share/icons/locolor/22x22/actions/.keep_me
 share/icons/locolor/22x22/apps/.keep_me
 share/icons/locolor/22x22/devices/.keep_me
 share/icons/locolor/22x22/filesystems/.keep_me
 share/icons/locolor/22x22/mimetypes/.keep_me
+share/icons/locolor/32x32/.keep_me
 share/icons/locolor/32x32/actions/.keep_me
 share/icons/locolor/32x32/apps/.keep_me
 share/icons/locolor/32x32/devices/.keep_me
 share/icons/locolor/32x32/filesystems/.keep_me
 share/icons/locolor/32x32/mimetypes/.keep_me
+share/icons/locolor/48x48/.keep_me
 share/icons/locolor/48x48/actions/.keep_me
 share/icons/locolor/48x48/apps/.keep_me
 share/icons/locolor/48x48/devices/.keep_me
 share/icons/locolor/48x48/filesystems/.keep_me
 share/icons/locolor/48x48/mimetypes/.keep_me
+share/icons/locolor/64x64/.keep_me
 share/icons/locolor/64x64/actions/.keep_me
 share/icons/locolor/64x64/apps/.keep_me
 share/icons/locolor/64x64/devices/.keep_me
 share/icons/locolor/64x64/filesystems/.keep_me
 share/icons/locolor/64x64/mimetypes/.keep_me
+share/mimelnk/.keep_me
 share/mimelnk/all/.keep_me
 share/mimelnk/application/.keep_me
 share/mimelnk/audio/.keep_me
@@ -216,123 +246,149 @@ share/wallpapers/.keep_me
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk/all
+@dirrm share/mimelnk
 @dirrm share/icons/locolor/64x64/mimetypes
 @dirrm share/icons/locolor/64x64/filesystems
 @dirrm share/icons/locolor/64x64/devices
 @dirrm share/icons/locolor/64x64/apps
 @dirrm share/icons/locolor/64x64/actions
+@dirrm share/icons/locolor/64x64
 @dirrm share/icons/locolor/48x48/mimetypes
 @dirrm share/icons/locolor/48x48/filesystems
 @dirrm share/icons/locolor/48x48/devices
 @dirrm share/icons/locolor/48x48/apps
 @dirrm share/icons/locolor/48x48/actions
+@dirrm share/icons/locolor/48x48
 @dirrm share/icons/locolor/32x32/mimetypes
 @dirrm share/icons/locolor/32x32/filesystems
 @dirrm share/icons/locolor/32x32/devices
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32/actions
+@dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/22x22/mimetypes
 @dirrm share/icons/locolor/22x22/filesystems
 @dirrm share/icons/locolor/22x22/devices
 @dirrm share/icons/locolor/22x22/apps
 @dirrm share/icons/locolor/22x22/actions
+@dirrm share/icons/locolor/22x22
 @dirrm share/icons/locolor/16x16/mimetypes
 @dirrm share/icons/locolor/16x16/filesystems
 @dirrm share/icons/locolor/16x16/devices
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16/actions
+@dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor/128x128/mimetypes
 @dirrm share/icons/locolor/128x128/filesystem
 @dirrm share/icons/locolor/128x128/devices
 @dirrm share/icons/locolor/128x128/apps
 @dirrm share/icons/locolor/128x128/actions
+@dirrm share/icons/locolor/128x128
 @dirrm share/icons/locolor
 @dirrm share/icons/hicolor/64x64/mimetypes
 @dirrm share/icons/hicolor/64x64/filesystems
 @dirrm share/icons/hicolor/64x64/devices
 @dirrm share/icons/hicolor/64x64/apps
 @dirrm share/icons/hicolor/64x64/actions
+@dirrm share/icons/hicolor/64x64
 @dirrm share/icons/hicolor/48x48/mimetypes
 @dirrm share/icons/hicolor/48x48/filesystems
 @dirrm share/icons/hicolor/48x48/devices
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48/actions
+@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/mimetypes
 @dirrm share/icons/hicolor/32x32/filesystems
 @dirrm share/icons/hicolor/32x32/devices
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/32x32/actions
+@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/22x22/mimetypes
 @dirrm share/icons/hicolor/22x22/filesystems
 @dirrm share/icons/hicolor/22x22/devices
 @dirrm share/icons/hicolor/22x22/apps
 @dirrm share/icons/hicolor/22x22/actions
+@dirrm share/icons/hicolor/22x22
 @dirrm share/icons/hicolor/16x16/mimetypes
 @dirrm share/icons/hicolor/16x16/filesystems
 @dirrm share/icons/hicolor/16x16/devices
 @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/16x16/actions
+@dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor/128x128/mimetypes
 @dirrm share/icons/hicolor/128x128/filesystems
 @dirrm share/icons/hicolor/128x128/devices
 @dirrm share/icons/hicolor/128x128/apps
 @dirrm share/icons/hicolor/128x128/actions
+@dirrm share/icons/hicolor/128x128
 @dirrm share/icons/hicolor
 @dirrm share/icons/crystalsvg/scalable/mimetype
 @dirrm share/icons/crystalsvg/scalable/filesystems
 @dirrm share/icons/crystalsvg/scalable/devices
 @dirrm share/icons/crystalsvg/scalable/apps
 @dirrm share/icons/crystalsvg/scalable/actions
+@dirrm share/icons/crystalsvg/scalable
 @dirrm share/icons/crystalsvg/64x64/mimetypes
 @dirrm share/icons/crystalsvg/64x64/filesystems
 @dirrm share/icons/crystalsvg/64x64/devices
 @dirrm share/icons/crystalsvg/64x64/apps
 @dirrm share/icons/crystalsvg/64x64/actions
+@dirrm share/icons/crystalsvg/64x64
 @dirrm share/icons/crystalsvg/48x48/mimetypes
 @dirrm share/icons/crystalsvg/48x48/filesystems
 @dirrm share/icons/crystalsvg/48x48/devices
 @dirrm share/icons/crystalsvg/48x48/apps
 @dirrm share/icons/crystalsvg/48x48/actions
+@dirrm share/icons/crystalsvg/48x48
 @dirrm share/icons/crystalsvg/32x32/mimetypes
 @dirrm share/icons/crystalsvg/32x32/filesystems
 @dirrm share/icons/crystalsvg/32x32/devices
 @dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/32x32/actions
+@dirrm share/icons/crystalsvg/32x32
 @dirrm share/icons/crystalsvg/22x22/mimetypes
 @dirrm share/icons/crystalsvg/22x22/filesystems
 @dirrm share/icons/crystalsvg/22x22/devices
 @dirrm share/icons/crystalsvg/22x22/apps
 @dirrm share/icons/crystalsvg/22x22/actions
+@dirrm share/icons/crystalsvg/22x22
 @dirrm share/icons/crystalsvg/16x16/mimetypes
 @dirrm share/icons/crystalsvg/16x16/filesystems
 @dirrm share/icons/crystalsvg/16x16/devices
 @dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/icons/crystalsvg/16x16/actions
+@dirrm share/icons/crystalsvg/16x16
 @dirrm share/icons/crystalsvg/128x128/mimetypes
 @dirrm share/icons/crystalsvg/128x128/filesystems
 @dirrm share/icons/crystalsvg/128x128/devices
 @dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/icons/crystalsvg/128x128/actions
+@dirrm share/icons/crystalsvg/128x128
 @dirrm share/icons/crystalsvg
+@dirrm share/icons
 @dirrm share/fonts/override
 @dirrm share/fonts
 @dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/en
 @dirrm share/config.kcfg
 @dirrm share/apps/kwin/pics
 @dirrm share/apps/kwin/icewm-themes
 @dirrm share/apps/kwin
 @dirrm share/apps/kthememgr/Themes
+@dirrm share/apps/kthememgr
 @dirrm share/apps/konsole/profiles
 @dirrm share/apps/konsole
 @dirrm share/apps/konqueror/servicemenus
 @dirrm share/apps/konqueror/profiles
+@dirrm share/apps/konqueror
 @dirrm share/apps/konqsidebartng/virtual_folders/services
 @dirrm share/apps/konqsidebartng/virtual_folders/remote/web
 @dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
 @dirrm share/apps/konqsidebartng/virtual_folders/remote
+@dirrm share/apps/konqsidebartng/virtual_folders
 @dirrm share/apps/konqsidebartng/entries
 @dirrm share/apps/konqsidebartng/dirtree
 @dirrm share/apps/konqsidebartng/add
+@dirrm share/apps/konqsidebartng
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
@@ -341,14 +397,18 @@ share/wallpapers/.keep_me
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins
+@dirrm share/apps/khelpcenter
 @dirrm share/apps/kdesktop/programs
 @dirrm share/apps/kdesktop/pics
 @dirrm share/apps/kdesktop/patterns
 @dirrm share/apps/kdesktop/DesktopLinks
 @dirrm share/apps/kdesktop
 @dirrm share/apps/kate/scripts
+@dirrm share/apps/kate
 @dirrm share/apps/kabc/plugins
 @dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps
 @dirrm share/applnk/Utilities/XUtilities
 @dirrm share/applnk/Utilities/More
 @dirrm share/applnk/Utilities
diff --git a/misc/kdehier4/Makefile b/misc/kdehier4/Makefile
index c96c7187b440..f4da4473d5fb 100644
--- a/misc/kdehier4/Makefile
+++ b/misc/kdehier4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdehier
 PORTVERSION=	1.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/kdehier4/files/dirlist b/misc/kdehier4/files/dirlist
index 4a44396f619f..dd2dc1b8291f 100644
--- a/misc/kdehier4/files/dirlist
+++ b/misc/kdehier4/files/dirlist
@@ -81,6 +81,8 @@ share/applnk/Utilities/XUtilities
 @comment share/apps/kate/pics
 @comment --------------------------------------------------------------------
 @comment -- There might be ports which install Kate scripts
+share/apps
+share/apps/kate
 share/apps/kate/scripts
 @comment share/apps/kbookmark
 @comment share/apps/kcmcss
@@ -117,6 +119,7 @@ share/apps/kdesktop/programs
 @comment share/apps/khelpcenter
 @comment -------------------------------------------------------------------
 @comment -- Hopefully we get more KHelpCenter plugins :-)
+share/apps/khelpcenter
 share/apps/khelpcenter/plugins
 @comment share/apps/khelpcenter/plugins/Applications
 @comment share/apps/khelpcenter/plugins/Manpages
@@ -146,9 +149,11 @@ share/apps/kicker/wallpapers
 @comment share/apps/konqlistview/kpartplugins
 @comment -------------------------------------------------------------------
 @comment -- Konqueror sidebar plugins could install stuff here.
+share/apps/konqsidebartng
 share/apps/konqsidebartng/add
 share/apps/konqsidebartng/dirtree
 share/apps/konqsidebartng/entries
+share/apps/konqsidebartng/virtual_folders
 share/apps/konqsidebartng/virtual_folders/remote
 share/apps/konqsidebartng/virtual_folders/remote/ftp
 share/apps/konqsidebartng/virtual_folders/remote/web
@@ -159,6 +164,7 @@ share/apps/konqsidebartng/virtual_folders/services
 @comment share/apps/konqueror/pic
 @comment -------------------------------------------------------------------
 @comment -- Konqueror profiles maybe, and additional service menus.
+share/apps/konqueror
 share/apps/konqueror/profiles
 share/apps/konqueror/servicemenus
 @comment share/apps/konqueror/tiles
@@ -175,6 +181,7 @@ share/apps/konsole/profiles
 @comment share/apps/kthememgr
 @comment -------------------------------------------------------------------
 @comment -- Additional kthememgr and kwin themes - not sure about kwin/pics
+share/apps/kthememgr
 share/apps/kthememgr/Themes
 share/apps/kwin
 share/apps/kwin/icewm-themes
@@ -189,6 +196,7 @@ share/config.kcfg
 @comment share/doc/HTML/en/kate
 @comment -------------------------------------------------------------------
 @comment -- Documentation for additional kcontrol modules could go here.
+share/doc/HTML/en
 share/doc/HTML/en/kcontrol
 @comment share/doc/HTML/en/kcontrol/arts
 @comment share/doc/HTML/en/kcontrol/background
@@ -410,106 +418,129 @@ share/wallpapers
 @comment -- Directories handpicked out of kdelibs
 lib/kde3
 share/applnk/Settings/Components
+share/apps
+share/apps/kabc
 share/apps/kabc/formats
 share/apps/kabc/plugins
+share/icons
 share/icons/crystalsvg
+share/icons/crystalsvg/128x128
 share/icons/crystalsvg/128x128/actions
 share/icons/crystalsvg/128x128/apps
 share/icons/crystalsvg/128x128/devices
 share/icons/crystalsvg/128x128/filesystems
 share/icons/crystalsvg/128x128/mimetypes
+share/icons/crystalsvg/16x16
 share/icons/crystalsvg/16x16/actions
 share/icons/crystalsvg/16x16/apps
 share/icons/crystalsvg/16x16/devices
 share/icons/crystalsvg/16x16/filesystems
 share/icons/crystalsvg/16x16/mimetypes
+share/icons/crystalsvg/22x22
 share/icons/crystalsvg/22x22/actions
 share/icons/crystalsvg/22x22/apps
 share/icons/crystalsvg/22x22/devices
 share/icons/crystalsvg/22x22/filesystems
 share/icons/crystalsvg/22x22/mimetypes
+share/icons/crystalsvg/32x32
 share/icons/crystalsvg/32x32/actions
 share/icons/crystalsvg/32x32/apps
 share/icons/crystalsvg/32x32/devices
 share/icons/crystalsvg/32x32/filesystems
 share/icons/crystalsvg/32x32/mimetypes
+share/icons/crystalsvg/48x48
 share/icons/crystalsvg/48x48/actions
 share/icons/crystalsvg/48x48/apps
 share/icons/crystalsvg/48x48/devices
 share/icons/crystalsvg/48x48/filesystems
 share/icons/crystalsvg/48x48/mimetypes
+share/icons/crystalsvg/64x64
 share/icons/crystalsvg/64x64/actions
 share/icons/crystalsvg/64x64/apps
 share/icons/crystalsvg/64x64/devices
 share/icons/crystalsvg/64x64/filesystems
 share/icons/crystalsvg/64x64/mimetypes
+share/icons/crystalsvg/scalable
 share/icons/crystalsvg/scalable/actions
 share/icons/crystalsvg/scalable/apps
 share/icons/crystalsvg/scalable/devices
 share/icons/crystalsvg/scalable/filesystems
 share/icons/crystalsvg/scalable/mimetype
 share/icons/hicolor
+share/icons/hicolor/128x128
 share/icons/hicolor/128x128/actions
 share/icons/hicolor/128x128/apps
 share/icons/hicolor/128x128/devices
 share/icons/hicolor/128x128/filesystems
 share/icons/hicolor/128x128/mimetypes
+share/icons/hicolor/16x16
 share/icons/hicolor/16x16/actions
 share/icons/hicolor/16x16/apps
 share/icons/hicolor/16x16/devices
 share/icons/hicolor/16x16/filesystems
 share/icons/hicolor/16x16/mimetypes
+share/icons/hicolor/22x22
 share/icons/hicolor/22x22/actions
 share/icons/hicolor/22x22/apps
 share/icons/hicolor/22x22/devices
 share/icons/hicolor/22x22/filesystems
 share/icons/hicolor/22x22/mimetypes
+share/icons/hicolor/32x32
 share/icons/hicolor/32x32/actions
 share/icons/hicolor/32x32/apps
 share/icons/hicolor/32x32/devices
 share/icons/hicolor/32x32/filesystems
 share/icons/hicolor/32x32/mimetypes
+share/icons/hicolor/48x48
 share/icons/hicolor/48x48/actions
 share/icons/hicolor/48x48/apps
 share/icons/hicolor/48x48/devices
 share/icons/hicolor/48x48/filesystems
 share/icons/hicolor/48x48/mimetypes
+share/icons/hicolor/64x64
 share/icons/hicolor/64x64/actions
 share/icons/hicolor/64x64/apps
 share/icons/hicolor/64x64/devices
 share/icons/hicolor/64x64/filesystems
 share/icons/hicolor/64x64/mimetypes
 share/icons/locolor
+share/icons/locolor/128x128
 share/icons/locolor/128x128/actions
 share/icons/locolor/128x128/apps
 share/icons/locolor/128x128/devices
 share/icons/locolor/128x128/filesystem
 share/icons/locolor/128x128/mimetypes
+share/icons/locolor/16x16
 share/icons/locolor/16x16/actions
 share/icons/locolor/16x16/apps
 share/icons/locolor/16x16/devices
 share/icons/locolor/16x16/filesystems
 share/icons/locolor/16x16/mimetypes
+share/icons/locolor/22x22
 share/icons/locolor/22x22/actions
 share/icons/locolor/22x22/apps
 share/icons/locolor/22x22/devices
 share/icons/locolor/22x22/filesystems
 share/icons/locolor/22x22/mimetypes
+share/icons/locolor/32x32
 share/icons/locolor/32x32/actions
 share/icons/locolor/32x32/apps
 share/icons/locolor/32x32/devices
 share/icons/locolor/32x32/filesystems
 share/icons/locolor/32x32/mimetypes
+share/icons/locolor/48x48
 share/icons/locolor/48x48/actions
 share/icons/locolor/48x48/apps
 share/icons/locolor/48x48/devices
 share/icons/locolor/48x48/filesystems
 share/icons/locolor/48x48/mimetypes
+share/icons/locolor/64x64
 share/icons/locolor/64x64/actions
 share/icons/locolor/64x64/apps
 share/icons/locolor/64x64/devices
 share/icons/locolor/64x64/filesystems
 share/icons/locolor/64x64/mimetypes
+share/mimelnk
 share/mimelnk/all
 share/mimelnk/application
 share/mimelnk/audio
diff --git a/misc/kdehier4/pkg-plist b/misc/kdehier4/pkg-plist
index 1df80552064a..c6ce195ef42e 100644
--- a/misc/kdehier4/pkg-plist
+++ b/misc/kdehier4/pkg-plist
@@ -47,14 +47,18 @@ share/applnk/Toys/.keep_me
 share/applnk/Utilities/.keep_me
 share/applnk/Utilities/More/.keep_me
 share/applnk/Utilities/XUtilities/.keep_me
+share/apps/.keep_me
+share/apps/kabc/.keep_me
 share/apps/kabc/formats/.keep_me
 share/apps/kabc/plugins/.keep_me
+share/apps/kate/.keep_me
 share/apps/kate/scripts/.keep_me
 share/apps/kdesktop/.keep_me
 share/apps/kdesktop/DesktopLinks/.keep_me
 share/apps/kdesktop/patterns/.keep_me
 share/apps/kdesktop/pics/.keep_me
 share/apps/kdesktop/programs/.keep_me
+share/apps/khelpcenter/.keep_me
 share/apps/khelpcenter/plugins/.keep_me
 share/apps/kicker/.keep_me
 share/apps/kicker/applets/.keep_me
@@ -63,123 +67,149 @@ share/apps/kicker/menuext/.keep_me
 share/apps/kicker/pics/.keep_me
 share/apps/kicker/tiles/.keep_me
 share/apps/kicker/wallpapers/.keep_me
+share/apps/konqsidebartng/.keep_me
 share/apps/konqsidebartng/add/.keep_me
 share/apps/konqsidebartng/dirtree/.keep_me
 share/apps/konqsidebartng/entries/.keep_me
+share/apps/konqsidebartng/virtual_folders/.keep_me
 share/apps/konqsidebartng/virtual_folders/remote/.keep_me
 share/apps/konqsidebartng/virtual_folders/remote/ftp/.keep_me
 share/apps/konqsidebartng/virtual_folders/remote/web/.keep_me
 share/apps/konqsidebartng/virtual_folders/services/.keep_me
+share/apps/konqueror/.keep_me
 share/apps/konqueror/profiles/.keep_me
 share/apps/konqueror/servicemenus/.keep_me
 share/apps/konsole/.keep_me
 share/apps/konsole/profiles/.keep_me
+share/apps/kthememgr/.keep_me
 share/apps/kthememgr/Themes/.keep_me
 share/apps/kwin/.keep_me
 share/apps/kwin/icewm-themes/.keep_me
 share/apps/kwin/pics/.keep_me
 share/config.kcfg/.keep_me
+share/doc/HTML/en/.keep_me
 share/doc/HTML/en/kcontrol/.keep_me
 share/fonts/.keep_me
 share/fonts/override/.keep_me
+share/icons/.keep_me
 share/icons/crystalsvg/.keep_me
+share/icons/crystalsvg/128x128/.keep_me
 share/icons/crystalsvg/128x128/actions/.keep_me
 share/icons/crystalsvg/128x128/apps/.keep_me
 share/icons/crystalsvg/128x128/devices/.keep_me
 share/icons/crystalsvg/128x128/filesystems/.keep_me
 share/icons/crystalsvg/128x128/mimetypes/.keep_me
+share/icons/crystalsvg/16x16/.keep_me
 share/icons/crystalsvg/16x16/actions/.keep_me
 share/icons/crystalsvg/16x16/apps/.keep_me
 share/icons/crystalsvg/16x16/devices/.keep_me
 share/icons/crystalsvg/16x16/filesystems/.keep_me
 share/icons/crystalsvg/16x16/mimetypes/.keep_me
+share/icons/crystalsvg/22x22/.keep_me
 share/icons/crystalsvg/22x22/actions/.keep_me
 share/icons/crystalsvg/22x22/apps/.keep_me
 share/icons/crystalsvg/22x22/devices/.keep_me
 share/icons/crystalsvg/22x22/filesystems/.keep_me
 share/icons/crystalsvg/22x22/mimetypes/.keep_me
+share/icons/crystalsvg/32x32/.keep_me
 share/icons/crystalsvg/32x32/actions/.keep_me
 share/icons/crystalsvg/32x32/apps/.keep_me
 share/icons/crystalsvg/32x32/devices/.keep_me
 share/icons/crystalsvg/32x32/filesystems/.keep_me
 share/icons/crystalsvg/32x32/mimetypes/.keep_me
+share/icons/crystalsvg/48x48/.keep_me
 share/icons/crystalsvg/48x48/actions/.keep_me
 share/icons/crystalsvg/48x48/apps/.keep_me
 share/icons/crystalsvg/48x48/devices/.keep_me
 share/icons/crystalsvg/48x48/filesystems/.keep_me
 share/icons/crystalsvg/48x48/mimetypes/.keep_me
+share/icons/crystalsvg/64x64/.keep_me
 share/icons/crystalsvg/64x64/actions/.keep_me
 share/icons/crystalsvg/64x64/apps/.keep_me
 share/icons/crystalsvg/64x64/devices/.keep_me
 share/icons/crystalsvg/64x64/filesystems/.keep_me
 share/icons/crystalsvg/64x64/mimetypes/.keep_me
+share/icons/crystalsvg/scalable/.keep_me
 share/icons/crystalsvg/scalable/actions/.keep_me
 share/icons/crystalsvg/scalable/apps/.keep_me
 share/icons/crystalsvg/scalable/devices/.keep_me
 share/icons/crystalsvg/scalable/filesystems/.keep_me
 share/icons/crystalsvg/scalable/mimetype/.keep_me
 share/icons/hicolor/.keep_me
+share/icons/hicolor/128x128/.keep_me
 share/icons/hicolor/128x128/actions/.keep_me
 share/icons/hicolor/128x128/apps/.keep_me
 share/icons/hicolor/128x128/devices/.keep_me
 share/icons/hicolor/128x128/filesystems/.keep_me
 share/icons/hicolor/128x128/mimetypes/.keep_me
+share/icons/hicolor/16x16/.keep_me
 share/icons/hicolor/16x16/actions/.keep_me
 share/icons/hicolor/16x16/apps/.keep_me
 share/icons/hicolor/16x16/devices/.keep_me
 share/icons/hicolor/16x16/filesystems/.keep_me
 share/icons/hicolor/16x16/mimetypes/.keep_me
+share/icons/hicolor/22x22/.keep_me
 share/icons/hicolor/22x22/actions/.keep_me
 share/icons/hicolor/22x22/apps/.keep_me
 share/icons/hicolor/22x22/devices/.keep_me
 share/icons/hicolor/22x22/filesystems/.keep_me
 share/icons/hicolor/22x22/mimetypes/.keep_me
+share/icons/hicolor/32x32/.keep_me
 share/icons/hicolor/32x32/actions/.keep_me
 share/icons/hicolor/32x32/apps/.keep_me
 share/icons/hicolor/32x32/devices/.keep_me
 share/icons/hicolor/32x32/filesystems/.keep_me
 share/icons/hicolor/32x32/mimetypes/.keep_me
+share/icons/hicolor/48x48/.keep_me
 share/icons/hicolor/48x48/actions/.keep_me
 share/icons/hicolor/48x48/apps/.keep_me
 share/icons/hicolor/48x48/devices/.keep_me
 share/icons/hicolor/48x48/filesystems/.keep_me
 share/icons/hicolor/48x48/mimetypes/.keep_me
+share/icons/hicolor/64x64/.keep_me
 share/icons/hicolor/64x64/actions/.keep_me
 share/icons/hicolor/64x64/apps/.keep_me
 share/icons/hicolor/64x64/devices/.keep_me
 share/icons/hicolor/64x64/filesystems/.keep_me
 share/icons/hicolor/64x64/mimetypes/.keep_me
 share/icons/locolor/.keep_me
+share/icons/locolor/128x128/.keep_me
 share/icons/locolor/128x128/actions/.keep_me
 share/icons/locolor/128x128/apps/.keep_me
 share/icons/locolor/128x128/devices/.keep_me
 share/icons/locolor/128x128/filesystem/.keep_me
 share/icons/locolor/128x128/mimetypes/.keep_me
+share/icons/locolor/16x16/.keep_me
 share/icons/locolor/16x16/actions/.keep_me
 share/icons/locolor/16x16/apps/.keep_me
 share/icons/locolor/16x16/devices/.keep_me
 share/icons/locolor/16x16/filesystems/.keep_me
 share/icons/locolor/16x16/mimetypes/.keep_me
+share/icons/locolor/22x22/.keep_me
 share/icons/locolor/22x22/actions/.keep_me
 share/icons/locolor/22x22/apps/.keep_me
 share/icons/locolor/22x22/devices/.keep_me
 share/icons/locolor/22x22/filesystems/.keep_me
 share/icons/locolor/22x22/mimetypes/.keep_me
+share/icons/locolor/32x32/.keep_me
 share/icons/locolor/32x32/actions/.keep_me
 share/icons/locolor/32x32/apps/.keep_me
 share/icons/locolor/32x32/devices/.keep_me
 share/icons/locolor/32x32/filesystems/.keep_me
 share/icons/locolor/32x32/mimetypes/.keep_me
+share/icons/locolor/48x48/.keep_me
 share/icons/locolor/48x48/actions/.keep_me
 share/icons/locolor/48x48/apps/.keep_me
 share/icons/locolor/48x48/devices/.keep_me
 share/icons/locolor/48x48/filesystems/.keep_me
 share/icons/locolor/48x48/mimetypes/.keep_me
+share/icons/locolor/64x64/.keep_me
 share/icons/locolor/64x64/actions/.keep_me
 share/icons/locolor/64x64/apps/.keep_me
 share/icons/locolor/64x64/devices/.keep_me
 share/icons/locolor/64x64/filesystems/.keep_me
 share/icons/locolor/64x64/mimetypes/.keep_me
+share/mimelnk/.keep_me
 share/mimelnk/all/.keep_me
 share/mimelnk/application/.keep_me
 share/mimelnk/audio/.keep_me
@@ -216,123 +246,149 @@ share/wallpapers/.keep_me
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk/all
+@dirrm share/mimelnk
 @dirrm share/icons/locolor/64x64/mimetypes
 @dirrm share/icons/locolor/64x64/filesystems
 @dirrm share/icons/locolor/64x64/devices
 @dirrm share/icons/locolor/64x64/apps
 @dirrm share/icons/locolor/64x64/actions
+@dirrm share/icons/locolor/64x64
 @dirrm share/icons/locolor/48x48/mimetypes
 @dirrm share/icons/locolor/48x48/filesystems
 @dirrm share/icons/locolor/48x48/devices
 @dirrm share/icons/locolor/48x48/apps
 @dirrm share/icons/locolor/48x48/actions
+@dirrm share/icons/locolor/48x48
 @dirrm share/icons/locolor/32x32/mimetypes
 @dirrm share/icons/locolor/32x32/filesystems
 @dirrm share/icons/locolor/32x32/devices
 @dirrm share/icons/locolor/32x32/apps
 @dirrm share/icons/locolor/32x32/actions
+@dirrm share/icons/locolor/32x32
 @dirrm share/icons/locolor/22x22/mimetypes
 @dirrm share/icons/locolor/22x22/filesystems
 @dirrm share/icons/locolor/22x22/devices
 @dirrm share/icons/locolor/22x22/apps
 @dirrm share/icons/locolor/22x22/actions
+@dirrm share/icons/locolor/22x22
 @dirrm share/icons/locolor/16x16/mimetypes
 @dirrm share/icons/locolor/16x16/filesystems
 @dirrm share/icons/locolor/16x16/devices
 @dirrm share/icons/locolor/16x16/apps
 @dirrm share/icons/locolor/16x16/actions
+@dirrm share/icons/locolor/16x16
 @dirrm share/icons/locolor/128x128/mimetypes
 @dirrm share/icons/locolor/128x128/filesystem
 @dirrm share/icons/locolor/128x128/devices
 @dirrm share/icons/locolor/128x128/apps
 @dirrm share/icons/locolor/128x128/actions
+@dirrm share/icons/locolor/128x128
 @dirrm share/icons/locolor
 @dirrm share/icons/hicolor/64x64/mimetypes
 @dirrm share/icons/hicolor/64x64/filesystems
 @dirrm share/icons/hicolor/64x64/devices
 @dirrm share/icons/hicolor/64x64/apps
 @dirrm share/icons/hicolor/64x64/actions
+@dirrm share/icons/hicolor/64x64
 @dirrm share/icons/hicolor/48x48/mimetypes
 @dirrm share/icons/hicolor/48x48/filesystems
 @dirrm share/icons/hicolor/48x48/devices
 @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/icons/hicolor/48x48/actions
+@dirrm share/icons/hicolor/48x48
 @dirrm share/icons/hicolor/32x32/mimetypes
 @dirrm share/icons/hicolor/32x32/filesystems
 @dirrm share/icons/hicolor/32x32/devices
 @dirrm share/icons/hicolor/32x32/apps
 @dirrm share/icons/hicolor/32x32/actions
+@dirrm share/icons/hicolor/32x32
 @dirrm share/icons/hicolor/22x22/mimetypes
 @dirrm share/icons/hicolor/22x22/filesystems
 @dirrm share/icons/hicolor/22x22/devices
 @dirrm share/icons/hicolor/22x22/apps
 @dirrm share/icons/hicolor/22x22/actions
+@dirrm share/icons/hicolor/22x22
 @dirrm share/icons/hicolor/16x16/mimetypes
 @dirrm share/icons/hicolor/16x16/filesystems
 @dirrm share/icons/hicolor/16x16/devices
 @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/icons/hicolor/16x16/actions
+@dirrm share/icons/hicolor/16x16
 @dirrm share/icons/hicolor/128x128/mimetypes
 @dirrm share/icons/hicolor/128x128/filesystems
 @dirrm share/icons/hicolor/128x128/devices
 @dirrm share/icons/hicolor/128x128/apps
 @dirrm share/icons/hicolor/128x128/actions
+@dirrm share/icons/hicolor/128x128
 @dirrm share/icons/hicolor
 @dirrm share/icons/crystalsvg/scalable/mimetype
 @dirrm share/icons/crystalsvg/scalable/filesystems
 @dirrm share/icons/crystalsvg/scalable/devices
 @dirrm share/icons/crystalsvg/scalable/apps
 @dirrm share/icons/crystalsvg/scalable/actions
+@dirrm share/icons/crystalsvg/scalable
 @dirrm share/icons/crystalsvg/64x64/mimetypes
 @dirrm share/icons/crystalsvg/64x64/filesystems
 @dirrm share/icons/crystalsvg/64x64/devices
 @dirrm share/icons/crystalsvg/64x64/apps
 @dirrm share/icons/crystalsvg/64x64/actions
+@dirrm share/icons/crystalsvg/64x64
 @dirrm share/icons/crystalsvg/48x48/mimetypes
 @dirrm share/icons/crystalsvg/48x48/filesystems
 @dirrm share/icons/crystalsvg/48x48/devices
 @dirrm share/icons/crystalsvg/48x48/apps
 @dirrm share/icons/crystalsvg/48x48/actions
+@dirrm share/icons/crystalsvg/48x48
 @dirrm share/icons/crystalsvg/32x32/mimetypes
 @dirrm share/icons/crystalsvg/32x32/filesystems
 @dirrm share/icons/crystalsvg/32x32/devices
 @dirrm share/icons/crystalsvg/32x32/apps
 @dirrm share/icons/crystalsvg/32x32/actions
+@dirrm share/icons/crystalsvg/32x32
 @dirrm share/icons/crystalsvg/22x22/mimetypes
 @dirrm share/icons/crystalsvg/22x22/filesystems
 @dirrm share/icons/crystalsvg/22x22/devices
 @dirrm share/icons/crystalsvg/22x22/apps
 @dirrm share/icons/crystalsvg/22x22/actions
+@dirrm share/icons/crystalsvg/22x22
 @dirrm share/icons/crystalsvg/16x16/mimetypes
 @dirrm share/icons/crystalsvg/16x16/filesystems
 @dirrm share/icons/crystalsvg/16x16/devices
 @dirrm share/icons/crystalsvg/16x16/apps
 @dirrm share/icons/crystalsvg/16x16/actions
+@dirrm share/icons/crystalsvg/16x16
 @dirrm share/icons/crystalsvg/128x128/mimetypes
 @dirrm share/icons/crystalsvg/128x128/filesystems
 @dirrm share/icons/crystalsvg/128x128/devices
 @dirrm share/icons/crystalsvg/128x128/apps
 @dirrm share/icons/crystalsvg/128x128/actions
+@dirrm share/icons/crystalsvg/128x128
 @dirrm share/icons/crystalsvg
+@dirrm share/icons
 @dirrm share/fonts/override
 @dirrm share/fonts
 @dirrm share/doc/HTML/en/kcontrol
+@dirrm share/doc/HTML/en
 @dirrm share/config.kcfg
 @dirrm share/apps/kwin/pics
 @dirrm share/apps/kwin/icewm-themes
 @dirrm share/apps/kwin
 @dirrm share/apps/kthememgr/Themes
+@dirrm share/apps/kthememgr
 @dirrm share/apps/konsole/profiles
 @dirrm share/apps/konsole
 @dirrm share/apps/konqueror/servicemenus
 @dirrm share/apps/konqueror/profiles
+@dirrm share/apps/konqueror
 @dirrm share/apps/konqsidebartng/virtual_folders/services
 @dirrm share/apps/konqsidebartng/virtual_folders/remote/web
 @dirrm share/apps/konqsidebartng/virtual_folders/remote/ftp
 @dirrm share/apps/konqsidebartng/virtual_folders/remote
+@dirrm share/apps/konqsidebartng/virtual_folders
 @dirrm share/apps/konqsidebartng/entries
 @dirrm share/apps/konqsidebartng/dirtree
 @dirrm share/apps/konqsidebartng/add
+@dirrm share/apps/konqsidebartng
 @dirrm share/apps/kicker/wallpapers
 @dirrm share/apps/kicker/tiles
 @dirrm share/apps/kicker/pics
@@ -341,14 +397,18 @@ share/wallpapers/.keep_me
 @dirrm share/apps/kicker/applets
 @dirrm share/apps/kicker
 @dirrm share/apps/khelpcenter/plugins
+@dirrm share/apps/khelpcenter
 @dirrm share/apps/kdesktop/programs
 @dirrm share/apps/kdesktop/pics
 @dirrm share/apps/kdesktop/patterns
 @dirrm share/apps/kdesktop/DesktopLinks
 @dirrm share/apps/kdesktop
 @dirrm share/apps/kate/scripts
+@dirrm share/apps/kate
 @dirrm share/apps/kabc/plugins
 @dirrm share/apps/kabc/formats
+@dirrm share/apps/kabc
+@dirrm share/apps
 @dirrm share/applnk/Utilities/XUtilities
 @dirrm share/applnk/Utilities/More
 @dirrm share/applnk/Utilities
diff --git a/misc/koffice-i18n-br/pkg-plist b/misc/koffice-i18n-br/pkg-plist
index 4a5fb5efd69e..87444164eee8 100644
--- a/misc/koffice-i18n-br/pkg-plist
+++ b/misc/koffice-i18n-br/pkg-plist
@@ -42,5 +42,3 @@ share/locale/br/LC_MESSAGES/olefilterswinword97filter.mo
 share/locale/br/LC_MESSAGES/thesaurus_tool.mo
 share/locale/br/LC_MESSAGES/xsltexportfilter.mo
 share/locale/br/LC_MESSAGES/xsltimportfilter.mo
-@dirrm share/locale/br/LC_MESSAGES
-@dirrm share/locale/br
diff --git a/misc/koffice-i18n-th/pkg-plist b/misc/koffice-i18n-th/pkg-plist
index 161693b245a1..aa003a3cb9d7 100644
--- a/misc/koffice-i18n-th/pkg-plist
+++ b/misc/koffice-i18n-th/pkg-plist
@@ -33,5 +33,3 @@ share/locale/th/LC_MESSAGES/olefilterswinword97filter.mo
 share/locale/th/LC_MESSAGES/thesaurus_tool.mo
 share/locale/th/LC_MESSAGES/xsltexportfilter.mo
 share/locale/th/LC_MESSAGES/xsltimportfilter.mo
-@dirrm share/locale/th/LC_MESSAGES
-@dirrm share/locale/th