19 files changed, 57 insertions, 1182 deletions

diff --git a/sysutils/Makefile b/sysutils/Makefile
index 9081e8f286f5..51cde1241de5 100644
--- a/sysutils/Makefile
+++ b/sysutils/Makefile
@@ -416,8 +416,10 @@
     SUBDIR += kcpuload
     SUBDIR += kdeadmin3
     SUBDIR += kdeadmin4
+    SUBDIR += kdf
     SUBDIR += kdirstat
     SUBDIR += keep
+    SUBDIR += kfloppy
     SUBDIR += kgrubeditor
     SUBDIR += kgtk
     SUBDIR += kiconvtool
@@ -865,6 +867,7 @@
     SUBDIR += swapd
     SUBDIR += swapexd
     SUBDIR += swapmon
+    SUBDIR += sweeper
     SUBDIR += symlinks
     SUBDIR += symon
     SUBDIR += synergy
diff --git a/sysutils/filelight-kde4/Makefile b/sysutils/filelight-kde4/Makefile
index 9740777eb3f0..7bb8606e6323 100644
--- a/sysutils/filelight-kde4/Makefile
+++ b/sysutils/filelight-kde4/Makefile
@@ -7,11 +7,9 @@
 
 PORTNAME=	filelight
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
-DISTNAME=	kdeutils-${PORTVERSION}
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -25,10 +23,7 @@ USE_KDE4=	kdehier kdelibs kdeprefix automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
 QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
-USE_BZIP2=	yes
-DISTINFO_FILE=	${PORTSDIR}/misc/kdeutils4/distinfo
+USE_XZ=	yes
 MAKE_JOBS_SAFE=	yes
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
-
 .include <bsd.port.mk>
diff --git a/sysutils/filelight-kde4/distinfo b/sysutils/filelight-kde4/distinfo
new file mode 100644
index 000000000000..0126a8e1d3bd
--- /dev/null
+++ b/sysutils/filelight-kde4/distinfo
@@ -0,0 +1,2 @@
+SHA256 (KDE/filelight-4.8.3.tar.xz) = d13c307ef86e43fd884b08da76ae66ac4a666e09b777fbc6e1777f44ed35904f
+SIZE (KDE/filelight-4.8.3.tar.xz) = 296648
diff --git a/sysutils/kdeadmin4/Makefile b/sysutils/kdeadmin4/Makefile
index 0cc086e677a3..c56552709e07 100644
--- a/sysutils/kdeadmin4/Makefile
+++ b/sysutils/kdeadmin4/Makefile
@@ -6,7 +6,6 @@
 
 PORTNAME=	kdeadmin
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	1
 CATEGORIES=	sysutils kde ipv6
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
@@ -17,7 +16,7 @@ COMMENT=	KDE Admin applications
 
 LATEST_LINK=	${PORTNAME}4
 
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_KDE4=	kdelibs pimlibs kdeprefix kdehier automoc4
 KDE4_BUILDENV=	yes
 USE_QT_VER=	4
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 125cb98bb28b..435232fcbff1 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeadmin-4.7.4.tar.bz2) = f90ecbe4a34bbe47d862e9af6a26811635120d11f6a3ef9163e2c0d7ee1fc79b
-SIZE (KDE/kdeadmin-4.7.4.tar.bz2) = 807192
+SHA256 (KDE/kdeadmin-4.8.3.tar.xz) = b05d2ac0c8928fb38fab2cfbc70b9c9b80fd1428ec937d99a50da34de2dff8c3
+SIZE (KDE/kdeadmin-4.8.3.tar.xz) = 759732
diff --git a/sysutils/kdf/Makefile b/sysutils/kdf/Makefile
index 2176ecabf8ac..2f7be5cc7847 100644
--- a/sysutils/kdf/Makefile
+++ b/sysutils/kdf/Makefile
@@ -4,90 +4,23 @@
 #
 # $FreeBSD$
 
-PORTNAME=	kdeutils
+PORTNAME=	kdf
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
-CATEGORIES=	misc kde
+CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Collection of utilities for KDE 4
+COMMENT=	Shows free space of devices for KDE
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
-
-RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-
-LATEST_LINK=	${PORTNAME}4
+CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
 
+USE_XZ=	yes
+USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdeprefix kdehier automoc4 sharedmime \
-		kdelibs pimlibs workspace baseapps
-USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui network script xml xmlpatterns \
-		qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xrender xtst
-USE_BZIP2=	yes
-CMAKE_ARGS+=	-DBUILD_filelight:BOOL=FALSE \
-		-DBUILD_printer-applet:BOOL=FALSE
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		ark.1
-
-OPTIONS=	FILELIGHT "Install Filelight file system viewer" on \
-		LIRC "Support for IR remote controls" off \
-		PRINTER_APPLET "Install printer system tray utility" off \
-		7ZIP "Support for 7-Zip archives in Ark" off \
-		RAR "Support for RAR archives in Ark" off \
-		ZIP "Support for ZIP archives in Ark" off
-
-.include <bsd.port.options.mk>
-
-.ifndef(WITHOUT_FILELIGHT)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
-.endif
-
-.ifdef(WITH_LIRC)
-RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
-.endif
-
-.ifdef(WITH_PRINTER_APPLET)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
-.endif
-
-.ifdef(WITH_7ZIP)
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
-.endif
-
-.ifdef(WITH_ZIP)
-RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	archive.12:${PORTSDIR}/archivers/libarchive
-.endif
-
-.ifdef(WITH_RAR)
-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
-.if ${ARCH} != "amd64" && ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64"
-INSTALL_RAR=	YES
-.elif ${ARCH} == "amd64"
-.ifndef(HAVE_COMPAT_IA32_KERN)
-HAVE_COMPAT_IA32_KERN!=	if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then ${ECHO_CMD} YES; fi
-.endif
-.if ${HAVE_COMPAT_IA32_KERN} == "YES"
-INSTALL_RAR=	YES
-.endif
-.endif
-.ifdef(INSTALL_RAR)
-RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 2df4c25591af..1ec7d057eaac 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.7.4.tar.bz2) = bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
-SIZE (KDE/kdeutils-4.7.4.tar.bz2) = 3802873
+SHA256 (KDE/kdf-4.8.3.tar.xz) = aa59ae1e057f03bbd88eee97d1f87eab1314968cef0533718d3adc84d1895f3d
+SIZE (KDE/kdf-4.8.3.tar.xz) = 157652
diff --git a/sysutils/kdf/pkg-descr b/sysutils/kdf/pkg-descr
index e1be153978a1..099df3a9a8d8 100644
--- a/sysutils/kdf/pkg-descr
+++ b/sysutils/kdf/pkg-descr
@@ -1,4 +1,10 @@
-The KDE utilities are a compilation of various desktop utilities,
-developed in the KDE module kdeutils.
+KDiskFree displays the available file devices (hard drive partitions,
+floppy and CD/DVD drives, etc.) along with information on their
+capacity, free space, type and mount point. It also allows you to
+mount and unmount drives and view them in a file manager.
+
+KDiskFree is similar to the Systemsettings Partitions module, but 
+takes up less screen space. It is useful if you want to keep a
+KDiskFree window available at all times.
 
 WWW: http://utils.kde.org
diff --git a/sysutils/kdf/pkg-plist b/sysutils/kdf/pkg-plist
index 2b26cef5db6e..df6a74b8dff9 100644
--- a/sysutils/kdf/pkg-plist
+++ b/sysutils/kdf/pkg-plist
@@ -1,330 +1,33 @@
-bin/ark
-bin/kcalc
-bin/kcharselect
 bin/kdf
-bin/kfloppy
-bin/kgpg
-bin/krcdnotifieritem
-bin/ktimer
-bin/kwalletmanager
 bin/kwikdisk
-bin/superkaramba
-bin/sweeper
-lib/kde4/arkpart.so
 lib/kde4/kcm_kdf.so
-lib/kde4/kcm_kwallet.so
-lib/kde4/kcm_remotecontrol.so
-lib/kde4/kded_kremotecontroldaemon.so
-lib/kde4/kerfuffle_cli7z.so
-lib/kde4/kerfuffle_clirar.so
-lib/kde4/kerfuffle_clizip.so
-lib/kde4/kerfuffle_libarchive.so
-lib/kde4/kerfuffle_libbz2.so
-lib/kde4/kerfuffle_libgz.so
-lib/kde4/kerfuffle_libxz.so
-lib/kde4/kremotecontrol_lirc.so
-lib/kde4/libextracthere.so
-lib/kde4/plasma_engine_kremoteconrol.so
-lib/kde4/plasma_package_superkaramba.so
-lib/kde4/plasma_scriptengine_superkaramba.so
-lib/libkdeinit4_kcalc.so
-lib/libkerfuffle.so
-lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.1
-lib/liblibkremotecontrol.so
-lib/liblibkremotecontrol.so.1
-lib/liblibkremotecontrol.so.1.0.0
-lib/libsuperkaramba.so
-lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.1
-share/applications/kde4/KCharSelect.desktop
-share/applications/kde4/KFloppy.desktop
-share/applications/kde4/ark.desktop
-share/applications/kde4/kcalc.desktop
 share/applications/kde4/kdf.desktop
-share/applications/kde4/kgpg.desktop
-share/applications/kde4/krcdnotifieritem.desktop
-share/applications/kde4/ktimer.desktop
-share/applications/kde4/kwalletmanager-kwalletd.desktop
-share/applications/kde4/kwalletmanager.desktop
 share/applications/kde4/kwikdisk.desktop
-share/applications/kde4/superkaramba.desktop
-share/applications/kde4/sweeper.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/kcalc/kcalcui.rc
-share/apps/kcalc/scienceconstants.xml
-share/apps/kcharselect/kcharselectui.rc
-share/apps/kconf_update/kcalcrc.upd
-share/apps/kconf_update/kcharselect.upd
 share/apps/kdf/kdfui.rc
-share/apps/kgpg/icons/hicolor/16x16/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/16x16/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/16x16/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-group.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-orphan.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-pair.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-single.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/key-generate-pair.png
-share/apps/kgpg/icons/hicolor/22x22/actions/view-key-secret.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-group.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-pair.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-single.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-group.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-pair.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-single.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-group.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-pair.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-single.png
-share/apps/kgpg/icons/hicolor/scalable/actions/document-export-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/actions/document-import-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/actions/document-properties-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-group.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-pair.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-single.svgz
-share/apps/kgpg/keysmanager.rc
-share/apps/kgpg/kgpgeditor.rc
-share/apps/kgpg/tips
-share/apps/kremotecontrol/profiles/amarok.profile.xml
-share/apps/kremotecontrol/profiles/dragonplayer.profile.xml
-share/apps/kremotecontrol/profiles/klauncher.profile.xml
-share/apps/kremotecontrol/profiles/kmix.profile.xml
-share/apps/kremotecontrol/profiles/konqueror.profile.xml
-share/apps/kremotecontrol/profiles/kscd.profile.xml
-share/apps/kremotecontrol/profiles/okular.profile.xml
-share/apps/kremotecontrol/profiles/powermanagement.profile.xml
-share/apps/kremotecontrol/profiles/profile.xsd
-share/apps/kremotecontrol/profiles/vlc.profile.xml
-share/apps/kremotecontroldaemon/kremotecontroldaemon.notifyrc
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_closed.png
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_open.png
-share/apps/kwalletmanager/kwalleteditor.rc
-share/apps/kwalletmanager/kwalletmanager.rc
-share/apps/superkaramba/superkarambaui.rc
-share/apps/sweeper/sweeperui.rc
-share/autostart/kgpg.desktop
-share/config.kcfg/ark.kcfg
-share/config.kcfg/kcalc.kcfg
-share/config.kcfg/kgpg.kcfg
-share/config/superkaramba.knsrc
-share/dbus-1/interfaces/org.kde.kgpg.Key.xml
-share/dbus-1/interfaces/org.kde.superkaramba.xml
-share/dbus-1/interfaces/org.kde.sweeper.xml
-share/doc/HTML/en/ark/ark-mainwindow.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/kcalc/commands.docbook
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcharselect/common
-share/doc/HTML/en/kcharselect/index.cache.bz2
-share/doc/HTML/en/kcharselect/index.docbook
-share/doc/HTML/en/kcharselect/kcharselect.png
 share/doc/HTML/en/kcontrol/blockdevices/common
 share/doc/HTML/en/kcontrol/blockdevices/index.cache.bz2
 share/doc/HTML/en/kcontrol/blockdevices/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/AddAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddActionOptions.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddDBusAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddProfileAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AutoPopulate.png
-share/doc/HTML/en/kcontrol/kremotecontrol/EditMasterMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/common
-share/doc/HTML/en/kcontrol/kremotecontrol/index.cache.bz2
-share/doc/HTML/en/kcontrol/kremotecontrol/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/irkick.png
-share/doc/HTML/en/kcontrol/kremotecontrol/irkickoff.png
-share/doc/HTML/en/kcontrol/kremotecontrol/kcmremotecontrol.png
 share/doc/HTML/en/kdf/common
 share/doc/HTML/en/kdf/index.cache.bz2
 share/doc/HTML/en/kdf/index.docbook
 share/doc/HTML/en/kdf/kdf.png
 share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/kgpg/common
-share/doc/HTML/en/kgpg/editor.png
-share/doc/HTML/en/kgpg/index.cache.bz2
-share/doc/HTML/en/kgpg/index.docbook
-share/doc/HTML/en/kgpg/keygen.png
-share/doc/HTML/en/kgpg/keymanage.png
-share/doc/HTML/en/kgpg/keyprop.png
-share/doc/HTML/en/kgpg/keys.png
-share/doc/HTML/en/kgpg/keyserver-search.png
-share/doc/HTML/en/kgpg/keyserver.png
-share/doc/HTML/en/kgpg/options.png
-share/doc/HTML/en/kgpg/select-secret-key.png
-share/doc/HTML/en/kgpg/systray.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
-share/doc/HTML/en/kwallet/first-open-request.png
-share/doc/HTML/en/kwallet/index.cache.bz2
-share/doc/HTML/en/kwallet/index.docbook
-share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/openwallet-request.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
-share/doc/HTML/en/kwallet/save-login-information.png
-share/doc/HTML/en/sweeper/common
-share/doc/HTML/en/sweeper/index.cache.bz2
-share/doc/HTML/en/sweeper/index.docbook
-share/doc/HTML/en/sweeper/sweeper.png
 share/icons/hicolor/128x128/apps/kdf.png
-share/icons/hicolor/128x128/apps/kfloppy.png
-share/icons/hicolor/128x128/apps/ktimer.png
-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/128x128/devices/infrared-remote.png
 share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/kgpg.png
-share/icons/hicolor/16x16/apps/ktimer.png
-share/icons/hicolor/16x16/apps/kwalletmanager.png
-share/icons/hicolor/16x16/apps/kwalletmanager2.png
 share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/16x16/devices/infrared-remote.png
-share/icons/hicolor/22x22/actions/krcd_flash.png
-share/icons/hicolor/22x22/actions/krcd_off.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/krcd.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/22x22/devices/infrared-remote.png
 share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/kgpg.png
-share/icons/hicolor/32x32/apps/ktimer.png
-share/icons/hicolor/32x32/apps/kwalletmanager.png
-share/icons/hicolor/32x32/apps/kwalletmanager2.png
 share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/32x32/devices/infrared-remote.png
-share/icons/hicolor/42x42/devices/infrared-remote.png
 share/icons/hicolor/48x48/apps/kdf.png
-share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/kgpg.png
-share/icons/hicolor/48x48/apps/ktimer.png
-share/icons/hicolor/48x48/apps/kwalletmanager.png
-share/icons/hicolor/48x48/apps/kwalletmanager2.png
 share/icons/hicolor/48x48/apps/kwikdisk.png
-share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/48x48/devices/infrared-remote.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/64x64/devices/infrared-remote.png
-share/icons/hicolor/8x8/devices/infrared-remote.png
-share/icons/hicolor/scalable/actions/krcd_flash.svgz
-share/icons/hicolor/scalable/actions/krcd_off.svgz
-share/icons/hicolor/scalable/apps/krcd.svgz
-share/icons/hicolor/scalable/apps/superkaramba.svgz
-share/icons/hicolor/scalable/devices/infrared-remote.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/viewdecrypted.desktop
-share/kde4/services/ark_dndextract.desktop
-share/kde4/services/ark_part.desktop
-share/kde4/services/kcm_remotecontrol.desktop
 share/kde4/services/kcmdf.desktop
-share/kde4/services/kded/kremotecontroldaemon.desktop
-share/kde4/services/kerfuffle_cli7z.desktop
-share/kde4/services/kerfuffle_clirar.desktop
-share/kde4/services/kerfuffle_clizip.desktop
-share/kde4/services/kerfuffle_libarchive.desktop
-share/kde4/services/kerfuffle_libarchive_readonly.desktop
-share/kde4/services/kerfuffle_libbz2.desktop
-share/kde4/services/kerfuffle_libgz.desktop
-share/kde4/services/kerfuffle_libxz.desktop
-share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop
-share/kde4/services/kwalletconfig.desktop
-share/kde4/services/kwalletmanager_show.desktop
-share/kde4/services/plasma-engine-kremotecontrol.desktop
-share/kde4/services/plasma-package-superkaramba.desktop
-share/kde4/services/plasma-scriptengine-superkaramba.desktop
-share/kde4/servicetypes/kerfufflePlugin.desktop
-share/kde4/servicetypes/kremotecontrolmanager.desktop
-@dirrm share/kde4/services/kremotecontrolbackends
-@dirrmtry share/icons/oxygen/42x42/devices
-@dirrmtry share/icons/oxygen/42x42
-@dirrmtry share/icons/hicolor/8x8/devices
-@dirrmtry share/icons/hicolor/8x8
-@dirrmtry share/icons/hicolor/42x42/devices
-@dirrmtry share/icons/hicolor/42x42
-@dirrm share/doc/HTML/en/sweeper
-@dirrm share/doc/HTML/en/kwallet
-@dirrm share/doc/HTML/en/ktimer
-@dirrm share/doc/HTML/en/kgpg
-@dirrm share/doc/HTML/en/kfloppy
 @dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcontrol/kremotecontrol
 @dirrm share/doc/HTML/en/kcontrol/blockdevices
-@dirrm share/doc/HTML/en/kcharselect
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/sweeper
-@dirrm share/apps/superkaramba
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22
-@dirrm share/apps/kwalletmanager/icons/hicolor
-@dirrm share/apps/kwalletmanager/icons
-@dirrm share/apps/kwalletmanager
-@dirrm share/apps/kremotecontroldaemon
-@dirrm share/apps/kremotecontrol/profiles
-@dirrm share/apps/kremotecontrol
-@dirrm share/apps/kgpg/icons/hicolor/scalable/status
-@dirrm share/apps/kgpg/icons/hicolor/scalable/actions
-@dirrm share/apps/kgpg/icons/hicolor/scalable
-@dirrm share/apps/kgpg/icons/hicolor/48x48/status
-@dirrm share/apps/kgpg/icons/hicolor/48x48/actions
-@dirrm share/apps/kgpg/icons/hicolor/48x48
-@dirrm share/apps/kgpg/icons/hicolor/32x32/status
-@dirrm share/apps/kgpg/icons/hicolor/32x32/actions
-@dirrm share/apps/kgpg/icons/hicolor/32x32
-@dirrm share/apps/kgpg/icons/hicolor/22x22/status
-@dirrm share/apps/kgpg/icons/hicolor/22x22/actions
-@dirrm share/apps/kgpg/icons/hicolor/22x22
-@dirrm share/apps/kgpg/icons/hicolor/16x16/status
-@dirrm share/apps/kgpg/icons/hicolor/16x16/actions
-@dirrm share/apps/kgpg/icons/hicolor/16x16
-@dirrm share/apps/kgpg/icons/hicolor
-@dirrm share/apps/kgpg/icons
-@dirrm share/apps/kgpg
 @dirrm share/apps/kdf
-@dirrm share/apps/kcalc
-@dirrm share/apps/ark
diff --git a/sysutils/kfloppy/Makefile b/sysutils/kfloppy/Makefile
index 2176ecabf8ac..f3f93fbc94f3 100644
--- a/sysutils/kfloppy/Makefile
+++ b/sysutils/kfloppy/Makefile
@@ -4,90 +4,25 @@
 #
 # $FreeBSD$
 
-PORTNAME=	kdeutils
+PORTNAME=	kfloppy
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
-CATEGORIES=	misc kde
+CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Collection of utilities for KDE 4
+COMMENT=	Floppy disk formatter for KDE
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
+CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
 
-RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-
-LATEST_LINK=	${PORTNAME}4
+LATEST_LINK=	${PORTNAME}-kde4
 
+USE_XZ=	yes
+USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdeprefix kdehier automoc4 sharedmime \
-		kdelibs pimlibs workspace baseapps
-USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui network script xml xmlpatterns \
-		qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xrender xtst
-USE_BZIP2=	yes
-CMAKE_ARGS+=	-DBUILD_filelight:BOOL=FALSE \
-		-DBUILD_printer-applet:BOOL=FALSE
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		ark.1
-
-OPTIONS=	FILELIGHT "Install Filelight file system viewer" on \
-		LIRC "Support for IR remote controls" off \
-		PRINTER_APPLET "Install printer system tray utility" off \
-		7ZIP "Support for 7-Zip archives in Ark" off \
-		RAR "Support for RAR archives in Ark" off \
-		ZIP "Support for ZIP archives in Ark" off
-
-.include <bsd.port.options.mk>
-
-.ifndef(WITHOUT_FILELIGHT)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
-.endif
-
-.ifdef(WITH_LIRC)
-RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
-.endif
-
-.ifdef(WITH_PRINTER_APPLET)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
-.endif
-
-.ifdef(WITH_7ZIP)
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
-.endif
-
-.ifdef(WITH_ZIP)
-RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	archive.12:${PORTSDIR}/archivers/libarchive
-.endif
-
-.ifdef(WITH_RAR)
-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
-.if ${ARCH} != "amd64" && ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64"
-INSTALL_RAR=	YES
-.elif ${ARCH} == "amd64"
-.ifndef(HAVE_COMPAT_IA32_KERN)
-HAVE_COMPAT_IA32_KERN!=	if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then ${ECHO_CMD} YES; fi
-.endif
-.if ${HAVE_COMPAT_IA32_KERN} == "YES"
-INSTALL_RAR=	YES
-.endif
-.endif
-.ifdef(INSTALL_RAR)
-RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 2df4c25591af..a1ade4396a00 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.7.4.tar.bz2) = bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
-SIZE (KDE/kdeutils-4.7.4.tar.bz2) = 3802873
+SHA256 (KDE/kfloppy-4.8.3.tar.xz) = 40d150af9e72b59bb2174f4d832c1d0d01fd5a7ff977ea7c6f11d969611a275b
+SIZE (KDE/kfloppy-4.8.3.tar.xz) = 61824
diff --git a/sysutils/kfloppy/pkg-descr b/sysutils/kfloppy/pkg-descr
index e1be153978a1..532ece5993fe 100644
--- a/sysutils/kfloppy/pkg-descr
+++ b/sysutils/kfloppy/pkg-descr
@@ -1,4 +1,7 @@
-The KDE utilities are a compilation of various desktop utilities,
-developed in the KDE module kdeutils.
+KFloppy is a utility that provides a straightforward graphical means
+to format 3.5" and 5.25" floppy disks.
+
+Make sure that your floppy disk is not mounted. KFloppy cannot format
+a mounted floppy disk.
 
 WWW: http://utils.kde.org
diff --git a/sysutils/kfloppy/pkg-message b/sysutils/kfloppy/pkg-message
new file mode 100644
index 000000000000..18142d9b9298
--- /dev/null
+++ b/sysutils/kfloppy/pkg-message
@@ -0,0 +1,2 @@
+Make sure that your floppy disk is not mounted. KFloppy cannot format
+a mounted floppy disk.
diff --git a/sysutils/kfloppy/pkg-plist b/sysutils/kfloppy/pkg-plist
index 2b26cef5db6e..280098bd8086 100644
--- a/sysutils/kfloppy/pkg-plist
+++ b/sysutils/kfloppy/pkg-plist
@@ -1,330 +1,12 @@
-bin/ark
-bin/kcalc
-bin/kcharselect
-bin/kdf
 bin/kfloppy
-bin/kgpg
-bin/krcdnotifieritem
-bin/ktimer
-bin/kwalletmanager
-bin/kwikdisk
-bin/superkaramba
-bin/sweeper
-lib/kde4/arkpart.so
-lib/kde4/kcm_kdf.so
-lib/kde4/kcm_kwallet.so
-lib/kde4/kcm_remotecontrol.so
-lib/kde4/kded_kremotecontroldaemon.so
-lib/kde4/kerfuffle_cli7z.so
-lib/kde4/kerfuffle_clirar.so
-lib/kde4/kerfuffle_clizip.so
-lib/kde4/kerfuffle_libarchive.so
-lib/kde4/kerfuffle_libbz2.so
-lib/kde4/kerfuffle_libgz.so
-lib/kde4/kerfuffle_libxz.so
-lib/kde4/kremotecontrol_lirc.so
-lib/kde4/libextracthere.so
-lib/kde4/plasma_engine_kremoteconrol.so
-lib/kde4/plasma_package_superkaramba.so
-lib/kde4/plasma_scriptengine_superkaramba.so
-lib/libkdeinit4_kcalc.so
-lib/libkerfuffle.so
-lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.1
-lib/liblibkremotecontrol.so
-lib/liblibkremotecontrol.so.1
-lib/liblibkremotecontrol.so.1.0.0
-lib/libsuperkaramba.so
-lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.1
-share/applications/kde4/KCharSelect.desktop
 share/applications/kde4/KFloppy.desktop
-share/applications/kde4/ark.desktop
-share/applications/kde4/kcalc.desktop
-share/applications/kde4/kdf.desktop
-share/applications/kde4/kgpg.desktop
-share/applications/kde4/krcdnotifieritem.desktop
-share/applications/kde4/ktimer.desktop
-share/applications/kde4/kwalletmanager-kwalletd.desktop
-share/applications/kde4/kwalletmanager.desktop
-share/applications/kde4/kwikdisk.desktop
-share/applications/kde4/superkaramba.desktop
-share/applications/kde4/sweeper.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/kcalc/kcalcui.rc
-share/apps/kcalc/scienceconstants.xml
-share/apps/kcharselect/kcharselectui.rc
-share/apps/kconf_update/kcalcrc.upd
-share/apps/kconf_update/kcharselect.upd
-share/apps/kdf/kdfui.rc
-share/apps/kgpg/icons/hicolor/16x16/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/16x16/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/16x16/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-group.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-orphan.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-pair.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-single.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/key-generate-pair.png
-share/apps/kgpg/icons/hicolor/22x22/actions/view-key-secret.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-group.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-pair.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-single.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-group.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-pair.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-single.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-group.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-pair.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-single.png
-share/apps/kgpg/icons/hicolor/scalable/actions/document-export-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/actions/document-import-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/actions/document-properties-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-group.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-pair.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-single.svgz
-share/apps/kgpg/keysmanager.rc
-share/apps/kgpg/kgpgeditor.rc
-share/apps/kgpg/tips
-share/apps/kremotecontrol/profiles/amarok.profile.xml
-share/apps/kremotecontrol/profiles/dragonplayer.profile.xml
-share/apps/kremotecontrol/profiles/klauncher.profile.xml
-share/apps/kremotecontrol/profiles/kmix.profile.xml
-share/apps/kremotecontrol/profiles/konqueror.profile.xml
-share/apps/kremotecontrol/profiles/kscd.profile.xml
-share/apps/kremotecontrol/profiles/okular.profile.xml
-share/apps/kremotecontrol/profiles/powermanagement.profile.xml
-share/apps/kremotecontrol/profiles/profile.xsd
-share/apps/kremotecontrol/profiles/vlc.profile.xml
-share/apps/kremotecontroldaemon/kremotecontroldaemon.notifyrc
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_closed.png
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_open.png
-share/apps/kwalletmanager/kwalleteditor.rc
-share/apps/kwalletmanager/kwalletmanager.rc
-share/apps/superkaramba/superkarambaui.rc
-share/apps/sweeper/sweeperui.rc
-share/autostart/kgpg.desktop
-share/config.kcfg/ark.kcfg
-share/config.kcfg/kcalc.kcfg
-share/config.kcfg/kgpg.kcfg
-share/config/superkaramba.knsrc
-share/dbus-1/interfaces/org.kde.kgpg.Key.xml
-share/dbus-1/interfaces/org.kde.superkaramba.xml
-share/dbus-1/interfaces/org.kde.sweeper.xml
-share/doc/HTML/en/ark/ark-mainwindow.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/kcalc/commands.docbook
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcharselect/common
-share/doc/HTML/en/kcharselect/index.cache.bz2
-share/doc/HTML/en/kcharselect/index.docbook
-share/doc/HTML/en/kcharselect/kcharselect.png
-share/doc/HTML/en/kcontrol/blockdevices/common
-share/doc/HTML/en/kcontrol/blockdevices/index.cache.bz2
-share/doc/HTML/en/kcontrol/blockdevices/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/AddAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddActionOptions.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddDBusAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddProfileAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AutoPopulate.png
-share/doc/HTML/en/kcontrol/kremotecontrol/EditMasterMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/common
-share/doc/HTML/en/kcontrol/kremotecontrol/index.cache.bz2
-share/doc/HTML/en/kcontrol/kremotecontrol/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/irkick.png
-share/doc/HTML/en/kcontrol/kremotecontrol/irkickoff.png
-share/doc/HTML/en/kcontrol/kremotecontrol/kcmremotecontrol.png
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
 share/doc/HTML/en/kfloppy/common
 share/doc/HTML/en/kfloppy/index.cache.bz2
 share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/kgpg/common
-share/doc/HTML/en/kgpg/editor.png
-share/doc/HTML/en/kgpg/index.cache.bz2
-share/doc/HTML/en/kgpg/index.docbook
-share/doc/HTML/en/kgpg/keygen.png
-share/doc/HTML/en/kgpg/keymanage.png
-share/doc/HTML/en/kgpg/keyprop.png
-share/doc/HTML/en/kgpg/keys.png
-share/doc/HTML/en/kgpg/keyserver-search.png
-share/doc/HTML/en/kgpg/keyserver.png
-share/doc/HTML/en/kgpg/options.png
-share/doc/HTML/en/kgpg/select-secret-key.png
-share/doc/HTML/en/kgpg/systray.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
-share/doc/HTML/en/kwallet/first-open-request.png
-share/doc/HTML/en/kwallet/index.cache.bz2
-share/doc/HTML/en/kwallet/index.docbook
-share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/openwallet-request.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
-share/doc/HTML/en/kwallet/save-login-information.png
-share/doc/HTML/en/sweeper/common
-share/doc/HTML/en/sweeper/index.cache.bz2
-share/doc/HTML/en/sweeper/index.docbook
-share/doc/HTML/en/sweeper/sweeper.png
-share/icons/hicolor/128x128/apps/kdf.png
 share/icons/hicolor/128x128/apps/kfloppy.png
-share/icons/hicolor/128x128/apps/ktimer.png
-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/128x128/devices/infrared-remote.png
-share/icons/hicolor/16x16/apps/kdf.png
 share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/kgpg.png
-share/icons/hicolor/16x16/apps/ktimer.png
-share/icons/hicolor/16x16/apps/kwalletmanager.png
-share/icons/hicolor/16x16/apps/kwalletmanager2.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/16x16/devices/infrared-remote.png
-share/icons/hicolor/22x22/actions/krcd_flash.png
-share/icons/hicolor/22x22/actions/krcd_off.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/krcd.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/22x22/devices/infrared-remote.png
-share/icons/hicolor/32x32/apps/kdf.png
 share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/kgpg.png
-share/icons/hicolor/32x32/apps/ktimer.png
-share/icons/hicolor/32x32/apps/kwalletmanager.png
-share/icons/hicolor/32x32/apps/kwalletmanager2.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/32x32/devices/infrared-remote.png
-share/icons/hicolor/42x42/devices/infrared-remote.png
-share/icons/hicolor/48x48/apps/kdf.png
 share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/kgpg.png
-share/icons/hicolor/48x48/apps/ktimer.png
-share/icons/hicolor/48x48/apps/kwalletmanager.png
-share/icons/hicolor/48x48/apps/kwalletmanager2.png
-share/icons/hicolor/48x48/apps/kwikdisk.png
-share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/48x48/devices/infrared-remote.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/64x64/devices/infrared-remote.png
-share/icons/hicolor/8x8/devices/infrared-remote.png
-share/icons/hicolor/scalable/actions/krcd_flash.svgz
-share/icons/hicolor/scalable/actions/krcd_off.svgz
-share/icons/hicolor/scalable/apps/krcd.svgz
-share/icons/hicolor/scalable/apps/superkaramba.svgz
-share/icons/hicolor/scalable/devices/infrared-remote.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/viewdecrypted.desktop
-share/kde4/services/ark_dndextract.desktop
-share/kde4/services/ark_part.desktop
-share/kde4/services/kcm_remotecontrol.desktop
-share/kde4/services/kcmdf.desktop
-share/kde4/services/kded/kremotecontroldaemon.desktop
-share/kde4/services/kerfuffle_cli7z.desktop
-share/kde4/services/kerfuffle_clirar.desktop
-share/kde4/services/kerfuffle_clizip.desktop
-share/kde4/services/kerfuffle_libarchive.desktop
-share/kde4/services/kerfuffle_libarchive_readonly.desktop
-share/kde4/services/kerfuffle_libbz2.desktop
-share/kde4/services/kerfuffle_libgz.desktop
-share/kde4/services/kerfuffle_libxz.desktop
-share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop
-share/kde4/services/kwalletconfig.desktop
-share/kde4/services/kwalletmanager_show.desktop
-share/kde4/services/plasma-engine-kremotecontrol.desktop
-share/kde4/services/plasma-package-superkaramba.desktop
-share/kde4/services/plasma-scriptengine-superkaramba.desktop
-share/kde4/servicetypes/kerfufflePlugin.desktop
-share/kde4/servicetypes/kremotecontrolmanager.desktop
-@dirrm share/kde4/services/kremotecontrolbackends
-@dirrmtry share/icons/oxygen/42x42/devices
-@dirrmtry share/icons/oxygen/42x42
-@dirrmtry share/icons/hicolor/8x8/devices
-@dirrmtry share/icons/hicolor/8x8
-@dirrmtry share/icons/hicolor/42x42/devices
-@dirrmtry share/icons/hicolor/42x42
-@dirrm share/doc/HTML/en/sweeper
-@dirrm share/doc/HTML/en/kwallet
-@dirrm share/doc/HTML/en/ktimer
-@dirrm share/doc/HTML/en/kgpg
 @dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcontrol/kremotecontrol
-@dirrm share/doc/HTML/en/kcontrol/blockdevices
-@dirrm share/doc/HTML/en/kcharselect
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/ark
-@dirrm share/apps/sweeper
-@dirrm share/apps/superkaramba
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22
-@dirrm share/apps/kwalletmanager/icons/hicolor
-@dirrm share/apps/kwalletmanager/icons
-@dirrm share/apps/kwalletmanager
-@dirrm share/apps/kremotecontroldaemon
-@dirrm share/apps/kremotecontrol/profiles
-@dirrm share/apps/kremotecontrol
-@dirrm share/apps/kgpg/icons/hicolor/scalable/status
-@dirrm share/apps/kgpg/icons/hicolor/scalable/actions
-@dirrm share/apps/kgpg/icons/hicolor/scalable
-@dirrm share/apps/kgpg/icons/hicolor/48x48/status
-@dirrm share/apps/kgpg/icons/hicolor/48x48/actions
-@dirrm share/apps/kgpg/icons/hicolor/48x48
-@dirrm share/apps/kgpg/icons/hicolor/32x32/status
-@dirrm share/apps/kgpg/icons/hicolor/32x32/actions
-@dirrm share/apps/kgpg/icons/hicolor/32x32
-@dirrm share/apps/kgpg/icons/hicolor/22x22/status
-@dirrm share/apps/kgpg/icons/hicolor/22x22/actions
-@dirrm share/apps/kgpg/icons/hicolor/22x22
-@dirrm share/apps/kgpg/icons/hicolor/16x16/status
-@dirrm share/apps/kgpg/icons/hicolor/16x16/actions
-@dirrm share/apps/kgpg/icons/hicolor/16x16
-@dirrm share/apps/kgpg/icons/hicolor
-@dirrm share/apps/kgpg/icons
-@dirrm share/apps/kgpg
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc
-@dirrm share/apps/ark
diff --git a/sysutils/ksysguardd/Makefile b/sysutils/ksysguardd/Makefile
index 20ff9351c7c2..6387818d3cdd 100644
--- a/sysutils/ksysguardd/Makefile
+++ b/sysutils/ksysguardd/Makefile
@@ -17,7 +17,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	KDE System Guard Daemon
 
 DISTINFO_FILE=	${PORTSDIR}/x11/kde4-workspace/distinfo
-USE_BZIP2=	yes
+USE_XZ=	yes
 USE_KDE4=	kdeprefix kdehier
 USE_CMAKE=	yes
 CMAKE_ARGS+=	-DBIN_INSTALL_DIR:STRING="${PREFIX}/bin" \
diff --git a/sysutils/sweeper/Makefile b/sysutils/sweeper/Makefile
index 2176ecabf8ac..d5e39e0ce23a 100644
--- a/sysutils/sweeper/Makefile
+++ b/sysutils/sweeper/Makefile
@@ -4,90 +4,23 @@
 #
 # $FreeBSD$
 
-PORTNAME=	kdeutils
+PORTNAME=	sweeper
 PORTVERSION=	${KDE4_VERSION}
-PORTREVISION=	2
-CATEGORIES=	misc kde
+CATEGORIES=	sysutils kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	${KDE4_BRANCH}/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
-COMMENT=	Collection of utilities for KDE 4
+COMMENT=	Cleans temporal files for KDE
 
-LIB_DEPENDS=	gmp.10:${PORTSDIR}/math/gmp \
-		qimageblitz.4:${PORTSDIR}/x11/qimageblitz
-
-RUN_DEPENDS=	gpg2:${PORTSDIR}/security/gnupg
-
-LATEST_LINK=	${PORTNAME}4
+CONFLICTS_INSTALL=	kdeutils-4.[0-7].*
 
+USE_XZ=	yes
+USE_KDE4=	kdeprefix kdehier automoc4 kdelibs
 KDE4_BUILDENV=	yes
-USE_KDE4=	kdeprefix kdehier automoc4 sharedmime \
-		kdelibs pimlibs workspace baseapps
-USE_PYTHON=	2.5+
 USE_QT_VER=	4
-QT_COMPONENTS=	dbus gui network script xml xmlpatterns \
-		qmake_build moc_build rcc_build uic_build
-USE_XORG=	x11 xrender xtst
-USE_BZIP2=	yes
-CMAKE_ARGS+=	-DBUILD_filelight:BOOL=FALSE \
-		-DBUILD_printer-applet:BOOL=FALSE
+QT_COMPONENTS=	qmake_build moc_build rcc_build uic_build
 MAKE_JOBS_SAFE=	yes
 
-MAN1=		ark.1
-
-OPTIONS=	FILELIGHT "Install Filelight file system viewer" on \
-		LIRC "Support for IR remote controls" off \
-		PRINTER_APPLET "Install printer system tray utility" off \
-		7ZIP "Support for 7-Zip archives in Ark" off \
-		RAR "Support for RAR archives in Ark" off \
-		ZIP "Support for ZIP archives in Ark" off
-
-.include <bsd.port.options.mk>
-
-.ifndef(WITHOUT_FILELIGHT)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/filelight:${PORTSDIR}/sysutils/filelight-kde4
-.endif
-
-.ifdef(WITH_LIRC)
-RUN_DEPENDS+=	lircd:${PORTSDIR}/comms/lirc
-.endif
-
-.ifdef(WITH_PRINTER_APPLET)
-RUN_DEPENDS+=	${KDE4_PREFIX}/bin/printer-applet:${PORTSDIR}/print/kdeutils4-printer-applet
-.endif
-
-.ifdef(WITH_7ZIP)
-RUN_DEPENDS+=	7z:${PORTSDIR}/archivers/p7zip
-.endif
-
-.ifdef(WITH_ZIP)
-RUN_DEPENDS+=	unzip>0:${PORTSDIR}/archivers/unzip \
-		zip:${PORTSDIR}/archivers/zip
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 800505 || (${OSVERSION} >= 900000 && ${OSVERSION} < 900012)
-LIB_DEPENDS+=	archive.12:${PORTSDIR}/archivers/libarchive
-.endif
-
-.ifdef(WITH_RAR)
-RUN_DEPENDS+=	unrar:${PORTSDIR}/archivers/unrar
-.if ${ARCH} != "amd64" && ${ARCH} != "ia64" && ${ARCH} != "powerpc" && ${ARCH} != "sparc64"
-INSTALL_RAR=	YES
-.elif ${ARCH} == "amd64"
-.ifndef(HAVE_COMPAT_IA32_KERN)
-HAVE_COMPAT_IA32_KERN!=	if ${SYSCTL} -n compat.ia32.maxvmem >/dev/null 2>&1; then ${ECHO_CMD} YES; fi
-.endif
-.if ${HAVE_COMPAT_IA32_KERN} == "YES"
-INSTALL_RAR=	YES
-.endif
-.endif
-.ifdef(INSTALL_RAR)
-RUN_DEPENDS+=	rar:${PORTSDIR}/archivers/rar
-.endif
-.endif
-
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 2df4c25591af..22532d76a3e9 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,2 +1,2 @@
-SHA256 (KDE/kdeutils-4.7.4.tar.bz2) = bb50a5069808a0280eff671b2f9c0053f5bbbfdc432760bc35ccf654de833c68
-SIZE (KDE/kdeutils-4.7.4.tar.bz2) = 3802873
+SHA256 (KDE/sweeper-4.8.3.tar.xz) = 08a30e03af4e3baaefeddca46a86e6ec514cbaf76173e59e908947354dae2836
+SIZE (KDE/sweeper-4.8.3.tar.xz) = 84900
diff --git a/sysutils/sweeper/pkg-descr b/sysutils/sweeper/pkg-descr
index e1be153978a1..ca9672b7506a 100644
--- a/sysutils/sweeper/pkg-descr
+++ b/sysutils/sweeper/pkg-descr
@@ -1,4 +1,3 @@
-The KDE utilities are a compilation of various desktop utilities,
-developed in the KDE module kdeutils.
+Sweeper helps to clean unwanted traces the user leaves on the system.
 
 WWW: http://utils.kde.org
diff --git a/sysutils/sweeper/pkg-plist b/sysutils/sweeper/pkg-plist
index 2b26cef5db6e..476adb310905 100644
--- a/sysutils/sweeper/pkg-plist
+++ b/sysutils/sweeper/pkg-plist
@@ -1,330 +1,10 @@
-bin/ark
-bin/kcalc
-bin/kcharselect
-bin/kdf
-bin/kfloppy
-bin/kgpg
-bin/krcdnotifieritem
-bin/ktimer
-bin/kwalletmanager
-bin/kwikdisk
-bin/superkaramba
 bin/sweeper
-lib/kde4/arkpart.so
-lib/kde4/kcm_kdf.so
-lib/kde4/kcm_kwallet.so
-lib/kde4/kcm_remotecontrol.so
-lib/kde4/kded_kremotecontroldaemon.so
-lib/kde4/kerfuffle_cli7z.so
-lib/kde4/kerfuffle_clirar.so
-lib/kde4/kerfuffle_clizip.so
-lib/kde4/kerfuffle_libarchive.so
-lib/kde4/kerfuffle_libbz2.so
-lib/kde4/kerfuffle_libgz.so
-lib/kde4/kerfuffle_libxz.so
-lib/kde4/kremotecontrol_lirc.so
-lib/kde4/libextracthere.so
-lib/kde4/plasma_engine_kremoteconrol.so
-lib/kde4/plasma_package_superkaramba.so
-lib/kde4/plasma_scriptengine_superkaramba.so
-lib/libkdeinit4_kcalc.so
-lib/libkerfuffle.so
-lib/libkerfuffle.so.5
-lib/libkerfuffle.so.5.0.1
-lib/liblibkremotecontrol.so
-lib/liblibkremotecontrol.so.1
-lib/liblibkremotecontrol.so.1.0.0
-lib/libsuperkaramba.so
-lib/libsuperkaramba.so.5
-lib/libsuperkaramba.so.5.0.1
-share/applications/kde4/KCharSelect.desktop
-share/applications/kde4/KFloppy.desktop
-share/applications/kde4/ark.desktop
-share/applications/kde4/kcalc.desktop
-share/applications/kde4/kdf.desktop
-share/applications/kde4/kgpg.desktop
-share/applications/kde4/krcdnotifieritem.desktop
-share/applications/kde4/ktimer.desktop
-share/applications/kde4/kwalletmanager-kwalletd.desktop
-share/applications/kde4/kwalletmanager.desktop
-share/applications/kde4/kwikdisk.desktop
-share/applications/kde4/superkaramba.desktop
 share/applications/kde4/sweeper.desktop
-share/apps/ark/ark_part.rc
-share/apps/ark/arkui.rc
-share/apps/kcalc/kcalcui.rc
-share/apps/kcalc/scienceconstants.xml
-share/apps/kcharselect/kcharselectui.rc
-share/apps/kconf_update/kcalcrc.upd
-share/apps/kconf_update/kcharselect.upd
-share/apps/kdf/kdfui.rc
-share/apps/kgpg/icons/hicolor/16x16/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/16x16/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/16x16/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-group.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-orphan.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-pair.png
-share/apps/kgpg/icons/hicolor/16x16/status/key-single.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/22x22/actions/key-generate-pair.png
-share/apps/kgpg/icons/hicolor/22x22/actions/view-key-secret.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-group.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-pair.png
-share/apps/kgpg/icons/hicolor/22x22/status/key-single.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/32x32/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-group.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-pair.png
-share/apps/kgpg/icons/hicolor/32x32/status/key-single.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-export-key.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-import-key.png
-share/apps/kgpg/icons/hicolor/48x48/actions/document-properties-key.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-group.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-pair.png
-share/apps/kgpg/icons/hicolor/48x48/status/key-single.png
-share/apps/kgpg/icons/hicolor/scalable/actions/document-export-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/actions/document-import-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/actions/document-properties-key.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-group.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-pair.svgz
-share/apps/kgpg/icons/hicolor/scalable/status/key-single.svgz
-share/apps/kgpg/keysmanager.rc
-share/apps/kgpg/kgpgeditor.rc
-share/apps/kgpg/tips
-share/apps/kremotecontrol/profiles/amarok.profile.xml
-share/apps/kremotecontrol/profiles/dragonplayer.profile.xml
-share/apps/kremotecontrol/profiles/klauncher.profile.xml
-share/apps/kremotecontrol/profiles/kmix.profile.xml
-share/apps/kremotecontrol/profiles/konqueror.profile.xml
-share/apps/kremotecontrol/profiles/kscd.profile.xml
-share/apps/kremotecontrol/profiles/okular.profile.xml
-share/apps/kremotecontrol/profiles/powermanagement.profile.xml
-share/apps/kremotecontrol/profiles/profile.xsd
-share/apps/kremotecontrol/profiles/vlc.profile.xml
-share/apps/kremotecontroldaemon/kremotecontroldaemon.notifyrc
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_closed.png
-share/apps/kwalletmanager/icons/hicolor/22x22/actions/folder_open.png
-share/apps/kwalletmanager/kwalleteditor.rc
-share/apps/kwalletmanager/kwalletmanager.rc
-share/apps/superkaramba/superkarambaui.rc
 share/apps/sweeper/sweeperui.rc
-share/autostart/kgpg.desktop
-share/config.kcfg/ark.kcfg
-share/config.kcfg/kcalc.kcfg
-share/config.kcfg/kgpg.kcfg
-share/config/superkaramba.knsrc
-share/dbus-1/interfaces/org.kde.kgpg.Key.xml
-share/dbus-1/interfaces/org.kde.superkaramba.xml
 share/dbus-1/interfaces/org.kde.sweeper.xml
-share/doc/HTML/en/ark/ark-mainwindow.png
-share/doc/HTML/en/ark/common
-share/doc/HTML/en/ark/index.cache.bz2
-share/doc/HTML/en/ark/index.docbook
-share/doc/HTML/en/ark/man-ark.1.docbook
-share/doc/HTML/en/kcalc/commands.docbook
-share/doc/HTML/en/kcalc/common
-share/doc/HTML/en/kcalc/index.cache.bz2
-share/doc/HTML/en/kcalc/index.docbook
-share/doc/HTML/en/kcharselect/common
-share/doc/HTML/en/kcharselect/index.cache.bz2
-share/doc/HTML/en/kcharselect/index.docbook
-share/doc/HTML/en/kcharselect/kcharselect.png
-share/doc/HTML/en/kcontrol/blockdevices/common
-share/doc/HTML/en/kcontrol/blockdevices/index.cache.bz2
-share/doc/HTML/en/kcontrol/blockdevices/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/AddAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddActionOptions.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddDBusAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AddProfileAction.png
-share/doc/HTML/en/kcontrol/kremotecontrol/AutoPopulate.png
-share/doc/HTML/en/kcontrol/kremotecontrol/EditMasterMode.png
-share/doc/HTML/en/kcontrol/kremotecontrol/common
-share/doc/HTML/en/kcontrol/kremotecontrol/index.cache.bz2
-share/doc/HTML/en/kcontrol/kremotecontrol/index.docbook
-share/doc/HTML/en/kcontrol/kremotecontrol/irkick.png
-share/doc/HTML/en/kcontrol/kremotecontrol/irkickoff.png
-share/doc/HTML/en/kcontrol/kremotecontrol/kcmremotecontrol.png
-share/doc/HTML/en/kdf/common
-share/doc/HTML/en/kdf/index.cache.bz2
-share/doc/HTML/en/kdf/index.docbook
-share/doc/HTML/en/kdf/kdf.png
-share/doc/HTML/en/kdf/kdf_config.png
-share/doc/HTML/en/kfloppy/common
-share/doc/HTML/en/kfloppy/index.cache.bz2
-share/doc/HTML/en/kfloppy/index.docbook
-share/doc/HTML/en/kgpg/common
-share/doc/HTML/en/kgpg/editor.png
-share/doc/HTML/en/kgpg/index.cache.bz2
-share/doc/HTML/en/kgpg/index.docbook
-share/doc/HTML/en/kgpg/keygen.png
-share/doc/HTML/en/kgpg/keymanage.png
-share/doc/HTML/en/kgpg/keyprop.png
-share/doc/HTML/en/kgpg/keys.png
-share/doc/HTML/en/kgpg/keyserver-search.png
-share/doc/HTML/en/kgpg/keyserver.png
-share/doc/HTML/en/kgpg/options.png
-share/doc/HTML/en/kgpg/select-secret-key.png
-share/doc/HTML/en/kgpg/systray.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
-share/doc/HTML/en/kwallet/first-open-request.png
-share/doc/HTML/en/kwallet/index.cache.bz2
-share/doc/HTML/en/kwallet/index.docbook
-share/doc/HTML/en/kwallet/kwalletmanager.png
-share/doc/HTML/en/kwallet/openwallet-request.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-closed.png
-share/doc/HTML/en/kwallet/oxygen48-status-wallet-open.png
-share/doc/HTML/en/kwallet/save-login-information.png
 share/doc/HTML/en/sweeper/common
 share/doc/HTML/en/sweeper/index.cache.bz2
 share/doc/HTML/en/sweeper/index.docbook
 share/doc/HTML/en/sweeper/sweeper.png
-share/icons/hicolor/128x128/apps/kdf.png
-share/icons/hicolor/128x128/apps/kfloppy.png
-share/icons/hicolor/128x128/apps/ktimer.png
-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/128x128/devices/infrared-remote.png
-share/icons/hicolor/16x16/apps/kdf.png
-share/icons/hicolor/16x16/apps/kfloppy.png
-share/icons/hicolor/16x16/apps/kgpg.png
-share/icons/hicolor/16x16/apps/ktimer.png
-share/icons/hicolor/16x16/apps/kwalletmanager.png
-share/icons/hicolor/16x16/apps/kwalletmanager2.png
-share/icons/hicolor/16x16/apps/kwikdisk.png
-share/icons/hicolor/16x16/apps/superkaramba.png
-share/icons/hicolor/16x16/devices/infrared-remote.png
-share/icons/hicolor/22x22/actions/krcd_flash.png
-share/icons/hicolor/22x22/actions/krcd_off.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/krcd.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/22x22/devices/infrared-remote.png
-share/icons/hicolor/32x32/apps/kdf.png
-share/icons/hicolor/32x32/apps/kfloppy.png
-share/icons/hicolor/32x32/apps/kgpg.png
-share/icons/hicolor/32x32/apps/ktimer.png
-share/icons/hicolor/32x32/apps/kwalletmanager.png
-share/icons/hicolor/32x32/apps/kwalletmanager2.png
-share/icons/hicolor/32x32/apps/kwikdisk.png
-share/icons/hicolor/32x32/apps/superkaramba.png
-share/icons/hicolor/32x32/devices/infrared-remote.png
-share/icons/hicolor/42x42/devices/infrared-remote.png
-share/icons/hicolor/48x48/apps/kdf.png
-share/icons/hicolor/48x48/apps/kfloppy.png
-share/icons/hicolor/48x48/apps/kgpg.png
-share/icons/hicolor/48x48/apps/ktimer.png
-share/icons/hicolor/48x48/apps/kwalletmanager.png
-share/icons/hicolor/48x48/apps/kwalletmanager2.png
-share/icons/hicolor/48x48/apps/kwikdisk.png
-share/icons/hicolor/48x48/apps/superkaramba.png
-share/icons/hicolor/48x48/devices/infrared-remote.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/64x64/devices/infrared-remote.png
-share/icons/hicolor/8x8/devices/infrared-remote.png
-share/icons/hicolor/scalable/actions/krcd_flash.svgz
-share/icons/hicolor/scalable/actions/krcd_off.svgz
-share/icons/hicolor/scalable/apps/krcd.svgz
-share/icons/hicolor/scalable/apps/superkaramba.svgz
-share/icons/hicolor/scalable/devices/infrared-remote.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/viewdecrypted.desktop
-share/kde4/services/ark_dndextract.desktop
-share/kde4/services/ark_part.desktop
-share/kde4/services/kcm_remotecontrol.desktop
-share/kde4/services/kcmdf.desktop
-share/kde4/services/kded/kremotecontroldaemon.desktop
-share/kde4/services/kerfuffle_cli7z.desktop
-share/kde4/services/kerfuffle_clirar.desktop
-share/kde4/services/kerfuffle_clizip.desktop
-share/kde4/services/kerfuffle_libarchive.desktop
-share/kde4/services/kerfuffle_libarchive_readonly.desktop
-share/kde4/services/kerfuffle_libbz2.desktop
-share/kde4/services/kerfuffle_libgz.desktop
-share/kde4/services/kerfuffle_libxz.desktop
-share/kde4/services/kremotecontrolbackends/kremotecontrol_lirc.desktop
-share/kde4/services/kwalletconfig.desktop
-share/kde4/services/kwalletmanager_show.desktop
-share/kde4/services/plasma-engine-kremotecontrol.desktop
-share/kde4/services/plasma-package-superkaramba.desktop
-share/kde4/services/plasma-scriptengine-superkaramba.desktop
-share/kde4/servicetypes/kerfufflePlugin.desktop
-share/kde4/servicetypes/kremotecontrolmanager.desktop
-@dirrm share/kde4/services/kremotecontrolbackends
-@dirrmtry share/icons/oxygen/42x42/devices
-@dirrmtry share/icons/oxygen/42x42
-@dirrmtry share/icons/hicolor/8x8/devices
-@dirrmtry share/icons/hicolor/8x8
-@dirrmtry share/icons/hicolor/42x42/devices
-@dirrmtry share/icons/hicolor/42x42
 @dirrm share/doc/HTML/en/sweeper
-@dirrm share/doc/HTML/en/kwallet
-@dirrm share/doc/HTML/en/ktimer
-@dirrm share/doc/HTML/en/kgpg
-@dirrm share/doc/HTML/en/kfloppy
-@dirrm share/doc/HTML/en/kdf
-@dirrm share/doc/HTML/en/kcontrol/kremotecontrol
-@dirrm share/doc/HTML/en/kcontrol/blockdevices
-@dirrm share/doc/HTML/en/kcharselect
-@dirrm share/doc/HTML/en/kcalc
-@dirrm share/doc/HTML/en/ark
 @dirrm share/apps/sweeper
-@dirrm share/apps/superkaramba
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22/actions
-@dirrm share/apps/kwalletmanager/icons/hicolor/22x22
-@dirrm share/apps/kwalletmanager/icons/hicolor
-@dirrm share/apps/kwalletmanager/icons
-@dirrm share/apps/kwalletmanager
-@dirrm share/apps/kremotecontroldaemon
-@dirrm share/apps/kremotecontrol/profiles
-@dirrm share/apps/kremotecontrol
-@dirrm share/apps/kgpg/icons/hicolor/scalable/status
-@dirrm share/apps/kgpg/icons/hicolor/scalable/actions
-@dirrm share/apps/kgpg/icons/hicolor/scalable
-@dirrm share/apps/kgpg/icons/hicolor/48x48/status
-@dirrm share/apps/kgpg/icons/hicolor/48x48/actions
-@dirrm share/apps/kgpg/icons/hicolor/48x48
-@dirrm share/apps/kgpg/icons/hicolor/32x32/status
-@dirrm share/apps/kgpg/icons/hicolor/32x32/actions
-@dirrm share/apps/kgpg/icons/hicolor/32x32
-@dirrm share/apps/kgpg/icons/hicolor/22x22/status
-@dirrm share/apps/kgpg/icons/hicolor/22x22/actions
-@dirrm share/apps/kgpg/icons/hicolor/22x22
-@dirrm share/apps/kgpg/icons/hicolor/16x16/status
-@dirrm share/apps/kgpg/icons/hicolor/16x16/actions
-@dirrm share/apps/kgpg/icons/hicolor/16x16
-@dirrm share/apps/kgpg/icons/hicolor
-@dirrm share/apps/kgpg/icons
-@dirrm share/apps/kgpg
-@dirrm share/apps/kdf
-@dirrm share/apps/kcalc
-@dirrm share/apps/ark