- Update to version 1.0.1

- take maintainership [1]
- keep pkg-plist sorted
- respect CFLAGS and PTHREAD_LIBS
- SIZEify

Approved by:	maintainer [1]
		arved (mentor)

8 files changed, 132 insertions, 92 deletions

diff --git a/graphics/gwenview-kde4/Makefile b/graphics/gwenview-kde4/Makefile
index 50b0d59874d..276aedc6a12 100644
--- a/graphics/gwenview-kde4/Makefile
+++ b/graphics/gwenview-kde4/Makefile
@@ -6,29 +6,26 @@
 #
 
 PORTNAME=	gwenview
-PORTVERSION=	0.17.1.a
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gwenview
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	stefan.jahn@nemesis-sektor.de
+MAINTAINER=	markus@FreeBSD.org
 COMMENT=	An image viewer and browser for the KDE environment
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_KDELIBS_VER=	3
-
+USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
 MAN1=	gwenview.1
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|xx||g' ${WRKSRC}/po/Makefile.in
+	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
+.include <bsd.port.post.mk>
diff --git a/graphics/gwenview-kde4/distinfo b/graphics/gwenview-kde4/distinfo
index 88e38a945a4..f0f3b5f0066 100644
--- a/graphics/gwenview-kde4/distinfo
+++ b/graphics/gwenview-kde4/distinfo
@@ -1 +1,2 @@
-MD5 (gwenview-0.17.1a.tar.bz2) = 2065d93a00860221c578d95ec0633493
+MD5 (gwenview-1.0.1.tar.bz2) = 98bc89e3bda282cf192f84bd1fc03fdf
+SIZE (gwenview-1.0.1.tar.bz2) = 670552
diff --git a/graphics/gwenview-kde4/pkg-descr b/graphics/gwenview-kde4/pkg-descr
index 512dd88479f..82463458060 100644
--- a/graphics/gwenview-kde4/pkg-descr
+++ b/graphics/gwenview-kde4/pkg-descr
@@ -5,6 +5,3 @@ heirarchy. It supports all image formats your
 KDE installation supports.
 
 WWW: http://gwenview.sourceforge.net
-
-- Stefan Jahn
-stefan.jahn@nemesis-sektor.de
diff --git a/graphics/gwenview-kde4/pkg-plist b/graphics/gwenview-kde4/pkg-plist
index 554f0ca7f4b..ca52481eb45 100644
--- a/graphics/gwenview-kde4/pkg-plist
+++ b/graphics/gwenview-kde4/pkg-plist
@@ -1,5 +1,9 @@
 bin/gwenview
-share/applnk/Graphics/gwenview.desktop
+share/applications/kde/gwenview.desktop
+share/apps/gwenview/cursors/drag.png
+share/apps/gwenview/cursors/dragging.png
+share/apps/gwenview/cursors/zoom.png
+share/apps/gwenview/gwenviewui.rc
 share/apps/gwenview/icons/hicolor/16x16/actions/dnd1.png
 share/apps/gwenview/icons/hicolor/16x16/actions/dnd2.png
 share/apps/gwenview/icons/hicolor/16x16/actions/dnd3.png
@@ -13,42 +17,53 @@ share/apps/gwenview/icons/hicolor/16x16/actions/mirror.png
 share/apps/gwenview/icons/hicolor/16x16/actions/rotate_left.png
 share/apps/gwenview/icons/hicolor/16x16/actions/rotate_right.png
 share/apps/gwenview/icons/hicolor/16x16/actions/slideshow.png
-share/apps/gwenview/icons/hicolor/22x22/actions/actualsize.png
-share/apps/gwenview/icons/hicolor/22x22/actions/autozoom.png
+share/apps/gwenview/icons/hicolor/22x22/actions/flip.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvfirst.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvlast.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvnext.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvprevious.png
 share/apps/gwenview/icons/hicolor/22x22/actions/largethumbnails.png
-share/apps/gwenview/icons/hicolor/22x22/actions/lockzoom.png
 share/apps/gwenview/icons/hicolor/22x22/actions/medthumbnails.png
+share/apps/gwenview/icons/hicolor/22x22/actions/mirror.png
+share/apps/gwenview/icons/hicolor/22x22/actions/rotate_left.png
+share/apps/gwenview/icons/hicolor/22x22/actions/rotate_right.png
 share/apps/gwenview/icons/hicolor/22x22/actions/slideshow.png
 share/apps/gwenview/icons/hicolor/22x22/actions/smallthumbnails.png
-share/apps/gwenview/icons/hicolor/22x22/actions/zoomin.png
-share/apps/gwenview/icons/hicolor/22x22/actions/zoomout.png
-share/apps/gwenview/icons/hicolor/32x32/actions/actualsize.png
-share/apps/gwenview/icons/hicolor/32x32/actions/autozoom.png
+share/apps/gwenview/icons/hicolor/32x32/actions/flip.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvfirst.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvlast.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvnext.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvprevious.png
 share/apps/gwenview/icons/hicolor/32x32/actions/largethumbnails.png
-share/apps/gwenview/icons/hicolor/32x32/actions/lockzoom.png
 share/apps/gwenview/icons/hicolor/32x32/actions/medthumbnails.png
+share/apps/gwenview/icons/hicolor/32x32/actions/mirror.png
+share/apps/gwenview/icons/hicolor/32x32/actions/rotate_left.png
+share/apps/gwenview/icons/hicolor/32x32/actions/rotate_right.png
 share/apps/gwenview/icons/hicolor/32x32/actions/slideshow.png
 share/apps/gwenview/icons/hicolor/32x32/actions/smallthumbnails.png
-share/apps/gwenview/icons/hicolor/32x32/actions/zoomin.png
-share/apps/gwenview/icons/hicolor/32x32/actions/zoomout.png
+share/apps/gwenview/icons/hicolor/48x48/actions/flip.png
+share/apps/gwenview/icons/hicolor/48x48/actions/mirror.png
+share/apps/gwenview/icons/hicolor/48x48/actions/rotate_left.png
+share/apps/gwenview/icons/hicolor/48x48/actions/rotate_right.png
+share/apps/gwenview/icons/hicolor/48x48/actions/slideshow.png
+share/apps/gwenview/thumbnail/wait.png
+share/apps/gwenview/tools/gimp.desktop
+share/apps/gwenview/tools/konqueror.desktop
+share/apps/gwenview/tools/tiledwallpaper.desktop
+share/apps/gwenview/tools/wallpaper.desktop
 share/apps/konqueror/servicemenus/konqgwenview.desktop
 share/icons/hicolor/16x16/apps/gwenview.png
+share/icons/hicolor/22x22/apps/gwenview.png
 share/icons/hicolor/32x32/apps/gwenview.png
 share/icons/hicolor/48x48/apps/gwenview.png
+share/icons/hicolor/64x64/apps/gwenview.png
 share/icons/locolor/16x16/apps/gwenview.png
 share/icons/locolor/32x32/apps/gwenview.png
 share/locale/ar/LC_MESSAGES/gwenview.mo
 share/locale/cs/LC_MESSAGES/gwenview.mo
 share/locale/da/LC_MESSAGES/gwenview.mo
 share/locale/de/LC_MESSAGES/gwenview.mo
+share/locale/el/LC_MESSAGES/gwenview.mo
 share/locale/en_GB/LC_MESSAGES/gwenview.mo
 share/locale/es/LC_MESSAGES/gwenview.mo
 share/locale/et/LC_MESSAGES/gwenview.mo
@@ -74,29 +89,39 @@ share/locale/xh/LC_MESSAGES/gwenview.mo
 share/locale/zh_CN/LC_MESSAGES/gwenview.mo
 share/locale/zh_TW/LC_MESSAGES/gwenview.mo
 share/locale/zu/LC_MESSAGES/gwenview.mo
-@dirrm share/apps/gwenview/icons/hicolor/16x16/actions
-@dirrm share/apps/gwenview/icons/hicolor/16x16
-@dirrm share/apps/gwenview/icons/hicolor/22x22/actions
-@dirrm share/apps/gwenview/icons/hicolor/22x22
-@dirrm share/apps/gwenview/icons/hicolor/32x32/actions
-@dirrm share/apps/gwenview/icons/hicolor/32x32
-@dirrm share/apps/gwenview/icons/hicolor
-@dirrm share/apps/gwenview/icons
-@dirrm share/apps/gwenview
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Graphics 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@dirrm share/apps/gwenview/tools
+@dirrm share/apps/gwenview/thumbnail
+@dirrm share/apps/gwenview/icons/hicolor/48x48/actions
+@dirrm share/apps/gwenview/icons/hicolor/48x48
+@dirrm share/apps/gwenview/icons/hicolor/32x32/actions
+@dirrm share/apps/gwenview/icons/hicolor/32x32
+@dirrm share/apps/gwenview/icons/hicolor/22x22/actions
+@dirrm share/apps/gwenview/icons/hicolor/22x22
+@dirrm share/apps/gwenview/icons/hicolor/16x16/actions
+@dirrm share/apps/gwenview/icons/hicolor/16x16
+@dirrm share/apps/gwenview/icons/hicolor
+@dirrm share/apps/gwenview/icons
+@dirrm share/apps/gwenview/cursors
+@dirrm share/apps/gwenview
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true
diff --git a/graphics/gwenview/Makefile b/graphics/gwenview/Makefile
index 50b0d59874d..276aedc6a12 100644
--- a/graphics/gwenview/Makefile
+++ b/graphics/gwenview/Makefile
@@ -6,29 +6,26 @@
 #
 
 PORTNAME=	gwenview
-PORTVERSION=	0.17.1.a
-PORTREVISION=	1
+PORTVERSION=	1.0.1
 CATEGORIES=	graphics kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	gwenview
-DISTNAME=	${PORTNAME}-${PORTVERSION:S/.a/a/}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	stefan.jahn@nemesis-sektor.de
+MAINTAINER=	markus@FreeBSD.org
 COMMENT=	An image viewer and browser for the KDE environment
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_KDELIBS_VER=	3
-
+USE_KDELIBS_VER=3
 GNU_CONFIGURE=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
 USE_REINPLACE=	yes
 
 MAN1=	gwenview.1
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|xx||g' ${WRKSRC}/po/Makefile.in
+	@${REINPLACE_CMD} -e 's|xx||g' ${WRKSRC}/po/Makefile.in
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.mk>
+.include <bsd.port.pre.mk>
+.include "${PORTSDIR}/x11/kde3/Makefile.kde"
+.include <bsd.port.post.mk>
diff --git a/graphics/gwenview/distinfo b/graphics/gwenview/distinfo
index 88e38a945a4..f0f3b5f0066 100644
--- a/graphics/gwenview/distinfo
+++ b/graphics/gwenview/distinfo
@@ -1 +1,2 @@
-MD5 (gwenview-0.17.1a.tar.bz2) = 2065d93a00860221c578d95ec0633493
+MD5 (gwenview-1.0.1.tar.bz2) = 98bc89e3bda282cf192f84bd1fc03fdf
+SIZE (gwenview-1.0.1.tar.bz2) = 670552
diff --git a/graphics/gwenview/pkg-descr b/graphics/gwenview/pkg-descr
index 512dd88479f..82463458060 100644
--- a/graphics/gwenview/pkg-descr
+++ b/graphics/gwenview/pkg-descr
@@ -5,6 +5,3 @@ heirarchy. It supports all image formats your
 KDE installation supports.
 
 WWW: http://gwenview.sourceforge.net
-
-- Stefan Jahn
-stefan.jahn@nemesis-sektor.de
diff --git a/graphics/gwenview/pkg-plist b/graphics/gwenview/pkg-plist
index 554f0ca7f4b..ca52481eb45 100644
--- a/graphics/gwenview/pkg-plist
+++ b/graphics/gwenview/pkg-plist
@@ -1,5 +1,9 @@
 bin/gwenview
-share/applnk/Graphics/gwenview.desktop
+share/applications/kde/gwenview.desktop
+share/apps/gwenview/cursors/drag.png
+share/apps/gwenview/cursors/dragging.png
+share/apps/gwenview/cursors/zoom.png
+share/apps/gwenview/gwenviewui.rc
 share/apps/gwenview/icons/hicolor/16x16/actions/dnd1.png
 share/apps/gwenview/icons/hicolor/16x16/actions/dnd2.png
 share/apps/gwenview/icons/hicolor/16x16/actions/dnd3.png
@@ -13,42 +17,53 @@ share/apps/gwenview/icons/hicolor/16x16/actions/mirror.png
 share/apps/gwenview/icons/hicolor/16x16/actions/rotate_left.png
 share/apps/gwenview/icons/hicolor/16x16/actions/rotate_right.png
 share/apps/gwenview/icons/hicolor/16x16/actions/slideshow.png
-share/apps/gwenview/icons/hicolor/22x22/actions/actualsize.png
-share/apps/gwenview/icons/hicolor/22x22/actions/autozoom.png
+share/apps/gwenview/icons/hicolor/22x22/actions/flip.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvfirst.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvlast.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvnext.png
 share/apps/gwenview/icons/hicolor/22x22/actions/gvprevious.png
 share/apps/gwenview/icons/hicolor/22x22/actions/largethumbnails.png
-share/apps/gwenview/icons/hicolor/22x22/actions/lockzoom.png
 share/apps/gwenview/icons/hicolor/22x22/actions/medthumbnails.png
+share/apps/gwenview/icons/hicolor/22x22/actions/mirror.png
+share/apps/gwenview/icons/hicolor/22x22/actions/rotate_left.png
+share/apps/gwenview/icons/hicolor/22x22/actions/rotate_right.png
 share/apps/gwenview/icons/hicolor/22x22/actions/slideshow.png
 share/apps/gwenview/icons/hicolor/22x22/actions/smallthumbnails.png
-share/apps/gwenview/icons/hicolor/22x22/actions/zoomin.png
-share/apps/gwenview/icons/hicolor/22x22/actions/zoomout.png
-share/apps/gwenview/icons/hicolor/32x32/actions/actualsize.png
-share/apps/gwenview/icons/hicolor/32x32/actions/autozoom.png
+share/apps/gwenview/icons/hicolor/32x32/actions/flip.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvfirst.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvlast.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvnext.png
 share/apps/gwenview/icons/hicolor/32x32/actions/gvprevious.png
 share/apps/gwenview/icons/hicolor/32x32/actions/largethumbnails.png
-share/apps/gwenview/icons/hicolor/32x32/actions/lockzoom.png
 share/apps/gwenview/icons/hicolor/32x32/actions/medthumbnails.png
+share/apps/gwenview/icons/hicolor/32x32/actions/mirror.png
+share/apps/gwenview/icons/hicolor/32x32/actions/rotate_left.png
+share/apps/gwenview/icons/hicolor/32x32/actions/rotate_right.png
 share/apps/gwenview/icons/hicolor/32x32/actions/slideshow.png
 share/apps/gwenview/icons/hicolor/32x32/actions/smallthumbnails.png
-share/apps/gwenview/icons/hicolor/32x32/actions/zoomin.png
-share/apps/gwenview/icons/hicolor/32x32/actions/zoomout.png
+share/apps/gwenview/icons/hicolor/48x48/actions/flip.png
+share/apps/gwenview/icons/hicolor/48x48/actions/mirror.png
+share/apps/gwenview/icons/hicolor/48x48/actions/rotate_left.png
+share/apps/gwenview/icons/hicolor/48x48/actions/rotate_right.png
+share/apps/gwenview/icons/hicolor/48x48/actions/slideshow.png
+share/apps/gwenview/thumbnail/wait.png
+share/apps/gwenview/tools/gimp.desktop
+share/apps/gwenview/tools/konqueror.desktop
+share/apps/gwenview/tools/tiledwallpaper.desktop
+share/apps/gwenview/tools/wallpaper.desktop
 share/apps/konqueror/servicemenus/konqgwenview.desktop
 share/icons/hicolor/16x16/apps/gwenview.png
+share/icons/hicolor/22x22/apps/gwenview.png
 share/icons/hicolor/32x32/apps/gwenview.png
 share/icons/hicolor/48x48/apps/gwenview.png
+share/icons/hicolor/64x64/apps/gwenview.png
 share/icons/locolor/16x16/apps/gwenview.png
 share/icons/locolor/32x32/apps/gwenview.png
 share/locale/ar/LC_MESSAGES/gwenview.mo
 share/locale/cs/LC_MESSAGES/gwenview.mo
 share/locale/da/LC_MESSAGES/gwenview.mo
 share/locale/de/LC_MESSAGES/gwenview.mo
+share/locale/el/LC_MESSAGES/gwenview.mo
 share/locale/en_GB/LC_MESSAGES/gwenview.mo
 share/locale/es/LC_MESSAGES/gwenview.mo
 share/locale/et/LC_MESSAGES/gwenview.mo
@@ -74,29 +89,39 @@ share/locale/xh/LC_MESSAGES/gwenview.mo
 share/locale/zh_CN/LC_MESSAGES/gwenview.mo
 share/locale/zh_TW/LC_MESSAGES/gwenview.mo
 share/locale/zu/LC_MESSAGES/gwenview.mo
-@dirrm share/apps/gwenview/icons/hicolor/16x16/actions
-@dirrm share/apps/gwenview/icons/hicolor/16x16
-@dirrm share/apps/gwenview/icons/hicolor/22x22/actions
-@dirrm share/apps/gwenview/icons/hicolor/22x22
-@dirrm share/apps/gwenview/icons/hicolor/32x32/actions
-@dirrm share/apps/gwenview/icons/hicolor/32x32
-@dirrm share/apps/gwenview/icons/hicolor
-@dirrm share/apps/gwenview/icons
-@dirrm share/apps/gwenview
-@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
-@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
-@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
+@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/48x48 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/32x32 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22/apps 2>/dev/null || true
+@unexec rmdir %D/share/icons/hicolor/22x22 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor/16x16 2>/dev/null || true
 @unexec rmdir %D/share/icons/hicolor 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/32x32 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16/apps 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor/16x16 2>/dev/null || true
-@unexec rmdir %D/share/icons/locolor 2>/dev/null || true
-@unexec rmdir %D/share/applnk/Graphics 2>/dev/null || true
-@unexec rmdir %D/share/applnk 2>/dev/null || true
+@unexec rmdir %D/share/icons 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror/servicemenus 2>/dev/null || true
+@unexec rmdir %D/share/apps/konqueror 2>/dev/null || true
+@dirrm share/apps/gwenview/tools
+@dirrm share/apps/gwenview/thumbnail
+@dirrm share/apps/gwenview/icons/hicolor/48x48/actions
+@dirrm share/apps/gwenview/icons/hicolor/48x48
+@dirrm share/apps/gwenview/icons/hicolor/32x32/actions
+@dirrm share/apps/gwenview/icons/hicolor/32x32
+@dirrm share/apps/gwenview/icons/hicolor/22x22/actions
+@dirrm share/apps/gwenview/icons/hicolor/22x22
+@dirrm share/apps/gwenview/icons/hicolor/16x16/actions
+@dirrm share/apps/gwenview/icons/hicolor/16x16
+@dirrm share/apps/gwenview/icons/hicolor
+@dirrm share/apps/gwenview/icons
+@dirrm share/apps/gwenview/cursors
+@dirrm share/apps/gwenview
+@unexec rmdir %D/share/apps 2>/dev/null || true
+@unexec rmdir %D/share/applications/kde 2>/dev/null || true
+@unexec rmdir %D/share/applications 2>/dev/null || true