21 files changed, 219 insertions, 239 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index ad9af4be6645..de939d44b57e 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -577,6 +577,7 @@
     SUBDIR += pmap
     SUBDIR += policykit
     SUBDIR += policykit-gnome
+    SUBDIR += policykit-kde
     SUBDIR += powerman
     SUBDIR += prips
     SUBDIR += procmap
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index f11d2d794728..3b613b129be0 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -8,7 +8,7 @@ PORTNAME=	kdeadmin
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	sysutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -27,17 +27,17 @@ QT_COMPONENTS=	corelib opengl dbus qt3support designer network svg qtestlib \
 		network porting_build qmake_build moc_build rcc_build \
 		uic_build uic3_build
 #USE_OPENLDAP=	yes
-
-# dirty hack should fix in upstream?
-LDFLAGS=	-lcrypt
+PATCH_WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 CMAKE_ARGS+=	-DBUILD_kpackage:BOOL=Off \
 		-DBUILD_lilo-config:BOOL=Off
 
-post-patch:
+post-extract:
 	${MKDIR} ${WRKSRC}
+
+post-patch:
 	${REINPLACE_CMD} -e \
 	's,$${LIB_INSTALL_DIR}/pkgconfig,libdata/pkgconfig,' \
-	${WRKSRC}/../knetworkconf/backends/CMakeLists.txt
+	${PATCH_WRKSRC}/knetworkconf/backends/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 5c17033cece6..5c44dda1e7bd 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeadmin-4.1.4.tar.bz2) = c3194bc30daacae33322993f2dba0074
-SHA256 (KDE/kdeadmin-4.1.4.tar.bz2) = 97b75cfde0065e6a773b19a9577134fb3a73adde8ef7200a374aedd0e03f5328
-SIZE (KDE/kdeadmin-4.1.4.tar.bz2) = 1840943
+MD5 (KDE/kdeadmin-4.2.0.tar.bz2) = 2c5b33477b5679bcd9fdbc1f8017e6fb
+SHA256 (KDE/kdeadmin-4.2.0.tar.bz2) = e8ba0b3c4ca2083277b1edab1fe3098e9c2f1cfe8d0a0404611ef8e98fcf9099
+SIZE (KDE/kdeadmin-4.2.0.tar.bz2) = 1923292
diff --git a/sysutils/kdeadmin4/pkg-plist b/sysutils/kdeadmin4/pkg-plist
index 798020214e83..04d92cac0d9a 100644
--- a/sysutils/kdeadmin4/pkg-plist
+++ b/sysutils/kdeadmin4/pkg-plist
@@ -114,33 +114,11 @@ share/icons/hicolor/64x64/apps/kuser.png
 share/icons/hicolor/scalable/apps/ksystemlog.svgz
 share/kde4/services/kcm_cron.desktop
 share/kde4/services/kcm_knetworkconfmodule.desktop
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22/actions
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/doc/HTML/en/kuser
 @dirrm share/doc/HTML/en/ksystemlog
 @dirrm share/doc/HTML/en/kpackage
 @dirrm share/doc/HTML/en/kcron
 @dirrm share/doc/HTML/en/kcontrol/knetworkconf
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/config.kcfg
 @dirrm share/apps/kuser/pics
 @dirrm share/apps/kuser/icons/oxygen/22x22/actions
 @dirrm share/apps/kuser/icons/oxygen/22x22
@@ -151,7 +129,3 @@ share/kde4/services/kcm_knetworkconfmodule.desktop
 @dirrm share/apps/knetworkconf/pixmaps
 @dirrm share/apps/knetworkconf/backends
 @dirrm share/apps/knetworkconf
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/kde4
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 4b1a79df695a..23a75146b16a 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -8,16 +8,15 @@ PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
-		netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		zip.1:${PORTSDIR}/archivers/libzip
+		zip.1:${PORTSDIR}/archivers/libzip \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
@@ -25,10 +24,12 @@ LATEST_LINK=	${PORTNAME}4
 USE_BZIP2=	yes
 USE_QT_VER=	4
 KDE4_BUILDENV= yes
-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
 
+MAN1=		ark.1
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index b32341e6b180..5bf5f73fd46e 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.1.4.tar.bz2) = 542663eeae777978dafab2dcf9d422c2
-SHA256 (KDE/kdeutils-4.1.4.tar.bz2) = fc20381de8df78548a88361dc845624c66eeaa9415c883461ba24b094c81b7df
-SIZE (KDE/kdeutils-4.1.4.tar.bz2) = 2285905
+MD5 (KDE/kdeutils-4.2.0.tar.bz2) = f0ca24c7d3e5bb0ab55bf6b26fc6224e
+SHA256 (KDE/kdeutils-4.2.0.tar.bz2) = 1b811b5ea12641aa4003dcc97ea19570418e83a909866f78c08a358a1e1a1cfd
+SIZE (KDE/kdeutils-4.2.0.tar.bz2) = 2234345
diff --git a/sysutils/kdf/files/patch-ark_plugins_libzipplugin-zipplugin.cpp b/sysutils/kdf/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
index c5e3f75034b6..eb03ee5e2287 100644
--- a/sysutils/kdf/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
+++ b/sysutils/kdf/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
@@ -1,13 +1,13 @@
---- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-08-30 13:07:45.000000000 +0400
-+++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-08-30 13:12:59.000000000 +0400
-@@ -30,8 +30,8 @@
- //usually compiled with off_t to 32bit. in the long run libzip should be
- //compiled according to bugs.kde.org bug #167018
- //but for now this will probably do
+--- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-12-10 16:13:03.000000000 +0000
++++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-12-29 22:16:13.000000000 +0000
+@@ -28,8 +28,8 @@
+ 
+ #ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T
+ 
 -#define __off_t_defined
 -typedef quint32 off_t;
 +// #define __off_t_defined
 +// typedef quint32 off_t;
  
- #include "kerfuffle/archiveinterface.h"
- #include "kerfuffle/archivefactory.h"
+ #endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
+ 
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index 1f32022c99f9..03f698c23b80 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -13,8 +13,9 @@ bin/superkaramba
 bin/sweeper
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
-lib/kde4/kerfuffle_bk.so
+lib/kde4/kerfuffle_7zip.so
 lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libzip.so
 lib/kde4/kerfuffle_rar.so
 lib/kde4/libarkpart.so
@@ -25,16 +26,16 @@ lib/kde4/plasma_scriptengine_superkaramba.so
 lib/libkdeinit4_kcalc.so
 lib/libkerfuffle.so
 lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.0
+lib/libkerfuffle.so.5.0.1
 lib/liboktetacore.so
 lib/liboktetacore.so.5
-lib/liboktetacore.so.5.0.0
+lib/liboktetacore.so.5.0.1
 lib/liboktetagui.so
 lib/liboktetagui.so.5
-lib/liboktetagui.so.5.0.0
+lib/liboktetagui.so.5.0.1
 lib/libsuperkaramba.so
 lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.0
+lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
@@ -145,8 +146,12 @@ share/doc/HTML/en/kgpg/keyserver.png
 share/doc/HTML/en/kgpg/kicker.png
 share/doc/HTML/en/kgpg/options.png
 share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/first.png
 share/doc/HTML/en/ktimer/index.cache.bz2
 share/doc/HTML/en/ktimer/index.docbook
+share/doc/HTML/en/ktimer/main.png
+share/doc/HTML/en/ktimer/running.png
+share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
@@ -176,7 +181,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager.png
 share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
 share/icons/hicolor/128x128/apps/superkaramba.png
-share/icons/hicolor/16x16/apps/kcalc.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
@@ -186,14 +190,12 @@ share/icons/hicolor/16x16/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwikdisk.png
 share/icons/hicolor/16x16/apps/okteta.png
 share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/22x22/apps/kcalc.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
 share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
 share/icons/hicolor/22x22/apps/superkaramba.png
-share/icons/hicolor/32x32/apps/kcalc.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
@@ -203,7 +205,6 @@ share/icons/hicolor/32x32/apps/kwalletmanager2.png
 share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/okteta.png
 share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/48x48/apps/kcalc.png
 share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
@@ -213,26 +214,28 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
 share/icons/hicolor/48x48/apps/okteta.png
 share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/64x64/apps/kcalc.png
 share/icons/hicolor/64x64/apps/kdf.png
 share/icons/hicolor/64x64/apps/kfloppy.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
 share/icons/hicolor/64x64/apps/kwalletmanager2.png
 share/icons/hicolor/64x64/apps/kwikdisk.png
 share/icons/hicolor/64x64/apps/superkaramba.png
-share/icons/hicolor/scalable/apps/kcalc.svgz
 share/icons/hicolor/scalable/apps/superkaramba.svgz
 share/icons/oxygen/16x16/apps/kcmdf.png
 share/icons/oxygen/22x22/apps/kcmdf.png
 share/icons/oxygen/32x32/apps/kcmdf.png
+share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop
+share/kde4/services/ServiceMenus/ark_servicemenu.desktop
 share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/floppy_format.desktop
+share/kde4/services/ServiceMenus/viewdecrypted.desktop
 share/kde4/services/ark_part.desktop
 share/kde4/services/kbytearrayedit.desktop
 share/kde4/services/kcmdf.desktop
-share/kde4/services/kerfuffle_bk.desktop
+share/kde4/services/kerfuffle_7zip.desktop
 share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libgz.desktop
 share/kde4/services/kerfuffle_libzip.desktop
 share/kde4/services/kerfuffle_rar.desktop
 share/kde4/services/kwalletconfig.desktop
@@ -241,33 +244,6 @@ share/kde4/services/oktetapart.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
-@dirrmtry share/kde4/servicetypes
-@dirrmtry share/kde4/services/ServiceMenus
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/oxygen/32x32/apps
-@dirrmtry share/icons/oxygen/32x32
-@dirrmtry share/icons/oxygen/22x22/apps
-@dirrmtry share/icons/oxygen/22x22
-@dirrmtry share/icons/oxygen/16x16/apps
-@dirrmtry share/icons/oxygen/16x16
-@dirrmtry share/icons/oxygen
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/doc/HTML/en/superkaramba
 @dirrm share/doc/HTML/en/okteta
 @dirrm share/doc/HTML/en/kwallet
@@ -279,13 +255,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/doc/HTML/en/kcharselect
 @dirrm share/doc/HTML/en/kcalc
 @dirrm share/doc/HTML/en/ark
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/dbus-1/interfaces
-@dirrmtry share/dbus-1
-@dirrmtry share/config.kcfg
-@dirrmtry share/config
-@dirrmtry share/autostart
 @dirrm share/apps/sweeper
 @dirrm share/apps/superkaramba
 @dirrm share/apps/oktetapart
@@ -316,11 +285,5 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/apps/kgpg
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
-@dirrmtry share/apps/kconf_update
-@dirrmtry share/apps/kcharselect
 @dirrm share/apps/kcalc
 @dirrm share/apps/ark
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/kde4
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 4b1a79df695a..23a75146b16a 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -8,16 +8,15 @@ PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
-		netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		zip.1:${PORTSDIR}/archivers/libzip
+		zip.1:${PORTSDIR}/archivers/libzip \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
@@ -25,10 +24,12 @@ LATEST_LINK=	${PORTNAME}4
 USE_BZIP2=	yes
 USE_QT_VER=	4
 KDE4_BUILDENV= yes
-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
 
+MAN1=		ark.1
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index b32341e6b180..5bf5f73fd46e 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.1.4.tar.bz2) = 542663eeae777978dafab2dcf9d422c2
-SHA256 (KDE/kdeutils-4.1.4.tar.bz2) = fc20381de8df78548a88361dc845624c66eeaa9415c883461ba24b094c81b7df
-SIZE (KDE/kdeutils-4.1.4.tar.bz2) = 2285905
+MD5 (KDE/kdeutils-4.2.0.tar.bz2) = f0ca24c7d3e5bb0ab55bf6b26fc6224e
+SHA256 (KDE/kdeutils-4.2.0.tar.bz2) = 1b811b5ea12641aa4003dcc97ea19570418e83a909866f78c08a358a1e1a1cfd
+SIZE (KDE/kdeutils-4.2.0.tar.bz2) = 2234345
diff --git a/sysutils/kfloppy/files/patch-ark_plugins_libzipplugin-zipplugin.cpp b/sysutils/kfloppy/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
index c5e3f75034b6..eb03ee5e2287 100644
--- a/sysutils/kfloppy/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
+++ b/sysutils/kfloppy/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
@@ -1,13 +1,13 @@
---- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-08-30 13:07:45.000000000 +0400
-+++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-08-30 13:12:59.000000000 +0400
-@@ -30,8 +30,8 @@
- //usually compiled with off_t to 32bit. in the long run libzip should be
- //compiled according to bugs.kde.org bug #167018
- //but for now this will probably do
+--- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-12-10 16:13:03.000000000 +0000
++++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-12-29 22:16:13.000000000 +0000
+@@ -28,8 +28,8 @@
+ 
+ #ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T
+ 
 -#define __off_t_defined
 -typedef quint32 off_t;
 +// #define __off_t_defined
 +// typedef quint32 off_t;
  
- #include "kerfuffle/archiveinterface.h"
- #include "kerfuffle/archivefactory.h"
+ #endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
+ 
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 1f32022c99f9..03f698c23b80 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -13,8 +13,9 @@ bin/superkaramba
 bin/sweeper
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
-lib/kde4/kerfuffle_bk.so
+lib/kde4/kerfuffle_7zip.so
 lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libzip.so
 lib/kde4/kerfuffle_rar.so
 lib/kde4/libarkpart.so
@@ -25,16 +26,16 @@ lib/kde4/plasma_scriptengine_superkaramba.so
 lib/libkdeinit4_kcalc.so
 lib/libkerfuffle.so
 lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.0
+lib/libkerfuffle.so.5.0.1
 lib/liboktetacore.so
 lib/liboktetacore.so.5
-lib/liboktetacore.so.5.0.0
+lib/liboktetacore.so.5.0.1
 lib/liboktetagui.so
 lib/liboktetagui.so.5
-lib/liboktetagui.so.5.0.0
+lib/liboktetagui.so.5.0.1
 lib/libsuperkaramba.so
 lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.0
+lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
@@ -145,8 +146,12 @@ share/doc/HTML/en/kgpg/keyserver.png
 share/doc/HTML/en/kgpg/kicker.png
 share/doc/HTML/en/kgpg/options.png
 share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/first.png
 share/doc/HTML/en/ktimer/index.cache.bz2
 share/doc/HTML/en/ktimer/index.docbook
+share/doc/HTML/en/ktimer/main.png
+share/doc/HTML/en/ktimer/running.png
+share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
@@ -176,7 +181,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager.png
 share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
 share/icons/hicolor/128x128/apps/superkaramba.png
-share/icons/hicolor/16x16/apps/kcalc.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
@@ -186,14 +190,12 @@ share/icons/hicolor/16x16/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwikdisk.png
 share/icons/hicolor/16x16/apps/okteta.png
 share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/22x22/apps/kcalc.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
 share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
 share/icons/hicolor/22x22/apps/superkaramba.png
-share/icons/hicolor/32x32/apps/kcalc.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
@@ -203,7 +205,6 @@ share/icons/hicolor/32x32/apps/kwalletmanager2.png
 share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/okteta.png
 share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/48x48/apps/kcalc.png
 share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
@@ -213,26 +214,28 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
 share/icons/hicolor/48x48/apps/okteta.png
 share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/64x64/apps/kcalc.png
 share/icons/hicolor/64x64/apps/kdf.png
 share/icons/hicolor/64x64/apps/kfloppy.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
 share/icons/hicolor/64x64/apps/kwalletmanager2.png
 share/icons/hicolor/64x64/apps/kwikdisk.png
 share/icons/hicolor/64x64/apps/superkaramba.png
-share/icons/hicolor/scalable/apps/kcalc.svgz
 share/icons/hicolor/scalable/apps/superkaramba.svgz
 share/icons/oxygen/16x16/apps/kcmdf.png
 share/icons/oxygen/22x22/apps/kcmdf.png
 share/icons/oxygen/32x32/apps/kcmdf.png
+share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop
+share/kde4/services/ServiceMenus/ark_servicemenu.desktop
 share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/floppy_format.desktop
+share/kde4/services/ServiceMenus/viewdecrypted.desktop
 share/kde4/services/ark_part.desktop
 share/kde4/services/kbytearrayedit.desktop
 share/kde4/services/kcmdf.desktop
-share/kde4/services/kerfuffle_bk.desktop
+share/kde4/services/kerfuffle_7zip.desktop
 share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libgz.desktop
 share/kde4/services/kerfuffle_libzip.desktop
 share/kde4/services/kerfuffle_rar.desktop
 share/kde4/services/kwalletconfig.desktop
@@ -241,33 +244,6 @@ share/kde4/services/oktetapart.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
-@dirrmtry share/kde4/servicetypes
-@dirrmtry share/kde4/services/ServiceMenus
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/oxygen/32x32/apps
-@dirrmtry share/icons/oxygen/32x32
-@dirrmtry share/icons/oxygen/22x22/apps
-@dirrmtry share/icons/oxygen/22x22
-@dirrmtry share/icons/oxygen/16x16/apps
-@dirrmtry share/icons/oxygen/16x16
-@dirrmtry share/icons/oxygen
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/doc/HTML/en/superkaramba
 @dirrm share/doc/HTML/en/okteta
 @dirrm share/doc/HTML/en/kwallet
@@ -279,13 +255,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/doc/HTML/en/kcharselect
 @dirrm share/doc/HTML/en/kcalc
 @dirrm share/doc/HTML/en/ark
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/dbus-1/interfaces
-@dirrmtry share/dbus-1
-@dirrmtry share/config.kcfg
-@dirrmtry share/config
-@dirrmtry share/autostart
 @dirrm share/apps/sweeper
 @dirrm share/apps/superkaramba
 @dirrm share/apps/oktetapart
@@ -316,11 +285,5 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/apps/kgpg
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
-@dirrmtry share/apps/kconf_update
-@dirrmtry share/apps/kcharselect
 @dirrm share/apps/kcalc
 @dirrm share/apps/ark
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/kde4
diff --git a/sysutils/policykit-kde/Makefile b/sysutils/policykit-kde/Makefile
new file mode 100644
index 000000000000..ecc650d5e6cc
--- /dev/null
+++ b/sysutils/policykit-kde/Makefile
@@ -0,0 +1,31 @@
+# New ports collection makefile for:	PolicyKit-kde
+# Date created:		2009-02-03
+# Whom:			David Naylor <dragonsa@highveldmail.co.za>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	PolicyKit-kde
+PORTVERSION=	${EXTRA_VER}
+CATEGORIES=	sysutils kde
+MASTER_SITES=	${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR=	stable/${EXTRA_VER}/src/extragear
+DIST_SUBDIR=	KDE/extragear
+
+MAINTAINER=	kde@FreeBSD.org
+COMMENT=	PolicyKit manager for KDE
+
+LIB_DEPENDS=	polkit.2:${PORTSDIR}/sysutils/policykit
+
+USE_BZIP2=	yes
+USE_GETTEXT=	yes
+USE_KDE4=	kdelibs kdeprefix automoc4
+USE_LDCONFIG=	yes
+USE_QT_VER=	4
+QT_COMPONENTS=	corelib dbus gui network svg xml  \
+		qmake_build moc_build rcc_build uic_build
+USE_CMAKE=	yes
+
+EXTRA_VER=	4.2.0
+
+.include <bsd.port.mk>
diff --git a/sysutils/policykit-kde/distinfo b/sysutils/policykit-kde/distinfo
new file mode 100644
index 000000000000..b7f03b51a838
--- /dev/null
+++ b/sysutils/policykit-kde/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/extragear/PolicyKit-kde-4.2.0.tar.bz2) = e3bc0669e5a61549d12a66af31dd81b6
+SHA256 (KDE/extragear/PolicyKit-kde-4.2.0.tar.bz2) = ded03e4f353df95a1f28c21344f99674ed1853560d0f9113f0f3c0a7a7f5524f
+SIZE (KDE/extragear/PolicyKit-kde-4.2.0.tar.bz2) = 86743
diff --git a/sysutils/policykit-kde/files/patch-CMakeLists.txt b/sysutils/policykit-kde/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..0a638e66fdf5
--- /dev/null
+++ b/sysutils/policykit-kde/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt~	2009-02-03 19:54:33.000000000 +0200
++++ CMakeLists.txt	2009-02-03 19:53:40.000000000 +0200
+@@ -19,6 +19,8 @@
+       polkit-qt/
+     )
+ 
++  link_directories(${POLKIT_LIBRARY_DIR}  ${POLKITDBUS_LIBRARY_DIRS} ${POLKITGRANT_LIBRARY_DIRS})
++
+   add_subdirectory(manager)
+   add_subdirectory(services)
+   add_subdirectory(authorization)
diff --git a/sysutils/policykit-kde/pkg-descr b/sysutils/policykit-kde/pkg-descr
new file mode 100644
index 000000000000..c12b263c3099
--- /dev/null
+++ b/sysutils/policykit-kde/pkg-descr
@@ -0,0 +1,3 @@
+KDE frontend to PolicyKit.
+
+WWW:	http://www.kde.org/
diff --git a/sysutils/policykit-kde/pkg-plist b/sysutils/policykit-kde/pkg-plist
new file mode 100644
index 000000000000..4df434eb944f
--- /dev/null
+++ b/sysutils/policykit-kde/pkg-plist
@@ -0,0 +1,65 @@
+bin/polkit-kde-authorization
+lib/kde4/kcm_pkk_authorization.so
+lib/kde4/libexec/polkit-kde-manager
+lib/libpolkit_qt.so
+lib/libpolkit_qt.so.5
+lib/libpolkit_qt.so.5.0.1
+lib/libpolkitkdeprivate.so
+lib/libpolkitkdeprivate.so.5
+lib/libpolkitkdeprivate.so.5.0.1
+share/dbus-1/services/kde-org.freedesktop.PolicyKit.AuthenticationAgent.service
+share/dbus-1/services/org.kde.PolicyKit.service
+share/kde4/services/kcm_pkk_authorization.desktop
+share/locale/ar/LC_MESSAGES/policykit-kde.mo
+share/locale/ar/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/cs/LC_MESSAGES/policykit-kde.mo
+share/locale/cs/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/de/LC_MESSAGES/policykit-kde.mo
+share/locale/de/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/el/LC_MESSAGES/policykit-kde.mo
+share/locale/el/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/es/LC_MESSAGES/policykit-kde.mo
+share/locale/es/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/et/LC_MESSAGES/policykit-kde.mo
+share/locale/fr/LC_MESSAGES/policykit-kde.mo
+share/locale/fr/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/ga/LC_MESSAGES/policykit-kde.mo
+share/locale/ga/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/gl/LC_MESSAGES/policykit-kde.mo
+share/locale/gl/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/ja/LC_MESSAGES/policykit-kde.mo
+share/locale/ja/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/km/LC_MESSAGES/policykit-kde.mo
+share/locale/km/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/ku/LC_MESSAGES/policykit-kde.mo
+share/locale/lt/LC_MESSAGES/policykit-kde.mo
+share/locale/lt/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/lv/LC_MESSAGES/policykit-kde.mo
+share/locale/lv/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/nb/LC_MESSAGES/policykit-kde.mo
+share/locale/nb/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/nds/LC_MESSAGES/policykit-kde.mo
+share/locale/nds/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/nl/LC_MESSAGES/policykit-kde.mo
+share/locale/nl/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/nn/LC_MESSAGES/policykit-kde.mo
+share/locale/nn/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/pa/LC_MESSAGES/policykit-kde.mo
+share/locale/pa/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/pl/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/pt/LC_MESSAGES/policykit-kde.mo
+share/locale/pt/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/pt_BR/LC_MESSAGES/policykit-kde.mo
+share/locale/pt_BR/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/ro/LC_MESSAGES/policykit-kde.mo
+share/locale/ro/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/sr/LC_MESSAGES/policykit-kde.mo
+share/locale/sr/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/sv/LC_MESSAGES/policykit-kde.mo
+share/locale/sv/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/tr/LC_MESSAGES/policykit-kde.mo
+share/locale/tr/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/uk/LC_MESSAGES/policykit-kde.mo
+share/locale/uk/LC_MESSAGES/polkit-kde-authorization.mo
+share/locale/zh_TW/LC_MESSAGES/policykit-kde.mo
+share/locale/zh_TW/LC_MESSAGES/polkit-kde-authorization.mo
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 4b1a79df695a..23a75146b16a 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -8,16 +8,15 @@ PORTNAME=	kdeutils
 PORTVERSION=	${KDE4_VERSION}
 CATEGORIES=	misc kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
+MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Utilities for the KDE4 integrated X11 Desktop
 
 LIB_DEPENDS=    gmp.7:${PORTSDIR}/math/libgmp4 \
-		netsnmp:${PORTSDIR}/net-mgmt/net-snmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz \
-		zip.1:${PORTSDIR}/archivers/libzip
+		zip.1:${PORTSDIR}/archivers/libzip \
+		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
 RUN_DEPENDS=    gpg:${PORTSDIR}/security/gnupg
 
 LATEST_LINK=	${PORTNAME}4
@@ -25,10 +24,12 @@ LATEST_LINK=	${PORTNAME}4
 USE_BZIP2=	yes
 USE_QT_VER=	4
 KDE4_BUILDENV= yes
-USE_KDE4=	kdelibs pimlibs workspace kdeprefix kdehier automoc4
+USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 QT_COMPONENTS=	network gui porting xml \
 		qmake_build moc_build rcc_build uic_build
 
+MAN1=		ark.1
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index b32341e6b180..5bf5f73fd46e 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeutils-4.1.4.tar.bz2) = 542663eeae777978dafab2dcf9d422c2
-SHA256 (KDE/kdeutils-4.1.4.tar.bz2) = fc20381de8df78548a88361dc845624c66eeaa9415c883461ba24b094c81b7df
-SIZE (KDE/kdeutils-4.1.4.tar.bz2) = 2285905
+MD5 (KDE/kdeutils-4.2.0.tar.bz2) = f0ca24c7d3e5bb0ab55bf6b26fc6224e
+SHA256 (KDE/kdeutils-4.2.0.tar.bz2) = 1b811b5ea12641aa4003dcc97ea19570418e83a909866f78c08a358a1e1a1cfd
+SIZE (KDE/kdeutils-4.2.0.tar.bz2) = 2234345
diff --git a/sysutils/sweeper/files/patch-ark_plugins_libzipplugin-zipplugin.cpp b/sysutils/sweeper/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
index c5e3f75034b6..eb03ee5e2287 100644
--- a/sysutils/sweeper/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
+++ b/sysutils/sweeper/files/patch-ark_plugins_libzipplugin-zipplugin.cpp
@@ -1,13 +1,13 @@
---- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-08-30 13:07:45.000000000 +0400
-+++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-08-30 13:12:59.000000000 +0400
-@@ -30,8 +30,8 @@
- //usually compiled with off_t to 32bit. in the long run libzip should be
- //compiled according to bugs.kde.org bug #167018
- //but for now this will probably do
+--- ../ark/plugins/libzipplugin/zipplugin.cpp.orig	2008-12-10 16:13:03.000000000 +0000
++++ ../ark/plugins/libzipplugin/zipplugin.cpp	2008-12-29 22:16:13.000000000 +0000
+@@ -28,8 +28,8 @@
+ 
+ #ifdef LIBZIP_COMPILED_WITH_32BIT_OFF_T
+ 
 -#define __off_t_defined
 -typedef quint32 off_t;
 +// #define __off_t_defined
 +// typedef quint32 off_t;
  
- #include "kerfuffle/archiveinterface.h"
- #include "kerfuffle/archivefactory.h"
+ #endif /* LIBZIP_COMPILED_WITH_32BIT_OFF_T */
+ 
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index 1f32022c99f9..03f698c23b80 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/pkg-plist
@@ -13,8 +13,9 @@ bin/superkaramba
 bin/sweeper
 lib/kde4/kcm_kdf.so
 lib/kde4/kcm_kwallet.so
-lib/kde4/kerfuffle_bk.so
+lib/kde4/kerfuffle_7zip.so
 lib/kde4/kerfuffle_libarchive.so
+lib/kde4/kerfuffle_libgz.so
 lib/kde4/kerfuffle_libzip.so
 lib/kde4/kerfuffle_rar.so
 lib/kde4/libarkpart.so
@@ -25,16 +26,16 @@ lib/kde4/plasma_scriptengine_superkaramba.so
 lib/libkdeinit4_kcalc.so
 lib/libkerfuffle.so
 lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.0
+lib/libkerfuffle.so.5.0.1
 lib/liboktetacore.so
 lib/liboktetacore.so.5
-lib/liboktetacore.so.5.0.0
+lib/liboktetacore.so.5.0.1
 lib/liboktetagui.so
 lib/liboktetagui.so.5
-lib/liboktetagui.so.5.0.0
+lib/liboktetagui.so.5.0.1
 lib/libsuperkaramba.so
 lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.0
+lib/libsuperkaramba.so.5.0.1
 share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
 share/applications/kde4/ark.desktop
@@ -145,8 +146,12 @@ share/doc/HTML/en/kgpg/keyserver.png
 share/doc/HTML/en/kgpg/kicker.png
 share/doc/HTML/en/kgpg/options.png
 share/doc/HTML/en/ktimer/common
+share/doc/HTML/en/ktimer/first.png
 share/doc/HTML/en/ktimer/index.cache.bz2
 share/doc/HTML/en/ktimer/index.docbook
+share/doc/HTML/en/ktimer/main.png
+share/doc/HTML/en/ktimer/running.png
+share/doc/HTML/en/ktimer/two.at.once.png
 share/doc/HTML/en/kwallet/common
 share/doc/HTML/en/kwallet/edit1.png
 share/doc/HTML/en/kwallet/edit2.png
@@ -176,7 +181,6 @@ share/icons/hicolor/128x128/apps/kwalletmanager.png
 share/icons/hicolor/128x128/apps/kwalletmanager2.png
 share/icons/hicolor/128x128/apps/kwikdisk.png
 share/icons/hicolor/128x128/apps/superkaramba.png
-share/icons/hicolor/16x16/apps/kcalc.png
 share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
 share/icons/hicolor/16x16/apps/kgpg.png
@@ -186,14 +190,12 @@ share/icons/hicolor/16x16/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwikdisk.png
 share/icons/hicolor/16x16/apps/okteta.png
 share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/22x22/apps/kcalc.png
 share/icons/hicolor/22x22/apps/kdf.png
 share/icons/hicolor/22x22/apps/kfloppy.png
 share/icons/hicolor/22x22/apps/kgpg.png
 share/icons/hicolor/22x22/apps/kwalletmanager.png
 share/icons/hicolor/22x22/apps/kwikdisk.png
 share/icons/hicolor/22x22/apps/superkaramba.png
-share/icons/hicolor/32x32/apps/kcalc.png
 share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
 share/icons/hicolor/32x32/apps/kgpg.png
@@ -203,7 +205,6 @@ share/icons/hicolor/32x32/apps/kwalletmanager2.png
 share/icons/hicolor/32x32/apps/kwikdisk.png
 share/icons/hicolor/32x32/apps/okteta.png
 share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/48x48/apps/kcalc.png
 share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
 share/icons/hicolor/48x48/apps/kgpg.png
@@ -213,26 +214,28 @@ share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
 share/icons/hicolor/48x48/apps/okteta.png
 share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/64x64/apps/kcalc.png
 share/icons/hicolor/64x64/apps/kdf.png
 share/icons/hicolor/64x64/apps/kfloppy.png
 share/icons/hicolor/64x64/apps/kwalletmanager.png
 share/icons/hicolor/64x64/apps/kwalletmanager2.png
 share/icons/hicolor/64x64/apps/kwikdisk.png
 share/icons/hicolor/64x64/apps/superkaramba.png
-share/icons/hicolor/scalable/apps/kcalc.svgz
 share/icons/hicolor/scalable/apps/superkaramba.svgz
 share/icons/oxygen/16x16/apps/kcmdf.png
 share/icons/oxygen/22x22/apps/kcmdf.png
 share/icons/oxygen/32x32/apps/kcmdf.png
+share/kde4/services/ServiceMenus/ark_addtoservicemenu.desktop
+share/kde4/services/ServiceMenus/ark_servicemenu.desktop
 share/kde4/services/ServiceMenus/encryptfile.desktop
 share/kde4/services/ServiceMenus/encryptfolder.desktop
 share/kde4/services/ServiceMenus/floppy_format.desktop
+share/kde4/services/ServiceMenus/viewdecrypted.desktop
 share/kde4/services/ark_part.desktop
 share/kde4/services/kbytearrayedit.desktop
 share/kde4/services/kcmdf.desktop
-share/kde4/services/kerfuffle_bk.desktop
+share/kde4/services/kerfuffle_7zip.desktop
 share/kde4/services/kerfuffle_libarchive.desktop
+share/kde4/services/kerfuffle_libgz.desktop
 share/kde4/services/kerfuffle_libzip.desktop
 share/kde4/services/kerfuffle_rar.desktop
 share/kde4/services/kwalletconfig.desktop
@@ -241,33 +244,6 @@ share/kde4/services/oktetapart.desktop
 share/kde4/services/plasma-package-superkaramba.desktop
 share/kde4/services/plasma-scriptengine-superkaramba.desktop
 share/kde4/servicetypes/kerfufflePlugin.desktop
-@dirrmtry share/kde4/servicetypes
-@dirrmtry share/kde4/services/ServiceMenus
-@dirrmtry share/kde4/services
-@dirrmtry share/kde4
-@dirrmtry share/icons/oxygen/32x32/apps
-@dirrmtry share/icons/oxygen/32x32
-@dirrmtry share/icons/oxygen/22x22/apps
-@dirrmtry share/icons/oxygen/22x22
-@dirrmtry share/icons/oxygen/16x16/apps
-@dirrmtry share/icons/oxygen/16x16
-@dirrmtry share/icons/oxygen
-@dirrmtry share/icons/hicolor/scalable/apps
-@dirrmtry share/icons/hicolor/scalable
-@dirrmtry share/icons/hicolor/64x64/apps
-@dirrmtry share/icons/hicolor/64x64
-@dirrmtry share/icons/hicolor/48x48/apps
-@dirrmtry share/icons/hicolor/48x48
-@dirrmtry share/icons/hicolor/32x32/apps
-@dirrmtry share/icons/hicolor/32x32
-@dirrmtry share/icons/hicolor/22x22/apps
-@dirrmtry share/icons/hicolor/22x22
-@dirrmtry share/icons/hicolor/16x16/apps
-@dirrmtry share/icons/hicolor/16x16
-@dirrmtry share/icons/hicolor/128x128/apps
-@dirrmtry share/icons/hicolor/128x128
-@dirrmtry share/icons/hicolor
-@dirrmtry share/icons
 @dirrm share/doc/HTML/en/superkaramba
 @dirrm share/doc/HTML/en/okteta
 @dirrm share/doc/HTML/en/kwallet
@@ -279,13 +255,6 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/doc/HTML/en/kcharselect
 @dirrm share/doc/HTML/en/kcalc
 @dirrm share/doc/HTML/en/ark
-@dirrmtry share/doc/HTML/en
-@dirrmtry share/doc/HTML
-@dirrmtry share/dbus-1/interfaces
-@dirrmtry share/dbus-1
-@dirrmtry share/config.kcfg
-@dirrmtry share/config
-@dirrmtry share/autostart
 @dirrm share/apps/sweeper
 @dirrm share/apps/superkaramba
 @dirrm share/apps/oktetapart
@@ -316,11 +285,5 @@ share/kde4/servicetypes/kerfufflePlugin.desktop
 @dirrm share/apps/kgpg
 @dirrm share/apps/kdf/pics
 @dirrm share/apps/kdf
-@dirrmtry share/apps/kconf_update
-@dirrmtry share/apps/kcharselect
 @dirrm share/apps/kcalc
 @dirrm share/apps/ark
-@dirrmtry share/apps
-@dirrmtry share/applications/kde4
-@dirrmtry share/applications
-@dirrmtry lib/kde4