Do not install hicolor-theme directories and index file, instead depend

on misc/hicolor-icon-theme.

Approved by:	portmgr (marcus)

10 files changed, 96 insertions, 266 deletions

diff --git a/misc/kdehier/Makefile b/misc/kdehier/Makefile
index 1e41b7299314..b127a0ece5e3 100644
--- a/misc/kdehier/Makefile
+++ b/misc/kdehier/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdehier
 PORTVERSION=	1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/kdehier/files/dirlist b/misc/kdehier/files/dirlist
index cc6eff543652..5bd399dcacf6 100644
--- a/misc/kdehier/files/dirlist
+++ b/misc/kdehier/files/dirlist
@@ -509,49 +509,49 @@ share/icons/crystalsvg/scalable/apps
 share/icons/crystalsvg/scalable/devices
 share/icons/crystalsvg/scalable/filesystems
 share/icons/crystalsvg/scalable/mimetypes
-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/hicolor/scalable
-share/icons/hicolor/scalable/actions
-share/icons/hicolor/scalable/apps
-share/icons/hicolor/scalable/devices
-share/icons/hicolor/scalable/filesystems
-share/icons/hicolor/scalable/mimetypes
+@comment share/icons/hicolor
+@comment share/icons/hicolor/128x128
+@comment share/icons/hicolor/128x128/actions
+@comment share/icons/hicolor/128x128/apps
+@comment share/icons/hicolor/128x128/devices
+@comment share/icons/hicolor/128x128/filesystems
+@comment share/icons/hicolor/128x128/mimetypes
+@comment share/icons/hicolor/16x16
+@comment share/icons/hicolor/16x16/actions
+@comment share/icons/hicolor/16x16/apps
+@comment share/icons/hicolor/16x16/devices
+@comment share/icons/hicolor/16x16/filesystems
+@comment share/icons/hicolor/16x16/mimetypes
+@comment share/icons/hicolor/22x22
+@comment share/icons/hicolor/22x22/actions
+@comment share/icons/hicolor/22x22/apps
+@comment share/icons/hicolor/22x22/devices
+@comment share/icons/hicolor/22x22/filesystems
+@comment share/icons/hicolor/22x22/mimetypes
+@comment share/icons/hicolor/32x32
+@comment share/icons/hicolor/32x32/actions
+@comment share/icons/hicolor/32x32/apps
+@comment share/icons/hicolor/32x32/devices
+@comment share/icons/hicolor/32x32/filesystems
+@comment share/icons/hicolor/32x32/mimetypes
+@comment share/icons/hicolor/48x48
+@comment share/icons/hicolor/48x48/actions
+@comment share/icons/hicolor/48x48/apps
+@comment share/icons/hicolor/48x48/devices
+@comment share/icons/hicolor/48x48/filesystems
+@comment share/icons/hicolor/48x48/mimetypes
+@comment share/icons/hicolor/64x64
+@comment share/icons/hicolor/64x64/actions
+@comment share/icons/hicolor/64x64/apps
+@comment share/icons/hicolor/64x64/devices
+@comment share/icons/hicolor/64x64/filesystems
+@comment share/icons/hicolor/64x64/mimetypes
+@comment share/icons/hicolor/scalable
+@comment share/icons/hicolor/scalable/actions
+@comment share/icons/hicolor/scalable/apps
+@comment share/icons/hicolor/scalable/devices
+@comment share/icons/hicolor/scalable/filesystems
+@comment share/icons/hicolor/scalable/mimetypes
 share/icons/locolor
 share/icons/locolor/128x128
 share/icons/locolor/128x128/actions
diff --git a/misc/kdehier/pkg-plist b/misc/kdehier/pkg-plist
index 564c35b1b246..ec50204b9f1c 100644
--- a/misc/kdehier/pkg-plist
+++ b/misc/kdehier/pkg-plist
@@ -166,49 +166,6 @@ 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/mimetypes/.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/hicolor/scalable/.keep_me
-share/icons/hicolor/scalable/actions/.keep_me
-share/icons/hicolor/scalable/apps/.keep_me
-share/icons/hicolor/scalable/devices/.keep_me
-share/icons/hicolor/scalable/filesystems/.keep_me
-share/icons/hicolor/scalable/mimetypes/.keep_me
 share/icons/locolor/.keep_me
 share/icons/locolor/128x128/.keep_me
 share/icons/locolor/128x128/actions/.keep_me
@@ -323,49 +280,6 @@ share/wallpapers/.keep_me
 @dirrm share/icons/locolor/128x128/actions
 @dirrm share/icons/locolor/128x128
 @dirrm share/icons/locolor
-@dirrm share/icons/hicolor/scalable/mimetypes
-@dirrm share/icons/hicolor/scalable/filesystems
-@dirrm share/icons/hicolor/scalable/devices
-@dirrm share/icons/hicolor/scalable/apps
-@dirrm share/icons/hicolor/scalable/actions
-@dirrm share/icons/hicolor/scalable
-@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/mimetypes
 @dirrm share/icons/crystalsvg/scalable/filesystems
 @dirrm share/icons/crystalsvg/scalable/devices
diff --git a/misc/kdehier4/Makefile b/misc/kdehier4/Makefile
index 1e41b7299314..b127a0ece5e3 100644
--- a/misc/kdehier4/Makefile
+++ b/misc/kdehier4/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	kdehier
 PORTVERSION=	1.0
-PORTREVISION=	10
+PORTREVISION=	11
 CATEGORIES=	misc kde
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/misc/kdehier4/files/dirlist b/misc/kdehier4/files/dirlist
index cc6eff543652..5bd399dcacf6 100644
--- a/misc/kdehier4/files/dirlist
+++ b/misc/kdehier4/files/dirlist
@@ -509,49 +509,49 @@ share/icons/crystalsvg/scalable/apps
 share/icons/crystalsvg/scalable/devices
 share/icons/crystalsvg/scalable/filesystems
 share/icons/crystalsvg/scalable/mimetypes
-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/hicolor/scalable
-share/icons/hicolor/scalable/actions
-share/icons/hicolor/scalable/apps
-share/icons/hicolor/scalable/devices
-share/icons/hicolor/scalable/filesystems
-share/icons/hicolor/scalable/mimetypes
+@comment share/icons/hicolor
+@comment share/icons/hicolor/128x128
+@comment share/icons/hicolor/128x128/actions
+@comment share/icons/hicolor/128x128/apps
+@comment share/icons/hicolor/128x128/devices
+@comment share/icons/hicolor/128x128/filesystems
+@comment share/icons/hicolor/128x128/mimetypes
+@comment share/icons/hicolor/16x16
+@comment share/icons/hicolor/16x16/actions
+@comment share/icons/hicolor/16x16/apps
+@comment share/icons/hicolor/16x16/devices
+@comment share/icons/hicolor/16x16/filesystems
+@comment share/icons/hicolor/16x16/mimetypes
+@comment share/icons/hicolor/22x22
+@comment share/icons/hicolor/22x22/actions
+@comment share/icons/hicolor/22x22/apps
+@comment share/icons/hicolor/22x22/devices
+@comment share/icons/hicolor/22x22/filesystems
+@comment share/icons/hicolor/22x22/mimetypes
+@comment share/icons/hicolor/32x32
+@comment share/icons/hicolor/32x32/actions
+@comment share/icons/hicolor/32x32/apps
+@comment share/icons/hicolor/32x32/devices
+@comment share/icons/hicolor/32x32/filesystems
+@comment share/icons/hicolor/32x32/mimetypes
+@comment share/icons/hicolor/48x48
+@comment share/icons/hicolor/48x48/actions
+@comment share/icons/hicolor/48x48/apps
+@comment share/icons/hicolor/48x48/devices
+@comment share/icons/hicolor/48x48/filesystems
+@comment share/icons/hicolor/48x48/mimetypes
+@comment share/icons/hicolor/64x64
+@comment share/icons/hicolor/64x64/actions
+@comment share/icons/hicolor/64x64/apps
+@comment share/icons/hicolor/64x64/devices
+@comment share/icons/hicolor/64x64/filesystems
+@comment share/icons/hicolor/64x64/mimetypes
+@comment share/icons/hicolor/scalable
+@comment share/icons/hicolor/scalable/actions
+@comment share/icons/hicolor/scalable/apps
+@comment share/icons/hicolor/scalable/devices
+@comment share/icons/hicolor/scalable/filesystems
+@comment share/icons/hicolor/scalable/mimetypes
 share/icons/locolor
 share/icons/locolor/128x128
 share/icons/locolor/128x128/actions
diff --git a/misc/kdehier4/pkg-plist b/misc/kdehier4/pkg-plist
index 564c35b1b246..ec50204b9f1c 100644
--- a/misc/kdehier4/pkg-plist
+++ b/misc/kdehier4/pkg-plist
@@ -166,49 +166,6 @@ 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/mimetypes/.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/hicolor/scalable/.keep_me
-share/icons/hicolor/scalable/actions/.keep_me
-share/icons/hicolor/scalable/apps/.keep_me
-share/icons/hicolor/scalable/devices/.keep_me
-share/icons/hicolor/scalable/filesystems/.keep_me
-share/icons/hicolor/scalable/mimetypes/.keep_me
 share/icons/locolor/.keep_me
 share/icons/locolor/128x128/.keep_me
 share/icons/locolor/128x128/actions/.keep_me
@@ -323,49 +280,6 @@ share/wallpapers/.keep_me
 @dirrm share/icons/locolor/128x128/actions
 @dirrm share/icons/locolor/128x128
 @dirrm share/icons/locolor
-@dirrm share/icons/hicolor/scalable/mimetypes
-@dirrm share/icons/hicolor/scalable/filesystems
-@dirrm share/icons/hicolor/scalable/devices
-@dirrm share/icons/hicolor/scalable/apps
-@dirrm share/icons/hicolor/scalable/actions
-@dirrm share/icons/hicolor/scalable
-@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/mimetypes
 @dirrm share/icons/crystalsvg/scalable/filesystems
 @dirrm share/icons/crystalsvg/scalable/devices
diff --git a/x11/kdelibs3/Makefile b/x11/kdelibs3/Makefile
index 2b22d7547581..00ae1a11b738 100644
--- a/x11/kdelibs3/Makefile
+++ b/x11/kdelibs3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -34,7 +34,8 @@ LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	iceauth:${X_CLIENTS_PORT} \
 		${FONTSCALE}:${X_FONTS_TTF_PORT} \
-		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
+		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 CONFLICTS+=	kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2*
 .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
@@ -86,6 +87,7 @@ pre-configure:
 			 -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure
 	${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \
 		${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp
+	${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in
 	${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu
 
 post-configure:
diff --git a/x11/kdelibs3/pkg-plist b/x11/kdelibs3/pkg-plist
index 6f2655702458..bfad1b9ed1a6 100644
--- a/x11/kdelibs3/pkg-plist
+++ b/x11/kdelibs3/pkg-plist
@@ -5076,7 +5076,6 @@ share/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
 share/icons/crystalsvg/scalable/mimetypes/zip.svgz
 share/icons/default.kde
-share/icons/hicolor/index.theme
 share/locale/all_languages
 share/mimelnk/all/all.desktop
 share/mimelnk/all/allfiles.desktop
diff --git a/x11/kdelibs4/Makefile b/x11/kdelibs4/Makefile
index 2b22d7547581..00ae1a11b738 100644
--- a/x11/kdelibs4/Makefile
+++ b/x11/kdelibs4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdelibs
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	x11 kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -34,7 +34,8 @@ LIB_DEPENDS=	IlmImf:${PORTSDIR}/graphics/OpenEXR \
 		xslt.2:${PORTSDIR}/textproc/libxslt
 RUN_DEPENDS=	iceauth:${X_CLIENTS_PORT} \
 		${FONTSCALE}:${X_FONTS_TTF_PORT} \
-		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT}
+		${FONTENCOD}:${X_FONTS_ENCODINGS_PORT} \
+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
 
 CONFLICTS+=	kdeadmin-3.[0-3].* kdeadmin-3.4.[0-1]* kdeartwork-3.[2-3]* kdebase-3.[0-4]* kdepim-3.2*
 .if defined(WITHOUT_CUPS) || defined(KDE_WITHOUT_CUPS)
@@ -86,6 +87,7 @@ pre-configure:
 			 -e "s,pcreposix.h,pcre.h,g" ${WRKSRC}/configure
 	${REINPLACE_CMD} -e "s,applications.menu,kde-applications.menu,g" \
 		${WRKSRC}/kded/Makefile.in ${WRKSRC}/kded/kbuildsycoca.cpp
+	${REINPLACE_CMD} -e "s,hicolor,,g" ${WRKSRC}/pics/Makefile.in
 	${MV} ${WRKSRC}/kded/applications.menu ${WRKSRC}/kded/kde-applications.menu
 
 post-configure:
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index 6f2655702458..bfad1b9ed1a6 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -5076,7 +5076,6 @@ share/icons/crystalsvg/scalable/mimetypes/widget_doc.svgz
 share/icons/crystalsvg/scalable/mimetypes/wordprocessing.svgz
 share/icons/crystalsvg/scalable/mimetypes/zip.svgz
 share/icons/default.kde
-share/icons/hicolor/index.theme
 share/locale/all_languages
 share/mimelnk/all/all.desktop
 share/mimelnk/all/allfiles.desktop