4 files changed, 32 insertions, 68 deletions

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