6 files changed, 72 insertions, 64 deletions

diff --git a/x11-clocks/kdetoys3/Makefile b/x11-clocks/kdetoys3/Makefile
index c8605982ee16..aa4fe57bc45b 100644
--- a/x11-clocks/kdetoys3/Makefile
+++ b/x11-clocks/kdetoys3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
-CATEGORIES=	x11-clocks kde
+CATEGORIES=	x11-clocks kde misc
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
diff --git a/x11-clocks/kdetoys3/distinfo b/x11-clocks/kdetoys3/distinfo
index 900366c0e355..a4550b41659b 100644
--- a/x11-clocks/kdetoys3/distinfo
+++ b/x11-clocks/kdetoys3/distinfo
@@ -1,2 +1,3 @@
-MD5 (KDE/kdetoys-3.4.3.tar.bz2) = 1dae200dc1be8527a5f7dca690cbffc1
-SIZE (KDE/kdetoys-3.4.3.tar.bz2) = 3168237
+MD5 (KDE/kdetoys-3.5.0.tar.bz2) = aebe4a9586728b37543bd515d35e76e1
+SHA256 (KDE/kdetoys-3.5.0.tar.bz2) = 9d666ee0691fb341fdf9d0de2157b0ec5a23c73128b5bd5248ae6f8db158faf2
+SIZE (KDE/kdetoys-3.5.0.tar.bz2) = 3172108
diff --git a/x11-clocks/kdetoys3/pkg-plist b/x11-clocks/kdetoys3/pkg-plist
index bd9c331d7351..18482e01ce1f 100644
--- a/x11-clocks/kdetoys3/pkg-plist
+++ b/x11-clocks/kdetoys3/pkg-plist
@@ -462,13 +462,13 @@ share/apps/kmoon/pics/moon8.png
 share/apps/kmoon/pics/moon9.png
 share/apps/kodo/numbers.png
 share/apps/kteatime/eventsrc
-share/apps/kteatime/icons/crystalsvg/16x16/apps/kteatime.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/mug.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_anim1.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_anim2.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_not_ready.png
-share/apps/kteatime/icons/crystalsvg/32x32/apps/kteatime.png
-share/apps/kteatime/icons/crystalsvg/48x48/apps/kteatime.png
+share/apps/kteatime/icons/hicolor/16x16/apps/kteatime.png
+share/apps/kteatime/icons/hicolor/32x32/apps/kteatime.png
+share/apps/kteatime/icons/hicolor/48x48/apps/kteatime.png
 share/apps/ktux/sprites/anim0001.png
 share/apps/ktux/sprites/anim0002.png
 share/apps/ktux/sprites/anim0003.png
@@ -585,26 +585,28 @@ share/doc/HTML/en/kworldclock/screenshot-rmb-flags.png
 share/doc/HTML/en/kworldclock/screenshot-withclocks.png
 share/doc/HTML/en/kworldclock/screenshot-withflags.png
 share/doc/HTML/en/kworldclock/screenshot.png
-share/icons/crystalsvg/16x16/apps/amor.png
-share/icons/crystalsvg/16x16/apps/kmoon.png
-share/icons/crystalsvg/16x16/apps/kodo.png
-share/icons/crystalsvg/16x16/apps/kteatime.png
-share/icons/crystalsvg/16x16/apps/kweather.png
-share/icons/crystalsvg/16x16/apps/kworldclock.png
-share/icons/crystalsvg/32x32/apps/amor.png
-share/icons/crystalsvg/32x32/apps/kmoon.png
-share/icons/crystalsvg/32x32/apps/kodo.png
-share/icons/crystalsvg/32x32/apps/kteatime.png
-share/icons/crystalsvg/32x32/apps/kweather.png
-share/icons/crystalsvg/32x32/apps/kworldclock.png
-share/icons/crystalsvg/48x48/apps/amor.png
-share/icons/crystalsvg/48x48/apps/kmoon.png
-share/icons/crystalsvg/48x48/apps/kodo.png
-share/icons/crystalsvg/48x48/apps/kteatime.png
-share/icons/crystalsvg/48x48/apps/kweather.png
-share/icons/crystalsvg/48x48/apps/kworldclock.png
-share/icons/locolor/16x16/apps/ktux.png
-share/icons/locolor/32x32/apps/ktux.png
+share/icons/hicolor/16x16/apps/amor.png
+share/icons/hicolor/16x16/apps/kmoon.png
+share/icons/hicolor/16x16/apps/kodo.png
+share/icons/hicolor/16x16/apps/kteatime.png
+share/icons/hicolor/16x16/apps/ktux.png
+share/icons/hicolor/16x16/apps/kweather.png
+share/icons/hicolor/16x16/apps/kworldclock.png
+share/icons/hicolor/22x22/apps/amor.png
+share/icons/hicolor/22x22/apps/kworldclock.png
+share/icons/hicolor/32x32/apps/amor.png
+share/icons/hicolor/32x32/apps/kmoon.png
+share/icons/hicolor/32x32/apps/kodo.png
+share/icons/hicolor/32x32/apps/kteatime.png
+share/icons/hicolor/32x32/apps/ktux.png
+share/icons/hicolor/32x32/apps/kweather.png
+share/icons/hicolor/32x32/apps/kworldclock.png
+share/icons/hicolor/48x48/apps/amor.png
+share/icons/hicolor/48x48/apps/kmoon.png
+share/icons/hicolor/48x48/apps/kodo.png
+share/icons/hicolor/48x48/apps/kteatime.png
+share/icons/hicolor/48x48/apps/kweather.png
+share/icons/hicolor/48x48/apps/kworldclock.png
 share/services/kcmweather.desktop
 share/services/kcmweatherservice.desktop
 share/services/kweatherservice.desktop
@@ -623,14 +625,15 @@ share/services/kweatherservice.desktop
 @dirrm share/apps/kweather
 @dirrm share/apps/ktux/sprites
 @dirrm share/apps/ktux
-@dirrm share/apps/kteatime/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kteatime/icons/crystalsvg/48x48
-@dirrm share/apps/kteatime/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kteatime/icons/crystalsvg/32x32
+@dirrm share/apps/kteatime/icons/hicolor/48x48/apps
+@dirrm share/apps/kteatime/icons/hicolor/48x48
+@dirrm share/apps/kteatime/icons/hicolor/32x32/apps
+@dirrm share/apps/kteatime/icons/hicolor/32x32
+@dirrm share/apps/kteatime/icons/hicolor/16x16/apps
+@dirrm share/apps/kteatime/icons/hicolor/16x16
+@dirrm share/apps/kteatime/icons/hicolor
 @dirrm share/apps/kteatime/icons/crystalsvg/22x22/actions
 @dirrm share/apps/kteatime/icons/crystalsvg/22x22
-@dirrm share/apps/kteatime/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kteatime/icons/crystalsvg/16x16
 @dirrm share/apps/kteatime/icons/crystalsvg
 @dirrm share/apps/kteatime/icons
 @dirrm share/apps/kteatime
diff --git a/x11-clocks/kdetoys4/Makefile b/x11-clocks/kdetoys4/Makefile
index c8605982ee16..aa4fe57bc45b 100644
--- a/x11-clocks/kdetoys4/Makefile
+++ b/x11-clocks/kdetoys4/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdetoys
 PORTVERSION=	${KDE_VERSION}
-CATEGORIES=	x11-clocks kde
+CATEGORIES=	x11-clocks kde misc
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
 DIST_SUBDIR=	KDE
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index 900366c0e355..a4550b41659b 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1,2 +1,3 @@
-MD5 (KDE/kdetoys-3.4.3.tar.bz2) = 1dae200dc1be8527a5f7dca690cbffc1
-SIZE (KDE/kdetoys-3.4.3.tar.bz2) = 3168237
+MD5 (KDE/kdetoys-3.5.0.tar.bz2) = aebe4a9586728b37543bd515d35e76e1
+SHA256 (KDE/kdetoys-3.5.0.tar.bz2) = 9d666ee0691fb341fdf9d0de2157b0ec5a23c73128b5bd5248ae6f8db158faf2
+SIZE (KDE/kdetoys-3.5.0.tar.bz2) = 3172108
diff --git a/x11-clocks/kdetoys4/pkg-plist b/x11-clocks/kdetoys4/pkg-plist
index bd9c331d7351..18482e01ce1f 100644
--- a/x11-clocks/kdetoys4/pkg-plist
+++ b/x11-clocks/kdetoys4/pkg-plist
@@ -462,13 +462,13 @@ share/apps/kmoon/pics/moon8.png
 share/apps/kmoon/pics/moon9.png
 share/apps/kodo/numbers.png
 share/apps/kteatime/eventsrc
-share/apps/kteatime/icons/crystalsvg/16x16/apps/kteatime.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/mug.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_anim1.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_anim2.png
 share/apps/kteatime/icons/crystalsvg/22x22/actions/tea_not_ready.png
-share/apps/kteatime/icons/crystalsvg/32x32/apps/kteatime.png
-share/apps/kteatime/icons/crystalsvg/48x48/apps/kteatime.png
+share/apps/kteatime/icons/hicolor/16x16/apps/kteatime.png
+share/apps/kteatime/icons/hicolor/32x32/apps/kteatime.png
+share/apps/kteatime/icons/hicolor/48x48/apps/kteatime.png
 share/apps/ktux/sprites/anim0001.png
 share/apps/ktux/sprites/anim0002.png
 share/apps/ktux/sprites/anim0003.png
@@ -585,26 +585,28 @@ share/doc/HTML/en/kworldclock/screenshot-rmb-flags.png
 share/doc/HTML/en/kworldclock/screenshot-withclocks.png
 share/doc/HTML/en/kworldclock/screenshot-withflags.png
 share/doc/HTML/en/kworldclock/screenshot.png
-share/icons/crystalsvg/16x16/apps/amor.png
-share/icons/crystalsvg/16x16/apps/kmoon.png
-share/icons/crystalsvg/16x16/apps/kodo.png
-share/icons/crystalsvg/16x16/apps/kteatime.png
-share/icons/crystalsvg/16x16/apps/kweather.png
-share/icons/crystalsvg/16x16/apps/kworldclock.png
-share/icons/crystalsvg/32x32/apps/amor.png
-share/icons/crystalsvg/32x32/apps/kmoon.png
-share/icons/crystalsvg/32x32/apps/kodo.png
-share/icons/crystalsvg/32x32/apps/kteatime.png
-share/icons/crystalsvg/32x32/apps/kweather.png
-share/icons/crystalsvg/32x32/apps/kworldclock.png
-share/icons/crystalsvg/48x48/apps/amor.png
-share/icons/crystalsvg/48x48/apps/kmoon.png
-share/icons/crystalsvg/48x48/apps/kodo.png
-share/icons/crystalsvg/48x48/apps/kteatime.png
-share/icons/crystalsvg/48x48/apps/kweather.png
-share/icons/crystalsvg/48x48/apps/kworldclock.png
-share/icons/locolor/16x16/apps/ktux.png
-share/icons/locolor/32x32/apps/ktux.png
+share/icons/hicolor/16x16/apps/amor.png
+share/icons/hicolor/16x16/apps/kmoon.png
+share/icons/hicolor/16x16/apps/kodo.png
+share/icons/hicolor/16x16/apps/kteatime.png
+share/icons/hicolor/16x16/apps/ktux.png
+share/icons/hicolor/16x16/apps/kweather.png
+share/icons/hicolor/16x16/apps/kworldclock.png
+share/icons/hicolor/22x22/apps/amor.png
+share/icons/hicolor/22x22/apps/kworldclock.png
+share/icons/hicolor/32x32/apps/amor.png
+share/icons/hicolor/32x32/apps/kmoon.png
+share/icons/hicolor/32x32/apps/kodo.png
+share/icons/hicolor/32x32/apps/kteatime.png
+share/icons/hicolor/32x32/apps/ktux.png
+share/icons/hicolor/32x32/apps/kweather.png
+share/icons/hicolor/32x32/apps/kworldclock.png
+share/icons/hicolor/48x48/apps/amor.png
+share/icons/hicolor/48x48/apps/kmoon.png
+share/icons/hicolor/48x48/apps/kodo.png
+share/icons/hicolor/48x48/apps/kteatime.png
+share/icons/hicolor/48x48/apps/kweather.png
+share/icons/hicolor/48x48/apps/kworldclock.png
 share/services/kcmweather.desktop
 share/services/kcmweatherservice.desktop
 share/services/kweatherservice.desktop
@@ -623,14 +625,15 @@ share/services/kweatherservice.desktop
 @dirrm share/apps/kweather
 @dirrm share/apps/ktux/sprites
 @dirrm share/apps/ktux
-@dirrm share/apps/kteatime/icons/crystalsvg/48x48/apps
-@dirrm share/apps/kteatime/icons/crystalsvg/48x48
-@dirrm share/apps/kteatime/icons/crystalsvg/32x32/apps
-@dirrm share/apps/kteatime/icons/crystalsvg/32x32
+@dirrm share/apps/kteatime/icons/hicolor/48x48/apps
+@dirrm share/apps/kteatime/icons/hicolor/48x48
+@dirrm share/apps/kteatime/icons/hicolor/32x32/apps
+@dirrm share/apps/kteatime/icons/hicolor/32x32
+@dirrm share/apps/kteatime/icons/hicolor/16x16/apps
+@dirrm share/apps/kteatime/icons/hicolor/16x16
+@dirrm share/apps/kteatime/icons/hicolor
 @dirrm share/apps/kteatime/icons/crystalsvg/22x22/actions
 @dirrm share/apps/kteatime/icons/crystalsvg/22x22
-@dirrm share/apps/kteatime/icons/crystalsvg/16x16/apps
-@dirrm share/apps/kteatime/icons/crystalsvg/16x16
 @dirrm share/apps/kteatime/icons/crystalsvg
 @dirrm share/apps/kteatime/icons
 @dirrm share/apps/kteatime