aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--UPDATING9
-rw-r--r--accessibility/kaccessible/distinfo6
-rw-r--r--accessibility/kdeaccessibility4/distinfo6
-rw-r--r--accessibility/kmag/distinfo6
-rw-r--r--accessibility/kmousetool/distinfo6
-rw-r--r--accessibility/kmouth/distinfo6
-rw-r--r--arabic/kde4-l10n/distinfo6
-rw-r--r--archivers/ark/distinfo6
-rw-r--r--archivers/ark/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--chinese/kde4-l10n-zh_CN/distinfo6
-rw-r--r--chinese/kde4-l10n-zh_TW/distinfo6
-rw-r--r--comms/kremotecontrol/distinfo6
-rw-r--r--comms/kremotecontrol/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--databases/akonadi/Makefile9
-rw-r--r--deskutils/kcharselect/distinfo6
-rw-r--r--deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--deskutils/kdepim4/Makefile1
-rw-r--r--deskutils/kdepim4/distinfo6
-rw-r--r--deskutils/kdepim4/files/patch-kmail_kmcommands.cpp15
-rw-r--r--deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc10
-rw-r--r--deskutils/kdepim4/pkg-plist2
-rw-r--r--deskutils/kdepim44/Makefile1
-rw-r--r--deskutils/kdepim44/distinfo6
-rw-r--r--deskutils/kdepim44/files/patch-kmail_kmcommands.cpp15
-rw-r--r--deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc10
-rw-r--r--deskutils/kdepim44/pkg-plist2
-rw-r--r--deskutils/kdepimlibs4/distinfo6
-rw-r--r--deskutils/kdepimlibs4/files/patch-CMakeLists.txt11
-rw-r--r--deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake11
-rw-r--r--deskutils/kdepimlibs4/pkg-plist12
-rw-r--r--deskutils/kdeplasma-addons/distinfo6
-rw-r--r--devel/kdesdk4/Makefile1
-rw-r--r--devel/kdesdk4/distinfo6
-rw-r--r--french/kde4-l10n/distinfo6
-rw-r--r--french/kde4-l10n/pkg-plist16
-rw-r--r--games/kdegames4/distinfo6
-rw-r--r--games/kdegames4/pkg-plist1
-rw-r--r--german/kde4-l10n/Makefile.man4
-rw-r--r--german/kde4-l10n/distinfo6
-rw-r--r--german/kde4-l10n/pkg-plist55
-rw-r--r--graphics/kdegraphics4/Makefile1
-rw-r--r--graphics/kdegraphics4/distinfo6
-rw-r--r--hebrew/kde4-l10n/distinfo6
-rw-r--r--hebrew/kde4-l10n/pkg-plist1
-rw-r--r--hungarian/kde4-l10n/distinfo6
-rw-r--r--hungarian/kde4-l10n/pkg-plist3
-rw-r--r--japanese/kde4-l10n/distinfo6
-rw-r--r--japanese/kde4-l10n/pkg-plist1
-rw-r--r--korean/kde4-l10n/distinfo6
-rw-r--r--math/eigen2/Makefile3
-rw-r--r--math/eigen2/distinfo6
-rw-r--r--math/eigen2/pkg-plist29
-rw-r--r--math/eigen3/Makefile3
-rw-r--r--math/eigen3/distinfo6
-rw-r--r--math/eigen3/pkg-plist29
-rw-r--r--math/kcalc/distinfo6
-rw-r--r--math/kcalc/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--misc/kde4-l10n-bg/distinfo6
-rw-r--r--misc/kde4-l10n-bn_IN/distinfo6
-rw-r--r--misc/kde4-l10n-ca/Makefile.man3
-rw-r--r--misc/kde4-l10n-ca/distinfo6
-rw-r--r--misc/kde4-l10n-ca/pkg-plist5
-rw-r--r--misc/kde4-l10n-cs/distinfo6
-rw-r--r--misc/kde4-l10n-cs/pkg-plist1
-rw-r--r--misc/kde4-l10n-csb/distinfo6
-rw-r--r--misc/kde4-l10n-da/distinfo6
-rw-r--r--misc/kde4-l10n-da/pkg-plist93
-rw-r--r--misc/kde4-l10n-el/distinfo6
-rw-r--r--misc/kde4-l10n-en_GB/distinfo6
-rw-r--r--misc/kde4-l10n-es/distinfo6
-rw-r--r--misc/kde4-l10n-es/pkg-plist1
-rw-r--r--misc/kde4-l10n-et/distinfo6
-rw-r--r--misc/kde4-l10n-et/pkg-plist29
-rw-r--r--misc/kde4-l10n-eu/distinfo6
-rw-r--r--misc/kde4-l10n-eu/pkg-plist16
-rw-r--r--misc/kde4-l10n-fi/distinfo6
-rw-r--r--misc/kde4-l10n-ga/distinfo6
-rw-r--r--misc/kde4-l10n-gl/distinfo6
-rw-r--r--misc/kde4-l10n-gl/pkg-plist1
-rw-r--r--misc/kde4-l10n-gu/distinfo6
-rw-r--r--misc/kde4-l10n-hi/distinfo6
-rw-r--r--misc/kde4-l10n-is/distinfo6
-rw-r--r--misc/kde4-l10n-it/distinfo6
-rw-r--r--misc/kde4-l10n-it/pkg-plist1
-rw-r--r--misc/kde4-l10n-kk/distinfo6
-rw-r--r--misc/kde4-l10n-km/distinfo6
-rw-r--r--misc/kde4-l10n-kn/distinfo6
-rw-r--r--misc/kde4-l10n-ku/distinfo6
-rw-r--r--misc/kde4-l10n-ku/pkg-plist15
-rw-r--r--misc/kde4-l10n-lt/distinfo6
-rw-r--r--misc/kde4-l10n-lv/distinfo6
-rw-r--r--misc/kde4-l10n-mai/distinfo6
-rw-r--r--misc/kde4-l10n-mk/distinfo6
-rw-r--r--misc/kde4-l10n-ml/distinfo6
-rw-r--r--misc/kde4-l10n-ml/pkg-plist2
-rw-r--r--misc/kde4-l10n-mr/distinfo6
-rw-r--r--misc/kde4-l10n-nb/distinfo6
-rw-r--r--misc/kde4-l10n-nds/distinfo6
-rw-r--r--misc/kde4-l10n-nds/pkg-plist1
-rw-r--r--misc/kde4-l10n-nl/distinfo6
-rw-r--r--misc/kde4-l10n-nl/pkg-plist179
-rw-r--r--misc/kde4-l10n-nn/distinfo6
-rw-r--r--misc/kde4-l10n-pa/distinfo6
-rw-r--r--misc/kde4-l10n-ro/distinfo6
-rw-r--r--misc/kde4-l10n-ro/pkg-plist2
-rw-r--r--misc/kde4-l10n-sl/distinfo6
-rw-r--r--misc/kde4-l10n-sr/distinfo6
-rw-r--r--misc/kde4-l10n-sr/pkg-plist34
-rw-r--r--misc/kde4-l10n-sv/Makefile.man2
-rw-r--r--misc/kde4-l10n-sv/distinfo6
-rw-r--r--misc/kde4-l10n-sv/pkg-plist67
-rw-r--r--misc/kde4-l10n-tg/distinfo6
-rw-r--r--misc/kde4-l10n-th/distinfo6
-rw-r--r--misc/kde4-l10n-tr/distinfo6
-rw-r--r--misc/kde4-l10n-wa/distinfo6
-rw-r--r--misc/kde4-l10n-wa/pkg-plist1
-rw-r--r--misc/kdeedu4/Makefile7
-rw-r--r--misc/kdeedu4/distinfo6
-rw-r--r--misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake68
-rw-r--r--misc/kdeedu4/pkg-plist7
-rw-r--r--misc/kdeutils4/distinfo6
-rw-r--r--misc/kdeutils4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--misc/konq-plugins-kde4/Makefile4
-rw-r--r--multimedia/Makefile2
-rw-r--r--multimedia/kdemultimedia4/distinfo6
-rw-r--r--multimedia/phonon-gstreamer/Makefile39
-rw-r--r--multimedia/phonon-gstreamer/distinfo3
-rw-r--r--multimedia/phonon-gstreamer/files/patch-CMakeLists.txt50
-rw-r--r--multimedia/phonon-gstreamer/files/patch-cmake__FindGObject.cmake (renamed from multimedia/phonon/files/patch-cmake_FindGObject.cmake)4
-rw-r--r--multimedia/phonon-gstreamer/files/patch-cmake__FindPhonon.cmake73
-rw-r--r--multimedia/phonon-gstreamer/files/patch-gstreamer__CMakeLists.txt14
-rw-r--r--multimedia/phonon-gstreamer/pkg-descr2
-rw-r--r--multimedia/phonon-gstreamer/pkg-plist4
-rw-r--r--multimedia/phonon-xine/Makefile35
-rw-r--r--multimedia/phonon-xine/distinfo3
-rw-r--r--multimedia/phonon-xine/files/patch-CMakeLists.txt51
-rw-r--r--multimedia/phonon-xine/files/patch-cmake__FindPhonon.cmake73
-rw-r--r--multimedia/phonon-xine/files/patch-xine__CMakeLists.txt19
-rw-r--r--multimedia/phonon-xine/pkg-descr2
-rw-r--r--multimedia/phonon-xine/pkg-plist11
-rw-r--r--multimedia/phonon/Makefile15
-rw-r--r--multimedia/phonon/distinfo6
-rw-r--r--multimedia/phonon/files/patch-CMakeLists.txt17
-rw-r--r--multimedia/phonon/files/pkg-message.in10
-rw-r--r--multimedia/phonon/pkg-descr2
-rw-r--r--multimedia/phonon/pkg-message2
-rw-r--r--multimedia/phonon/pkg-plist13
-rw-r--r--net/kdenetwork4/Makefile1
-rw-r--r--net/kdenetwork4/distinfo6
-rw-r--r--net/kdenetwork4/files/patch-kopete__plugins__otr__CMakeLists.txt29
-rw-r--r--net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.cpp68
-rw-r--r--net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.h15
-rw-r--r--net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.cpp25
-rw-r--r--net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.h10
-rw-r--r--polish/kde4-l10n/distinfo6
-rw-r--r--polish/kde4-l10n/pkg-plist29
-rw-r--r--portuguese/kde4-l10n-pt_BR/Makefile.man24
-rw-r--r--portuguese/kde4-l10n-pt_BR/distinfo6
-rw-r--r--portuguese/kde4-l10n-pt_BR/pkg-plist434
-rw-r--r--portuguese/kde4-l10n/Makefile.man18
-rw-r--r--portuguese/kde4-l10n/distinfo6
-rw-r--r--portuguese/kde4-l10n/pkg-plist346
-rw-r--r--russian/kde4-l10n/distinfo6
-rw-r--r--russian/kde4-l10n/pkg-plist4
-rw-r--r--security/kgpg-kde4/distinfo6
-rw-r--r--security/kgpg-kde4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--security/kwallet/distinfo6
-rw-r--r--security/kwallet/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--sysutils/kdeadmin4/distinfo6
-rw-r--r--sysutils/kdf/distinfo6
-rw-r--r--sysutils/kdf/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--sysutils/kfloppy/distinfo6
-rw-r--r--sysutils/kfloppy/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--sysutils/sweeper/distinfo6
-rw-r--r--sysutils/sweeper/files/patch-ark_plugins_libarchive-libarchivehandler.cpp20
-rw-r--r--textproc/ebook-tools/Makefile6
-rw-r--r--textproc/soprano/Makefile32
-rw-r--r--textproc/soprano/distinfo6
-rw-r--r--textproc/soprano/pkg-plist11
-rw-r--r--ukrainian/kde4-l10n/distinfo6
-rw-r--r--ukrainian/kde4-l10n/pkg-plist28
-rw-r--r--www/kdewebdev4/Makefile1
-rw-r--r--www/kdewebdev4/distinfo6
-rw-r--r--x11-clocks/kdetoys4/distinfo6
-rw-r--r--x11-themes/kdeartwork4/distinfo6
-rw-r--r--x11-themes/kdeartwork4/pkg-plist27
-rw-r--r--x11/kde4-baseapps/distinfo6
-rw-r--r--x11/kde4-runtime/Makefile1
-rw-r--r--x11/kde4-runtime/distinfo6
-rw-r--r--x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake29
-rw-r--r--x11/kde4-runtime/pkg-plist9
-rw-r--r--x11/kde4-workspace/Makefile3
-rw-r--r--x11/kde4-workspace/distinfo6
-rw-r--r--x11/kde4-workspace/files/patch-CMakeLists.txt11
-rw-r--r--x11/kde4-workspace/files/patch-kdm_config.def13
-rw-r--r--x11/kde4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc10
-rw-r--r--x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp40
-rw-r--r--x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp84
-rw-r--r--x11/kde4-workspace/pkg-plist20
-rw-r--r--x11/kdebase4-runtime/Makefile1
-rw-r--r--x11/kdebase4-runtime/distinfo6
-rw-r--r--x11/kdebase4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake29
-rw-r--r--x11/kdebase4-runtime/pkg-plist9
-rw-r--r--x11/kdebase4-workspace/Makefile3
-rw-r--r--x11/kdebase4-workspace/distinfo6
-rw-r--r--x11/kdebase4-workspace/files/patch-CMakeLists.txt11
-rw-r--r--x11/kdebase4-workspace/files/patch-kdm_config.def13
-rw-r--r--x11/kdebase4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc10
-rw-r--r--x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp40
-rw-r--r--x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp84
-rw-r--r--x11/kdebase4-workspace/pkg-plist20
-rw-r--r--x11/kdebase4/distinfo6
-rw-r--r--x11/kdelibs4/distinfo6
-rw-r--r--x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake11
-rw-r--r--x11/kdelibs4/files/patch-kded-kded.cpp68
-rw-r--r--x11/kdelibs4/files/patch-kded-kded.h20
-rw-r--r--x11/kdelibs4/files/patch-kinit-klauncher.cpp199
-rw-r--r--x11/kdelibs4/files/patch-kinit-klauncher.h10
-rw-r--r--x11/kdelibs4/files/patch-kio-kio-copyjob.cpp116
-rw-r--r--x11/kdelibs4/files/patch-kio-kio-copyjob.h10
-rw-r--r--x11/kdelibs4/pkg-plist4
221 files changed, 2329 insertions, 1665 deletions
diff --git a/UPDATING b/UPDATING
index 657496abeb03..4bcf354a383b 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,15 @@ You should get into the habit of checking this file for changes each
time you update your ports collection, before attempting any port
upgrades.
+20090309:
+ AFFECTS: users of multimedia/phonon
+ AUTHOR: kde@FreeBSD.org
+
+ multimedia/phonon port has been split into phonon itself, phonon-xine
+ and phono-gstreamer backends. After updating phonon port you have
+ to install at least one backend. phonon-xine backend is recommended
+ for KDE.
+
20090308:
AFFECTS: users of emulators/qemu
AUTHOR: nox@FreeBSD.org
diff --git a/accessibility/kaccessible/distinfo b/accessibility/kaccessible/distinfo
index 0c5d66145f60..f2eaa646c40f 100644
--- a/accessibility/kaccessible/distinfo
+++ b/accessibility/kaccessible/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeaccessibility-4.2.0.tar.bz2) = f32f24c4f07906b7af39ca18d47b5e27
-SHA256 (KDE/kdeaccessibility-4.2.0.tar.bz2) = 2ec7bab55ae0e41a616cdf10c81b6cf7a504442d01c631c7e268876dd959b434
-SIZE (KDE/kdeaccessibility-4.2.0.tar.bz2) = 6592084
+MD5 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 4005e2acc05a2479d83386588b91668f
+SHA256 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 5037e0b8a49895184690bb272ea984edfc162c2708bcf70ac18d5e2d14977584
+SIZE (KDE/kdeaccessibility-4.2.1.tar.bz2) = 6596408
diff --git a/accessibility/kdeaccessibility4/distinfo b/accessibility/kdeaccessibility4/distinfo
index 0c5d66145f60..f2eaa646c40f 100644
--- a/accessibility/kdeaccessibility4/distinfo
+++ b/accessibility/kdeaccessibility4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeaccessibility-4.2.0.tar.bz2) = f32f24c4f07906b7af39ca18d47b5e27
-SHA256 (KDE/kdeaccessibility-4.2.0.tar.bz2) = 2ec7bab55ae0e41a616cdf10c81b6cf7a504442d01c631c7e268876dd959b434
-SIZE (KDE/kdeaccessibility-4.2.0.tar.bz2) = 6592084
+MD5 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 4005e2acc05a2479d83386588b91668f
+SHA256 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 5037e0b8a49895184690bb272ea984edfc162c2708bcf70ac18d5e2d14977584
+SIZE (KDE/kdeaccessibility-4.2.1.tar.bz2) = 6596408
diff --git a/accessibility/kmag/distinfo b/accessibility/kmag/distinfo
index 0c5d66145f60..f2eaa646c40f 100644
--- a/accessibility/kmag/distinfo
+++ b/accessibility/kmag/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeaccessibility-4.2.0.tar.bz2) = f32f24c4f07906b7af39ca18d47b5e27
-SHA256 (KDE/kdeaccessibility-4.2.0.tar.bz2) = 2ec7bab55ae0e41a616cdf10c81b6cf7a504442d01c631c7e268876dd959b434
-SIZE (KDE/kdeaccessibility-4.2.0.tar.bz2) = 6592084
+MD5 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 4005e2acc05a2479d83386588b91668f
+SHA256 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 5037e0b8a49895184690bb272ea984edfc162c2708bcf70ac18d5e2d14977584
+SIZE (KDE/kdeaccessibility-4.2.1.tar.bz2) = 6596408
diff --git a/accessibility/kmousetool/distinfo b/accessibility/kmousetool/distinfo
index 0c5d66145f60..f2eaa646c40f 100644
--- a/accessibility/kmousetool/distinfo
+++ b/accessibility/kmousetool/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeaccessibility-4.2.0.tar.bz2) = f32f24c4f07906b7af39ca18d47b5e27
-SHA256 (KDE/kdeaccessibility-4.2.0.tar.bz2) = 2ec7bab55ae0e41a616cdf10c81b6cf7a504442d01c631c7e268876dd959b434
-SIZE (KDE/kdeaccessibility-4.2.0.tar.bz2) = 6592084
+MD5 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 4005e2acc05a2479d83386588b91668f
+SHA256 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 5037e0b8a49895184690bb272ea984edfc162c2708bcf70ac18d5e2d14977584
+SIZE (KDE/kdeaccessibility-4.2.1.tar.bz2) = 6596408
diff --git a/accessibility/kmouth/distinfo b/accessibility/kmouth/distinfo
index 0c5d66145f60..f2eaa646c40f 100644
--- a/accessibility/kmouth/distinfo
+++ b/accessibility/kmouth/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeaccessibility-4.2.0.tar.bz2) = f32f24c4f07906b7af39ca18d47b5e27
-SHA256 (KDE/kdeaccessibility-4.2.0.tar.bz2) = 2ec7bab55ae0e41a616cdf10c81b6cf7a504442d01c631c7e268876dd959b434
-SIZE (KDE/kdeaccessibility-4.2.0.tar.bz2) = 6592084
+MD5 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 4005e2acc05a2479d83386588b91668f
+SHA256 (KDE/kdeaccessibility-4.2.1.tar.bz2) = 5037e0b8a49895184690bb272ea984edfc162c2708bcf70ac18d5e2d14977584
+SIZE (KDE/kdeaccessibility-4.2.1.tar.bz2) = 6596408
diff --git a/arabic/kde4-l10n/distinfo b/arabic/kde4-l10n/distinfo
index 0afff7429390..ba1160815cc5 100644
--- a/arabic/kde4-l10n/distinfo
+++ b/arabic/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ar-4.2.0.tar.bz2) = 058b0bd3a7b2ca4ef56730488a234afa
-SHA256 (KDE/kde-l10n/kde-l10n-ar-4.2.0.tar.bz2) = c2e7258475f2718b7db8076008f840ea5587d34007dcd10ce26ea1a2294ae677
-SIZE (KDE/kde-l10n/kde-l10n-ar-4.2.0.tar.bz2) = 3036530
+MD5 (KDE/kde-l10n/kde-l10n-ar-4.2.1.tar.bz2) = 7d2caac95a427cafadaca02f3647cd1e
+SHA256 (KDE/kde-l10n/kde-l10n-ar-4.2.1.tar.bz2) = db044ea2ffeb95dca7480b518dfcdd1407c5c3e8cec99281362c95cdaa294ddc
+SIZE (KDE/kde-l10n/kde-l10n-ar-4.2.1.tar.bz2) = 3047398
diff --git a/archivers/ark/distinfo b/archivers/ark/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/archivers/ark/distinfo
+++ b/archivers/ark/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/archivers/ark/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/archivers/ark/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/archivers/ark/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/chinese/kde4-l10n-zh_CN/distinfo b/chinese/kde4-l10n-zh_CN/distinfo
index ddda608a4a09..ab4e7461ce37 100644
--- a/chinese/kde4-l10n-zh_CN/distinfo
+++ b/chinese/kde4-l10n-zh_CN/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-zh_CN-4.2.0.tar.bz2) = c4730babc7bef39cea255c9528607fdc
-SHA256 (KDE/kde-l10n/kde-l10n-zh_CN-4.2.0.tar.bz2) = e80ae8ba6d0e4c1f8c1452298e713ff667554f4069cb1fc53b22352362f44d50
-SIZE (KDE/kde-l10n/kde-l10n-zh_CN-4.2.0.tar.bz2) = 3152936
+MD5 (KDE/kde-l10n/kde-l10n-zh_CN-4.2.1.tar.bz2) = f3cbd496581e3acdaf5bb371549103ee
+SHA256 (KDE/kde-l10n/kde-l10n-zh_CN-4.2.1.tar.bz2) = 004fd17c00bb0c0798b3ff2b3642bcef51e66ed785c91fcb2e3ff5373d106e7b
+SIZE (KDE/kde-l10n/kde-l10n-zh_CN-4.2.1.tar.bz2) = 3150248
diff --git a/chinese/kde4-l10n-zh_TW/distinfo b/chinese/kde4-l10n-zh_TW/distinfo
index 775e4b3b8de2..79e410147432 100644
--- a/chinese/kde4-l10n-zh_TW/distinfo
+++ b/chinese/kde4-l10n-zh_TW/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-zh_TW-4.2.0.tar.bz2) = 08af73c8b0f82689f5ab046f0700bf9d
-SHA256 (KDE/kde-l10n/kde-l10n-zh_TW-4.2.0.tar.bz2) = f76e5b9e3a20cc53988620681d0c294b4f48c4906149871b146b03cdcd3535ae
-SIZE (KDE/kde-l10n/kde-l10n-zh_TW-4.2.0.tar.bz2) = 2072103
+MD5 (KDE/kde-l10n/kde-l10n-zh_TW-4.2.1.tar.bz2) = 4b78c747661c0f1f7840f180b06e48a8
+SHA256 (KDE/kde-l10n/kde-l10n-zh_TW-4.2.1.tar.bz2) = 04ccf18bca8b33b62be19ab15305d81ea78988d94a939ecce2ee5e70298f04bc
+SIZE (KDE/kde-l10n/kde-l10n-zh_TW-4.2.1.tar.bz2) = 2078672
diff --git a/comms/kremotecontrol/distinfo b/comms/kremotecontrol/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/comms/kremotecontrol/distinfo
+++ b/comms/kremotecontrol/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/comms/kremotecontrol/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/comms/kremotecontrol/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/comms/kremotecontrol/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/databases/akonadi/Makefile b/databases/akonadi/Makefile
index b754f7958b5c..b3cc9d6965ec 100644
--- a/databases/akonadi/Makefile
+++ b/databases/akonadi/Makefile
@@ -14,18 +14,15 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= Storage server for kdepim
LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python
-BUILD_DEPENDS+= xsltproc:${PORTSDIR}/textproc/libxslt \
+BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt \
${LOCALBASE}/bin/mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server
-RUN_DEPENDS+= update-mime-database:${PORTSDIR}/misc/shared-mime-info \
- ${LOCALBASE}/bin/mysqld_safe:${PORTSDIR}/databases/mysql${MYSQL_VER}-server \
- ${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
+RUN_DEPENDS= ${QT_PREFIX}/lib/qt4/plugins/sqldrivers/libqsqlmysql.so:${PORTSDIR}/databases/qt4-mysql-plugin
USE_BZIP2= yes
USE_QT_VER= 4
-USE_XORG= x11
QT_COMPONENTS= corelib network qtestlib dbus sql \
qmake_build moc_build rcc_build uic_build
-USE_MYSQL= yes
+USE_MYSQL= server
USE_KDE4= kdeprefix kdehier automoc4 sharedmime
KDE4_BUILDENV= yes
PATCH_WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/deskutils/kcharselect/distinfo b/deskutils/kcharselect/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/deskutils/kcharselect/distinfo
+++ b/deskutils/kcharselect/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/deskutils/kcharselect/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/deskutils/kdepim4/Makefile b/deskutils/kdepim4/Makefile
index 44b9f38ba756..e7b240153c85 100644
--- a/deskutils/kdepim4/Makefile
+++ b/deskutils/kdepim4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepim4/distinfo b/deskutils/kdepim4/distinfo
index 45abad85ea51..e5ea2fdb2eef 100644
--- a/deskutils/kdepim4/distinfo
+++ b/deskutils/kdepim4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.0.tar.bz2) = a80631de21930b2544c86722138aaa6c
-SHA256 (KDE/kdepim-4.2.0.tar.bz2) = 20f4f22bc9284cefd9c196ba7636c68992c615a976050f43169dd108ebd63788
-SIZE (KDE/kdepim-4.2.0.tar.bz2) = 13549914
+MD5 (KDE/kdepim-4.2.1.tar.bz2) = 2ebc3730aaee53f494e8e6abd26029bd
+SHA256 (KDE/kdepim-4.2.1.tar.bz2) = 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c
+SIZE (KDE/kdepim-4.2.1.tar.bz2) = 13562215
diff --git a/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp b/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp
deleted file mode 100644
index 60247094e79a..000000000000
--- a/deskutils/kdepim4/files/patch-kmail_kmcommands.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kmail/kmcommands.cpp 2009/02/16 19:10:32 927080
-+++ ../kmail/kmcommands.cpp 2009/02/16 19:12:30 927081
-@@ -2320,8 +2320,10 @@
- mUrl.pathOrUrl() ), QString(), KGuiItem(i18n("Execute")), KStandardGuiItem::cancel() ) != KMessageBox::Yes)
- return Canceled;
- }
-- if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) )
-- (void) new KRun( mUrl, mMainWidget );
-+ if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) ) {
-+ KRun *runner = new KRun( mUrl, mMainWidget ); // will delete itself
-+ runner->setRunExecutables( false );
-+ }
- }
- else
- return Failed;
diff --git a/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc b/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
deleted file mode 100644
index 2ccddb36fd90..000000000000
--- a/deskutils/kdepim4/files/patch-kpilot_conduits_todo-todoconduit.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:11:42 915906
-+++ ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:19:21 915907
-@@ -68,6 +68,7 @@
-
- TodoSettings::self()->readConfig();
- d->fCollectionId = TodoSettings::akonadiCollection();
-+ d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
- }
-
- bool TodoConduit::initDataProxies()
diff --git a/deskutils/kdepim4/pkg-plist b/deskutils/kdepim4/pkg-plist
index b68e8a57a049..ac6cd14462c9 100644
--- a/deskutils/kdepim4/pkg-plist
+++ b/deskutils/kdepim4/pkg-plist
@@ -532,6 +532,7 @@ share/apps/kalarm/kalarmui.rc
share/apps/kconf_update/kalarm-1.2.1-general.pl
share/apps/kconf_update/kalarm-1.9.5-defaults.pl
share/apps/kconf_update/kalarm-2.0.2-general.pl
+share/apps/kconf_update/kalarm-2.1.5-general.pl
share/apps/kconf_update/kalarm-version.pl
share/apps/kconf_update/kalarm.upd
share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
@@ -795,6 +796,7 @@ share/apps/libkholidays/holiday_quebec
share/apps/libkholidays/holiday_ro
share/apps/libkholidays/holiday_ru
share/apps/libkholidays/holiday_se
+share/apps/libkholidays/holiday_sk
share/apps/libkholidays/holiday_si
share/apps/libkholidays/holiday_th
share/apps/libkholidays/holiday_ua
diff --git a/deskutils/kdepim44/Makefile b/deskutils/kdepim44/Makefile
index 44b9f38ba756..e7b240153c85 100644
--- a/deskutils/kdepim44/Makefile
+++ b/deskutils/kdepim44/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdepim
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= deskutils kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/deskutils/kdepim44/distinfo b/deskutils/kdepim44/distinfo
index 45abad85ea51..e5ea2fdb2eef 100644
--- a/deskutils/kdepim44/distinfo
+++ b/deskutils/kdepim44/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepim-4.2.0.tar.bz2) = a80631de21930b2544c86722138aaa6c
-SHA256 (KDE/kdepim-4.2.0.tar.bz2) = 20f4f22bc9284cefd9c196ba7636c68992c615a976050f43169dd108ebd63788
-SIZE (KDE/kdepim-4.2.0.tar.bz2) = 13549914
+MD5 (KDE/kdepim-4.2.1.tar.bz2) = 2ebc3730aaee53f494e8e6abd26029bd
+SHA256 (KDE/kdepim-4.2.1.tar.bz2) = 01dd85971722cc49d588130c21efea898315926bbc5baa6796053fcfb7d5536c
+SIZE (KDE/kdepim-4.2.1.tar.bz2) = 13562215
diff --git a/deskutils/kdepim44/files/patch-kmail_kmcommands.cpp b/deskutils/kdepim44/files/patch-kmail_kmcommands.cpp
deleted file mode 100644
index 60247094e79a..000000000000
--- a/deskutils/kdepim44/files/patch-kmail_kmcommands.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kmail/kmcommands.cpp 2009/02/16 19:10:32 927080
-+++ ../kmail/kmcommands.cpp 2009/02/16 19:12:30 927081
-@@ -2320,8 +2320,10 @@
- mUrl.pathOrUrl() ), QString(), KGuiItem(i18n("Execute")), KStandardGuiItem::cancel() ) != KMessageBox::Yes)
- return Canceled;
- }
-- if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) )
-- (void) new KRun( mUrl, mMainWidget );
-+ if ( !KMail::Util::handleUrlOnMac( mUrl.pathOrUrl() ) ) {
-+ KRun *runner = new KRun( mUrl, mMainWidget ); // will delete itself
-+ runner->setRunExecutables( false );
-+ }
- }
- else
- return Failed;
diff --git a/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc b/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc
deleted file mode 100644
index 2ccddb36fd90..000000000000
--- a/deskutils/kdepim44/files/patch-kpilot_conduits_todo-todoconduit.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:11:42 915906
-+++ ../kpilot/conduits/todo/todoconduit.cc 2009/01/24 05:19:21 915907
-@@ -68,6 +68,7 @@
-
- TodoSettings::self()->readConfig();
- d->fCollectionId = TodoSettings::akonadiCollection();
-+ d->fPrevCollectionId = TodoSettings::prevAkonadiCollection();
- }
-
- bool TodoConduit::initDataProxies()
diff --git a/deskutils/kdepim44/pkg-plist b/deskutils/kdepim44/pkg-plist
index b68e8a57a049..ac6cd14462c9 100644
--- a/deskutils/kdepim44/pkg-plist
+++ b/deskutils/kdepim44/pkg-plist
@@ -532,6 +532,7 @@ share/apps/kalarm/kalarmui.rc
share/apps/kconf_update/kalarm-1.2.1-general.pl
share/apps/kconf_update/kalarm-1.9.5-defaults.pl
share/apps/kconf_update/kalarm-2.0.2-general.pl
+share/apps/kconf_update/kalarm-2.1.5-general.pl
share/apps/kconf_update/kalarm-version.pl
share/apps/kconf_update/kalarm.upd
share/apps/kconf_update/kmail-3.1-update-new-mail-notification-settings.pl
@@ -795,6 +796,7 @@ share/apps/libkholidays/holiday_quebec
share/apps/libkholidays/holiday_ro
share/apps/libkholidays/holiday_ru
share/apps/libkholidays/holiday_se
+share/apps/libkholidays/holiday_sk
share/apps/libkholidays/holiday_si
share/apps/libkholidays/holiday_th
share/apps/libkholidays/holiday_ua
diff --git a/deskutils/kdepimlibs4/distinfo b/deskutils/kdepimlibs4/distinfo
index 978a0c7565b7..757adc44b3f0 100644
--- a/deskutils/kdepimlibs4/distinfo
+++ b/deskutils/kdepimlibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdepimlibs-4.2.0.tar.bz2) = 8a91677e2dca7d4db26b33c78e239e5e
-SHA256 (KDE/kdepimlibs-4.2.0.tar.bz2) = e6a6c5c1eb69141a6925b182e94704cda37ef48eb488bb71dc224bc00583b254
-SIZE (KDE/kdepimlibs-4.2.0.tar.bz2) = 1589202
+MD5 (KDE/kdepimlibs-4.2.1.tar.bz2) = 5f220939f33c38992f419d5dfc6874df
+SHA256 (KDE/kdepimlibs-4.2.1.tar.bz2) = bc5dd2ce77608beea061ca6c243a33fa53b02c386672a684da3864bf761a2042
+SIZE (KDE/kdepimlibs-4.2.1.tar.bz2) = 1592673
diff --git a/deskutils/kdepimlibs4/files/patch-CMakeLists.txt b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..312ff0638d1d
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ../CMakeLists.txt.orig 2009-02-26 17:15:42.000000000 +0300
++++ ../CMakeLists.txt 2009-03-07 09:57:33.000000000 +0300
+@@ -127,7 +127,7 @@
+ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KdepimLibsConfigVersion.cmake
+ ${KDEPIMLIBS_VERSION_MAJOR} ${KDEPIMLIBS_VERSION_MINOR} ${KDEPIMLIBS_VERSION_PATCH})
+
+-set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs-${KDEPIMLIBS_VERSION}/cmake)
++set(_KdepimLibsConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KdepimLibs/cmake)
+ # places where find_package() looks for FooConfig.cmake files:
+ # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
+ # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
diff --git a/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
new file mode 100644
index 000000000000..efbbb2725999
--- /dev/null
+++ b/deskutils/kdepimlibs4/files/patch-cmake-modules_FindLibical.cmake
@@ -0,0 +1,11 @@
+--- ../cmake/modules/FindLibical.cmake.orgi 2009-02-27 17:59:51.000000000 +0100
++++ ../cmake/modules/FindLibical.cmake 2009-02-27 18:00:20.000000000 +0100
+@@ -52,7 +52,7 @@
+
+ if(LIBICAL_INCLUDE_DIRS AND LIBICAL_LIBRARIES)
+ set(FIND_LIBICAL_VERSION_SOURCE
+- "#include <libical/ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
++ "#include <ical.h>\n int main()\n {\n printf(\"%s\",ICAL_VERSION);return 1;\n }\n")
+ set(FIND_LIBICAL_VERSION_SOURCE_FILE ${CMAKE_BINARY_DIR}/CMakeTmp/FindLIBICAL.cxx)
+ file(WRITE "${FIND_LIBICAL_VERSION_SOURCE_FILE}" "${FIND_LIBICAL_VERSION_SOURCE}")
+
diff --git a/deskutils/kdepimlibs4/pkg-plist b/deskutils/kdepimlibs4/pkg-plist
index faa899b0ccd5..5a5c45511002 100644
--- a/deskutils/kdepimlibs4/pkg-plist
+++ b/deskutils/kdepimlibs4/pkg-plist
@@ -333,10 +333,10 @@ include/syndication/specificitem.h
include/syndication/specificitemvisitor.h
include/syndication/syndication.h
include/syndication/tools.h
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfig.cmake
-lib/KdepimLibs-%%KDE4_VERSION%%/cmake/KdepimLibsConfigVersion.cmake
+lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix-%%KDE4_BUILD_TYPE%%.cmake
+lib/KdepimLibs/cmake/KDEPimLibsLibraryTargetsWithPrefix.cmake
+lib/KdepimLibs/cmake/KdepimLibsConfig.cmake
+lib/KdepimLibs/cmake/KdepimLibsConfigVersion.cmake
lib/gpgmepp/GpgmeppConfig.cmake
lib/gpgmepp/GpgmeppLibraryDepends.cmake
lib/kde4/kabc_directory.so
@@ -483,8 +483,8 @@ share/kde4/servicetypes/kresources_plugin.desktop
@dirrm share/doc/HTML/en/kcontrol/kresources
@dirrm share/apps/akonadi-kde
@dirrm lib/gpgmepp
-@dirrm lib/KdepimLibs-%%KDE4_VERSION%%/cmake
-@dirrm lib/KdepimLibs-%%KDE4_VERSION%%
+@dirrm lib/KdepimLibs/cmake
+@dirrm lib/KdepimLibs
@dirrm include/syndication/rss2
@dirrm include/syndication/rdf
@dirrm include/syndication/atom
diff --git a/deskutils/kdeplasma-addons/distinfo b/deskutils/kdeplasma-addons/distinfo
index 674febf9ef31..8069f9b8a12e 100644
--- a/deskutils/kdeplasma-addons/distinfo
+++ b/deskutils/kdeplasma-addons/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeplasma-addons-4.2.0.tar.bz2) = d98f805f4c9b7af7278067f9e544b2ec
-SHA256 (KDE/kdeplasma-addons-4.2.0.tar.bz2) = 8c2d917788873521d0379a060a2b049d1eec4917e9b7c1cb90a632c0bb392d6b
-SIZE (KDE/kdeplasma-addons-4.2.0.tar.bz2) = 4269323
+MD5 (KDE/kdeplasma-addons-4.2.1.tar.bz2) = 55219414d52924cb22ea2953cd2ae78b
+SHA256 (KDE/kdeplasma-addons-4.2.1.tar.bz2) = aeb3764533e9e10759ffef0969c6e566c22622695db8fca58dc72e7d9faea329
+SIZE (KDE/kdeplasma-addons-4.2.1.tar.bz2) = 4273190
diff --git a/devel/kdesdk4/Makefile b/devel/kdesdk4/Makefile
index 681425dbd4e3..e5cfc4bef1d1 100644
--- a/devel/kdesdk4/Makefile
+++ b/devel/kdesdk4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdesdk
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 2
CATEGORIES= devel kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/devel/kdesdk4/distinfo b/devel/kdesdk4/distinfo
index 7031361bedad..84be9e83e774 100644
--- a/devel/kdesdk4/distinfo
+++ b/devel/kdesdk4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdesdk-4.2.0.tar.bz2) = 79d01b4f10f1ecc283f7860d2c7973e9
-SHA256 (KDE/kdesdk-4.2.0.tar.bz2) = 2e53f7ff3331d3b72ce45bb71701ae38529212a5d35b7d8c8e26da2ee557fa05
-SIZE (KDE/kdesdk-4.2.0.tar.bz2) = 5434773
+MD5 (KDE/kdesdk-4.2.1.tar.bz2) = e1c95a5ab0e34d2d084677199af0b093
+SHA256 (KDE/kdesdk-4.2.1.tar.bz2) = 9071e3b17b5e08bc599b6a5e3fe447af2679972d41e2325a708544bfcb4099d1
+SIZE (KDE/kdesdk-4.2.1.tar.bz2) = 5436749
diff --git a/french/kde4-l10n/distinfo b/french/kde4-l10n/distinfo
index 21d40a279e33..9748a2d06176 100644
--- a/french/kde4-l10n/distinfo
+++ b/french/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-fr-4.2.0.tar.bz2) = ca231f7972a5269a589cad934cd4ab81
-SHA256 (KDE/kde-l10n/kde-l10n-fr-4.2.0.tar.bz2) = 198b0bece4e9d7cf70e0043f9371df3a00b52739b32341195f70c83f1fbfa099
-SIZE (KDE/kde-l10n/kde-l10n-fr-4.2.0.tar.bz2) = 20955373
+MD5 (KDE/kde-l10n/kde-l10n-fr-4.2.1.tar.bz2) = d9b613ccb77cce12385ba77bfc0eb5ec
+SHA256 (KDE/kde-l10n/kde-l10n-fr-4.2.1.tar.bz2) = 025fd1d85e3dc151917680a069bc33fabc38d861d97224417cfac573365b2671
+SIZE (KDE/kde-l10n/kde-l10n-fr-4.2.1.tar.bz2) = 20991326
diff --git a/french/kde4-l10n/pkg-plist b/french/kde4-l10n/pkg-plist
index eb8ad20b52a6..0de0f20f88c3 100644
--- a/french/kde4-l10n/pkg-plist
+++ b/french/kde4-l10n/pkg-plist
@@ -394,6 +394,9 @@ share/doc/HTML/fr/kcontrol/performance/index.docbook
share/doc/HTML/fr/kcontrol/powerctrl/common
share/doc/HTML/fr/kcontrol/powerctrl/index.cache.bz2
share/doc/HTML/fr/kcontrol/powerctrl/index.docbook
+share/doc/HTML/fr/kcontrol/powerdevil/common
+share/doc/HTML/fr/kcontrol/powerdevil/index.cache.bz2
+share/doc/HTML/fr/kcontrol/powerdevil/index.docbook
share/doc/HTML/fr/kcontrol/proxy/common
share/doc/HTML/fr/kcontrol/proxy/index.cache.bz2
share/doc/HTML/fr/kcontrol/proxy/index.docbook
@@ -1339,6 +1342,17 @@ share/doc/HTML/fr/ktuberling/menu.raw.png
share/doc/HTML/fr/ktuberling/menu.speech.png
share/doc/HTML/fr/ktuberling/technical-reference.docbook
share/doc/HTML/fr/ktuberling/toolbar.png
+share/doc/HTML/fr/kturtle/common
+share/doc/HTML/fr/kturtle/getting-started.docbook
+share/doc/HTML/fr/kturtle/glossary.docbook
+share/doc/HTML/fr/kturtle/index.cache.bz2
+share/doc/HTML/fr/kturtle/index.docbook
+share/doc/HTML/fr/kturtle/mainwindow.png
+share/doc/HTML/fr/kturtle/mainwindow_flower_nrs.png
+share/doc/HTML/fr/kturtle/programming-reference.docbook
+share/doc/HTML/fr/kturtle/translator-guide.docbook
+share/doc/HTML/fr/kturtle/using-kturtle.docbook
+share/doc/HTML/fr/kturtle/wrapping.png
share/doc/HTML/fr/kubrick/common
share/doc/HTML/fr/kubrick/index.cache.bz2
share/doc/HTML/fr/kubrick/index.docbook
@@ -1971,6 +1985,7 @@ share/locale/fr/entry.desktop
@dirrm share/doc/HTML/fr/kwallet
@dirrm share/doc/HTML/fr/kuser
@dirrm share/doc/HTML/fr/kubrick
+@dirrm share/doc/HTML/fr/kturtle
@dirrm share/doc/HTML/fr/ktuberling
@dirrm share/doc/HTML/fr/ktouch
@dirrm share/doc/HTML/fr/ktnef
@@ -2121,6 +2136,7 @@ share/locale/fr/entry.desktop
@dirrm share/doc/HTML/fr/kcontrol/smb
@dirrm share/doc/HTML/fr/kcontrol/screensaver
@dirrm share/doc/HTML/fr/kcontrol/proxy
+@dirrm share/doc/HTML/fr/kcontrol/powerdevil
@dirrm share/doc/HTML/fr/kcontrol/powerctrl
@dirrm share/doc/HTML/fr/kcontrol/performance
@dirrm share/doc/HTML/fr/kcontrol/paths
diff --git a/games/kdegames4/distinfo b/games/kdegames4/distinfo
index f411a62c2e31..85be45bd420b 100644
--- a/games/kdegames4/distinfo
+++ b/games/kdegames4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdegames-4.2.0.tar.bz2) = 68cefd627025be99ba136e5a4e35e554
-SHA256 (KDE/kdegames-4.2.0.tar.bz2) = 27c8c4c611ff839cacd537ae7bb2145ac77b02fc952112ed158bc2d3c4bbbe75
-SIZE (KDE/kdegames-4.2.0.tar.bz2) = 38708839
+MD5 (KDE/kdegames-4.2.1.tar.bz2) = c640899282024033124de5655a520d21
+SHA256 (KDE/kdegames-4.2.1.tar.bz2) = b32faa88e7c9f320f437f92fea4193aee6f19f348069fea7182cea323e5df3b9
+SIZE (KDE/kdegames-4.2.1.tar.bz2) = 38715487
diff --git a/games/kdegames4/pkg-plist b/games/kdegames4/pkg-plist
index 65850e0a0e1b..3d40075bbaae 100644
--- a/games/kdegames4/pkg-plist
+++ b/games/kdegames4/pkg-plist
@@ -680,6 +680,7 @@ share/apps/kbreakout/themes/crystal.svgz
share/apps/kbreakout/themes/crystal_preview.png
share/apps/kbreakout/themes/default.desktop
share/apps/kbreakout/themes/default.svgz
+share/apps/kbreakout/themes/default_preview.png
share/apps/kbreakout/themes/simple.desktop
share/apps/kbreakout/themes/simple.svgz
share/apps/kbreakout/themes/simple_preview.png
diff --git a/german/kde4-l10n/Makefile.man b/german/kde4-l10n/Makefile.man
index c5f73952a8fc..96e01bfa6ee9 100644
--- a/german/kde4-l10n/Makefile.man
+++ b/german/kde4-l10n/Makefile.man
@@ -16,6 +16,7 @@ MAN1= adddebug.1 \
fixincludes.1 \
kalzium.1 \
kappfinder.1 \
+ kabcclient.1 \
kate.1 \
kbookmarkmerger.1 \
kbruch.1 \
@@ -42,7 +43,8 @@ MAN1= adddebug.1 \
swappo.1 \
transxx.1 \
xml2pot.1 \
- zonetab2pot.py.1
+ zonetab2pot.py.1 \
+ xsldbg.1
MAN6= amor.6 \
khangman.6 \
kpat.6
diff --git a/german/kde4-l10n/distinfo b/german/kde4-l10n/distinfo
index 18a88896f61c..4357d7fa896e 100644
--- a/german/kde4-l10n/distinfo
+++ b/german/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-de-4.2.0.tar.bz2) = da8184a7380795790d498c7d5e4a6b62
-SHA256 (KDE/kde-l10n/kde-l10n-de-4.2.0.tar.bz2) = f2ccd1c4c1fb2dbca280bd9dcda6d42e08dd072b3c5935735729af4588d57666
-SIZE (KDE/kde-l10n/kde-l10n-de-4.2.0.tar.bz2) = 18178410
+MD5 (KDE/kde-l10n/kde-l10n-de-4.2.1.tar.bz2) = c1521b6517667e9dd1a29ffb9182cd0e
+SHA256 (KDE/kde-l10n/kde-l10n-de-4.2.1.tar.bz2) = aa4f5cb6f1b6e58c13468169f28891c0d1cf3dd0311c7cfe0e93017ac0b344e9
+SIZE (KDE/kde-l10n/kde-l10n-de-4.2.1.tar.bz2) = 18339559
diff --git a/german/kde4-l10n/pkg-plist b/german/kde4-l10n/pkg-plist
index 55de4463f606..6d60bdb2cc11 100644
--- a/german/kde4-l10n/pkg-plist
+++ b/german/kde4-l10n/pkg-plist
@@ -207,6 +207,9 @@ share/doc/HTML/de/blinken/blinken_quitbutton.png
share/doc/HTML/de/blinken/common
share/doc/HTML/de/blinken/index.cache.bz2
share/doc/HTML/de/blinken/index.docbook
+share/doc/HTML/de/bomber/common
+share/doc/HTML/de/bomber/index.cache.bz2
+share/doc/HTML/de/bomber/index.docbook
share/doc/HTML/de/bovo/common
share/doc/HTML/de/bovo/index.cache.bz2
share/doc/HTML/de/bovo/index.docbook
@@ -257,12 +260,19 @@ share/doc/HTML/de/juk/juk-tag-guesser.png
share/doc/HTML/de/juk/normal-playlist.png
share/doc/HTML/de/juk/search-playlist.png
share/doc/HTML/de/juk/toolbar.png
+share/doc/HTML/de/kabcclient/common
+share/doc/HTML/de/kabcclient/index.cache.bz2
+share/doc/HTML/de/kabcclient/index.docbook
+share/doc/HTML/de/kabcclient/man-kabcclient.1.docbook
share/doc/HTML/de/kaddressbook/common
share/doc/HTML/de/kaddressbook/index.cache.bz2
share/doc/HTML/de/kaddressbook/index.docbook
share/doc/HTML/de/kalarm/common
share/doc/HTML/de/kalarm/index.cache.bz2
share/doc/HTML/de/kalarm/index.docbook
+share/doc/HTML/de/kalgebra/common
+share/doc/HTML/de/kalgebra/index.cache.bz2
+share/doc/HTML/de/kalgebra/index.docbook
share/doc/HTML/de/kalzium/common
share/doc/HTML/de/kalzium/gradient.png
share/doc/HTML/de/kalzium/index.cache.bz2
@@ -304,6 +314,9 @@ share/doc/HTML/de/kanagram/vocab-settings.png
share/doc/HTML/de/kapman/common
share/doc/HTML/de/kapman/index.cache.bz2
share/doc/HTML/de/kapman/index.docbook
+share/doc/HTML/de/kapptemplate/common
+share/doc/HTML/de/kapptemplate/index.cache.bz2
+share/doc/HTML/de/kapptemplate/index.docbook
share/doc/HTML/de/kate-plugins/common
share/doc/HTML/de/kate-plugins/configure_insertcommand.png
share/doc/HTML/de/kate-plugins/filetemplates.docbook
@@ -501,12 +514,18 @@ share/doc/HTML/de/kcontrol/knetworkconf/09.png
share/doc/HTML/de/kcontrol/knetworkconf/common
share/doc/HTML/de/kcontrol/knetworkconf/index.cache.bz2
share/doc/HTML/de/kcontrol/knetworkconf/index.docbook
+share/doc/HTML/de/kcontrol/kresources/common
+share/doc/HTML/de/kcontrol/kresources/index.cache.bz2
+share/doc/HTML/de/kcontrol/kresources/index.docbook
share/doc/HTML/de/kcontrol/kwincompositing/common
share/doc/HTML/de/kcontrol/kwincompositing/index.cache.bz2
share/doc/HTML/de/kcontrol/kwincompositing/index.docbook
share/doc/HTML/de/kcontrol/kwindecoration/common
share/doc/HTML/de/kcontrol/kwindecoration/index.cache.bz2
share/doc/HTML/de/kcontrol/kwindecoration/index.docbook
+share/doc/HTML/de/kcontrol/kxkb/common
+share/doc/HTML/de/kcontrol/kxkb/index.cache.bz2
+share/doc/HTML/de/kcontrol/kxkb/index.docbook
share/doc/HTML/de/kcontrol/language/common
share/doc/HTML/de/kcontrol/language/index.cache.bz2
share/doc/HTML/de/kcontrol/language/index.docbook
@@ -531,6 +550,9 @@ share/doc/HTML/de/kcontrol/paths/index.docbook
share/doc/HTML/de/kcontrol/performance/common
share/doc/HTML/de/kcontrol/performance/index.cache.bz2
share/doc/HTML/de/kcontrol/performance/index.docbook
+share/doc/HTML/de/kcontrol/powerdevil/common
+share/doc/HTML/de/kcontrol/powerdevil/index.cache.bz2
+share/doc/HTML/de/kcontrol/powerdevil/index.docbook
share/doc/HTML/de/kcontrol/proxy/common
share/doc/HTML/de/kcontrol/proxy/index.cache.bz2
share/doc/HTML/de/kcontrol/proxy/index.docbook
@@ -580,6 +602,9 @@ share/doc/HTML/de/kdesu/man-kdesu.1.docbook
share/doc/HTML/de/kdf/common
share/doc/HTML/de/kdf/index.cache.bz2
share/doc/HTML/de/kdf/index.docbook
+share/doc/HTML/de/kdiamond/common
+share/doc/HTML/de/kdiamond/index.cache.bz2
+share/doc/HTML/de/kdiamond/index.docbook
share/doc/HTML/de/kdm/common
share/doc/HTML/de/kdm/index.cache.bz2
share/doc/HTML/de/kdm/index.docbook
@@ -795,6 +820,9 @@ share/doc/HTML/de/kig/text_label_wizard__select_property.png
share/doc/HTML/de/killbots/common
share/doc/HTML/de/killbots/index.cache.bz2
share/doc/HTML/de/killbots/index.docbook
+share/doc/HTML/de/kimagemapeditor/common
+share/doc/HTML/de/kimagemapeditor/index.cache.bz2
+share/doc/HTML/de/kimagemapeditor/index.docbook
share/doc/HTML/de/kinfocenter/devices/common
share/doc/HTML/de/kinfocenter/devices/index.cache.bz2
share/doc/HTML/de/kinfocenter/devices/index.docbook
@@ -1114,6 +1142,9 @@ share/doc/HTML/de/kommander/q-and-a.docbook
share/doc/HTML/de/kommander/specials.docbook
share/doc/HTML/de/kommander/tutorials.docbook
share/doc/HTML/de/kommander/widgets.docbook
+share/doc/HTML/de/kompare/common
+share/doc/HTML/de/kompare/index.cache.bz2
+share/doc/HTML/de/kompare/index.docbook
share/doc/HTML/de/konqueror/basics.docbook
share/doc/HTML/de/konqueror/bookmarks.docbook
share/doc/HTML/de/konqueror/browser.docbook
@@ -1473,6 +1504,9 @@ share/doc/HTML/de/kxsldbg/walk_window.png
share/doc/HTML/de/lilo-config/common
share/doc/HTML/de/lilo-config/index.cache.bz2
share/doc/HTML/de/lilo-config/index.docbook
+share/doc/HTML/de/lokalize/common
+share/doc/HTML/de/lokalize/index.cache.bz2
+share/doc/HTML/de/lokalize/index.docbook
share/doc/HTML/de/lskat/common
share/doc/HTML/de/lskat/index.cache.bz2
share/doc/HTML/de/lskat/index.docbook
@@ -1501,9 +1535,17 @@ share/doc/HTML/de/plasma/index.docbook
share/doc/HTML/de/sonnet/common
share/doc/HTML/de/sonnet/index.cache.bz2
share/doc/HTML/de/sonnet/index.docbook
+share/doc/HTML/de/step/common
+share/doc/HTML/de/step/examples.docbook
+share/doc/HTML/de/step/index.cache.bz2
+share/doc/HTML/de/step/index.docbook
+share/doc/HTML/de/step/tutorials.docbook
share/doc/HTML/de/superkaramba/common
share/doc/HTML/de/superkaramba/index.cache.bz2
share/doc/HTML/de/superkaramba/index.docbook
+share/doc/HTML/de/systemsettings/common
+share/doc/HTML/de/systemsettings/index.cache.bz2
+share/doc/HTML/de/systemsettings/index.docbook
share/doc/HTML/de/umbrello/activity-diagram.png
share/doc/HTML/de/umbrello/add-remove-languages.png
share/doc/HTML/de/umbrello/aggregation.png
@@ -2074,7 +2116,9 @@ share/locale/de/entry.desktop
@dirrm share/locale/de/LC_SCRIPTS/kdelibs4
@dirrm share/locale/de/LC_SCRIPTS
@dirrm share/doc/HTML/de/umbrello
+@dirrm share/doc/HTML/de/systemsettings
@dirrm share/doc/HTML/de/superkaramba
+@dirrm share/doc/HTML/de/step
@dirrm share/doc/HTML/de/sonnet
@dirrm share/doc/HTML/de/plasma
@dirrm share/doc/HTML/de/parley
@@ -2082,6 +2126,7 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/okteta
@dirrm share/doc/HTML/de/marble
@dirrm share/doc/HTML/de/lskat
+@dirrm share/doc/HTML/de/lokalize
@dirrm share/doc/HTML/de/lilo-config
@dirrm share/doc/HTML/de/kxsldbg
@dirrm share/doc/HTML/de/kwrite
@@ -2126,6 +2171,7 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/konsole
@dirrm share/doc/HTML/de/konquest
@dirrm share/doc/HTML/de/konqueror
+@dirrm share/doc/HTML/de/kompare
@dirrm share/doc/HTML/de/kommander
@dirrm share/doc/HTML/de/kolourpaint
@dirrm share/doc/HTML/de/kollision
@@ -2201,6 +2247,7 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/kinfocenter/dma
@dirrm share/doc/HTML/de/kinfocenter/devices
@dirrm share/doc/HTML/de/kinfocenter
+@dirrm share/doc/HTML/de/kimagemapeditor
@dirrm share/doc/HTML/de/killbots
@dirrm share/doc/HTML/de/kig
@dirrm share/doc/HTML/de/khelpcenter/visualdict
@@ -2220,6 +2267,7 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/kfind
@dirrm share/doc/HTML/de/kfilereplace
@dirrm share/doc/HTML/de/kdm
+@dirrm share/doc/HTML/de/kdiamond
@dirrm share/doc/HTML/de/kdf
@dirrm share/doc/HTML/de/kdesu
@dirrm share/doc/HTML/de/kdepasswd
@@ -2234,6 +2282,7 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/kcontrol/smb
@dirrm share/doc/HTML/de/kcontrol/screensaver
@dirrm share/doc/HTML/de/kcontrol/proxy
+@dirrm share/doc/HTML/de/kcontrol/powerdevil
@dirrm share/doc/HTML/de/kcontrol/performance
@dirrm share/doc/HTML/de/kcontrol/paths
@dirrm share/doc/HTML/de/kcontrol/passwords
@@ -2242,8 +2291,10 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/kcontrol/netpref
@dirrm share/doc/HTML/de/kcontrol/mouse
@dirrm share/doc/HTML/de/kcontrol/language
+@dirrm share/doc/HTML/de/kcontrol/kxkb
@dirrm share/doc/HTML/de/kcontrol/kwindecoration
@dirrm share/doc/HTML/de/kcontrol/kwincompositing
+@dirrm share/doc/HTML/de/kcontrol/kresources
@dirrm share/doc/HTML/de/kcontrol/knetworkconf
@dirrm share/doc/HTML/de/kcontrol/khtml
@dirrm share/doc/HTML/de/kcontrol/keys
@@ -2296,11 +2347,14 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/katomic
@dirrm share/doc/HTML/de/kate-plugins
@dirrm share/doc/HTML/de/kate
+@dirrm share/doc/HTML/de/kapptemplate
@dirrm share/doc/HTML/de/kapman
@dirrm share/doc/HTML/de/kanagram
@dirrm share/doc/HTML/de/kalzium
+@dirrm share/doc/HTML/de/kalgebra
@dirrm share/doc/HTML/de/kalarm
@dirrm share/doc/HTML/de/kaddressbook
+@dirrm share/doc/HTML/de/kabcclient
@dirrm share/doc/HTML/de/juk
@dirrm share/doc/HTML/de/gwenview
@dirrm share/doc/HTML/de/dragonplayer
@@ -2308,6 +2362,7 @@ share/locale/de/entry.desktop
@dirrm share/doc/HTML/de/common
@dirrm share/doc/HTML/de/cervisia
@dirrm share/doc/HTML/de/bovo
+@dirrm share/doc/HTML/de/bomber
@dirrm share/doc/HTML/de/blinken
@dirrm share/doc/HTML/de/ark
@dirrm share/doc/HTML/de/amor
diff --git a/graphics/kdegraphics4/Makefile b/graphics/kdegraphics4/Makefile
index 4a800295efb3..2a3f8abb19ba 100644
--- a/graphics/kdegraphics4/Makefile
+++ b/graphics/kdegraphics4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdegraphics
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= graphics kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/graphics/kdegraphics4/distinfo b/graphics/kdegraphics4/distinfo
index 714a1f7c05f0..20e020fd1b4c 100644
--- a/graphics/kdegraphics4/distinfo
+++ b/graphics/kdegraphics4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdegraphics-4.2.0.tar.bz2) = 8beb6fe5d475d0b0245ea6d4cc7e9732
-SHA256 (KDE/kdegraphics-4.2.0.tar.bz2) = 09cbf2aa80351eacf4f59f73d608b382f77a200a9e869e8f586e9629388e0898
-SIZE (KDE/kdegraphics-4.2.0.tar.bz2) = 3565632
+MD5 (KDE/kdegraphics-4.2.1.tar.bz2) = 9cc2bc859e678aa6178a5c6cf87eb0ab
+SHA256 (KDE/kdegraphics-4.2.1.tar.bz2) = 16e874ecb950235f2911bb63e93c61ae1a0d38a4f629d90d29b621a6aa57f03a
+SIZE (KDE/kdegraphics-4.2.1.tar.bz2) = 3573763
diff --git a/hebrew/kde4-l10n/distinfo b/hebrew/kde4-l10n/distinfo
index 86a695dc22ec..5599a6e47b16 100644
--- a/hebrew/kde4-l10n/distinfo
+++ b/hebrew/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-he-4.2.0.tar.bz2) = e45690f965c153b2f25ebba5358d1912
-SHA256 (KDE/kde-l10n/kde-l10n-he-4.2.0.tar.bz2) = f14f993ee90dad6ac56d5b03f3c46afa319bea6dd9882b20a3ca3023aaccbe6f
-SIZE (KDE/kde-l10n/kde-l10n-he-4.2.0.tar.bz2) = 2004541
+MD5 (KDE/kde-l10n/kde-l10n-he-4.2.1.tar.bz2) = 1d69a2182408b89393cbe6d773752d03
+SHA256 (KDE/kde-l10n/kde-l10n-he-4.2.1.tar.bz2) = 63807f57e55120e9c11ccbebbcd936f66f97e74861615f8eab68319bd7ec0dd2
+SIZE (KDE/kde-l10n/kde-l10n-he-4.2.1.tar.bz2) = 2012901
diff --git a/hebrew/kde4-l10n/pkg-plist b/hebrew/kde4-l10n/pkg-plist
index d0f3fbb125b6..4b5ce0c21fa8 100644
--- a/hebrew/kde4-l10n/pkg-plist
+++ b/hebrew/kde4-l10n/pkg-plist
@@ -363,7 +363,6 @@ share/locale/he/LC_MESSAGES/okular.mo
share/locale/he/LC_MESSAGES/parley.mo
share/locale/he/LC_MESSAGES/phonon_gstreamer.mo
share/locale/he/LC_MESSAGES/phonon_kde.mo
-share/locale/he/LC_MESSAGES/plasma.mo
share/locale/he/LC_MESSAGES/plasma_applet_battery.mo
share/locale/he/LC_MESSAGES/plasma_applet_bball.mo
share/locale/he/LC_MESSAGES/plasma_applet_binaryclock.mo
diff --git a/hungarian/kde4-l10n/distinfo b/hungarian/kde4-l10n/distinfo
index 0f29a254353e..5e5598ac12c6 100644
--- a/hungarian/kde4-l10n/distinfo
+++ b/hungarian/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-hu-4.2.0.tar.bz2) = b000573be5a3b6cee9ee9aa45b0931bc
-SHA256 (KDE/kde-l10n/kde-l10n-hu-4.2.0.tar.bz2) = 741cc09e8317404aa4fcfb83fa32974b32dc4db20f86302e9d1862709b0e6a92
-SIZE (KDE/kde-l10n/kde-l10n-hu-4.2.0.tar.bz2) = 4093636
+MD5 (KDE/kde-l10n/kde-l10n-hu-4.2.1.tar.bz2) = fe62f86cea5b6022b40650299ed5223c
+SHA256 (KDE/kde-l10n/kde-l10n-hu-4.2.1.tar.bz2) = ea05bb9ef723ad092f66d94ab0812a88be05c8d0ba119b4bd16484222266ef65
+SIZE (KDE/kde-l10n/kde-l10n-hu-4.2.1.tar.bz2) = 4099919
diff --git a/hungarian/kde4-l10n/pkg-plist b/hungarian/kde4-l10n/pkg-plist
index fef8db392a81..54bba3a36fbe 100644
--- a/hungarian/kde4-l10n/pkg-plist
+++ b/hungarian/kde4-l10n/pkg-plist
@@ -429,6 +429,7 @@ share/locale/hu/LC_MESSAGES/kcmxinerama.mo
share/locale/hu/LC_MESSAGES/kcolorchooser.mo
share/locale/hu/LC_MESSAGES/kcron.mo
share/locale/hu/LC_MESSAGES/kdat.mo
+share/locale/hu/LC_MESSAGES/kdeasciiquarium.mo
share/locale/hu/LC_MESSAGES/kde-menu.mo
share/locale/hu/LC_MESSAGES/kdebugdialog.mo
share/locale/hu/LC_MESSAGES/kdelibs4.mo
@@ -680,6 +681,7 @@ share/locale/hu/LC_MESSAGES/okular_tiff.mo
share/locale/hu/LC_MESSAGES/okular_xps.mo
share/locale/hu/LC_MESSAGES/parley.mo
share/locale/hu/LC_MESSAGES/phonon-xine.mo
+share/locale/hu/LC_MESSAGES/phonon_gstreamer.mo
share/locale/hu/LC_MESSAGES/phonon_kde.mo
share/locale/hu/LC_MESSAGES/plasma.mo
share/locale/hu/LC_MESSAGES/plasma_applet_battery.mo
@@ -719,6 +721,7 @@ share/locale/hu/LC_MESSAGES/plasmapkg.mo
share/locale/hu/LC_MESSAGES/plasmoidviewer.mo
share/locale/hu/LC_MESSAGES/processcore.mo
share/locale/hu/LC_MESSAGES/processui.mo
+share/locale/hu/LC_MESSAGES/powerdevil.mo
share/locale/hu/LC_MESSAGES/solid-bluetooth.mo
share/locale/hu/LC_MESSAGES/solid-hardware.mo
share/locale/hu/LC_MESSAGES/solid-network.mo
diff --git a/japanese/kde4-l10n/distinfo b/japanese/kde4-l10n/distinfo
index e14e6b0b386c..81b889a8eea1 100644
--- a/japanese/kde4-l10n/distinfo
+++ b/japanese/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ja-4.2.0.tar.bz2) = 84c1dc6f18dd405b217d98312ffec6bf
-SHA256 (KDE/kde-l10n/kde-l10n-ja-4.2.0.tar.bz2) = c37c7097d8bcbb156b956984462bb1941268683bfde0151fb5d87d96edeadc94
-SIZE (KDE/kde-l10n/kde-l10n-ja-4.2.0.tar.bz2) = 2428550
+MD5 (KDE/kde-l10n/kde-l10n-ja-4.2.1.tar.bz2) = f43e96ea7eba05616b25145cf3e26e9a
+SHA256 (KDE/kde-l10n/kde-l10n-ja-4.2.1.tar.bz2) = 451229e2472064f3768036911ae252de007af46c74ebb3f4770edfd847706d59
+SIZE (KDE/kde-l10n/kde-l10n-ja-4.2.1.tar.bz2) = 2434441
diff --git a/japanese/kde4-l10n/pkg-plist b/japanese/kde4-l10n/pkg-plist
index dc7bec3fcd32..5e9b74faea0f 100644
--- a/japanese/kde4-l10n/pkg-plist
+++ b/japanese/kde4-l10n/pkg-plist
@@ -463,6 +463,7 @@ share/locale/ja/LC_MESSAGES/phonon_kde.mo
share/locale/ja/LC_MESSAGES/plasma-overlay.mo
share/locale/ja/LC_MESSAGES/plasma-shells-common.mo
share/locale/ja/LC_MESSAGES/plasma.mo
+share/locale/ja/LC_MESSAGES/plasma_applet_icon.mo
share/locale/ja/LC_MESSAGES/plasma_applet_battery.mo
share/locale/ja/LC_MESSAGES/plasma_applet_bball.mo
share/locale/ja/LC_MESSAGES/plasma_applet_binaryclock.mo
diff --git a/korean/kde4-l10n/distinfo b/korean/kde4-l10n/distinfo
index 77457be3c4fb..d943895a07e3 100644
--- a/korean/kde4-l10n/distinfo
+++ b/korean/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ko-4.2.0.tar.bz2) = bbd68e1c9eee724c7db051657fdfb50c
-SHA256 (KDE/kde-l10n/kde-l10n-ko-4.2.0.tar.bz2) = 59eb4225178de4f751bf96b8c837de2afe5fda190df415689e41bb702dd8f6a2
-SIZE (KDE/kde-l10n/kde-l10n-ko-4.2.0.tar.bz2) = 1253267
+MD5 (KDE/kde-l10n/kde-l10n-ko-4.2.1.tar.bz2) = a05b21792fb0a2dc032454852a1d75e6
+SHA256 (KDE/kde-l10n/kde-l10n-ko-4.2.1.tar.bz2) = f9fc5a1d2b007739c2781c2c9b1788726acc9286e6e6d10cd914a8b32c9191ef
+SIZE (KDE/kde-l10n/kde-l10n-ko-4.2.1.tar.bz2) = 1259716
diff --git a/math/eigen2/Makefile b/math/eigen2/Makefile
index f65594fd3eb4..2a7791496a8d 100644
--- a/math/eigen2/Makefile
+++ b/math/eigen2/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= eigen
-DISTVERSION= 2.0-beta3
+DISTVERSION= 2.0.0
CATEGORIES= math
MASTER_SITES= http://download.tuxfamily.org/eigen/
@@ -14,6 +14,5 @@ COMMENT= Lightweight library for vector and matrix math
USE_BZIP2= yes
USE_CMAKE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}2
.include <bsd.port.mk>
diff --git a/math/eigen2/distinfo b/math/eigen2/distinfo
index b7db4b495f8e..03ca7646f466 100644
--- a/math/eigen2/distinfo
+++ b/math/eigen2/distinfo
@@ -1,3 +1,3 @@
-MD5 (eigen-2.0-beta3.tar.bz2) = 7d0e8e83562c1608dfbdb853677ee49f
-SHA256 (eigen-2.0-beta3.tar.bz2) = adad041e72046cc0a1979c148062fc11c82145b3d006542caeae941faa5435b1
-SIZE (eigen-2.0-beta3.tar.bz2) = 320429
+MD5 (eigen-2.0.0.tar.bz2) = bedfe344498b926a4b5db17d2846dbb5
+SHA256 (eigen-2.0.0.tar.bz2) = 0b21dac2e780dddeb1f966900e3718751c69d9c49cc2d635082b1475ec3dc785
+SIZE (eigen-2.0.0.tar.bz2) = 346043
diff --git a/math/eigen2/pkg-plist b/math/eigen2/pkg-plist
index 45f044dadd78..12875986606e 100644
--- a/math/eigen2/pkg-plist
+++ b/math/eigen2/pkg-plist
@@ -3,19 +3,19 @@ include/eigen2/Eigen/Cholesky
include/eigen2/Eigen/Core
include/eigen2/Eigen/Geometry
include/eigen2/Eigen/LU
+include/eigen2/Eigen/LeastSquares
include/eigen2/Eigen/QR
-include/eigen2/Eigen/Regression
+include/eigen2/Eigen/QtAlignedMalloc
include/eigen2/Eigen/SVD
include/eigen2/Eigen/Sparse
-include/eigen2/Eigen/src/Array/AllAndAny.h
+include/eigen2/Eigen/StdVector
+include/eigen2/Eigen/src/Array/BooleanRedux.h
include/eigen2/Eigen/src/Array/CwiseOperators.h
include/eigen2/Eigen/src/Array/Functors.h
include/eigen2/Eigen/src/Array/Norms.h
include/eigen2/Eigen/src/Array/PartialRedux.h
include/eigen2/Eigen/src/Array/Random.h
include/eigen2/Eigen/src/Array/Select.h
-include/eigen2/Eigen/src/Cholesky/Cholesky.h
-include/eigen2/Eigen/src/Cholesky/CholeskyWithoutSquareRoot.h
include/eigen2/Eigen/src/Cholesky/LDLT.h
include/eigen2/Eigen/src/Cholesky/LLT.h
include/eigen2/Eigen/src/Core/Assign.h
@@ -79,34 +79,49 @@ include/eigen2/Eigen/src/Geometry/Translation.h
include/eigen2/Eigen/src/LU/Determinant.h
include/eigen2/Eigen/src/LU/Inverse.h
include/eigen2/Eigen/src/LU/LU.h
+include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
include/eigen2/Eigen/src/QR/EigenSolver.h
include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
include/eigen2/Eigen/src/QR/QR.h
include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
include/eigen2/Eigen/src/QR/Tridiagonalization.h
-include/eigen2/Eigen/src/Regression/Regression.h
include/eigen2/Eigen/src/SVD/SVD.h
include/eigen2/Eigen/src/Sparse/AmbiVector.h
include/eigen2/Eigen/src/Sparse/CholmodSupport.h
+include/eigen2/Eigen/src/Sparse/CompressedStorage.h
include/eigen2/Eigen/src/Sparse/CoreIterators.h
+include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
+include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
include/eigen2/Eigen/src/Sparse/RandomSetter.h
-include/eigen2/Eigen/src/Sparse/SparseArray.h
+include/eigen2/Eigen/src/Sparse/SparseAssign.h
include/eigen2/Eigen/src/Sparse/SparseBlock.h
+include/eigen2/Eigen/src/Sparse/SparseCwise.h
+include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
+include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+include/eigen2/Eigen/src/Sparse/SparseDot.h
+include/eigen2/Eigen/src/Sparse/SparseFlagged.h
+include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
include/eigen2/Eigen/src/Sparse/SparseLDLT.h
include/eigen2/Eigen/src/Sparse/SparseLLT.h
include/eigen2/Eigen/src/Sparse/SparseLU.h
include/eigen2/Eigen/src/Sparse/SparseMatrix.h
include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
include/eigen2/Eigen/src/Sparse/SparseProduct.h
+include/eigen2/Eigen/src/Sparse/SparseRedux.h
+include/eigen2/Eigen/src/Sparse/SparseTranspose.h
include/eigen2/Eigen/src/Sparse/SparseUtil.h
+include/eigen2/Eigen/src/Sparse/SparseVector.h
include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
include/eigen2/Eigen/src/Sparse/TaucsSupport.h
include/eigen2/Eigen/src/Sparse/TriangularSolver.h
include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
+include/eigen2/Eigen/src/StdVector/StdVector.h
+include/eigen2/Eigen/src/StdVector/UnalignedType.h
+@dirrm include/eigen2/Eigen/src/StdVector
@dirrm include/eigen2/Eigen/src/Sparse
@dirrm include/eigen2/Eigen/src/SVD
-@dirrm include/eigen2/Eigen/src/Regression
@dirrm include/eigen2/Eigen/src/QR
+@dirrm include/eigen2/Eigen/src/LeastSquares
@dirrm include/eigen2/Eigen/src/LU
@dirrm include/eigen2/Eigen/src/Geometry
@dirrm include/eigen2/Eigen/src/Core/util
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index f65594fd3eb4..2a7791496a8d 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= eigen
-DISTVERSION= 2.0-beta3
+DISTVERSION= 2.0.0
CATEGORIES= math
MASTER_SITES= http://download.tuxfamily.org/eigen/
@@ -14,6 +14,5 @@ COMMENT= Lightweight library for vector and matrix math
USE_BZIP2= yes
USE_CMAKE= yes
-WRKSRC= ${WRKDIR}/${PORTNAME}2
.include <bsd.port.mk>
diff --git a/math/eigen3/distinfo b/math/eigen3/distinfo
index b7db4b495f8e..03ca7646f466 100644
--- a/math/eigen3/distinfo
+++ b/math/eigen3/distinfo
@@ -1,3 +1,3 @@
-MD5 (eigen-2.0-beta3.tar.bz2) = 7d0e8e83562c1608dfbdb853677ee49f
-SHA256 (eigen-2.0-beta3.tar.bz2) = adad041e72046cc0a1979c148062fc11c82145b3d006542caeae941faa5435b1
-SIZE (eigen-2.0-beta3.tar.bz2) = 320429
+MD5 (eigen-2.0.0.tar.bz2) = bedfe344498b926a4b5db17d2846dbb5
+SHA256 (eigen-2.0.0.tar.bz2) = 0b21dac2e780dddeb1f966900e3718751c69d9c49cc2d635082b1475ec3dc785
+SIZE (eigen-2.0.0.tar.bz2) = 346043
diff --git a/math/eigen3/pkg-plist b/math/eigen3/pkg-plist
index 45f044dadd78..12875986606e 100644
--- a/math/eigen3/pkg-plist
+++ b/math/eigen3/pkg-plist
@@ -3,19 +3,19 @@ include/eigen2/Eigen/Cholesky
include/eigen2/Eigen/Core
include/eigen2/Eigen/Geometry
include/eigen2/Eigen/LU
+include/eigen2/Eigen/LeastSquares
include/eigen2/Eigen/QR
-include/eigen2/Eigen/Regression
+include/eigen2/Eigen/QtAlignedMalloc
include/eigen2/Eigen/SVD
include/eigen2/Eigen/Sparse
-include/eigen2/Eigen/src/Array/AllAndAny.h
+include/eigen2/Eigen/StdVector
+include/eigen2/Eigen/src/Array/BooleanRedux.h
include/eigen2/Eigen/src/Array/CwiseOperators.h
include/eigen2/Eigen/src/Array/Functors.h
include/eigen2/Eigen/src/Array/Norms.h
include/eigen2/Eigen/src/Array/PartialRedux.h
include/eigen2/Eigen/src/Array/Random.h
include/eigen2/Eigen/src/Array/Select.h
-include/eigen2/Eigen/src/Cholesky/Cholesky.h
-include/eigen2/Eigen/src/Cholesky/CholeskyWithoutSquareRoot.h
include/eigen2/Eigen/src/Cholesky/LDLT.h
include/eigen2/Eigen/src/Cholesky/LLT.h
include/eigen2/Eigen/src/Core/Assign.h
@@ -79,34 +79,49 @@ include/eigen2/Eigen/src/Geometry/Translation.h
include/eigen2/Eigen/src/LU/Determinant.h
include/eigen2/Eigen/src/LU/Inverse.h
include/eigen2/Eigen/src/LU/LU.h
+include/eigen2/Eigen/src/LeastSquares/LeastSquares.h
include/eigen2/Eigen/src/QR/EigenSolver.h
include/eigen2/Eigen/src/QR/HessenbergDecomposition.h
include/eigen2/Eigen/src/QR/QR.h
include/eigen2/Eigen/src/QR/SelfAdjointEigenSolver.h
include/eigen2/Eigen/src/QR/Tridiagonalization.h
-include/eigen2/Eigen/src/Regression/Regression.h
include/eigen2/Eigen/src/SVD/SVD.h
include/eigen2/Eigen/src/Sparse/AmbiVector.h
include/eigen2/Eigen/src/Sparse/CholmodSupport.h
+include/eigen2/Eigen/src/Sparse/CompressedStorage.h
include/eigen2/Eigen/src/Sparse/CoreIterators.h
+include/eigen2/Eigen/src/Sparse/DynamicSparseMatrix.h
+include/eigen2/Eigen/src/Sparse/MappedSparseMatrix.h
include/eigen2/Eigen/src/Sparse/RandomSetter.h
-include/eigen2/Eigen/src/Sparse/SparseArray.h
+include/eigen2/Eigen/src/Sparse/SparseAssign.h
include/eigen2/Eigen/src/Sparse/SparseBlock.h
+include/eigen2/Eigen/src/Sparse/SparseCwise.h
+include/eigen2/Eigen/src/Sparse/SparseCwiseBinaryOp.h
+include/eigen2/Eigen/src/Sparse/SparseCwiseUnaryOp.h
+include/eigen2/Eigen/src/Sparse/SparseDot.h
+include/eigen2/Eigen/src/Sparse/SparseFlagged.h
+include/eigen2/Eigen/src/Sparse/SparseFuzzy.h
include/eigen2/Eigen/src/Sparse/SparseLDLT.h
include/eigen2/Eigen/src/Sparse/SparseLLT.h
include/eigen2/Eigen/src/Sparse/SparseLU.h
include/eigen2/Eigen/src/Sparse/SparseMatrix.h
include/eigen2/Eigen/src/Sparse/SparseMatrixBase.h
include/eigen2/Eigen/src/Sparse/SparseProduct.h
+include/eigen2/Eigen/src/Sparse/SparseRedux.h
+include/eigen2/Eigen/src/Sparse/SparseTranspose.h
include/eigen2/Eigen/src/Sparse/SparseUtil.h
+include/eigen2/Eigen/src/Sparse/SparseVector.h
include/eigen2/Eigen/src/Sparse/SuperLUSupport.h
include/eigen2/Eigen/src/Sparse/TaucsSupport.h
include/eigen2/Eigen/src/Sparse/TriangularSolver.h
include/eigen2/Eigen/src/Sparse/UmfPackSupport.h
+include/eigen2/Eigen/src/StdVector/StdVector.h
+include/eigen2/Eigen/src/StdVector/UnalignedType.h
+@dirrm include/eigen2/Eigen/src/StdVector
@dirrm include/eigen2/Eigen/src/Sparse
@dirrm include/eigen2/Eigen/src/SVD
-@dirrm include/eigen2/Eigen/src/Regression
@dirrm include/eigen2/Eigen/src/QR
+@dirrm include/eigen2/Eigen/src/LeastSquares
@dirrm include/eigen2/Eigen/src/LU
@dirrm include/eigen2/Eigen/src/Geometry
@dirrm include/eigen2/Eigen/src/Core/util
diff --git a/math/kcalc/distinfo b/math/kcalc/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/math/kcalc/distinfo
+++ b/math/kcalc/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/math/kcalc/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/math/kcalc/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/math/kcalc/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/misc/kde4-l10n-bg/distinfo b/misc/kde4-l10n-bg/distinfo
index 5ab5aac533eb..d4d086829c15 100644
--- a/misc/kde4-l10n-bg/distinfo
+++ b/misc/kde4-l10n-bg/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-bg-4.2.0.tar.bz2) = fc201d9b7d85b84ed02d049309d50ec7
-SHA256 (KDE/kde-l10n/kde-l10n-bg-4.2.0.tar.bz2) = db0c8b29b8577b42e0bc1c3d27d577b45930b33a391cd2774f0e7164a0277891
-SIZE (KDE/kde-l10n/kde-l10n-bg-4.2.0.tar.bz2) = 1722388
+MD5 (KDE/kde-l10n/kde-l10n-bg-4.2.1.tar.bz2) = f6621960e9a1f3328e42a6f5735083c7
+SHA256 (KDE/kde-l10n/kde-l10n-bg-4.2.1.tar.bz2) = 086834d86cf6a0c93bcd9ef462c4eb939ac66aedb23fa2f22d9f5077ac90bac2
+SIZE (KDE/kde-l10n/kde-l10n-bg-4.2.1.tar.bz2) = 1717671
diff --git a/misc/kde4-l10n-bn_IN/distinfo b/misc/kde4-l10n-bn_IN/distinfo
index a7dc23d7036a..714cc72b45d6 100644
--- a/misc/kde4-l10n-bn_IN/distinfo
+++ b/misc/kde4-l10n-bn_IN/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-bn_IN-4.2.0.tar.bz2) = ede59c3abee9c5249a138fc7607d47ed
-SHA256 (KDE/kde-l10n/kde-l10n-bn_IN-4.2.0.tar.bz2) = af7048d095ee347ae799a21fc52498cfba79e3b2bce3a603d1f9853aabf7b1bb
-SIZE (KDE/kde-l10n/kde-l10n-bn_IN-4.2.0.tar.bz2) = 296380
+MD5 (KDE/kde-l10n/kde-l10n-bn_IN-4.2.1.tar.bz2) = af599df9273d8b772e009225d0efb97c
+SHA256 (KDE/kde-l10n/kde-l10n-bn_IN-4.2.1.tar.bz2) = 2a3f141869df3a965fc7cf6df0e80be216ef5ddb44e1440f5ece3e7016c1fdd0
+SIZE (KDE/kde-l10n/kde-l10n-bn_IN-4.2.1.tar.bz2) = 297921
diff --git a/misc/kde4-l10n-ca/Makefile.man b/misc/kde4-l10n-ca/Makefile.man
index 5602000ff487..1b43aa2a27b5 100644
--- a/misc/kde4-l10n-ca/Makefile.man
+++ b/misc/kde4-l10n-ca/Makefile.man
@@ -1,4 +1,5 @@
-MAN1= cheatmake.1 \
+MAN1= adddebug.1 \
+ cheatmake.1 \
checkXML.1 \
create_cvsignore.1 \
create_makefile.1 \
diff --git a/misc/kde4-l10n-ca/distinfo b/misc/kde4-l10n-ca/distinfo
index 46724438663a..f6bc9375b51e 100644
--- a/misc/kde4-l10n-ca/distinfo
+++ b/misc/kde4-l10n-ca/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ca-4.2.0.tar.bz2) = 62b468adf048dde92abcea1cc8378ee0
-SHA256 (KDE/kde-l10n/kde-l10n-ca-4.2.0.tar.bz2) = faaee22d0e8257ad1ba4d42b09eba31992450c0d199cb88aade361fffb36f428
-SIZE (KDE/kde-l10n/kde-l10n-ca-4.2.0.tar.bz2) = 3754448
+MD5 (KDE/kde-l10n/kde-l10n-ca-4.2.1.tar.bz2) = b4e42ac60e2491025705ef7d4f9ff613
+SHA256 (KDE/kde-l10n/kde-l10n-ca-4.2.1.tar.bz2) = 0b26d0693ae98ca70f3ef3d42a3fbdf535e3c64929982809f6b077e633f29953
+SIZE (KDE/kde-l10n/kde-l10n-ca-4.2.1.tar.bz2) = 3774631
diff --git a/misc/kde4-l10n-ca/pkg-plist b/misc/kde4-l10n-ca/pkg-plist
index c6c925ab042e..3cf747d0f027 100644
--- a/misc/kde4-l10n-ca/pkg-plist
+++ b/misc/kde4-l10n-ca/pkg-plist
@@ -76,6 +76,9 @@ share/doc/HTML/ca/kcontrol/background/index.docbook
share/doc/HTML/ca/kcontrol/bell/common
share/doc/HTML/ca/kcontrol/bell/index.cache.bz2
share/doc/HTML/ca/kcontrol/bell/index.docbook
+share/doc/HTML/ca/kcontrol/blockdevices/common
+share/doc/HTML/ca/kcontrol/blockdevices/index.cache.bz2
+share/doc/HTML/ca/kcontrol/blockdevices/index.docbook
share/doc/HTML/ca/kcontrol/cache/common
share/doc/HTML/ca/kcontrol/cache/index.cache.bz2
share/doc/HTML/ca/kcontrol/cache/index.docbook
@@ -1042,6 +1045,7 @@ share/locale/ca/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/ca/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/ca/LC_MESSAGES/plasma_applet_frame.mo
share/locale/ca/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/ca/LC_MESSAGES/plasma_applet_icon.mo
share/locale/ca/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/ca/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/ca/LC_MESSAGES/plasma_applet_kalzium.mo
@@ -1258,6 +1262,7 @@ share/locale/ca/entry.desktop
@dirrm share/doc/HTML/ca/kcontrol/colors
@dirrm share/doc/HTML/ca/kcontrol/clock
@dirrm share/doc/HTML/ca/kcontrol/cache
+@dirrm share/doc/HTML/ca/kcontrol/blockdevices
@dirrm share/doc/HTML/ca/kcontrol/bell
@dirrm share/doc/HTML/ca/kcontrol/background
@dirrm share/doc/HTML/ca/kcontrol
diff --git a/misc/kde4-l10n-cs/distinfo b/misc/kde4-l10n-cs/distinfo
index c0f7e699aaef..577b2f56b050 100644
--- a/misc/kde4-l10n-cs/distinfo
+++ b/misc/kde4-l10n-cs/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-cs-4.2.0.tar.bz2) = 3fbbda2cb209e8c773c075ed3d28f831
-SHA256 (KDE/kde-l10n/kde-l10n-cs-4.2.0.tar.bz2) = 55f2f84fca001ced042cad4c714f76da4127935da791c6b0241306bc9319f25d
-SIZE (KDE/kde-l10n/kde-l10n-cs-4.2.0.tar.bz2) = 3078315
+MD5 (KDE/kde-l10n/kde-l10n-cs-4.2.1.tar.bz2) = 7787304141fa31c4b967297b2d75b36f
+SHA256 (KDE/kde-l10n/kde-l10n-cs-4.2.1.tar.bz2) = 198b64a42ee53580a07970f802190d4cbb88d5d282c39dda44e5a913e47cf0c5
+SIZE (KDE/kde-l10n/kde-l10n-cs-4.2.1.tar.bz2) = 3083948
diff --git a/misc/kde4-l10n-cs/pkg-plist b/misc/kde4-l10n-cs/pkg-plist
index 0e2e6334c8a5..df8cbfc89d49 100644
--- a/misc/kde4-l10n-cs/pkg-plist
+++ b/misc/kde4-l10n-cs/pkg-plist
@@ -594,6 +594,7 @@ share/locale/cs/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/cs/LC_MESSAGES/plasma_applet_frame.mo
share/locale/cs/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
share/locale/cs/LC_MESSAGES/plasma_applet_incomingmsg.mo
+share/locale/cs/LC_MESSAGES/plasma_applet_icon.mo
share/locale/cs/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/cs/LC_MESSAGES/plasma_applet_kalzium.mo
share/locale/cs/LC_MESSAGES/plasma_applet_katesession.mo
diff --git a/misc/kde4-l10n-csb/distinfo b/misc/kde4-l10n-csb/distinfo
index 9f995d3b5253..6ed8159f2f8d 100644
--- a/misc/kde4-l10n-csb/distinfo
+++ b/misc/kde4-l10n-csb/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-csb-4.2.0.tar.bz2) = c9e576d85e7c8644a7f363a7dc446a47
-SHA256 (KDE/kde-l10n/kde-l10n-csb-4.2.0.tar.bz2) = 173c8bfdfd8c773868dfa7928e3b1244566d6bf776fac5bbe10af10b01190922
-SIZE (KDE/kde-l10n/kde-l10n-csb-4.2.0.tar.bz2) = 405103
+MD5 (KDE/kde-l10n/kde-l10n-csb-4.2.1.tar.bz2) = 2f2ca099814cd3bbf1a0273d0b027b80
+SHA256 (KDE/kde-l10n/kde-l10n-csb-4.2.1.tar.bz2) = 10494b5007917d5b14dd16cd028a6cbb5f4ff1ece2143528277ccd502c243ecc
+SIZE (KDE/kde-l10n/kde-l10n-csb-4.2.1.tar.bz2) = 405723
diff --git a/misc/kde4-l10n-da/distinfo b/misc/kde4-l10n-da/distinfo
index 8c0a4ce945b0..3eadf6a9e156 100644
--- a/misc/kde4-l10n-da/distinfo
+++ b/misc/kde4-l10n-da/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-da-4.2.0.tar.bz2) = 9f6a01336b631223e13df6f82f6247ad
-SHA256 (KDE/kde-l10n/kde-l10n-da-4.2.0.tar.bz2) = f3bc20d8178a477a4000aa2c8b24143b2f45fc89b6ce049216d94dc039efd50c
-SIZE (KDE/kde-l10n/kde-l10n-da-4.2.0.tar.bz2) = 9236055
+MD5 (KDE/kde-l10n/kde-l10n-da-4.2.1.tar.bz2) = 7765ade376b10d25d88e0b9d7ea7ef94
+SHA256 (KDE/kde-l10n/kde-l10n-da-4.2.1.tar.bz2) = 87ec3e9df6dcc8be81ba5fe2804bf90a10ea1658558fc691650c111b572f31fa
+SIZE (KDE/kde-l10n/kde-l10n-da-4.2.1.tar.bz2) = 17091015
diff --git a/misc/kde4-l10n-da/pkg-plist b/misc/kde4-l10n-da/pkg-plist
index aa015e1ab8d0..bdfa975cb4f8 100644
--- a/misc/kde4-l10n-da/pkg-plist
+++ b/misc/kde4-l10n-da/pkg-plist
@@ -58,27 +58,77 @@ share/apps/klettres/da/syllab/ad-7.ogg
share/apps/klettres/da/syllab/ad-8.ogg
share/apps/klettres/da/syllab/ad-9.ogg
share/apps/ktuberling/sounds/da.soundtheme
-share/apps/ktuberling/sounds/da/briller.wav
-share/apps/ktuberling/sounds/da/cigar.wav
-share/apps/ktuberling/sounds/da/haar.wav
-share/apps/ktuberling/sounds/da/halsbaand.wav
-share/apps/ktuberling/sounds/da/halstoerklaede.wav
-share/apps/ktuberling/sounds/da/hat.wav
-share/apps/ktuberling/sounds/da/horn.wav
-share/apps/ktuberling/sounds/da/kartoffelfyr.wav
-share/apps/ktuberling/sounds/da/mund.wav
-share/apps/ktuberling/sounds/da/naese.wav
-share/apps/ktuberling/sounds/da/oeje.wav
-share/apps/ktuberling/sounds/da/oejenbryn.wav
-share/apps/ktuberling/sounds/da/oere.wav
-share/apps/ktuberling/sounds/da/oerering.wav
-share/apps/ktuberling/sounds/da/overskaeg.wav
-share/apps/ktuberling/sounds/da/pingvin.wav
-share/apps/ktuberling/sounds/da/politiskilt.wav
-share/apps/ktuberling/sounds/da/slips.wav
-share/apps/ktuberling/sounds/da/sloejfe.wav
-share/apps/ktuberling/sounds/da/solbriller.wav
-share/apps/ktuberling/sounds/da/ur.wav
+share/apps/ktuberling/sounds/da/blomst.ogg
+share/apps/ktuberling/sounds/da/bold.ogg
+share/apps/ktuberling/sounds/da/briller.ogg
+share/apps/ktuberling/sounds/da/egypt_aesel.ogg
+share/apps/ktuberling/sounds/da/egypt_bro.ogg
+share/apps/ktuberling/sounds/da/egypt_broend.ogg
+share/apps/ktuberling/sounds/da/egypt_bue.ogg
+share/apps/ktuberling/sounds/da/egypt_dreng.ogg
+share/apps/ktuberling/sounds/da/egypt_fugle.ogg
+share/apps/ktuberling/sounds/da/egypt_graes.ogg
+share/apps/ktuberling/sounds/da/egypt_kamel.ogg
+share/apps/ktuberling/sounds/da/egypt_kvinde.ogg
+share/apps/ktuberling/sounds/da/egypt_mand.ogg
+share/apps/ktuberling/sounds/da/egypt_oase.ogg
+share/apps/ktuberling/sounds/da/egypt_palme.ogg
+share/apps/ktuberling/sounds/da/egypt_pige.ogg
+share/apps/ktuberling/sounds/da/egypt_pyramide.ogg
+share/apps/ktuberling/sounds/da/egypt_sfinx.ogg
+share/apps/ktuberling/sounds/da/egypt_soejle.ogg
+share/apps/ktuberling/sounds/da/egypt_vej.ogg
+share/apps/ktuberling/sounds/da/egypt_vogn.ogg
+share/apps/ktuberling/sounds/da/frakke.ogg
+share/apps/ktuberling/sounds/da/haar.ogg
+share/apps/ktuberling/sounds/da/hat.ogg
+share/apps/ktuberling/sounds/da/moon_astronaut.ogg
+share/apps/ktuberling/sounds/da/moon_hotel.ogg
+share/apps/ktuberling/sounds/da/moon_jorden.ogg
+share/apps/ktuberling/sounds/da/moon_maanefartoej.ogg
+share/apps/ktuberling/sounds/da/moon_planet.ogg
+share/apps/ktuberling/sounds/da/moon_radar.ogg
+share/apps/ktuberling/sounds/da/moon_raket.ogg
+share/apps/ktuberling/sounds/da/moon_rumvaesen.ogg
+share/apps/ktuberling/sounds/da/moon_satellit.ogg
+share/apps/ktuberling/sounds/da/moon_skilt.ogg
+share/apps/ktuberling/sounds/da/moon_stjerne.ogg
+share/apps/ktuberling/sounds/da/moon_stjerneskud.ogg
+share/apps/ktuberling/sounds/da/moon_ufo.ogg
+share/apps/ktuberling/sounds/da/moon_uhyre.ogg
+share/apps/ktuberling/sounds/da/mund.ogg
+share/apps/ktuberling/sounds/da/naese.ogg
+share/apps/ktuberling/sounds/da/nederdel.ogg
+share/apps/ktuberling/sounds/da/oeje.ogg
+share/apps/ktuberling/sounds/da/oejenbryn.ogg
+share/apps/ktuberling/sounds/da/oere.ogg
+share/apps/ktuberling/sounds/da/oerering.ogg
+share/apps/ktuberling/sounds/da/overskaeg.ogg
+share/apps/ktuberling/sounds/da/paraply.ogg
+share/apps/ktuberling/sounds/da/pizza_agurk.ogg
+share/apps/ktuberling/sounds/da/pizza_ananas.ogg
+share/apps/ktuberling/sounds/da/pizza_ansjos.ogg
+share/apps/ktuberling/sounds/da/pizza_bacon.ogg
+share/apps/ktuberling/sounds/da/pizza_broccoli.ogg
+share/apps/ktuberling/sounds/da/pizza_champignon.ogg
+share/apps/ktuberling/sounds/da/pizza_loeg.ogg
+share/apps/ktuberling/sounds/da/pizza_oliven.ogg
+share/apps/ktuberling/sounds/da/pizza_oregano.ogg
+share/apps/ktuberling/sounds/da/pizza_ost.ogg
+share/apps/ktuberling/sounds/da/pizza_pebber.ogg
+share/apps/ktuberling/sounds/da/pizza_pebberoni.ogg
+share/apps/ktuberling/sounds/da/pizza_salami.ogg
+share/apps/ktuberling/sounds/da/pizza_tomat.ogg
+share/apps/ktuberling/sounds/da/shorts.ogg
+share/apps/ktuberling/sounds/da/sko.ogg
+share/apps/ktuberling/sounds/da/slips.ogg
+share/apps/ktuberling/sounds/da/sloejfe.ogg
+share/apps/ktuberling/sounds/da/solbriller.ogg
+share/apps/ktuberling/sounds/da/stok.ogg
+share/apps/ktuberling/sounds/da/tv_bil.ogg
+share/apps/ktuberling/sounds/da/tv_cykel.ogg
+share/apps/ktuberling/sounds/da/tv_cyklist.ogg
+share/apps/ktuberling/sounds/da/tv_tog.ogg
share/apps/kvtml/da/beklaedning.kvtml
share/apps/kvtml/da/computere.kvtml
share/apps/kvtml/da/da_sports.kvtml
@@ -1495,6 +1545,7 @@ share/locale/da/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/da/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/da/LC_MESSAGES/plasma_applet_frame.mo
share/locale/da/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/da/LC_MESSAGES/plasma_applet_icon.mo
share/locale/da/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/da/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/da/LC_MESSAGES/plasma_applet_kalzium.mo
diff --git a/misc/kde4-l10n-el/distinfo b/misc/kde4-l10n-el/distinfo
index df69ba15cb50..8f7eb268e1b8 100644
--- a/misc/kde4-l10n-el/distinfo
+++ b/misc/kde4-l10n-el/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-el-4.2.0.tar.bz2) = 2bbfca0b7a1366aee558804105b176cb
-SHA256 (KDE/kde-l10n/kde-l10n-el-4.2.0.tar.bz2) = 72353ddec12ac799072ea60c886cd1d7e4416c1fbafd033a27c262cb26423b70
-SIZE (KDE/kde-l10n/kde-l10n-el-4.2.0.tar.bz2) = 2127041
+MD5 (KDE/kde-l10n/kde-l10n-el-4.2.1.tar.bz2) = 53df4a6bd3f6ce8aa4130ab4c927ec93
+SHA256 (KDE/kde-l10n/kde-l10n-el-4.2.1.tar.bz2) = 189d6c396eb334f74c902f39a0515d5efe7ad186f0d9d08a1c1eb40d7dd88dbb
+SIZE (KDE/kde-l10n/kde-l10n-el-4.2.1.tar.bz2) = 2135551
diff --git a/misc/kde4-l10n-en_GB/distinfo b/misc/kde4-l10n-en_GB/distinfo
index 59c5befc98e9..f5bcee6b2332 100644
--- a/misc/kde4-l10n-en_GB/distinfo
+++ b/misc/kde4-l10n-en_GB/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-en_GB-4.2.0.tar.bz2) = 12814406b6d35d8098a6cd16f49f827e
-SHA256 (KDE/kde-l10n/kde-l10n-en_GB-4.2.0.tar.bz2) = 2640fa292cc76bd0c5921fdea646b6670dec496bbdde80996108ea19704dd733
-SIZE (KDE/kde-l10n/kde-l10n-en_GB-4.2.0.tar.bz2) = 3515456
+MD5 (KDE/kde-l10n/kde-l10n-en_GB-4.2.1.tar.bz2) = bb92656ccfd7c4e1c28b8e1ae53d01b5
+SHA256 (KDE/kde-l10n/kde-l10n-en_GB-4.2.1.tar.bz2) = d703378844648fae3755c980a2a3a3a05e6602be642d055df448872cd35b4bf6
+SIZE (KDE/kde-l10n/kde-l10n-en_GB-4.2.1.tar.bz2) = 3518975
diff --git a/misc/kde4-l10n-es/distinfo b/misc/kde4-l10n-es/distinfo
index 169e2e8af571..08fac0681717 100644
--- a/misc/kde4-l10n-es/distinfo
+++ b/misc/kde4-l10n-es/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-es-4.2.0.tar.bz2) = e3b9bc8ef5573f7574e296385eb130a9
-SHA256 (KDE/kde-l10n/kde-l10n-es-4.2.0.tar.bz2) = e8f71c17a471cc12db74f9a428685d08e2d1e9a24f94a9397a3211cbaa07dac6
-SIZE (KDE/kde-l10n/kde-l10n-es-4.2.0.tar.bz2) = 15953509
+MD5 (KDE/kde-l10n/kde-l10n-es-4.2.1.tar.bz2) = 249501d5acaf9cdaa1c81ecc7892ee9f
+SHA256 (KDE/kde-l10n/kde-l10n-es-4.2.1.tar.bz2) = 6f6a7041dc8c4cb908ad684e65a8cfbf62e92ad4ee670aec7e66851cac68d7aa
+SIZE (KDE/kde-l10n/kde-l10n-es-4.2.1.tar.bz2) = 15971850
diff --git a/misc/kde4-l10n-es/pkg-plist b/misc/kde4-l10n-es/pkg-plist
index 1917b2460963..29e536c271ff 100644
--- a/misc/kde4-l10n-es/pkg-plist
+++ b/misc/kde4-l10n-es/pkg-plist
@@ -1646,6 +1646,7 @@ share/locale/es/LC_MESSAGES/plasma-overlay.mo
share/locale/es/LC_MESSAGES/plasma-shells-common.mo
share/locale/es/LC_MESSAGES/plasma.mo
share/locale/es/LC_MESSAGES/plasma_applet_battery.mo
+share/locale/es/LC_MESSAGES/plasma_applet_icon.mo
share/locale/es/LC_MESSAGES/plasma_applet_bball.mo
share/locale/es/LC_MESSAGES/plasma_applet_binaryclock.mo
share/locale/es/LC_MESSAGES/plasma_applet_bluemarble.mo
diff --git a/misc/kde4-l10n-et/distinfo b/misc/kde4-l10n-et/distinfo
index 98e5dbfef09f..8cf2dfec470e 100644
--- a/misc/kde4-l10n-et/distinfo
+++ b/misc/kde4-l10n-et/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-et-4.2.0.tar.bz2) = fb2e1d63d9d926c6639a537b6bf73d03
-SHA256 (KDE/kde-l10n/kde-l10n-et-4.2.0.tar.bz2) = 066963eb5f6f32e69c8da12cfd72b1c3241db1aef14762bd0863f187bca79d2a
-SIZE (KDE/kde-l10n/kde-l10n-et-4.2.0.tar.bz2) = 8465511
+MD5 (KDE/kde-l10n/kde-l10n-et-4.2.1.tar.bz2) = 4d7ba6e07f6949bf03d810e67d55230c
+SHA256 (KDE/kde-l10n/kde-l10n-et-4.2.1.tar.bz2) = ae23b5892b6369cdb3577ee04eeb4d12c2979eae8ddc0a212f833e8c433d474a
+SIZE (KDE/kde-l10n/kde-l10n-et-4.2.1.tar.bz2) = 8555842
diff --git a/misc/kde4-l10n-et/pkg-plist b/misc/kde4-l10n-et/pkg-plist
index ed055a8ac12f..83876043a184 100644
--- a/misc/kde4-l10n-et/pkg-plist
+++ b/misc/kde4-l10n-et/pkg-plist
@@ -253,6 +253,9 @@ share/doc/HTML/et/kcontrol/smb/index.docbook
share/doc/HTML/et/kcontrol/spellchecking/common
share/doc/HTML/et/kcontrol/spellchecking/index.cache.bz2
share/doc/HTML/et/kcontrol/spellchecking/index.docbook
+share/doc/HTML/et/kcontrol/splashscreen/common
+share/doc/HTML/et/kcontrol/splashscreen/index.cache.bz2
+share/doc/HTML/et/kcontrol/splashscreen/index.docbook
share/doc/HTML/et/kcontrol/useragent/common
share/doc/HTML/et/kcontrol/useragent/index.cache.bz2
share/doc/HTML/et/kcontrol/useragent/index.docbook
@@ -913,6 +916,14 @@ share/doc/HTML/et/ktuberling/common
share/doc/HTML/et/ktuberling/index.cache.bz2
share/doc/HTML/et/ktuberling/index.docbook
share/doc/HTML/et/ktuberling/technical-reference.docbook
+share/doc/HTML/et/kturtle/common
+share/doc/HTML/et/kturtle/getting-started.docbook
+share/doc/HTML/et/kturtle/glossary.docbook
+share/doc/HTML/et/kturtle/index.cache.bz2
+share/doc/HTML/et/kturtle/index.docbook
+share/doc/HTML/et/kturtle/programming-reference.docbook
+share/doc/HTML/et/kturtle/translator-guide.docbook
+share/doc/HTML/et/kturtle/using-kturtle.docbook
share/doc/HTML/et/kuser/common
share/doc/HTML/et/kuser/index.cache.bz2
share/doc/HTML/et/kuser/index.docbook
@@ -954,12 +965,21 @@ share/doc/HTML/et/lskat/index.docbook
share/doc/HTML/et/okular/common
share/doc/HTML/et/okular/index.cache.bz2
share/doc/HTML/et/okular/index.docbook
+share/doc/HTML/et/parley/common
+share/doc/HTML/et/parley/index.cache.bz2
+share/doc/HTML/et/parley/index.docbook
+share/doc/HTML/et/plasma/common
+share/doc/HTML/et/plasma/index.cache.bz2
+share/doc/HTML/et/plasma/index.docbook
share/doc/HTML/et/sonnet/common
share/doc/HTML/et/sonnet/index.cache.bz2
share/doc/HTML/et/sonnet/index.docbook
share/doc/HTML/et/superkaramba/common
share/doc/HTML/et/superkaramba/index.cache.bz2
share/doc/HTML/et/superkaramba/index.docbook
+share/doc/HTML/et/systemsettings/common
+share/doc/HTML/et/systemsettings/index.cache.bz2
+share/doc/HTML/et/systemsettings/index.docbook
share/doc/HTML/et/umbrello/authors.docbook
share/doc/HTML/et/umbrello/code_import_and_generation.docbook
share/doc/HTML/et/umbrello/common
@@ -1019,7 +1039,9 @@ share/locale/et/LC_MESSAGES/kanagram.mo
share/locale/et/LC_MESSAGES/kapman.mo
share/locale/et/LC_MESSAGES/kappfinder.mo
share/locale/et/LC_MESSAGES/kapptemplate.mo
+share/locale/et/LC_MESSAGES/kate-ctags-plugin.mo
share/locale/et/LC_MESSAGES/kate.mo
+share/locale/et/LC_MESSAGES/katebuild-plugin.mo
share/locale/et/LC_MESSAGES/kateexternaltoolsplugin.mo
share/locale/et/LC_MESSAGES/katefilebrowserplugin.mo
share/locale/et/LC_MESSAGES/katefiletemplates.mo
@@ -1269,6 +1291,7 @@ share/locale/et/LC_MESSAGES/kopete.mo
share/locale/et/LC_MESSAGES/korganizer.mo
share/locale/et/LC_MESSAGES/korn.mo
share/locale/et/LC_MESSAGES/kpackage.mo
+share/locale/et/LC_MESSAGES/kpartloader.mo
share/locale/et/LC_MESSAGES/kpartsaver.mo
share/locale/et/LC_MESSAGES/kpasswdserver.mo
share/locale/et/LC_MESSAGES/kpat.mo
@@ -1435,6 +1458,7 @@ share/locale/et/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/et/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/et/LC_MESSAGES/plasma_applet_frame.mo
share/locale/et/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/et/LC_MESSAGES/plasma_applet_icon.mo
share/locale/et/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/et/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/et/LC_MESSAGES/plasma_applet_kalzium.mo
@@ -1514,8 +1538,11 @@ share/locale/et/LC_MESSAGES/useraccount.mo
share/locale/et/entry.desktop
@dirrm share/doc/HTML/et/xsldbg
@dirrm share/doc/HTML/et/umbrello
+@dirrm share/doc/HTML/et/systemsettings
@dirrm share/doc/HTML/et/superkaramba
@dirrm share/doc/HTML/et/sonnet
+@dirrm share/doc/HTML/et/plasma
+@dirrm share/doc/HTML/et/parley
@dirrm share/doc/HTML/et/okular
@dirrm share/doc/HTML/et/lskat
@dirrm share/doc/HTML/et/lilo-config
@@ -1526,6 +1553,7 @@ share/locale/et/entry.desktop
@dirrm share/doc/HTML/et/kwatchgnupg
@dirrm share/doc/HTML/et/kwallet
@dirrm share/doc/HTML/et/kuser
+@dirrm share/doc/HTML/et/kturtle
@dirrm share/doc/HTML/et/ktuberling
@dirrm share/doc/HTML/et/kttsd
@dirrm share/doc/HTML/et/ktouch
@@ -1654,6 +1682,7 @@ share/locale/et/entry.desktop
@dirrm share/doc/HTML/et/kcron
@dirrm share/doc/HTML/et/kcontrol/windowspecific
@dirrm share/doc/HTML/et/kcontrol/useragent
+@dirrm share/doc/HTML/et/kcontrol/splashscreen
@dirrm share/doc/HTML/et/kcontrol/spellchecking
@dirrm share/doc/HTML/et/kcontrol/smb
@dirrm share/doc/HTML/et/kcontrol/screensaver
diff --git a/misc/kde4-l10n-eu/distinfo b/misc/kde4-l10n-eu/distinfo
index 3e56bbca7a88..10c7c08628c7 100644
--- a/misc/kde4-l10n-eu/distinfo
+++ b/misc/kde4-l10n-eu/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-eu-4.2.0.tar.bz2) = 5248515b294143a7821055754b9236e4
-SHA256 (KDE/kde-l10n/kde-l10n-eu-4.2.0.tar.bz2) = 74881e80f3cf3a0ddd876d0907239f6631f2875175d1b18919aa673ad33f78f6
-SIZE (KDE/kde-l10n/kde-l10n-eu-4.2.0.tar.bz2) = 1901110
+MD5 (KDE/kde-l10n/kde-l10n-eu-4.2.1.tar.bz2) = 5d4d1c5a9606f79b37ddb8bce6fd8dc8
+SHA256 (KDE/kde-l10n/kde-l10n-eu-4.2.1.tar.bz2) = f7c418bfc1116c237dc89409f1ac3b86070b53ad4ce0b03078663d49b253f514
+SIZE (KDE/kde-l10n/kde-l10n-eu-4.2.1.tar.bz2) = 1913152
diff --git a/misc/kde4-l10n-eu/pkg-plist b/misc/kde4-l10n-eu/pkg-plist
index 185b392557ed..9d5889a229d9 100644
--- a/misc/kde4-l10n-eu/pkg-plist
+++ b/misc/kde4-l10n-eu/pkg-plist
@@ -9,6 +9,7 @@ share/locale/eu/LC_MESSAGES/cervisia.mo
share/locale/eu/LC_MESSAGES/cvsservice.mo
share/locale/eu/LC_MESSAGES/display.mo
share/locale/eu/LC_MESSAGES/dolphin.mo
+share/locale/eu/LC_MESSAGES/dragonplayer.mo
share/locale/eu/LC_MESSAGES/drkonqi.mo
share/locale/eu/LC_MESSAGES/filetypes.mo
share/locale/eu/LC_MESSAGES/gwenview.mo
@@ -342,6 +343,7 @@ share/locale/eu/LC_MESSAGES/libkscreensaver.mo
share/locale/eu/LC_MESSAGES/libksieve.mo
share/locale/eu/LC_MESSAGES/libkworkspace.mo
share/locale/eu/LC_MESSAGES/liboktetacore.mo
+share/locale/eu/LC_MESSAGES/libphonon.mo
share/locale/eu/LC_MESSAGES/libplasma.mo
share/locale/eu/LC_MESSAGES/libplasmaclock.mo
share/locale/eu/LC_MESSAGES/libtaskmanager.mo
@@ -353,13 +355,27 @@ share/locale/eu/LC_MESSAGES/nsplugin.mo
share/locale/eu/LC_MESSAGES/okteta.mo
share/locale/eu/LC_MESSAGES/oktetapart.mo
share/locale/eu/LC_MESSAGES/okular.mo
+share/locale/eu/LC_MESSAGES/okular_chm.mo
+share/locale/eu/LC_MESSAGES/okular_comicbook.mo
+share/locale/eu/LC_MESSAGES/okular_djvu.mo
+share/locale/eu/LC_MESSAGES/okular_epub.mo
+share/locale/eu/LC_MESSAGES/okular_fax.mo
+share/locale/eu/LC_MESSAGES/okular_fictionbook.mo
+share/locale/eu/LC_MESSAGES/okular_kimgio.mo
+share/locale/eu/LC_MESSAGES/okular_ooo.mo
+share/locale/eu/LC_MESSAGES/okular_plucker.mo
+share/locale/eu/LC_MESSAGES/okular_poppler.mo
+share/locale/eu/LC_MESSAGES/okular_tiff.mo
+share/locale/eu/LC_MESSAGES/okular_xps.mo
share/locale/eu/LC_MESSAGES/parley.mo
share/locale/eu/LC_MESSAGES/phonon-xine.mo
+share/locale/eu/LC_MESSAGES/phonon_gstreamer.mo
share/locale/eu/LC_MESSAGES/phonon_kde.mo
share/locale/eu/LC_MESSAGES/plasma-overlay.mo
share/locale/eu/LC_MESSAGES/plasma-shells-common.mo
share/locale/eu/LC_MESSAGES/plasma.mo
share/locale/eu/LC_MESSAGES/plasma_applet_battery.mo
+share/locale/eu/LC_MESSAGES/plasma_applet_bball.mo
share/locale/eu/LC_MESSAGES/plasma_applet_calculator.mo
share/locale/eu/LC_MESSAGES/plasma_applet_clock.mo
share/locale/eu/LC_MESSAGES/plasma_applet_comic.mo
diff --git a/misc/kde4-l10n-fi/distinfo b/misc/kde4-l10n-fi/distinfo
index fd43123f1c55..8db3366245da 100644
--- a/misc/kde4-l10n-fi/distinfo
+++ b/misc/kde4-l10n-fi/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-fi-4.2.0.tar.bz2) = dc5bda4589b9a2042ade700caf8de083
-SHA256 (KDE/kde-l10n/kde-l10n-fi-4.2.0.tar.bz2) = 4e4f76ca0814110b2b13b5f18e93b51a1ffef281551d59b470d44c6dc386d39b
-SIZE (KDE/kde-l10n/kde-l10n-fi-4.2.0.tar.bz2) = 1995482
+MD5 (KDE/kde-l10n/kde-l10n-fi-4.2.1.tar.bz2) = 4b69917aee664dd2b10471d8a9294dd2
+SHA256 (KDE/kde-l10n/kde-l10n-fi-4.2.1.tar.bz2) = 59cb49ec788890adde0b43bc5a57edbc488166405ba6a3b1363df035b5e34cea
+SIZE (KDE/kde-l10n/kde-l10n-fi-4.2.1.tar.bz2) = 2004490
diff --git a/misc/kde4-l10n-ga/distinfo b/misc/kde4-l10n-ga/distinfo
index 83cd10f77a1b..f9356ae43fd1 100644
--- a/misc/kde4-l10n-ga/distinfo
+++ b/misc/kde4-l10n-ga/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ga-4.2.0.tar.bz2) = d18b399ca99aa54c936bcdb207baac0a
-SHA256 (KDE/kde-l10n/kde-l10n-ga-4.2.0.tar.bz2) = e8a90368d3429f9b03d3e96084f5b14f662ce11068a6c80db42d7e201f7271cd
-SIZE (KDE/kde-l10n/kde-l10n-ga-4.2.0.tar.bz2) = 1814084
+MD5 (KDE/kde-l10n/kde-l10n-ga-4.2.1.tar.bz2) = e5b10ab623c56b45cf206db37024049a
+SHA256 (KDE/kde-l10n/kde-l10n-ga-4.2.1.tar.bz2) = 5c4d03ad7ddf1cf899fc81b130769088f07a4abbb798faa4fe8bd8f43dfe66d8
+SIZE (KDE/kde-l10n/kde-l10n-ga-4.2.1.tar.bz2) = 1884045
diff --git a/misc/kde4-l10n-gl/distinfo b/misc/kde4-l10n-gl/distinfo
index 70b3eb1c477a..6c43292ccd43 100644
--- a/misc/kde4-l10n-gl/distinfo
+++ b/misc/kde4-l10n-gl/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-gl-4.2.0.tar.bz2) = 104815bc1b20b100509f66132df52cad
-SHA256 (KDE/kde-l10n/kde-l10n-gl-4.2.0.tar.bz2) = 1e1070a8a28c067cd7c41075da7fd194b7b9e892ebaa0264ef8f4d940b57d310
-SIZE (KDE/kde-l10n/kde-l10n-gl-4.2.0.tar.bz2) = 3440760
+MD5 (KDE/kde-l10n/kde-l10n-gl-4.2.1.tar.bz2) = fafa0c2a2f6b46d0c9f4c11508ac86e6
+SHA256 (KDE/kde-l10n/kde-l10n-gl-4.2.1.tar.bz2) = 598657958390ed61e396b672d455ce7e7f82c5ebd3f0a1cd148963e63c2c524a
+SIZE (KDE/kde-l10n/kde-l10n-gl-4.2.1.tar.bz2) = 3458042
diff --git a/misc/kde4-l10n-gl/pkg-plist b/misc/kde4-l10n-gl/pkg-plist
index f27b9ba15ac8..1420ec9cba3b 100644
--- a/misc/kde4-l10n-gl/pkg-plist
+++ b/misc/kde4-l10n-gl/pkg-plist
@@ -757,6 +757,7 @@ share/locale/gl/LC_MESSAGES/phonon_kde.mo
share/locale/gl/LC_MESSAGES/plasma-overlay.mo
share/locale/gl/LC_MESSAGES/plasma-shells-common.mo
share/locale/gl/LC_MESSAGES/plasma.mo
+share/locale/gl/LC_MESSAGES/plasma_applet_icon.mo
share/locale/gl/LC_MESSAGES/plasma_applet_battery.mo
share/locale/gl/LC_MESSAGES/plasma_applet_bball.mo
share/locale/gl/LC_MESSAGES/plasma_applet_binaryclock.mo
diff --git a/misc/kde4-l10n-gu/distinfo b/misc/kde4-l10n-gu/distinfo
index 141d5af4a64c..7fa7f30c01e7 100644
--- a/misc/kde4-l10n-gu/distinfo
+++ b/misc/kde4-l10n-gu/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-gu-4.2.0.tar.bz2) = a1f22ef4f836477077f05386871f8336
-SHA256 (KDE/kde-l10n/kde-l10n-gu-4.2.0.tar.bz2) = 4cd76fbb148e01fb6621b3e69f59357149415510852d85cfafa8bf7633ad66cf
-SIZE (KDE/kde-l10n/kde-l10n-gu-4.2.0.tar.bz2) = 548587
+MD5 (KDE/kde-l10n/kde-l10n-gu-4.2.1.tar.bz2) = 1424e8bd14eb819a0b615ec17053654b
+SHA256 (KDE/kde-l10n/kde-l10n-gu-4.2.1.tar.bz2) = 2934188896a0324891b2a4828d321c8c464fed61a9b35d86bd6fc5c93727ea02
+SIZE (KDE/kde-l10n/kde-l10n-gu-4.2.1.tar.bz2) = 551065
diff --git a/misc/kde4-l10n-hi/distinfo b/misc/kde4-l10n-hi/distinfo
index 8ff9bbb19202..9e35c5fb3581 100644
--- a/misc/kde4-l10n-hi/distinfo
+++ b/misc/kde4-l10n-hi/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-hi-4.2.0.tar.bz2) = b828a209e2b370e4b3487be01dc0ea8e
-SHA256 (KDE/kde-l10n/kde-l10n-hi-4.2.0.tar.bz2) = 50f595d0724c99483c2ad6aa14c4e73e371f1d2d8717331721d56b8692582b0f
-SIZE (KDE/kde-l10n/kde-l10n-hi-4.2.0.tar.bz2) = 1629301
+MD5 (KDE/kde-l10n/kde-l10n-hi-4.2.1.tar.bz2) = 8b4a197ff42a3ec17624a612db748205
+SHA256 (KDE/kde-l10n/kde-l10n-hi-4.2.1.tar.bz2) = 8169d9c58f23a5f2409196d836c0e4ece1c06ca5099c01676085ba8f80ff5368
+SIZE (KDE/kde-l10n/kde-l10n-hi-4.2.1.tar.bz2) = 1634481
diff --git a/misc/kde4-l10n-is/distinfo b/misc/kde4-l10n-is/distinfo
index ae3dc2c8b75b..fc38e17d0f5d 100644
--- a/misc/kde4-l10n-is/distinfo
+++ b/misc/kde4-l10n-is/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-is-4.2.0.tar.bz2) = f3a6b7dcd549e7c7a6b83f12f57fb70f
-SHA256 (KDE/kde-l10n/kde-l10n-is-4.2.0.tar.bz2) = 67bbd5017af7f93c11835850b06872d3b7c45ea6d24d78483c57c1abd0b1ebda
-SIZE (KDE/kde-l10n/kde-l10n-is-4.2.0.tar.bz2) = 1630347
+MD5 (KDE/kde-l10n/kde-l10n-is-4.2.1.tar.bz2) = 3f5d697d382c84989b443bab06e28eb0
+SHA256 (KDE/kde-l10n/kde-l10n-is-4.2.1.tar.bz2) = 1bc6bb285df694a469e731709e481bdb31bc6ee1a5c2be595d2089df93e12bb5
+SIZE (KDE/kde-l10n/kde-l10n-is-4.2.1.tar.bz2) = 1634538
diff --git a/misc/kde4-l10n-it/distinfo b/misc/kde4-l10n-it/distinfo
index 0e4a79bc863a..cc5e9260453b 100644
--- a/misc/kde4-l10n-it/distinfo
+++ b/misc/kde4-l10n-it/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-it-4.2.0.tar.bz2) = 42387c0b473767173ebf65622edb4278
-SHA256 (KDE/kde-l10n/kde-l10n-it-4.2.0.tar.bz2) = fe2cbe152e68ec65d790065bc1cf3b9e4f9c90af54113712d99e3e0a68963965
-SIZE (KDE/kde-l10n/kde-l10n-it-4.2.0.tar.bz2) = 10834547
+MD5 (KDE/kde-l10n/kde-l10n-it-4.2.1.tar.bz2) = 5f366b474472536371baf9890458f1a0
+SHA256 (KDE/kde-l10n/kde-l10n-it-4.2.1.tar.bz2) = 91d2c5a0988bed6eb26ed24d7b0b462a56f9e75c6d2dc6dcaf989e061861668b
+SIZE (KDE/kde-l10n/kde-l10n-it-4.2.1.tar.bz2) = 10848638
diff --git a/misc/kde4-l10n-it/pkg-plist b/misc/kde4-l10n-it/pkg-plist
index fb84555c35ef..a677cd5b60dc 100644
--- a/misc/kde4-l10n-it/pkg-plist
+++ b/misc/kde4-l10n-it/pkg-plist
@@ -1650,6 +1650,7 @@ share/locale/it/LC_MESSAGES/plasma-overlay.mo
share/locale/it/LC_MESSAGES/plasma-shells-common.mo
share/locale/it/LC_MESSAGES/plasma.mo
share/locale/it/LC_MESSAGES/plasma_applet_battery.mo
+share/locale/it/LC_MESSAGES/plasma_applet_icon.mo
share/locale/it/LC_MESSAGES/plasma_applet_bball.mo
share/locale/it/LC_MESSAGES/plasma_applet_binaryclock.mo
share/locale/it/LC_MESSAGES/plasma_applet_bluemarble.mo
diff --git a/misc/kde4-l10n-kk/distinfo b/misc/kde4-l10n-kk/distinfo
index c9f4a79d755d..4589a4a26d1b 100644
--- a/misc/kde4-l10n-kk/distinfo
+++ b/misc/kde4-l10n-kk/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-kk-4.2.0.tar.bz2) = a984ed36132141eb8473ab541187d296
-SHA256 (KDE/kde-l10n/kde-l10n-kk-4.2.0.tar.bz2) = 47b1ab0e131d1db282be5e4fdb9491a5c0e58f6d5e569c9e60bd50401bfa9eef
-SIZE (KDE/kde-l10n/kde-l10n-kk-4.2.0.tar.bz2) = 1199131
+MD5 (KDE/kde-l10n/kde-l10n-kk-4.2.1.tar.bz2) = e32ff330ab1caa8cc45e6474bda42fc9
+SHA256 (KDE/kde-l10n/kde-l10n-kk-4.2.1.tar.bz2) = 4a2a8b22e00d1cc78772ca96525a0ab38a7445d9f1a406a8b910af3017a25ee5
+SIZE (KDE/kde-l10n/kde-l10n-kk-4.2.1.tar.bz2) = 1206964
diff --git a/misc/kde4-l10n-km/distinfo b/misc/kde4-l10n-km/distinfo
index f86f68b7a020..6d7e0df3f8ce 100644
--- a/misc/kde4-l10n-km/distinfo
+++ b/misc/kde4-l10n-km/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-km-4.2.0.tar.bz2) = a8aaca814f556e3e8b3cd99f04eddca6
-SHA256 (KDE/kde-l10n/kde-l10n-km-4.2.0.tar.bz2) = 639d132bf274baffc47650147d23545edfaa2b9d4808d048728bc61f4469becb
-SIZE (KDE/kde-l10n/kde-l10n-km-4.2.0.tar.bz2) = 1800515
+MD5 (KDE/kde-l10n/kde-l10n-km-4.2.1.tar.bz2) = 3db01f4d93ef17a03173e2c0b4693889
+SHA256 (KDE/kde-l10n/kde-l10n-km-4.2.1.tar.bz2) = 659a0c337dccf50f6d0d3e7c5a5dae8f7f3d277c18e940a4186d6fde3641baab
+SIZE (KDE/kde-l10n/kde-l10n-km-4.2.1.tar.bz2) = 1815544
diff --git a/misc/kde4-l10n-kn/distinfo b/misc/kde4-l10n-kn/distinfo
index 4d5e4a01a9a6..1d56b5a6c39e 100644
--- a/misc/kde4-l10n-kn/distinfo
+++ b/misc/kde4-l10n-kn/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-kn-4.2.0.tar.bz2) = c4f4b6591d8999557a66288e4d4d093f
-SHA256 (KDE/kde-l10n/kde-l10n-kn-4.2.0.tar.bz2) = e43928d32fda8c137e3e5c62a2bbb485c51a4b5086332d207df6392a2169273e
-SIZE (KDE/kde-l10n/kde-l10n-kn-4.2.0.tar.bz2) = 315021
+MD5 (KDE/kde-l10n/kde-l10n-kn-4.2.1.tar.bz2) = 057313628fa23d0006a00785bfe354fe
+SHA256 (KDE/kde-l10n/kde-l10n-kn-4.2.1.tar.bz2) = 9d5a6390cc44908e48aa35b303352bbafa18a56de92443a3dcfbfaf987076fbf
+SIZE (KDE/kde-l10n/kde-l10n-kn-4.2.1.tar.bz2) = 316459
diff --git a/misc/kde4-l10n-ku/distinfo b/misc/kde4-l10n-ku/distinfo
index 610d1393a207..6e4c0b28b60a 100644
--- a/misc/kde4-l10n-ku/distinfo
+++ b/misc/kde4-l10n-ku/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ku-4.2.0.tar.bz2) = 3ce287f12f044c14608692518018bbef
-SHA256 (KDE/kde-l10n/kde-l10n-ku-4.2.0.tar.bz2) = 3d3240bb80143bec69096900964acc4585ee6d1166039a11d19eb2aa58a9f72e
-SIZE (KDE/kde-l10n/kde-l10n-ku-4.2.0.tar.bz2) = 601653
+MD5 (KDE/kde-l10n/kde-l10n-ku-4.2.1.tar.bz2) = d065d40014e1a4a8d120b4c60ac4e298
+SHA256 (KDE/kde-l10n/kde-l10n-ku-4.2.1.tar.bz2) = 9407b19b4e1b37d49c9808c6f0faca9c7f533b8d04bfe926dd38d71fd7f2a09d
+SIZE (KDE/kde-l10n/kde-l10n-ku-4.2.1.tar.bz2) = 613469
diff --git a/misc/kde4-l10n-ku/pkg-plist b/misc/kde4-l10n-ku/pkg-plist
index d604a99320a0..22d9d2b0f53b 100644
--- a/misc/kde4-l10n-ku/pkg-plist
+++ b/misc/kde4-l10n-ku/pkg-plist
@@ -3,8 +3,10 @@ share/locale/ku/LC_MESSAGES/ark.mo
share/locale/ku/LC_MESSAGES/audiorename_plugin.mo
share/locale/ku/LC_MESSAGES/display.mo
share/locale/ku/LC_MESSAGES/dolphin.mo
+share/locale/ku/LC_MESSAGES/dragonplayer.mo
share/locale/ku/LC_MESSAGES/drkonqi.mo
share/locale/ku/LC_MESSAGES/filetypes.mo
+share/locale/ku/LC_MESSAGES/gwenview.mo
share/locale/ku/LC_MESSAGES/htmlsearch.mo
share/locale/ku/LC_MESSAGES/imagerename_plugin.mo
share/locale/ku/LC_MESSAGES/joystick.mo
@@ -43,6 +45,7 @@ share/locale/ku/LC_MESSAGES/kcminit.mo
share/locale/ku/LC_MESSAGES/kcminput.mo
share/locale/ku/LC_MESSAGES/kcmioslaveinfo.mo
share/locale/ku/LC_MESSAGES/kcmkclock.mo
+share/locale/ku/LC_MESSAGES/kcolorchooser.mo
share/locale/ku/LC_MESSAGES/kcmkded.mo
share/locale/ku/LC_MESSAGES/kcmkdnssd.mo
share/locale/ku/LC_MESSAGES/kcmkeyboard.mo
@@ -193,6 +196,17 @@ share/locale/ku/LC_MESSAGES/nepomuk.mo
share/locale/ku/LC_MESSAGES/nepomuksearch.mo
share/locale/ku/LC_MESSAGES/nsplugin.mo
share/locale/ku/LC_MESSAGES/okular.mo
+share/locale/ku/LC_MESSAGES/okular_chm.mo
+share/locale/ku/LC_MESSAGES/okular_comicbook.mo
+share/locale/ku/LC_MESSAGES/okular_djvu.mo
+share/locale/ku/LC_MESSAGES/okular_epub.mo
+share/locale/ku/LC_MESSAGES/okular_fax.mo
+share/locale/ku/LC_MESSAGES/okular_fictionbook.mo
+share/locale/ku/LC_MESSAGES/okular_ghostview.mo
+share/locale/ku/LC_MESSAGES/okular_kimgio.mo
+share/locale/ku/LC_MESSAGES/okular_plucker.mo
+share/locale/ku/LC_MESSAGES/okular_tiff.mo
+share/locale/ku/LC_MESSAGES/okular_xps.mo
share/locale/ku/LC_MESSAGES/phonon-xine.mo
share/locale/ku/LC_MESSAGES/phonon_kde.mo
share/locale/ku/LC_MESSAGES/plasma-overlay.mo
@@ -267,6 +281,7 @@ share/locale/ku/LC_MESSAGES/powerdevil.mo
share/locale/ku/LC_MESSAGES/printer-applet.mo
share/locale/ku/LC_MESSAGES/processcore.mo
share/locale/ku/LC_MESSAGES/processui.mo
+share/locale/ku/LC_MESSAGES/svgpart.mo
share/locale/ku/LC_MESSAGES/solid-bluetooth.mo
share/locale/ku/LC_MESSAGES/solid-hardware.mo
share/locale/ku/LC_MESSAGES/solid-network.mo
diff --git a/misc/kde4-l10n-lt/distinfo b/misc/kde4-l10n-lt/distinfo
index 15144ce6f575..847596e05009 100644
--- a/misc/kde4-l10n-lt/distinfo
+++ b/misc/kde4-l10n-lt/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-lt-4.2.0.tar.bz2) = 5ffad305fb06d70f7991745b82a427e3
-SHA256 (KDE/kde-l10n/kde-l10n-lt-4.2.0.tar.bz2) = e91fee9596a134ecf4166d7f7f875fb3aece5f34bae8a306f0b1c917028c39fb
-SIZE (KDE/kde-l10n/kde-l10n-lt-4.2.0.tar.bz2) = 1840646
+MD5 (KDE/kde-l10n/kde-l10n-lt-4.2.1.tar.bz2) = e10ac0d7d88183849a1a811dd1dc4191
+SHA256 (KDE/kde-l10n/kde-l10n-lt-4.2.1.tar.bz2) = f8e62696107183076e2dad05897160f266e02737cc33195bd57350b2796970fd
+SIZE (KDE/kde-l10n/kde-l10n-lt-4.2.1.tar.bz2) = 1878832
diff --git a/misc/kde4-l10n-lv/distinfo b/misc/kde4-l10n-lv/distinfo
index b8ab8a743b34..a8e591aee3bc 100644
--- a/misc/kde4-l10n-lv/distinfo
+++ b/misc/kde4-l10n-lv/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-lv-4.2.0.tar.bz2) = 9d8fe83cefb273eb065337a0ab8790a5
-SHA256 (KDE/kde-l10n/kde-l10n-lv-4.2.0.tar.bz2) = a9c788ce3a91c51a79b6c32e67d7789bda2709585047103f3f6eaa27d873bb4c
-SIZE (KDE/kde-l10n/kde-l10n-lv-4.2.0.tar.bz2) = 1480897
+MD5 (KDE/kde-l10n/kde-l10n-lv-4.2.1.tar.bz2) = 2591ad3682547ad5c5ddce2d99644325
+SHA256 (KDE/kde-l10n/kde-l10n-lv-4.2.1.tar.bz2) = 1011aa1c8c992707a6062c34e780c44390a345027d9d6a4d53188b8f61811a0e
+SIZE (KDE/kde-l10n/kde-l10n-lv-4.2.1.tar.bz2) = 1492646
diff --git a/misc/kde4-l10n-mai/distinfo b/misc/kde4-l10n-mai/distinfo
index 6e0c123025b5..2f3946414f89 100644
--- a/misc/kde4-l10n-mai/distinfo
+++ b/misc/kde4-l10n-mai/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-mai-4.2.0.tar.bz2) = 5292220754dfd3583a34929f5fa29f61
-SHA256 (KDE/kde-l10n/kde-l10n-mai-4.2.0.tar.bz2) = a9309d2d54f74709d1b1228841edc4ca0970a01b84ef89a9f4b151709a21a0bb
-SIZE (KDE/kde-l10n/kde-l10n-mai-4.2.0.tar.bz2) = 367131
+MD5 (KDE/kde-l10n/kde-l10n-mai-4.2.1.tar.bz2) = 3912b7a3ff628c2df189fdd521aa6776
+SHA256 (KDE/kde-l10n/kde-l10n-mai-4.2.1.tar.bz2) = 4ae4b6671b1f6de15078b30f303a250d56d0105c94cd1b4ee13a2c217b75f1d2
+SIZE (KDE/kde-l10n/kde-l10n-mai-4.2.1.tar.bz2) = 371486
diff --git a/misc/kde4-l10n-mk/distinfo b/misc/kde4-l10n-mk/distinfo
index dbd190d9b752..ab4d3ef7dfc3 100644
--- a/misc/kde4-l10n-mk/distinfo
+++ b/misc/kde4-l10n-mk/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-mk-4.2.0.tar.bz2) = 933d60b4c535d9d6d9729bd986906e64
-SHA256 (KDE/kde-l10n/kde-l10n-mk-4.2.0.tar.bz2) = 347b6a4655e006150e96081267c02da480fa2c4ce44bddac03e0a977616cbf5f
-SIZE (KDE/kde-l10n/kde-l10n-mk-4.2.0.tar.bz2) = 1657946
+MD5 (KDE/kde-l10n/kde-l10n-mk-4.2.1.tar.bz2) = c02330d7c1de2386dca89f9c5f4e124e
+SHA256 (KDE/kde-l10n/kde-l10n-mk-4.2.1.tar.bz2) = 56ba9aee66f835c22fd86e5493ca3ce5572286463c53abaebb472a3741f3db86
+SIZE (KDE/kde-l10n/kde-l10n-mk-4.2.1.tar.bz2) = 1665322
diff --git a/misc/kde4-l10n-ml/distinfo b/misc/kde4-l10n-ml/distinfo
index 3a4987f2ae71..dbdc5defb682 100644
--- a/misc/kde4-l10n-ml/distinfo
+++ b/misc/kde4-l10n-ml/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ml-4.2.0.tar.bz2) = 462763d9a71c273b7ae6f3ebd2c798e1
-SHA256 (KDE/kde-l10n/kde-l10n-ml-4.2.0.tar.bz2) = 1c5e092293e0d5c2bf8cb77075fbb8e11a691cc6f5f0d9e2fc4fbf3fa090a6a8
-SIZE (KDE/kde-l10n/kde-l10n-ml-4.2.0.tar.bz2) = 20026805
+MD5 (KDE/kde-l10n/kde-l10n-ml-4.2.1.tar.bz2) = 27d628c4230b378bdbe5ac74b1fd7611
+SHA256 (KDE/kde-l10n/kde-l10n-ml-4.2.1.tar.bz2) = 987d5897f53658a0cf5a0a47b77a5645fb99f3bc00592dda1c67acd544105c12
+SIZE (KDE/kde-l10n/kde-l10n-ml-4.2.1.tar.bz2) = 20143000
diff --git a/misc/kde4-l10n-ml/pkg-plist b/misc/kde4-l10n-ml/pkg-plist
index 771363d15225..07c9d13e9d5f 100644
--- a/misc/kde4-l10n-ml/pkg-plist
+++ b/misc/kde4-l10n-ml/pkg-plist
@@ -665,6 +665,7 @@ share/locale/ml/LC_MESSAGES/kpasswdserver.mo
share/locale/ml/LC_MESSAGES/kquitapp.mo
share/locale/ml/LC_MESSAGES/krandr.mo
share/locale/ml/LC_MESSAGES/krdb.mo
+share/locale/ml/LC_MESSAGES/krfb.mo
share/locale/ml/LC_MESSAGES/kreadconfig.mo
share/locale/ml/LC_MESSAGES/krunner.mo
share/locale/ml/LC_MESSAGES/ksayit.mo
@@ -673,6 +674,7 @@ share/locale/ml/LC_MESSAGES/kshorturifilter.mo
share/locale/ml/LC_MESSAGES/ksmserver.mo
share/locale/ml/LC_MESSAGES/ksplashthemes.mo
share/locale/ml/LC_MESSAGES/kstart.mo
+share/locale/ml/LC_MESSAGES/kstars.mo
share/locale/ml/LC_MESSAGES/kstyle_config.mo
share/locale/ml/LC_MESSAGES/kstyle_keramik_config.mo
share/locale/ml/LC_MESSAGES/kstyle_phase_config.mo
diff --git a/misc/kde4-l10n-mr/distinfo b/misc/kde4-l10n-mr/distinfo
index 4e315fdcbacd..55f0b3a4a910 100644
--- a/misc/kde4-l10n-mr/distinfo
+++ b/misc/kde4-l10n-mr/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-mr-4.2.0.tar.bz2) = 5894987baf7e4d3ce6d84b4c46ef16d1
-SHA256 (KDE/kde-l10n/kde-l10n-mr-4.2.0.tar.bz2) = 44c9d52dd3b800c88993b8c8bd93c0cc85ae5ecdb58e4fd1ccc46fcd66e6a4c1
-SIZE (KDE/kde-l10n/kde-l10n-mr-4.2.0.tar.bz2) = 279785
+MD5 (KDE/kde-l10n/kde-l10n-mr-4.2.1.tar.bz2) = 9e3404d137934537767773c7a8d3d6f3
+SHA256 (KDE/kde-l10n/kde-l10n-mr-4.2.1.tar.bz2) = e3d1ce9e27bb13cfe853549ac6e47d8c10ca60d4b007a19e079439a7f73173a0
+SIZE (KDE/kde-l10n/kde-l10n-mr-4.2.1.tar.bz2) = 282150
diff --git a/misc/kde4-l10n-nb/distinfo b/misc/kde4-l10n-nb/distinfo
index 4b65a2ef4e6f..826b03c5bfd0 100644
--- a/misc/kde4-l10n-nb/distinfo
+++ b/misc/kde4-l10n-nb/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-nb-4.2.0.tar.bz2) = db0d87c5125b05c25788cbf10fd56490
-SHA256 (KDE/kde-l10n/kde-l10n-nb-4.2.0.tar.bz2) = 86985180c744a8b97faf935943b967854fcb4c5ac5587b04b84eb16d9639b5fb
-SIZE (KDE/kde-l10n/kde-l10n-nb-4.2.0.tar.bz2) = 2395868
+MD5 (KDE/kde-l10n/kde-l10n-nb-4.2.1.tar.bz2) = e4b6d5a8f7a6acb46c6493986deb2fc0
+SHA256 (KDE/kde-l10n/kde-l10n-nb-4.2.1.tar.bz2) = ccec7224a7ded408801389e5208f3ecdf1e7ec4c395b70c992bab3293692cc59
+SIZE (KDE/kde-l10n/kde-l10n-nb-4.2.1.tar.bz2) = 2398769
diff --git a/misc/kde4-l10n-nds/distinfo b/misc/kde4-l10n-nds/distinfo
index 993618a88ff9..dec6fd5e6f22 100644
--- a/misc/kde4-l10n-nds/distinfo
+++ b/misc/kde4-l10n-nds/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-nds-4.2.0.tar.bz2) = 378e068c4c86670788019ae7d0dda136
-SHA256 (KDE/kde-l10n/kde-l10n-nds-4.2.0.tar.bz2) = 638d2042b103a8cc372a71d760a44b077f768cf6ca300369f3965005c63c45f2
-SIZE (KDE/kde-l10n/kde-l10n-nds-4.2.0.tar.bz2) = 3370727
+MD5 (KDE/kde-l10n/kde-l10n-nds-4.2.1.tar.bz2) = 6b3cd678e8d2bfdb3b3b28d1dbc17c9a
+SHA256 (KDE/kde-l10n/kde-l10n-nds-4.2.1.tar.bz2) = b6b23dacb46d5e9a5ebb89514a64a9cc654f95993438e05483cb828a37b59bd1
+SIZE (KDE/kde-l10n/kde-l10n-nds-4.2.1.tar.bz2) = 3378273
diff --git a/misc/kde4-l10n-nds/pkg-plist b/misc/kde4-l10n-nds/pkg-plist
index 14221efd4e0e..9776db8ae88e 100644
--- a/misc/kde4-l10n-nds/pkg-plist
+++ b/misc/kde4-l10n-nds/pkg-plist
@@ -641,6 +641,7 @@ share/locale/nds/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/nds/LC_MESSAGES/plasma_applet_frame.mo
share/locale/nds/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
share/locale/nds/LC_MESSAGES/plasma_applet_incomingmsg.mo
+share/locale/nds/LC_MESSAGES/plasma_applet_icon.mo
share/locale/nds/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/nds/LC_MESSAGES/plasma_applet_kalzium.mo
share/locale/nds/LC_MESSAGES/plasma_applet_katesession.mo
diff --git a/misc/kde4-l10n-nl/distinfo b/misc/kde4-l10n-nl/distinfo
index e02f75a178e6..23259812ff54 100644
--- a/misc/kde4-l10n-nl/distinfo
+++ b/misc/kde4-l10n-nl/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-nl-4.2.0.tar.bz2) = f9174173973b0e235a3d729b0ef2f1cf
-SHA256 (KDE/kde-l10n/kde-l10n-nl-4.2.0.tar.bz2) = 118c3980cc1f252292b444d5a98c3d13bc0c764d997645276686da9ae024e184
-SIZE (KDE/kde-l10n/kde-l10n-nl-4.2.0.tar.bz2) = 12244450
+MD5 (KDE/kde-l10n/kde-l10n-nl-4.2.1.tar.bz2) = c5612a215db0b13b0cfd5b17e337300e
+SHA256 (KDE/kde-l10n/kde-l10n-nl-4.2.1.tar.bz2) = 3b18aaf328ba45435f749f33ecb5640cdf205028dc3f3625efa4a9ba4d3ce589
+SIZE (KDE/kde-l10n/kde-l10n-nl-4.2.1.tar.bz2) = 12601647
diff --git a/misc/kde4-l10n-nl/pkg-plist b/misc/kde4-l10n-nl/pkg-plist
index ffe98dfb1400..8320d3b03388 100644
--- a/misc/kde4-l10n-nl/pkg-plist
+++ b/misc/kde4-l10n-nl/pkg-plist
@@ -498,48 +498,93 @@ share/doc/HTML/nl/kinfocenter/usb/index.docbook
share/doc/HTML/nl/kinfocenter/xserver/common
share/doc/HTML/nl/kinfocenter/xserver/index.cache.bz2
share/doc/HTML/nl/kinfocenter/xserver/index.docbook
-share/doc/HTML/nl/kioslave/kioslave/bzip.docbook
-share/doc/HTML/nl/kioslave/kioslave/bzip2.docbook
-share/doc/HTML/nl/kioslave/kioslave/cgi.docbook
-share/doc/HTML/nl/kioslave/kioslave/common
-share/doc/HTML/nl/kioslave/kioslave/data.docbook
-share/doc/HTML/nl/kioslave/kioslave/file.docbook
-share/doc/HTML/nl/kioslave/kioslave/finger.docbook
-share/doc/HTML/nl/kioslave/kioslave/fish.docbook
-share/doc/HTML/nl/kioslave/kioslave/floppy.docbook
-share/doc/HTML/nl/kioslave/kioslave/ftp.docbook
-share/doc/HTML/nl/kioslave/kioslave/gopher.docbook
-share/doc/HTML/nl/kioslave/kioslave/gzip.docbook
-share/doc/HTML/nl/kioslave/kioslave/help.docbook
-share/doc/HTML/nl/kioslave/kioslave/http.docbook
-share/doc/HTML/nl/kioslave/kioslave/https.docbook
-share/doc/HTML/nl/kioslave/kioslave/imap.docbook
-share/doc/HTML/nl/kioslave/kioslave/imaps.docbook
-share/doc/HTML/nl/kioslave/kioslave/index.cache.bz2
-share/doc/HTML/nl/kioslave/kioslave/index.docbook
-share/doc/HTML/nl/kioslave/kioslave/info.docbook
-share/doc/HTML/nl/kioslave/kioslave/lan.docbook
-share/doc/HTML/nl/kioslave/kioslave/ldap.docbook
-share/doc/HTML/nl/kioslave/kioslave/mac.docbook
-share/doc/HTML/nl/kioslave/kioslave/mailto.docbook
-share/doc/HTML/nl/kioslave/kioslave/man.docbook
-share/doc/HTML/nl/kioslave/kioslave/mrml.docbook
-share/doc/HTML/nl/kioslave/kioslave/news.docbook
-share/doc/HTML/nl/kioslave/kioslave/nfs.docbook
-share/doc/HTML/nl/kioslave/kioslave/nntp.docbook
-share/doc/HTML/nl/kioslave/kioslave/pop3.docbook
-share/doc/HTML/nl/kioslave/kioslave/pop3s.docbook
-share/doc/HTML/nl/kioslave/kioslave/print.docbook
-share/doc/HTML/nl/kioslave/kioslave/rlan.docbook
-share/doc/HTML/nl/kioslave/kioslave/rlogin.docbook
-share/doc/HTML/nl/kioslave/kioslave/sftp.docbook
-share/doc/HTML/nl/kioslave/kioslave/smb.docbook
-share/doc/HTML/nl/kioslave/kioslave/smtp.docbook
-share/doc/HTML/nl/kioslave/kioslave/tar.docbook
-share/doc/HTML/nl/kioslave/kioslave/telnet.docbook
-share/doc/HTML/nl/kioslave/kioslave/thumbnail.docbook
-share/doc/HTML/nl/kioslave/kioslave/webdav.docbook
-share/doc/HTML/nl/kioslave/kioslave/webdavs.docbook
+share/doc/HTML/nl/kioslave/audiocd/common
+share/doc/HTML/nl/kioslave/audiocd/index.cache.bz2
+share/doc/HTML/nl/kioslave/audiocd/index.docbook
+share/doc/HTML/nl/kioslave/bookmarks/common
+share/doc/HTML/nl/kioslave/bookmarks/index.cache.bz2
+share/doc/HTML/nl/kioslave/bookmarks/index.docbook
+share/doc/HTML/nl/kioslave/bzip2/common
+share/doc/HTML/nl/kioslave/bzip2/index.cache.bz2
+share/doc/HTML/nl/kioslave/bzip2/index.docbook
+share/doc/HTML/nl/kioslave/cgi/common
+share/doc/HTML/nl/kioslave/cgi/index.cache.bz2
+share/doc/HTML/nl/kioslave/cgi/index.docbook
+share/doc/HTML/nl/kioslave/data/common
+share/doc/HTML/nl/kioslave/data/index.cache.bz2
+share/doc/HTML/nl/kioslave/data/index.docbook
+share/doc/HTML/nl/kioslave/file/common
+share/doc/HTML/nl/kioslave/file/index.cache.bz2
+share/doc/HTML/nl/kioslave/file/index.docbook
+share/doc/HTML/nl/kioslave/finger/common
+share/doc/HTML/nl/kioslave/finger/index.cache.bz2
+share/doc/HTML/nl/kioslave/finger/index.docbook
+share/doc/HTML/nl/kioslave/fish/common
+share/doc/HTML/nl/kioslave/fish/index.cache.bz2
+share/doc/HTML/nl/kioslave/fish/index.docbook
+share/doc/HTML/nl/kioslave/floppy/common
+share/doc/HTML/nl/kioslave/floppy/index.cache.bz2
+share/doc/HTML/nl/kioslave/floppy/index.docbook
+share/doc/HTML/nl/kioslave/ftp/common
+share/doc/HTML/nl/kioslave/ftp/index.cache.bz2
+share/doc/HTML/nl/kioslave/ftp/index.docbook
+share/doc/HTML/nl/kioslave/gzip/common
+share/doc/HTML/nl/kioslave/gzip/index.cache.bz2
+share/doc/HTML/nl/kioslave/gzip/index.docbook
+share/doc/HTML/nl/kioslave/help/common
+share/doc/HTML/nl/kioslave/help/index.cache.bz2
+share/doc/HTML/nl/kioslave/help/index.docbook
+share/doc/HTML/nl/kioslave/http/common
+share/doc/HTML/nl/kioslave/http/index.cache.bz2
+share/doc/HTML/nl/kioslave/http/index.docbook
+share/doc/HTML/nl/kioslave/imap/common
+share/doc/HTML/nl/kioslave/imap/index.cache.bz2
+share/doc/HTML/nl/kioslave/imap/index.docbook
+share/doc/HTML/nl/kioslave/info/common
+share/doc/HTML/nl/kioslave/info/index.cache.bz2
+share/doc/HTML/nl/kioslave/info/index.docbook
+share/doc/HTML/nl/kioslave/ldap/common
+share/doc/HTML/nl/kioslave/ldap/index.cache.bz2
+share/doc/HTML/nl/kioslave/ldap/index.docbook
+share/doc/HTML/nl/kioslave/mailto/common
+share/doc/HTML/nl/kioslave/mailto/index.cache.bz2
+share/doc/HTML/nl/kioslave/mailto/index.docbook
+share/doc/HTML/nl/kioslave/man/common
+share/doc/HTML/nl/kioslave/man/index.cache.bz2
+share/doc/HTML/nl/kioslave/man/index.docbook
+share/doc/HTML/nl/kioslave/nfs/common
+share/doc/HTML/nl/kioslave/nfs/index.cache.bz2
+share/doc/HTML/nl/kioslave/nfs/index.docbook
+share/doc/HTML/nl/kioslave/nntp/common
+share/doc/HTML/nl/kioslave/nntp/index.cache.bz2
+share/doc/HTML/nl/kioslave/nntp/index.docbook
+share/doc/HTML/nl/kioslave/pop3/common
+share/doc/HTML/nl/kioslave/pop3/index.cache.bz2
+share/doc/HTML/nl/kioslave/pop3/index.docbook
+share/doc/HTML/nl/kioslave/rlogin/common
+share/doc/HTML/nl/kioslave/rlogin/index.cache.bz2
+share/doc/HTML/nl/kioslave/rlogin/index.docbook
+share/doc/HTML/nl/kioslave/sftp/common
+share/doc/HTML/nl/kioslave/sftp/index.cache.bz2
+share/doc/HTML/nl/kioslave/sftp/index.docbook
+share/doc/HTML/nl/kioslave/smb/common
+share/doc/HTML/nl/kioslave/smb/index.cache.bz2
+share/doc/HTML/nl/kioslave/smb/index.docbook
+share/doc/HTML/nl/kioslave/smtp/common
+share/doc/HTML/nl/kioslave/smtp/index.cache.bz2
+share/doc/HTML/nl/kioslave/smtp/index.docbook
+share/doc/HTML/nl/kioslave/tar/common
+share/doc/HTML/nl/kioslave/tar/index.cache.bz2
+share/doc/HTML/nl/kioslave/tar/index.docbook
+share/doc/HTML/nl/kioslave/telnet/common
+share/doc/HTML/nl/kioslave/telnet/index.cache.bz2
+share/doc/HTML/nl/kioslave/telnet/index.docbook
+share/doc/HTML/nl/kioslave/thumbnail/common
+share/doc/HTML/nl/kioslave/thumbnail/index.cache.bz2
+share/doc/HTML/nl/kioslave/thumbnail/index.docbook
+share/doc/HTML/nl/kioslave/webdav/common
+share/doc/HTML/nl/kioslave/webdav/index.cache.bz2
+share/doc/HTML/nl/kioslave/webdav/index.docbook
share/doc/HTML/nl/klines/common
share/doc/HTML/nl/klines/index.cache.bz2
share/doc/HTML/nl/klines/index.docbook
@@ -664,12 +709,17 @@ share/doc/HTML/nl/kpilot/index.cache.bz2
share/doc/HTML/nl/kpilot/index.docbook
share/doc/HTML/nl/kpilot/sync.docbook
share/doc/HTML/nl/kpilot/usage.docbook
+share/doc/HTML/nl/kruler/common
+share/doc/HTML/nl/kruler/index.cache.bz2
+share/doc/HTML/nl/kruler/index.docbook
share/doc/HTML/nl/ksim/common
share/doc/HTML/nl/ksim/index.cache.bz2
share/doc/HTML/nl/ksim/index.docbook
share/doc/HTML/nl/ksnapshot/common
share/doc/HTML/nl/ksnapshot/index.cache.bz2
share/doc/HTML/nl/ksnapshot/index.docbook
+share/doc/HTML/nl/ksnapshot/preview.png
+share/doc/HTML/nl/ksnapshot/window.png
share/doc/HTML/nl/kspaceduel/common
share/doc/HTML/nl/kspaceduel/index.cache.bz2
share/doc/HTML/nl/kspaceduel/index.docbook
@@ -830,6 +880,17 @@ share/doc/HTML/nl/marble/measure-1.png
share/doc/HTML/nl/marble/quick-1.png
share/doc/HTML/nl/marble/search-1.png
share/doc/HTML/nl/marble/search-2.png
+share/doc/HTML/nl/plasma/common
+share/doc/HTML/nl/plasma/favorite-widgets.png
+share/doc/HTML/nl/plasma/index.cache.bz2
+share/doc/HTML/nl/plasma/index.docbook
+share/doc/HTML/nl/plasma/taskbar-settings.png
+share/doc/HTML/nl/step/common
+share/doc/HTML/nl/step/examples.docbook
+share/doc/HTML/nl/step/index.cache.bz2
+share/doc/HTML/nl/step/index.docbook
+share/doc/HTML/nl/step/mainwindow.png
+share/doc/HTML/nl/step/tutorials.docbook
share/locale/nl/LC_MESSAGES/akonaditray.mo
share/locale/nl/LC_MESSAGES/akregator.mo
share/locale/nl/LC_MESSAGES/amor.mo
@@ -1291,6 +1352,7 @@ share/locale/nl/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/nl/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/nl/LC_MESSAGES/plasma_applet_frame.mo
share/locale/nl/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/nl/LC_MESSAGES/plasma_applet_icon.mo
share/locale/nl/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/nl/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/nl/LC_MESSAGES/plasma_applet_kalzium.mo
@@ -1368,6 +1430,8 @@ share/locale/nl/LC_MESSAGES/timezones4.mo
share/locale/nl/LC_MESSAGES/umbrello.mo
share/locale/nl/LC_MESSAGES/useraccount.mo
share/locale/nl/entry.desktop
+@dirrm share/doc/HTML/nl/step
+@dirrm share/doc/HTML/nl/plasma
@dirrm share/doc/HTML/nl/marble
@dirrm share/doc/HTML/nl/lskat
@dirrm share/doc/HTML/nl/kxkb
@@ -1381,6 +1445,7 @@ share/locale/nl/entry.desktop
@dirrm share/doc/HTML/nl/kspaceduel
@dirrm share/doc/HTML/nl/ksnapshot
@dirrm share/doc/HTML/nl/ksim
+@dirrm share/doc/HTML/nl/kruler
@dirrm share/doc/HTML/nl/kpilot
@dirrm share/doc/HTML/nl/kpat
@dirrm share/doc/HTML/nl/kontact
@@ -1398,7 +1463,35 @@ share/locale/nl/entry.desktop
@dirrm share/doc/HTML/nl/kmahjongg
@dirrm share/doc/HTML/nl/kmag
@dirrm share/doc/HTML/nl/klines
-@dirrm share/doc/HTML/nl/kioslave/kioslave
+@dirrm share/doc/HTML/nl/kioslave/webdav
+@dirrm share/doc/HTML/nl/kioslave/thumbnail
+@dirrm share/doc/HTML/nl/kioslave/telnet
+@dirrm share/doc/HTML/nl/kioslave/tar
+@dirrm share/doc/HTML/nl/kioslave/smtp
+@dirrm share/doc/HTML/nl/kioslave/smb
+@dirrm share/doc/HTML/nl/kioslave/sftp
+@dirrm share/doc/HTML/nl/kioslave/rlogin
+@dirrm share/doc/HTML/nl/kioslave/pop3
+@dirrm share/doc/HTML/nl/kioslave/nntp
+@dirrm share/doc/HTML/nl/kioslave/nfs
+@dirrm share/doc/HTML/nl/kioslave/man
+@dirrm share/doc/HTML/nl/kioslave/mailto
+@dirrm share/doc/HTML/nl/kioslave/ldap
+@dirrm share/doc/HTML/nl/kioslave/info
+@dirrm share/doc/HTML/nl/kioslave/imap
+@dirrm share/doc/HTML/nl/kioslave/http
+@dirrm share/doc/HTML/nl/kioslave/help
+@dirrm share/doc/HTML/nl/kioslave/gzip
+@dirrm share/doc/HTML/nl/kioslave/ftp
+@dirrm share/doc/HTML/nl/kioslave/floppy
+@dirrm share/doc/HTML/nl/kioslave/fish
+@dirrm share/doc/HTML/nl/kioslave/finger
+@dirrm share/doc/HTML/nl/kioslave/file
+@dirrm share/doc/HTML/nl/kioslave/data
+@dirrm share/doc/HTML/nl/kioslave/cgi
+@dirrm share/doc/HTML/nl/kioslave/bzip2
+@dirrm share/doc/HTML/nl/kioslave/bookmarks
+@dirrm share/doc/HTML/nl/kioslave/audiocd
@dirrm share/doc/HTML/nl/kioslave
@dirrm share/doc/HTML/nl/kinfocenter/xserver
@dirrm share/doc/HTML/nl/kinfocenter/usb
diff --git a/misc/kde4-l10n-nn/distinfo b/misc/kde4-l10n-nn/distinfo
index 84d3bae84abc..a67c5e3e7993 100644
--- a/misc/kde4-l10n-nn/distinfo
+++ b/misc/kde4-l10n-nn/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-nn-4.2.0.tar.bz2) = cff7964f1c88a52d7e64df19e53c88ea
-SHA256 (KDE/kde-l10n/kde-l10n-nn-4.2.0.tar.bz2) = 488291f95838906685d057b1324154eb52f29cbdbd20496be12f1a962dc723d9
-SIZE (KDE/kde-l10n/kde-l10n-nn-4.2.0.tar.bz2) = 1996868
+MD5 (KDE/kde-l10n/kde-l10n-nn-4.2.1.tar.bz2) = 80a3b5932356f21a8b9068ca40f7e0c1
+SHA256 (KDE/kde-l10n/kde-l10n-nn-4.2.1.tar.bz2) = 6e2750401a3fbc24c806757249a1a3b350a0ae14a29f30deaa729df3fc2fa583
+SIZE (KDE/kde-l10n/kde-l10n-nn-4.2.1.tar.bz2) = 2004707
diff --git a/misc/kde4-l10n-pa/distinfo b/misc/kde4-l10n-pa/distinfo
index 4ed4fc32410e..2ce06182e86b 100644
--- a/misc/kde4-l10n-pa/distinfo
+++ b/misc/kde4-l10n-pa/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-pa-4.2.0.tar.bz2) = a8dded180d298489861d17a761df51f8
-SHA256 (KDE/kde-l10n/kde-l10n-pa-4.2.0.tar.bz2) = 04eeaa6f63ce73ef400e3ab4f1ba5c8203011868e312b9e80c931a04da974c49
-SIZE (KDE/kde-l10n/kde-l10n-pa-4.2.0.tar.bz2) = 1436625
+MD5 (KDE/kde-l10n/kde-l10n-pa-4.2.1.tar.bz2) = 385983a3584a639c91f0c489140e9d28
+SHA256 (KDE/kde-l10n/kde-l10n-pa-4.2.1.tar.bz2) = c12b62ca24fc2483ea2b47a7456ee96a44d986d37208807af1a6afacd10eb849
+SIZE (KDE/kde-l10n/kde-l10n-pa-4.2.1.tar.bz2) = 1453289
diff --git a/misc/kde4-l10n-ro/distinfo b/misc/kde4-l10n-ro/distinfo
index 3ddcd647bea2..a415c193f8ad 100644
--- a/misc/kde4-l10n-ro/distinfo
+++ b/misc/kde4-l10n-ro/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ro-4.2.0.tar.bz2) = 50df8202c9f2e042eca28b8c8da10f2f
-SHA256 (KDE/kde-l10n/kde-l10n-ro-4.2.0.tar.bz2) = c1329786d900fcae4697cb7e9f9bb0ba6f22cee91abac3ef132993305ca5221b
-SIZE (KDE/kde-l10n/kde-l10n-ro-4.2.0.tar.bz2) = 3053356
+MD5 (KDE/kde-l10n/kde-l10n-ro-4.2.1.tar.bz2) = 184edad265e51d385cef9dfdf1deda3a
+SHA256 (KDE/kde-l10n/kde-l10n-ro-4.2.1.tar.bz2) = 7ee51040022a97e11885a0d3aa600d3e32ac740808eb56a685d0613378a098b4
+SIZE (KDE/kde-l10n/kde-l10n-ro-4.2.1.tar.bz2) = 3071252
diff --git a/misc/kde4-l10n-ro/pkg-plist b/misc/kde4-l10n-ro/pkg-plist
index 7587dddd9346..09f942d4aaaa 100644
--- a/misc/kde4-l10n-ro/pkg-plist
+++ b/misc/kde4-l10n-ro/pkg-plist
@@ -425,6 +425,7 @@ share/locale/ro/LC_MESSAGES/knetworkconfmodule.mo
share/locale/ro/LC_MESSAGES/knode.mo
share/locale/ro/LC_MESSAGES/knotes.mo
share/locale/ro/LC_MESSAGES/knotify4.mo
+share/locale/ro/LC_MESSAGES/kode.mo
share/locale/ro/LC_MESSAGES/kolf.mo
share/locale/ro/LC_MESSAGES/kollision.mo
share/locale/ro/LC_MESSAGES/kolourpaint.mo
@@ -471,6 +472,7 @@ share/locale/ro/LC_MESSAGES/ksaneplugin.mo
share/locale/ro/LC_MESSAGES/ksayit.mo
share/locale/ro/LC_MESSAGES/kscd.mo
share/locale/ro/LC_MESSAGES/kscreensaver.mo
+share/locale/ro/LC_MESSAGES/ksendemail.mo
share/locale/ro/LC_MESSAGES/kshisen.mo
share/locale/ro/LC_MESSAGES/kshorturifilter.mo
share/locale/ro/LC_MESSAGES/ksirk.mo
diff --git a/misc/kde4-l10n-sl/distinfo b/misc/kde4-l10n-sl/distinfo
index da656b981086..94c20bc584e4 100644
--- a/misc/kde4-l10n-sl/distinfo
+++ b/misc/kde4-l10n-sl/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-sl-4.2.0.tar.bz2) = b24648e4fe6552ed7253acee7306f03e
-SHA256 (KDE/kde-l10n/kde-l10n-sl-4.2.0.tar.bz2) = d97a6b92f3da90d059be410af8cc6f8e030c5a96ead31c318b3a4b36cd88efad
-SIZE (KDE/kde-l10n/kde-l10n-sl-4.2.0.tar.bz2) = 4134442
+MD5 (KDE/kde-l10n/kde-l10n-sl-4.2.1.tar.bz2) = d643261b6b97a587a9d3fc682f4b01b0
+SHA256 (KDE/kde-l10n/kde-l10n-sl-4.2.1.tar.bz2) = 5b0ea2e3958a558ae56ab45e65ee251dde197df58722cfaabb505aeb380e6945
+SIZE (KDE/kde-l10n/kde-l10n-sl-4.2.1.tar.bz2) = 4143335
diff --git a/misc/kde4-l10n-sr/distinfo b/misc/kde4-l10n-sr/distinfo
index f08758b6be29..51322619272b 100644
--- a/misc/kde4-l10n-sr/distinfo
+++ b/misc/kde4-l10n-sr/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-sr-4.2.0.tar.bz2) = 8d58ae783752ba8129df1e3866e8a089
-SHA256 (KDE/kde-l10n/kde-l10n-sr-4.2.0.tar.bz2) = 1cba9a3921e27c5dd817b10be8f00fc8117de945f518f13dc8d3aca22d7812d2
-SIZE (KDE/kde-l10n/kde-l10n-sr-4.2.0.tar.bz2) = 2345388
+MD5 (KDE/kde-l10n/kde-l10n-sr-4.2.1.tar.bz2) = 6ec221411c0e338bb25234c95abd3045
+SHA256 (KDE/kde-l10n/kde-l10n-sr-4.2.1.tar.bz2) = e5efee19895b21a6783316def5805d45a1cd4509d3131d6925a134bda2173a1f
+SIZE (KDE/kde-l10n/kde-l10n-sr-4.2.1.tar.bz2) = 2634203
diff --git a/misc/kde4-l10n-sr/pkg-plist b/misc/kde4-l10n-sr/pkg-plist
index 3bc11007ada4..a30d876c0c81 100644
--- a/misc/kde4-l10n-sr/pkg-plist
+++ b/misc/kde4-l10n-sr/pkg-plist
@@ -205,6 +205,7 @@ share/icons/oxygen/scalable/status/l10n/sr/dialog-information.svgz
share/icons/oxygen/scalable/status/small/16x16/l10n/sr/dialog-information.svgz
share/icons/oxygen/scalable/status/small/22x22/l10n/sr/dialog-information.svgz
share/icons/oxygen/scalable/status/small/48x48/l10n/sr/dialog-information.svgz
+share/locale/sr/LC_MESSAGES/ark.mo
share/locale/sr/LC_MESSAGES/amor.mo
share/locale/sr/LC_MESSAGES/audiocd_encoder_lame.mo
share/locale/sr/LC_MESSAGES/audiocd_encoder_vorbis.mo
@@ -251,6 +252,39 @@ share/locale/sr/LC_MESSAGES/katexmlcheck.mo
share/locale/sr/LC_MESSAGES/katexmltools.mo
share/locale/sr/LC_MESSAGES/kblankscrn.mo
share/locale/sr/LC_MESSAGES/kcertpart.mo
+share/locale/sr/LC_MESSAGES/kcalc.mo
+share/locale/sr/LC_MESSAGES/kcharselect.mo
+share/locale/sr/LC_MESSAGES/kcm_krfb.mo
+share/locale/sr/LC_MESSAGES/kcmkwallet.mo
+share/locale/sr/LC_MESSAGES/kdessh.mo
+share/locale/sr/LC_MESSAGES/kdf.mo
+share/locale/sr/LC_MESSAGES/kfile_torrent.mo
+share/locale/sr/LC_MESSAGES/kfileshare.mo
+share/locale/sr/LC_MESSAGES/kfloppy.mo
+share/locale/sr/LC_MESSAGES/kgpg.mo
+share/locale/sr/LC_MESSAGES/kinetd.mo
+share/locale/sr/LC_MESSAGES/kio_jabberdisco.mo
+share/locale/sr/LC_MESSAGES/kio_zeroconf.mo
+share/locale/sr/LC_MESSAGES/kmag.mo
+share/locale/sr/LC_MESSAGES/kmousetool.mo
+share/locale/sr/LC_MESSAGES/kmouth.mo
+share/locale/sr/LC_MESSAGES/kopete.mo
+share/locale/sr/LC_MESSAGES/kppp.mo
+share/locale/sr/LC_MESSAGES/kppplogview.mo
+share/locale/sr/LC_MESSAGES/krdc.mo
+share/locale/sr/LC_MESSAGES/krfb.mo
+share/locale/sr/LC_MESSAGES/ksayit.mo
+share/locale/sr/LC_MESSAGES/ktimer.mo
+share/locale/sr/LC_MESSAGES/kttsd.mo
+share/locale/sr/LC_MESSAGES/kwalletmanager.mo
+share/locale/sr/LC_MESSAGES/liboktetacore.mo
+share/locale/sr/LC_MESSAGES/okteta.mo
+share/locale/sr/LC_MESSAGES/oktetapart.mo
+share/locale/sr/LC_MESSAGES/plasma_applet_icon.mo
+share/locale/sr/LC_MESSAGES/plasma_applet_skapplet.mo
+share/locale/sr/LC_MESSAGES/printer-applet.mo
+share/locale/sr/LC_MESSAGES/superkaramba.mo
+share/locale/sr/LC_MESSAGES/sweeper.mo
share/locale/sr/LC_MESSAGES/kcm_autostart.mo
share/locale/sr/LC_MESSAGES/kcm_desktopthemedetails.mo
share/locale/sr/LC_MESSAGES/kcm_emoticons.mo
diff --git a/misc/kde4-l10n-sv/Makefile.man b/misc/kde4-l10n-sv/Makefile.man
index 22cdc485b471..66b97cbbcae5 100644
--- a/misc/kde4-l10n-sv/Makefile.man
+++ b/misc/kde4-l10n-sv/Makefile.man
@@ -14,6 +14,7 @@ MAN1= adddebug.1 \
extend_dmalloc.1 \
extractrc.1 \
fixincludes.1 \
+ kabcclient.1 \
kalzium.1 \
kappfinder.1 \
kate.1 \
@@ -52,4 +53,5 @@ MAN7= kdeoptions.7 \
MAN8= kbuildsycoca4.8 \
kcookiejar4.8 \
kdeinit4.8 \
+ kded4.8 \
meinproc4.8
diff --git a/misc/kde4-l10n-sv/distinfo b/misc/kde4-l10n-sv/distinfo
index 039bea6af623..24f0b9b78235 100644
--- a/misc/kde4-l10n-sv/distinfo
+++ b/misc/kde4-l10n-sv/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-sv-4.2.0.tar.bz2) = efbdb69f70e723c1ce0783e2a0693aaf
-SHA256 (KDE/kde-l10n/kde-l10n-sv-4.2.0.tar.bz2) = 9a8b9005e3ed894facb09d4a21a9f2bfe84fc7b3586bde9ded4806429b85fc87
-SIZE (KDE/kde-l10n/kde-l10n-sv-4.2.0.tar.bz2) = 21047908
+MD5 (KDE/kde-l10n/kde-l10n-sv-4.2.1.tar.bz2) = 4f2a5b6ee87c129499350418d1a0a17e
+SHA256 (KDE/kde-l10n/kde-l10n-sv-4.2.1.tar.bz2) = 4b0a0668876a34d89c1d72613037c3e572e2ee2d2df99a1cd51b401db624b7f0
+SIZE (KDE/kde-l10n/kde-l10n-sv-4.2.1.tar.bz2) = 21097904
diff --git a/misc/kde4-l10n-sv/pkg-plist b/misc/kde4-l10n-sv/pkg-plist
index 1a41fba4b1de..f269cbf6cf9d 100644
--- a/misc/kde4-l10n-sv/pkg-plist
+++ b/misc/kde4-l10n-sv/pkg-plist
@@ -74,6 +74,9 @@ share/doc/HTML/sv/blinken/blinken_nickprompt.png
share/doc/HTML/sv/blinken/common
share/doc/HTML/sv/blinken/index.cache.bz2
share/doc/HTML/sv/blinken/index.docbook
+share/doc/HTML/sv/bomber/common
+share/doc/HTML/sv/bomber/index.cache.bz2
+share/doc/HTML/sv/bomber/index.docbook
share/doc/HTML/sv/bovo/common
share/doc/HTML/sv/bovo/index.cache.bz2
share/doc/HTML/sv/bovo/index.docbook
@@ -123,6 +126,7 @@ share/doc/HTML/sv/juk/search-playlist.png
share/doc/HTML/sv/kabcclient/common
share/doc/HTML/sv/kabcclient/index.cache.bz2
share/doc/HTML/sv/kabcclient/index.docbook
+share/doc/HTML/sv/kabcclient/man-kabcclient.1.docbook
share/doc/HTML/sv/kaddressbook/addhost.png
share/doc/HTML/sv/kaddressbook/common
share/doc/HTML/sv/kaddressbook/conf.png
@@ -783,6 +787,51 @@ share/doc/HTML/sv/kinfocenter/usb/index.docbook
share/doc/HTML/sv/kinfocenter/xserver/common
share/doc/HTML/sv/kinfocenter/xserver/index.cache.bz2
share/doc/HTML/sv/kinfocenter/xserver/index.docbook
+share/doc/HTML/sv/kioslave/audiocd/common
+share/doc/HTML/sv/kioslave/audiocd/index.cache.bz2
+share/doc/HTML/sv/kioslave/audiocd/index.docbook
+share/doc/HTML/sv/kioslave/bookmarks/common
+share/doc/HTML/sv/kioslave/bookmarks/index.cache.bz2
+share/doc/HTML/sv/kioslave/bookmarks/index.docbook
+share/doc/HTML/sv/kioslave/bzip2/common
+share/doc/HTML/sv/kioslave/bzip2/index.cache.bz2
+share/doc/HTML/sv/kioslave/bzip2/index.docbook
+share/doc/HTML/sv/kioslave/cgi/common
+share/doc/HTML/sv/kioslave/cgi/index.cache.bz2
+share/doc/HTML/sv/kioslave/cgi/index.docbook
+share/doc/HTML/sv/kioslave/finger/common
+share/doc/HTML/sv/kioslave/finger/index.cache.bz2
+share/doc/HTML/sv/kioslave/finger/index.docbook
+share/doc/HTML/sv/kioslave/fish/common
+share/doc/HTML/sv/kioslave/fish/index.cache.bz2
+share/doc/HTML/sv/kioslave/fish/index.docbook
+share/doc/HTML/sv/kioslave/floppy/common
+share/doc/HTML/sv/kioslave/floppy/index.cache.bz2
+share/doc/HTML/sv/kioslave/floppy/index.docbook
+share/doc/HTML/sv/kioslave/gzip/common
+share/doc/HTML/sv/kioslave/gzip/index.cache.bz2
+share/doc/HTML/sv/kioslave/gzip/index.docbook
+share/doc/HTML/sv/kioslave/info/common
+share/doc/HTML/sv/kioslave/info/index.cache.bz2
+share/doc/HTML/sv/kioslave/info/index.docbook
+share/doc/HTML/sv/kioslave/man/common
+share/doc/HTML/sv/kioslave/man/index.cache.bz2
+share/doc/HTML/sv/kioslave/man/index.docbook
+share/doc/HTML/sv/kioslave/nfs/common
+share/doc/HTML/sv/kioslave/nfs/index.cache.bz2
+share/doc/HTML/sv/kioslave/nfs/index.docbook
+share/doc/HTML/sv/kioslave/sftp/common
+share/doc/HTML/sv/kioslave/sftp/index.cache.bz2
+share/doc/HTML/sv/kioslave/sftp/index.docbook
+share/doc/HTML/sv/kioslave/smb/common
+share/doc/HTML/sv/kioslave/smb/index.cache.bz2
+share/doc/HTML/sv/kioslave/smb/index.docbook
+share/doc/HTML/sv/kioslave/tar/common
+share/doc/HTML/sv/kioslave/tar/index.cache.bz2
+share/doc/HTML/sv/kioslave/tar/index.docbook
+share/doc/HTML/sv/kioslave/thumbnail/common
+share/doc/HTML/sv/kioslave/thumbnail/index.cache.bz2
+share/doc/HTML/sv/kioslave/thumbnail/index.docbook
share/doc/HTML/sv/kiriki/common
share/doc/HTML/sv/kiriki/index.cache.bz2
share/doc/HTML/sv/kiriki/index.docbook
@@ -2020,6 +2069,7 @@ share/locale/sv/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/sv/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/sv/LC_MESSAGES/plasma_applet_frame.mo
share/locale/sv/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/sv/LC_MESSAGES/plasma_applet_icon.mo
share/locale/sv/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/sv/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/sv/LC_MESSAGES/plasma_applet_kalzium.mo
@@ -2180,6 +2230,22 @@ share/locale/sv/entry.desktop
@dirrm share/doc/HTML/sv/kjots
@dirrm share/doc/HTML/sv/kiten
@dirrm share/doc/HTML/sv/kiriki
+@dirrm share/doc/HTML/sv/kioslave/thumbnail
+@dirrm share/doc/HTML/sv/kioslave/tar
+@dirrm share/doc/HTML/sv/kioslave/smb
+@dirrm share/doc/HTML/sv/kioslave/sftp
+@dirrm share/doc/HTML/sv/kioslave/nfs
+@dirrm share/doc/HTML/sv/kioslave/man
+@dirrm share/doc/HTML/sv/kioslave/info
+@dirrm share/doc/HTML/sv/kioslave/gzip
+@dirrm share/doc/HTML/sv/kioslave/floppy
+@dirrm share/doc/HTML/sv/kioslave/fish
+@dirrm share/doc/HTML/sv/kioslave/finger
+@dirrm share/doc/HTML/sv/kioslave/cgi
+@dirrm share/doc/HTML/sv/kioslave/bzip2
+@dirrm share/doc/HTML/sv/kioslave/bookmarks
+@dirrm share/doc/HTML/sv/kioslave/audiocd
+@dirrm share/doc/HTML/sv/kioslave
@dirrm share/doc/HTML/sv/kinfocenter/xserver
@dirrm share/doc/HTML/sv/kinfocenter/usb
@dirrm share/doc/HTML/sv/kinfocenter/sound
@@ -2312,6 +2378,7 @@ share/locale/sv/entry.desktop
@dirrm share/doc/HTML/sv/dolphin
@dirrm share/doc/HTML/sv/cervisia
@dirrm share/doc/HTML/sv/bovo
+@dirrm share/doc/HTML/sv/bomber
@dirrm share/doc/HTML/sv/blinken
@dirrm share/doc/HTML/sv/ark
@dirrm share/doc/HTML/sv/amor
diff --git a/misc/kde4-l10n-tg/distinfo b/misc/kde4-l10n-tg/distinfo
index 580585a14ad8..28ed1dbfe993 100644
--- a/misc/kde4-l10n-tg/distinfo
+++ b/misc/kde4-l10n-tg/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-tg-4.2.0.tar.bz2) = 30c2329a01c7ebbd61b4198ad6706acd
-SHA256 (KDE/kde-l10n/kde-l10n-tg-4.2.0.tar.bz2) = a128e107973d500c81ddab06417a19eac484b70e80a1279c82da9e82c1cd00a6
-SIZE (KDE/kde-l10n/kde-l10n-tg-4.2.0.tar.bz2) = 1834967
+MD5 (KDE/kde-l10n/kde-l10n-tg-4.2.1.tar.bz2) = 17e7c30245485a01a05e0501c60093f3
+SHA256 (KDE/kde-l10n/kde-l10n-tg-4.2.1.tar.bz2) = 071e8b4d0ac03e9c1a789323f44760cc98794bfd7c77175f340643550275eb5e
+SIZE (KDE/kde-l10n/kde-l10n-tg-4.2.1.tar.bz2) = 1839241
diff --git a/misc/kde4-l10n-th/distinfo b/misc/kde4-l10n-th/distinfo
index 50a1125dcd2e..9f3f474079d0 100644
--- a/misc/kde4-l10n-th/distinfo
+++ b/misc/kde4-l10n-th/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-th-4.2.0.tar.bz2) = 010ba3a0ed85c99cd215623f6d78fcd5
-SHA256 (KDE/kde-l10n/kde-l10n-th-4.2.0.tar.bz2) = 533d7f6529615c21ec7860ac1419bcf81f7d3a9431b8e895461f450850f2aed6
-SIZE (KDE/kde-l10n/kde-l10n-th-4.2.0.tar.bz2) = 1117942
+MD5 (KDE/kde-l10n/kde-l10n-th-4.2.1.tar.bz2) = 62c1114df471bc35e05e2980e2c12b47
+SHA256 (KDE/kde-l10n/kde-l10n-th-4.2.1.tar.bz2) = aa389c4880e10f36995811943b6aca5c95a2baca0b35ef2fbbd55b72faee45e8
+SIZE (KDE/kde-l10n/kde-l10n-th-4.2.1.tar.bz2) = 1125861
diff --git a/misc/kde4-l10n-tr/distinfo b/misc/kde4-l10n-tr/distinfo
index 08e6b045b3b0..a39d2f0750a6 100644
--- a/misc/kde4-l10n-tr/distinfo
+++ b/misc/kde4-l10n-tr/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-tr-4.2.0.tar.bz2) = 850a88f8d82d9d9ab4c5ef2406eba39e
-SHA256 (KDE/kde-l10n/kde-l10n-tr-4.2.0.tar.bz2) = d86886f59ff772737209eb2d41f3adb21627751b9c43bf87f76b94f3592bf40a
-SIZE (KDE/kde-l10n/kde-l10n-tr-4.2.0.tar.bz2) = 1981262
+MD5 (KDE/kde-l10n/kde-l10n-tr-4.2.1.tar.bz2) = 8ce5790512f818320804967a6e5c6204
+SHA256 (KDE/kde-l10n/kde-l10n-tr-4.2.1.tar.bz2) = 94f616b5bdc05e7b1d319003f1122b2012e362a2fc5997808a3675754cedafa0
+SIZE (KDE/kde-l10n/kde-l10n-tr-4.2.1.tar.bz2) = 2004028
diff --git a/misc/kde4-l10n-wa/distinfo b/misc/kde4-l10n-wa/distinfo
index dcfa6957b473..ad142aaafd1e 100644
--- a/misc/kde4-l10n-wa/distinfo
+++ b/misc/kde4-l10n-wa/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-wa-4.2.0.tar.bz2) = 0db1e8dc944786811cc1364df0ee4cf2
-SHA256 (KDE/kde-l10n/kde-l10n-wa-4.2.0.tar.bz2) = 022349b0d75b7edeba2b1dccb678241b7160348de39c692a3411271bad1ef798
-SIZE (KDE/kde-l10n/kde-l10n-wa-4.2.0.tar.bz2) = 808350
+MD5 (KDE/kde-l10n/kde-l10n-wa-4.2.1.tar.bz2) = 9334b0cd1a718afb59b81906a677ac44
+SHA256 (KDE/kde-l10n/kde-l10n-wa-4.2.1.tar.bz2) = ad3d63f23cbe0085c9eabc9002c85c0e088608ec36fbd55fa92a6ad54ec9fef3
+SIZE (KDE/kde-l10n/kde-l10n-wa-4.2.1.tar.bz2) = 814691
diff --git a/misc/kde4-l10n-wa/pkg-plist b/misc/kde4-l10n-wa/pkg-plist
index 8b9d1f4022db..eec15c50f9d5 100644
--- a/misc/kde4-l10n-wa/pkg-plist
+++ b/misc/kde4-l10n-wa/pkg-plist
@@ -20,6 +20,7 @@ share/locale/wa/LC_MESSAGES/kateopenheader.mo
share/locale/wa/LC_MESSAGES/katepart4.mo
share/locale/wa/LC_MESSAGES/katequickdocumentswitcherplugin.mo
share/locale/wa/LC_MESSAGES/kblankscrn.mo
+share/locale/wa/LC_MESSAGES/kbreakout.mo
share/locale/wa/LC_MESSAGES/kcalc.mo
share/locale/wa/LC_MESSAGES/kcertpart.mo
share/locale/wa/LC_MESSAGES/kcm_autostart.mo
diff --git a/misc/kdeedu4/Makefile b/misc/kdeedu4/Makefile
index 90611d6a60a4..6bf34c520e14 100644
--- a/misc/kdeedu4/Makefile
+++ b/misc/kdeedu4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdeedu
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= misc kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
@@ -15,11 +14,9 @@ DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
COMMENT= Collection of entertaining, educational programs for KDE
-BUILD_DEPENDS= ${LOCALBASE}/include/eigen/util.h:${PORTSDIR}/math/eigen \
- ${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \
+BUILD_DEPENDS= ${LOCALBASE}/lib/ocaml/facile/facile.a:${PORTSDIR}/math/facile \
gmm++>=3.0.4:${PORTSDIR}/math/gmm++
-LIB_DEPENDS= usb-0.1:${PORTSDIR}/devel/libusb \
- boost_python:${PORTSDIR}/devel/boost-python \
+LIB_DEPENDS= boost_python:${PORTSDIR}/devel/boost-python \
nova:${PORTSDIR}/astro/libnova \
openbabel.3:${PORTSDIR}/science/openbabel \
cfitsio.0:${PORTSDIR}/astro/cfitsio \
diff --git a/misc/kdeedu4/distinfo b/misc/kdeedu4/distinfo
index e207b4669b1b..316eb45570d2 100644
--- a/misc/kdeedu4/distinfo
+++ b/misc/kdeedu4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeedu-4.2.0.tar.bz2) = aaddbdab29e1d284ad8ee67a78b4c597
-SHA256 (KDE/kdeedu-4.2.0.tar.bz2) = 6b1584a39c2a8823deeccd893e0bbc87fa3faa4019f3f9c886face247fa3435a
-SIZE (KDE/kdeedu-4.2.0.tar.bz2) = 59252322
+MD5 (KDE/kdeedu-4.2.1.tar.bz2) = bc8fb562cf0564ce50486b83f7c94d01
+SHA256 (KDE/kdeedu-4.2.1.tar.bz2) = 768e05f1bc99b307e348fb97ad77a2d266fefb47dfc5fa2e28badbfebaae22a6
+SIZE (KDE/kdeedu-4.2.1.tar.bz2) = 59459156
diff --git a/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake b/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake
deleted file mode 100644
index 546ac033793f..000000000000
--- a/misc/kdeedu4/files/patch-cmake__modules__FindopenBabel2.cmake
+++ /dev/null
@@ -1,68 +0,0 @@
-diff -u ../cmake/modules/FindOpenBabel2.cmake ../cmake/modules/FindOpenBabel2.cmake
---- ../cmake/modules/FindOpenBabel2.cmake 2009/01/25 12:06:30 916420
-+++ ../cmake/modules/FindOpenBabel2.cmake 2009/01/26 22:11:35 917115
-@@ -4,6 +4,7 @@
- # OPENBABEL2_FOUND - system has OpenBabel2
- # OPENBABEL2_INCLUDE_DIR - the OpenBabel2 include directory
- # OPENBABEL2_LIBRARIES - Link these to use OpenBabel2
-+# Copyright (C) 2006, 2009 Pino Toscano, <pino@kde.org>
- # Copyright (c) 2006, 2007 Carsten Niehaus, <cniehaus@gmx.de>
- # Copyright (C) 2008 Marcus D. Hanwell <marcus@cryos.org>
- # Redistribution and use is allowed according to the terms of the BSD license.
-@@ -18,13 +19,11 @@
-
- # Use the newer PkgConfig stuff
- find_package(PkgConfig REQUIRED)
-- pkg_check_modules(OPENBABEL2 openbabel-2.0>=2.2.0)
-+ pkg_check_modules(PC_OPENBABEL2 openbabel-2.0>=2.2.0)
-
-- # Maintain backwards compatibility with previous version of module
-- if(OPENBABEL2_FOUND STREQUAL "1")
-+ if(PC_OPENBABEL2_FOUND)
- set(OPENBABEL2_VERSION_MET TRUE)
-- set(OPENBABEL2_INCLUDE_DIR ${OPENBABEL2_INCLUDE_DIRS})
-- endif(OPENBABEL2_FOUND STREQUAL "1")
-+ endif(PC_OPENBABEL2_FOUND)
-
- else(NOT WIN32)
- set(OPENBABEL2_VERSION_MET TRUE)
-@@ -32,28 +31,19 @@
-
- if(OPENBABEL2_VERSION_MET)
-
-- # find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
-- # PATHS
-- # ${_obIncDir}
-- # ${GNUWIN32_DIR}/include
-- # $ENV{OPENBABEL2_INCLUDE_DIR}
-- # )
--
-- if(WIN32)
-- if(NOT OPENBABEL2_INCLUDE_DIR)
-- find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
-- PATHS
-- ${_obIncDir}
-- ${GNUWIN32_DIR}/include
-- $ENV{OPENBABEL2_INCLUDE_DIR}
-- PATH_SUFFIXES openbabel-2.0
-- )
-- endif(NOT OPENBABEL2_INCLUDE_DIR)
-- endif(WIN32)
-+ find_path(OPENBABEL2_INCLUDE_DIR openbabel/obconversion.h
-+ PATHS
-+ ${PC_OPENBABEL2_INCLUDEDIR}
-+ ${PC_OPENBABEL2_INCLUDE_DIRS}
-+ ${GNUWIN32_DIR}/include
-+ $ENV{OPENBABEL2_INCLUDE_DIR}
-+ PATH_SUFFIXES openbabel-2.0
-+ )
-
-- find_library(OPENBABEL2_LIBRARIES NAMES openbabel
-+ find_library(OPENBABEL2_LIBRARIES NAMES openbabel openbabel-2
- PATHS
-- ${_obLinkDir}
-+ ${PC_OPENBABEL2_LIBDIR}
-+ ${PC_OPENBABEL2_LIBRARY_DIRS}
- ${GNUWIN32_DIR}/lib
- $ENV{OPENBABEL2_LIBRARIES}
- )
diff --git a/misc/kdeedu4/pkg-plist b/misc/kdeedu4/pkg-plist
index 69c7f79fa70d..4b64eeaddaa1 100644
--- a/misc/kdeedu4/pkg-plist
+++ b/misc/kdeedu4/pkg-plist
@@ -285,9 +285,12 @@ share/apps/kalzium/data/iconsets/school/38.svg
share/apps/kalzium/data/iconsets/school/39.svg
share/apps/kalzium/data/iconsets/school/4.svg
share/apps/kalzium/data/iconsets/school/40.svg
+share/apps/kalzium/data/iconsets/school/41.svg
share/apps/kalzium/data/iconsets/school/42.svg
share/apps/kalzium/data/iconsets/school/43.svg
share/apps/kalzium/data/iconsets/school/44.svg
+share/apps/kalzium/data/iconsets/school/45.svg
+share/apps/kalzium/data/iconsets/school/46.svg
share/apps/kalzium/data/iconsets/school/47.svg
share/apps/kalzium/data/iconsets/school/48.svg
share/apps/kalzium/data/iconsets/school/49.svg
@@ -301,6 +304,7 @@ share/apps/kalzium/data/iconsets/school/55.svg
share/apps/kalzium/data/iconsets/school/56.svg
share/apps/kalzium/data/iconsets/school/57.svg
share/apps/kalzium/data/iconsets/school/58.svg
+share/apps/kalzium/data/iconsets/school/59.svg
share/apps/kalzium/data/iconsets/school/6.svg
share/apps/kalzium/data/iconsets/school/60.svg
share/apps/kalzium/data/iconsets/school/61.svg
@@ -309,7 +313,10 @@ share/apps/kalzium/data/iconsets/school/7.svg
share/apps/kalzium/data/iconsets/school/72.svg
share/apps/kalzium/data/iconsets/school/73.svg
share/apps/kalzium/data/iconsets/school/74.svg
+share/apps/kalzium/data/iconsets/school/75.svg
share/apps/kalzium/data/iconsets/school/76.svg
+share/apps/kalzium/data/iconsets/school/77.svg
+share/apps/kalzium/data/iconsets/school/78.svg
share/apps/kalzium/data/iconsets/school/79.svg
share/apps/kalzium/data/iconsets/school/8.svg
share/apps/kalzium/data/iconsets/school/80.svg
diff --git a/misc/kdeutils4/distinfo b/misc/kdeutils4/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/misc/kdeutils4/distinfo
+++ b/misc/kdeutils4/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/misc/kdeutils4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/misc/kdeutils4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/misc/kdeutils4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/misc/konq-plugins-kde4/Makefile b/misc/konq-plugins-kde4/Makefile
index cae6910a4eae..5686f00f7e63 100644
--- a/misc/konq-plugins-kde4/Makefile
+++ b/misc/konq-plugins-kde4/Makefile
@@ -15,6 +15,10 @@ DIST_SUBDIR= KDE/extragear
MAINTAINER= kde@FreeBSD.org
COMMENT= Additonal plugins and features for Konqueror
+LIB_DEPENDS= tidy-0.99.0:${PORTSDIR}/www/tidy-lib
+
+LATEST_LINK= ${PORTNAME}-kde4
+
USE_BZIP2= yes
USE_KDE4= kdelibs kdebase kdeprefix kdehier automoc4
USE_QT_VER= 4
diff --git a/multimedia/Makefile b/multimedia/Makefile
index 4d5883028480..920b3dc51132 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -206,6 +206,8 @@
SUBDIR += p5-Video-Info
SUBDIR += p5-Video-OpenQuicktime
SUBDIR += phonon
+ SUBDIR += phonon-gstreamer
+ SUBDIR += phonon-xine
SUBDIR += podcatcher
SUBDIR += poe
SUBDIR += ppm2fli
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index 3d2ef12280c7..5bc4f603bfa5 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-4.2.0.tar.bz2) = 3e944c87888ac1ac5b11d3722dd31f88
-SHA256 (KDE/kdemultimedia-4.2.0.tar.bz2) = 632e920dfabda4600cbe9519aae75c8c47bd502fd013baa950db27926509ed36
-SIZE (KDE/kdemultimedia-4.2.0.tar.bz2) = 1550040
+MD5 (KDE/kdemultimedia-4.2.1.tar.bz2) = d3916cb7a0dd5cb4e230e5c19d99563b
+SHA256 (KDE/kdemultimedia-4.2.1.tar.bz2) = ca86127a2ce1e27faf0b9c934aa4a98533f78adb86f3717580f49c9a0d6fa3ce
+SIZE (KDE/kdemultimedia-4.2.1.tar.bz2) = 1550352
diff --git a/multimedia/phonon-gstreamer/Makefile b/multimedia/phonon-gstreamer/Makefile
new file mode 100644
index 000000000000..1258217ca9f1
--- /dev/null
+++ b/multimedia/phonon-gstreamer/Makefile
@@ -0,0 +1,39 @@
+# New ports collection Makefile for: phonon
+# Date created: 2008-01-30
+# Whom: Martin Wilke <miwi@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME= phonon
+PORTVERSION= 4.3.1
+CATEGORIES= multimedia kde ipv6
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
+PKGNAMESUFFIX= -gstreamer
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Phonon gstreamer backend
+
+LIB_DEPENDS= phonon.4:${PORTSDIR}/multimedia/phonon
+
+CONFLICTS= phonon-4.3.0*
+
+USE_BZIP2= yes
+USE_CMAKE= yes
+USE_KDE4= kdehier automoc4 kdeprefix
+USE_QT_VER= 4
+QT_COMPONENTS= gui dbus xml opengl \
+ qmake_build moc_build rcc_build uic_build
+USE_GSTREAMER= yes
+
+post-patch:
+#fix finding automoc when PREFIX is not matched KDE4_PREFIX
+ ${REINPLACE_CMD} -e 's|NO_DEFAULT_PATH|${KDE4_PREFIX} NO_DEFAULT_PATH|' \
+ ${WRKSRC}/cmake/FindAutomoc4.cmake
+
+pre-configure:
+ ${REINPLACE_CMD} -e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
+ ${WRKSRC}/CMakeLists.txt
+
+.include <bsd.port.mk>
diff --git a/multimedia/phonon-gstreamer/distinfo b/multimedia/phonon-gstreamer/distinfo
new file mode 100644
index 000000000000..7c88843e413a
--- /dev/null
+++ b/multimedia/phonon-gstreamer/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/phonon-4.3.1.tar.bz2) = 767cb68052c108e95f293f30acdef3fb
+SHA256 (KDE/phonon-4.3.1.tar.bz2) = 7fb6d9efad29d7ac390d539cd516177c26cc2f92ddb9b3a5d70f2c49fc15269a
+SIZE (KDE/phonon-4.3.1.tar.bz2) = 575856
diff --git a/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt b/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..8be2c7f30e28
--- /dev/null
+++ b/multimedia/phonon-gstreamer/files/patch-CMakeLists.txt
@@ -0,0 +1,50 @@
+--- ./CMakeLists.txt.orig 2009-01-22 11:20:44.000000000 +0300
++++ ./CMakeLists.txt 2009-02-21 01:22:42.000000000 +0300
+@@ -127,12 +127,12 @@
+
+ try_run(_run_result _compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}")
+
+- if(NOT _compile_result)
+- message(FATAL_ERROR "Could not compile simple test program:\n ${_source}")
+- endif(NOT _compile_result)
+- if(_run_result)
+- message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation.")
+- endif(_run_result)
++# if(NOT _compile_result)
++# message(FATAL_ERROR "Could not compile simple test program:\n ${_source}")
++# endif(NOT _compile_result)
++# if(_run_result)
++# message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation.")
++# endif(_run_result)
+
+ if (GCC_IS_NEWER_THAN_4_2)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+@@ -250,8 +250,8 @@
+
+
+ add_subdirectory(cmake)
+-add_subdirectory(phonon)
+-add_subdirectory(includes)
++# add_subdirectory(phonon)
++# add_subdirectory(includes)
+ if (Q_WS_MAC AND BUILD_PHONON_QT7)
+ add_subdirectory(qt7)
+ endif (Q_WS_MAC AND BUILD_PHONON_QT7)
+@@ -261,12 +261,12 @@
+
+ if (Q_WS_X11)
+ add_subdirectory(gstreamer)
+- add_subdirectory(xine)
++# add_subdirectory(xine)
+ endif (Q_WS_X11)
+
+-if(NOT WIN32) # pkgconfig file
+- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc @ONLY)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+-endif(NOT WIN32)
++# if(NOT WIN32) # pkgconfig file
++# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc @ONLY)
++# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc DESTINATION ${LIB_INSTALL_DIR}/../libdata/../libdata/../libdata/../libdata/../libdata/pkgconfig)
++# endif(NOT WIN32)
+
+ macro_display_feature_log()
diff --git a/multimedia/phonon/files/patch-cmake_FindGObject.cmake b/multimedia/phonon-gstreamer/files/patch-cmake__FindGObject.cmake
index d201555741bb..bb9f7fccfe55 100644
--- a/multimedia/phonon/files/patch-cmake_FindGObject.cmake
+++ b/multimedia/phonon-gstreamer/files/patch-cmake__FindGObject.cmake
@@ -1,5 +1,5 @@
---- ../cmake/FindGObject.cmake.orig 2008-11-24 20:11:55.000000000 +0300
-+++ ../cmake/FindGObject.cmake 2008-12-11 14:36:14.000000000 +0300
+--- ./cmake/FindGObject.cmake.orig 2008-11-24 20:11:55.000000000 +0300
++++ ./cmake/FindGObject.cmake 2009-02-21 01:19:39.000000000 +0300
@@ -23,14 +23,16 @@
# in the FIND_PATH() and FIND_LIBRARY() calls
PKG_CHECK_MODULES(PKG_GOBJECT2 REQUIRED gobject-2.0)
diff --git a/multimedia/phonon-gstreamer/files/patch-cmake__FindPhonon.cmake b/multimedia/phonon-gstreamer/files/patch-cmake__FindPhonon.cmake
new file mode 100644
index 000000000000..44c470dd884b
--- /dev/null
+++ b/multimedia/phonon-gstreamer/files/patch-cmake__FindPhonon.cmake
@@ -0,0 +1,73 @@
+--- ./cmake/FindPhonon.cmake.orig 2009-02-21 01:19:39.000000000 +0300
++++ ./cmake/FindPhonon.cmake 2009-02-21 01:19:39.000000000 +0300
+@@ -0,0 +1,70 @@
++# Find libphonon
++# Once done this will define
++#
++# PHONON_FOUND - system has Phonon Library
++# PHONON_INCLUDES - the Phonon include directory
++# PHONON_LIBS - link these to use Phonon
++# PHONON_VERSION - the version of the Phonon Library
++
++# Copyright (c) 2008, Matthias Kretz <kretz@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++macro(_phonon_find_version)
++ file(READ "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h" _phonon_header LIMIT 5000 OFFSET 1000)
++ string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
++ set(PHONON_VERSION "${CMAKE_MATCH_1}")
++ message(STATUS "Phonon Version: ${PHONON_VERSION}")
++endmacro(_phonon_find_version)
++
++find_package(PkgConfig)
++PKG_CHECK_MODULES(PKG_PHONON phonon)
++
++if(PHONON_FOUND)
++ # Already found, nothing more to do except figuring out the version
++ _phonon_find_version()
++else(PHONON_FOUND)
++ if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++ set(PHONON_FIND_QUIETLY TRUE)
++ endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++
++ # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
++ find_library(PHONON_LIBRARY NAMES phonon PATHS ${PKG_PHONON_LIBRARY_DIRS} ${KDE4_PREFIX}/lib ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
++ # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
++ find_library(PHONON_LIBRARY NAMES phonon)
++
++ find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${PKG_PHONON_INCLUDE_DIRS} ${KDE4_PREFIX}/include ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
++ find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
++
++ if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++ set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
++ set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}/phonon ${PHONON_INCLUDE_DIR})
++ set(PHONON_FOUND TRUE)
++ _phonon_find_version()
++ else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++ set(PHONON_FOUND FALSE)
++ endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++
++ if(PHONON_FOUND)
++ if(NOT PHONON_FIND_QUIETLY)
++ message(STATUS "Found Phonon: ${PHONON_LIBRARY}")
++ message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}")
++ endif(NOT PHONON_FIND_QUIETLY)
++ else(PHONON_FOUND)
++ if(Phonon_FIND_REQUIRED)
++ if(NOT PHONON_INCLUDE_DIR)
++ message(STATUS "Phonon includes NOT found!")
++ endif(NOT PHONON_INCLUDE_DIR)
++ if(NOT PHONON_LIBRARY)
++ message(STATUS "Phonon library NOT found!")
++ endif(NOT PHONON_LIBRARY)
++ message(FATAL_ERROR "Phonon library or includes NOT found!")
++ else(Phonon_FIND_REQUIRED)
++ message(STATUS "Unable to find Phonon")
++ endif(Phonon_FIND_REQUIRED)
++ endif(PHONON_FOUND)
++
++
++ mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES)
++endif(PHONON_FOUND)
diff --git a/multimedia/phonon-gstreamer/files/patch-gstreamer__CMakeLists.txt b/multimedia/phonon-gstreamer/files/patch-gstreamer__CMakeLists.txt
new file mode 100644
index 000000000000..3a39b9470bff
--- /dev/null
+++ b/multimedia/phonon-gstreamer/files/patch-gstreamer__CMakeLists.txt
@@ -0,0 +1,14 @@
+--- ./gstreamer/CMakeLists.txt.orig 2008-11-24 20:12:02.000000000 +0300
++++ ./gstreamer/CMakeLists.txt 2009-02-21 01:19:39.000000000 +0300
+@@ -16,8 +16,10 @@
+ project(phonon-gstreamer)
+ include(ConfigureChecks.cmake)
+
++find_package(Phonon)
++
+ if (BUILD_PHONON_GSTREAMER)
+- include_directories(${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
++ include_directories(${PHONON_INCLUDES} ${GSTREAMER_INCLUDE_DIR} ${GLIB2_INCLUDE_DIR}
+ ${LIBXML2_INCLUDE_DIR})
+ add_definitions(-DPHONON_BACKEND_VERSION_4_2)
+
diff --git a/multimedia/phonon-gstreamer/pkg-descr b/multimedia/phonon-gstreamer/pkg-descr
new file mode 100644
index 000000000000..d7ff46153a69
--- /dev/null
+++ b/multimedia/phonon-gstreamer/pkg-descr
@@ -0,0 +1,2 @@
+Phonon is multimedia framework for KDE4.
+This port provides GStreamer backend.
diff --git a/multimedia/phonon-gstreamer/pkg-plist b/multimedia/phonon-gstreamer/pkg-plist
new file mode 100644
index 000000000000..38ecb9467baa
--- /dev/null
+++ b/multimedia/phonon-gstreamer/pkg-plist
@@ -0,0 +1,4 @@
+lib/kde4/plugins/phonon_backend/phonon_gstreamer.so
+share/kde4/services/phononbackends/gstreamer.desktop
+@dirrmtry share/kde4/services/phononbackends
+@dirrmtry lib/kde4/plugins/phonon_backend
diff --git a/multimedia/phonon-xine/Makefile b/multimedia/phonon-xine/Makefile
new file mode 100644
index 000000000000..44677ec3c5b5
--- /dev/null
+++ b/multimedia/phonon-xine/Makefile
@@ -0,0 +1,35 @@
+# New ports collection Makefile for: phonon
+# Date created: 2008-01-30
+# Whom: Martin Wilke <miwi@FreeBSD.org>
+#
+# $FreeBSD$
+
+PORTNAME= phonon
+PORTVERSION= 4.3.1
+CATEGORIES= multimedia kde ipv6
+MASTER_SITES= ${MASTER_SITE_KDE}
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
+PKGNAMESUFFIX= -xine
+DIST_SUBDIR= KDE
+
+MAINTAINER= kde@FreeBSD.org
+COMMENT= Phonon xine backend
+
+LIB_DEPENDS= phonon.4:${PORTSDIR}/multimedia/phonon \
+ xine.1:${PORTSDIR}/multimedia/libxine
+
+CONFLICTS= phonon-4.3.0*
+
+USE_BZIP2= yes
+USE_CMAKE= yes
+USE_KDE4= kdehier automoc4 kdeprefix
+USE_QT_VER= 4
+QT_COMPONENTS= gui dbus xml \
+ qmake_build moc_build rcc_build uic_build
+
+post-patch:
+#fix finding automoc when PREFIX is not matched KDE4_PREFIX
+ ${REINPLACE_CMD} -e 's|NO_DEFAULT_PATH|${KDE4_PREFIX} NO_DEFAULT_PATH|' \
+ ${WRKSRC}/cmake/FindAutomoc4.cmake
+
+.include <bsd.port.mk>
diff --git a/multimedia/phonon-xine/distinfo b/multimedia/phonon-xine/distinfo
new file mode 100644
index 000000000000..7c88843e413a
--- /dev/null
+++ b/multimedia/phonon-xine/distinfo
@@ -0,0 +1,3 @@
+MD5 (KDE/phonon-4.3.1.tar.bz2) = 767cb68052c108e95f293f30acdef3fb
+SHA256 (KDE/phonon-4.3.1.tar.bz2) = 7fb6d9efad29d7ac390d539cd516177c26cc2f92ddb9b3a5d70f2c49fc15269a
+SIZE (KDE/phonon-4.3.1.tar.bz2) = 575856
diff --git a/multimedia/phonon-xine/files/patch-CMakeLists.txt b/multimedia/phonon-xine/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..a8327f774222
--- /dev/null
+++ b/multimedia/phonon-xine/files/patch-CMakeLists.txt
@@ -0,0 +1,51 @@
+--- ./CMakeLists.txt.orig 2009-01-22 11:20:44.000000000 +0300
++++ ./CMakeLists.txt 2009-02-21 01:22:02.000000000 +0300
+@@ -127,12 +127,12 @@
+
+ try_run(_run_result _compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}")
+
+- if(NOT _compile_result)
+- message(FATAL_ERROR "Could not compile simple test program:\n ${_source}")
+- endif(NOT _compile_result)
+- if(_run_result)
+- message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation.")
+- endif(_run_result)
++# if(NOT _compile_result)
++# message(FATAL_ERROR "Could not compile simple test program:\n ${_source}")
++# endif(NOT _compile_result)
++# if(_run_result)
++# message(FATAL_ERROR "Qt compiled without support for -fvisibility=hidden. This will break plugins and linking of some applications. Please fix your Qt installation.")
++# endif(_run_result)
+
+ if (GCC_IS_NEWER_THAN_4_2)
+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+@@ -250,8 +250,8 @@
+
+
+ add_subdirectory(cmake)
+-add_subdirectory(phonon)
+-add_subdirectory(includes)
++# add_subdirectory(phonon)
++# add_subdirectory(includes)
+ if (Q_WS_MAC AND BUILD_PHONON_QT7)
+ add_subdirectory(qt7)
+ endif (Q_WS_MAC AND BUILD_PHONON_QT7)
+@@ -260,13 +260,13 @@
+ endif (Q_WS_WIN)
+
+ if (Q_WS_X11)
+- add_subdirectory(gstreamer)
++# add_subdirectory(gstreamer)
+ add_subdirectory(xine)
+ endif (Q_WS_X11)
+
+-if(NOT WIN32) # pkgconfig file
+- configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc @ONLY)
+- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
+-endif(NOT WIN32)
++# if(NOT WIN32) # pkgconfig file
++# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/phonon.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc @ONLY)
++# install(FILES ${CMAKE_CURRENT_BINARY_DIR}/phonon.pc DESTINATION ${LIB_INSTALL_DIR}/../libdata/../libdata/../libdata/../libdata/../libdata/pkgconfig)
++# endif(NOT WIN32)
+
+ macro_display_feature_log()
diff --git a/multimedia/phonon-xine/files/patch-cmake__FindPhonon.cmake b/multimedia/phonon-xine/files/patch-cmake__FindPhonon.cmake
new file mode 100644
index 000000000000..44c470dd884b
--- /dev/null
+++ b/multimedia/phonon-xine/files/patch-cmake__FindPhonon.cmake
@@ -0,0 +1,73 @@
+--- ./cmake/FindPhonon.cmake.orig 2009-02-21 01:19:39.000000000 +0300
++++ ./cmake/FindPhonon.cmake 2009-02-21 01:19:39.000000000 +0300
+@@ -0,0 +1,70 @@
++# Find libphonon
++# Once done this will define
++#
++# PHONON_FOUND - system has Phonon Library
++# PHONON_INCLUDES - the Phonon include directory
++# PHONON_LIBS - link these to use Phonon
++# PHONON_VERSION - the version of the Phonon Library
++
++# Copyright (c) 2008, Matthias Kretz <kretz@kde.org>
++#
++# Redistribution and use is allowed according to the terms of the BSD license.
++# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
++
++macro(_phonon_find_version)
++ file(READ "${PHONON_INCLUDE_DIR}/phonon/phononnamespace.h" _phonon_header LIMIT 5000 OFFSET 1000)
++ string(REGEX MATCH "define PHONON_VERSION_STR \"(4\\.[0-9]+\\.[0-9a-z]+)\"" _phonon_version_match "${_phonon_header}")
++ set(PHONON_VERSION "${CMAKE_MATCH_1}")
++ message(STATUS "Phonon Version: ${PHONON_VERSION}")
++endmacro(_phonon_find_version)
++
++find_package(PkgConfig)
++PKG_CHECK_MODULES(PKG_PHONON phonon)
++
++if(PHONON_FOUND)
++ # Already found, nothing more to do except figuring out the version
++ _phonon_find_version()
++else(PHONON_FOUND)
++ if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++ set(PHONON_FIND_QUIETLY TRUE)
++ endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++
++ # As discussed on kde-buildsystem: first look at CMAKE_PREFIX_PATH, then at the suggested PATHS (kde4 install dir)
++ find_library(PHONON_LIBRARY NAMES phonon PATHS ${PKG_PHONON_LIBRARY_DIRS} ${KDE4_PREFIX}/lib ${KDE4_LIB_INSTALL_DIR} ${QT_LIBRARY_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
++ # then at the default system locations (CMAKE_SYSTEM_PREFIX_PATH, i.e. /usr etc.)
++ find_library(PHONON_LIBRARY NAMES phonon)
++
++ find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h PATHS ${PKG_PHONON_INCLUDE_DIRS} ${KDE4_PREFIX}/include ${KDE4_INCLUDE_INSTALL_DIR} ${QT_INCLUDE_DIR} ${INCLUDE_INSTALL_DIR} NO_SYSTEM_ENVIRONMENT_PATH NO_CMAKE_SYSTEM_PATH)
++ find_path(PHONON_INCLUDE_DIR NAMES phonon/phonon_export.h)
++
++ if(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++ set(PHONON_LIBS ${phonon_LIB_DEPENDS} ${PHONON_LIBRARY})
++ set(PHONON_INCLUDES ${PHONON_INCLUDE_DIR}/KDE ${PHONON_INCLUDE_DIR}/phonon ${PHONON_INCLUDE_DIR})
++ set(PHONON_FOUND TRUE)
++ _phonon_find_version()
++ else(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++ set(PHONON_FOUND FALSE)
++ endif(PHONON_INCLUDE_DIR AND PHONON_LIBRARY)
++
++ if(PHONON_FOUND)
++ if(NOT PHONON_FIND_QUIETLY)
++ message(STATUS "Found Phonon: ${PHONON_LIBRARY}")
++ message(STATUS "Found Phonon Includes: ${PHONON_INCLUDES}")
++ endif(NOT PHONON_FIND_QUIETLY)
++ else(PHONON_FOUND)
++ if(Phonon_FIND_REQUIRED)
++ if(NOT PHONON_INCLUDE_DIR)
++ message(STATUS "Phonon includes NOT found!")
++ endif(NOT PHONON_INCLUDE_DIR)
++ if(NOT PHONON_LIBRARY)
++ message(STATUS "Phonon library NOT found!")
++ endif(NOT PHONON_LIBRARY)
++ message(FATAL_ERROR "Phonon library or includes NOT found!")
++ else(Phonon_FIND_REQUIRED)
++ message(STATUS "Unable to find Phonon")
++ endif(Phonon_FIND_REQUIRED)
++ endif(PHONON_FOUND)
++
++
++ mark_as_advanced(PHONON_INCLUDE_DIR PHONON_LIBRARY PHONON_INCLUDES)
++endif(PHONON_FOUND)
diff --git a/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt b/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt
new file mode 100644
index 000000000000..a36be59bb980
--- /dev/null
+++ b/multimedia/phonon-xine/files/patch-xine__CMakeLists.txt
@@ -0,0 +1,19 @@
+--- ./xine/CMakeLists.txt.orig 2009-01-08 17:47:18.000000000 +0300
++++ ./xine/CMakeLists.txt 2009-02-21 01:19:39.000000000 +0300
+@@ -27,6 +27,7 @@
+ endif (NOT _OFFT_IS_64BIT)
+ endif (UNIX)
+
++find_package(Phonon)
+ macro_optional_find_package(Xine)
+ macro_optional_find_package(XCB)
+
+@@ -97,7 +98,7 @@
+
+
+ if(XINE_FOUND)
+- include_directories(${XINE_INCLUDE_DIR})
++ include_directories(${PHONON_INCLUDES} ${XINE_INCLUDE_DIR})
+
+ configure_file(config-xine-widget.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/config-xine-widget.h )
+
diff --git a/multimedia/phonon-xine/pkg-descr b/multimedia/phonon-xine/pkg-descr
new file mode 100644
index 000000000000..e3459ceb600e
--- /dev/null
+++ b/multimedia/phonon-xine/pkg-descr
@@ -0,0 +1,2 @@
+Phonon is multimedia framework for KDE4.
+This port provides xine backend.
diff --git a/multimedia/phonon-xine/pkg-plist b/multimedia/phonon-xine/pkg-plist
new file mode 100644
index 000000000000..2fce39cc3232
--- /dev/null
+++ b/multimedia/phonon-xine/pkg-plist
@@ -0,0 +1,11 @@
+lib/kde4/plugins/phonon_backend/phonon_xine.so
+share/icons/oxygen/128x128/apps/phonon-xine.png
+share/icons/oxygen/16x16/apps/phonon-xine.png
+share/icons/oxygen/22x22/apps/phonon-xine.png
+share/icons/oxygen/32x32/apps/phonon-xine.png
+share/icons/oxygen/48x48/apps/phonon-xine.png
+share/icons/oxygen/64x64/apps/phonon-xine.png
+share/icons/oxygen/scalable/apps/phonon-xine.svgz
+share/kde4/services/phononbackends/xine.desktop
+@dirrmtry share/kde4/services/phononbackends
+@dirrmtry lib/kde4/plugins/phonon_backend
diff --git a/multimedia/phonon/Makefile b/multimedia/phonon/Makefile
index 3c3280bde3f8..a6ff37cca42c 100644
--- a/multimedia/phonon/Makefile
+++ b/multimedia/phonon/Makefile
@@ -5,17 +5,14 @@
# $FreeBSD$
PORTNAME= phonon
-PORTVERSION= 4.3.0
-PORTREVISION= 1
+PORTVERSION= 4.3.1
CATEGORIES= multimedia kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR= stable/${PORTNAME}/${PORTVERSION}/
+MASTER_SITE_SUBDIR= stable/${PORTVERSION}/src
DIST_SUBDIR= KDE
MAINTAINER= kde@FreeBSD.org
-COMMENT= KDE4 phonon applications
-
-LIB_DEPENDS= xine.1:${PORTSDIR}/multimedia/libxine
+COMMENT= Multimedia framework for KDE4
CONFLICTS= qt4-phonon-4* kdebase-runtime-4.1.[0-4]*
@@ -23,9 +20,8 @@ USE_BZIP2= yes
USE_KDE4= kdehier automoc4 kdeprefix
KDE4_BUILDENV= yes
USE_QT_VER= 4
-QT_COMPONENTS= corelib opengl dbus qt3support designer network svg qtestlib \
+QT_COMPONENTS= gui dbus xml qtestlib \
qmake_build moc_build rcc_build uic_build
-USE_GSTREAMER= yes
.include <bsd.port.pre.mk>
@@ -46,4 +42,7 @@ pre-configure:
-e 's|{QT_INCLUDES}|{QT_INCLUDES} ${LOCALBASE}/include|'\
${WRKSRC}/../CMakeLists.txt
+post-install:
+ @${CAT} ${PKGMESSAGE}
+
.include <bsd.port.post.mk>
diff --git a/multimedia/phonon/distinfo b/multimedia/phonon/distinfo
index 3e854c308d09..7c88843e413a 100644
--- a/multimedia/phonon/distinfo
+++ b/multimedia/phonon/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/phonon-4.3.0.tar.bz2) = f851219ec1fb4eadc7904f053b6b498d
-SHA256 (KDE/phonon-4.3.0.tar.bz2) = cb4c55e353ca9e547c94670990d58b6873937b3498045563b5c50988fb2ded22
-SIZE (KDE/phonon-4.3.0.tar.bz2) = 565443
+MD5 (KDE/phonon-4.3.1.tar.bz2) = 767cb68052c108e95f293f30acdef3fb
+SHA256 (KDE/phonon-4.3.1.tar.bz2) = 7fb6d9efad29d7ac390d539cd516177c26cc2f92ddb9b3a5d70f2c49fc15269a
+SIZE (KDE/phonon-4.3.1.tar.bz2) = 575856
diff --git a/multimedia/phonon/files/patch-CMakeLists.txt b/multimedia/phonon/files/patch-CMakeLists.txt
index 41f604aaad52..098a9b7d48e2 100644
--- a/multimedia/phonon/files/patch-CMakeLists.txt
+++ b/multimedia/phonon/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- ../CMakeLists.txt.orgi 2008-07-25 14:58:35.000000000 +0200
-+++ ../CMakeLists.txt 2008-07-25 14:59:12.000000000 +0200
-@@ -120,12 +120,12 @@
+--- ../CMakeLists.txt.orig 2009-01-22 11:20:44.000000000 +0300
++++ ../CMakeLists.txt 2009-02-21 01:36:17.000000000 +0300
+@@ -127,12 +127,12 @@
try_run(_run_result _compile_result ${CMAKE_BINARY_DIR} ${_source_file} CMAKE_FLAGS "${_include_dirs}")
@@ -19,3 +19,14 @@
if (GCC_IS_NEWER_THAN_4_2)
set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+@@ -260,8 +260,8 @@
+ endif (Q_WS_WIN)
+
+ if (Q_WS_X11)
+- add_subdirectory(gstreamer)
+- add_subdirectory(xine)
++# add_subdirectory(gstreamer)
++# add_subdirectory(xine)
+ endif (Q_WS_X11)
+
+ if(NOT WIN32) # pkgconfig file
diff --git a/multimedia/phonon/files/pkg-message.in b/multimedia/phonon/files/pkg-message.in
deleted file mode 100644
index 34b19b396c20..000000000000
--- a/multimedia/phonon/files/pkg-message.in
+++ /dev/null
@@ -1,10 +0,0 @@
-Should you not hear any sound at first KDE4 startup, do the following:
-
-create $HOME/.kde4/share/config/phonon_platform_kde
-
-and add the following lines to phonon_platform_kde:
-
-[Settings]
-showOssDevices=true
-
-And then start kde4 new. \ No newline at end of file
diff --git a/multimedia/phonon/pkg-descr b/multimedia/phonon/pkg-descr
index 8c87bc653013..558e852027aa 100644
--- a/multimedia/phonon/pkg-descr
+++ b/multimedia/phonon/pkg-descr
@@ -1 +1 @@
-phonon tools for KDE4.
+Phonon is multimedia framework for KDE4.
diff --git a/multimedia/phonon/pkg-message b/multimedia/phonon/pkg-message
new file mode 100644
index 000000000000..ebb37d8c4058
--- /dev/null
+++ b/multimedia/phonon/pkg-message
@@ -0,0 +1,2 @@
+Please consider to install xine backend for phonon (multimedia/phonon-xine)
+or/and Gstreamer backend (multimedia/phonon-gstreamer).
diff --git a/multimedia/phonon/pkg-plist b/multimedia/phonon/pkg-plist
index 985ffb9d45d2..489b28c032d2 100644
--- a/multimedia/phonon/pkg-plist
+++ b/multimedia/phonon/pkg-plist
@@ -96,8 +96,6 @@ include/phonon/videowidgetinterface.h
include/phonon/volumefadereffect.h
include/phonon/volumefaderinterface.h
include/phonon/volumeslider.h
-lib/kde4/plugins/phonon_backend/phonon_gstreamer.so
-lib/kde4/plugins/phonon_backend/phonon_xine.so
lib/libphonon.so
lib/libphonon.so.4
lib/libphonon.so.4.3.0
@@ -106,17 +104,6 @@ lib/libphononexperimental.so.4
lib/libphononexperimental.so.4.3.0
libdata/pkgconfig/phonon.pc
share/dbus-1/interfaces/org.kde.Phonon.AudioOutput.xml
-share/icons/oxygen/128x128/apps/phonon-xine.png
-share/icons/oxygen/16x16/apps/phonon-xine.png
-share/icons/oxygen/22x22/apps/phonon-xine.png
-share/icons/oxygen/32x32/apps/phonon-xine.png
-share/icons/oxygen/48x48/apps/phonon-xine.png
-share/icons/oxygen/64x64/apps/phonon-xine.png
-share/icons/oxygen/scalable/apps/phonon-xine.svgz
-share/kde4/services/phononbackends/gstreamer.desktop
-share/kde4/services/phononbackends/xine.desktop
-@dirrm share/kde4/services/phononbackends
-@dirrm lib/kde4/plugins/phonon_backend
@dirrm include/phonon/experimental
@dirrm include/phonon
@dirrm include/KDE/Phonon/Experimental
diff --git a/net/kdenetwork4/Makefile b/net/kdenetwork4/Makefile
index 19d3b7ff3a24..39f5f9d60f72 100644
--- a/net/kdenetwork4/Makefile
+++ b/net/kdenetwork4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdenetwork
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= net kde ipv6
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/net/kdenetwork4/distinfo b/net/kdenetwork4/distinfo
index 3dbe63525787..f833f3c5054e 100644
--- a/net/kdenetwork4/distinfo
+++ b/net/kdenetwork4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdenetwork-4.2.0.tar.bz2) = 0ea1628e11d398fdf45276a35edd3cae
-SHA256 (KDE/kdenetwork-4.2.0.tar.bz2) = b44b092da8379292080d44ec60b0286638b89d671a14fb167a5f27619af524cd
-SIZE (KDE/kdenetwork-4.2.0.tar.bz2) = 7459315
+MD5 (KDE/kdenetwork-4.2.1.tar.bz2) = 17ba9800af0bfcf20a49337624f9946a
+SHA256 (KDE/kdenetwork-4.2.1.tar.bz2) = 9b279f18d345039283ce19f02bac793f3d421ddba8a110920a7cd57940f518a5
+SIZE (KDE/kdenetwork-4.2.1.tar.bz2) = 7462237
diff --git a/net/kdenetwork4/files/patch-kopete__plugins__otr__CMakeLists.txt b/net/kdenetwork4/files/patch-kopete__plugins__otr__CMakeLists.txt
deleted file mode 100644
index 49aad1d2a5ce..000000000000
--- a/net/kdenetwork4/files/patch-kopete__plugins__otr__CMakeLists.txt
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../kopete/plugins/otr/CMakeLists.txt.orig 2008-10-01 16:20:37.000000000 +0000
-+++ ../kopete/plugins/otr/CMakeLists.txt 2009-01-28 23:21:50.000000000 +0000
-@@ -10,7 +10,7 @@
-
- kde4_add_plugin(kopete_otr ${kopete_otr_PART_SRCS})
-
--target_link_libraries(kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared otr)
-+target_link_libraries(kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared ${LIBOTR_LIBRARY})
-
- install(TARGETS kopete_otr DESTINATION ${PLUGIN_INSTALL_DIR})
-
-@@ -24,7 +24,7 @@
-
- kde4_add_plugin(kcm_kopete_otr ${kcm_kopete_otr_PART_SRCS})
-
--target_link_libraries(kcm_kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared otr)
-+target_link_libraries(kcm_kopete_otr ${KDE4_KDEUI_LIBS} kopete kopete_otr_shared ${LIBOTR_LIBRARY})
-
- install(TARGETS kcm_kopete_otr DESTINATION ${PLUGIN_INSTALL_DIR})
-
-@@ -40,7 +40,7 @@
-
- kde4_add_library(kopete_otr_shared SHARED ${kopete_otr_shared_LIB_SRCS})
-
--target_link_libraries(kopete_otr_shared kopete ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} otr)
-+target_link_libraries(kopete_otr_shared kopete ${KDE4_KIO_LIBS} ${KDE4_KDEUI_LIBS} ${LIBOTR_LIBRARY})
-
- set_target_properties(kopete_otr_shared PROPERTIES VERSION 1.0.0 SOVERSION 1)
- install(TARGETS kopete_otr_shared ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.cpp b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.cpp
deleted file mode 100644
index bc7f63d32a68..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/client.cpp 2009/02/06 02:57:20 921978
-+++ ../kopete/protocols/yahoo/libkyahoo/client.cpp 2009/02/09 14:00:12 923817
-@@ -99,6 +99,8 @@
- QString statusMessageOnConnect;
- Yahoo::PictureStatus pictureFlag;
- int pictureChecksum;
-+ bool buddyListReady;
-+ QStringList pictureRequestQueue;
- };
-
- Client::Client(QObject *par) :QObject(par)
-@@ -117,12 +119,14 @@
- d->loginTask = new LoginTask( d->root );
- d->listTask = new ListTask( d->root );
- d->pictureFlag = Yahoo::NoPicture;
-+ d->buddyListReady = false;
- m_connector = 0L;
-
- m_pingTimer = new QTimer( this );
- QObject::connect( m_pingTimer, SIGNAL( timeout() ), this, SLOT( sendPing() ) );
-
- QObject::connect( d->loginTask, SIGNAL( haveSessionID( uint ) ), SLOT( lt_gotSessionID( uint ) ) );
-+ QObject::connect( d->loginTask, SIGNAL( buddyListReady() ), SLOT( processPictureQueue() ) );
- QObject::connect( d->loginTask, SIGNAL( loginResponse( int, const QString& ) ),
- SLOT( slotLoginResponse( int, const QString& ) ) );
- QObject::connect( d->loginTask, SIGNAL( haveCookies() ), SLOT( slotGotCookies() ) );
-@@ -197,6 +201,7 @@
- m_connector->deleteLater();
- m_connector = 0L;
- d->active = false;
-+ d->buddyListReady = false;
- }
-
- int Client::error()
-@@ -490,8 +495,33 @@
-
- // ***** Buddyicon handling *****
-
-+void Client::processPictureQueue()
-+{
-+ kDebug(YAHOO_RAW_DEBUG) << k_funcinfo << endl;
-+ d->buddyListReady = true;
-+ if( d->pictureRequestQueue.isEmpty() )
-+ {
-+ return;
-+ }
-+
-+ requestPicture( d->pictureRequestQueue.front() );
-+ d->pictureRequestQueue.pop_front();
-+
-+
-+ if( !d->pictureRequestQueue.isEmpty() )
-+ {
-+ QTimer::singleShot( 1000, this, SLOT(processPictureQueue()) );
-+ }
-+}
-+
- void Client::requestPicture( const QString &userId )
- {
-+ if( !d->buddyListReady )
-+ {
-+ d->pictureRequestQueue << userId;
-+ return;
-+ }
-+
- RequestPictureTask *rpt = new RequestPictureTask( d->root );
- rpt->setTarget( userId );
- rpt->go( true );
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.h b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.h
deleted file mode 100644
index 766d5d2111a0..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_libkyahoo-client.h
+++ /dev/null
@@ -1,15 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/client.h 2009/02/06 02:57:20 921978
-+++ ../kopete/protocols/yahoo/libkyahoo/client.h 2009/02/09 14:00:12 923817
-@@ -705,6 +705,12 @@
- * Send a Yahoo Ping packet to the server
- */
- void sendPing();
-+
-+ /**
-+ * Send all queued buddy icon requests
-+ */
-+ void processPictureQueue();
-+
- private:
- void distribute( Transfer *transfer );
-
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.cpp b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.cpp
deleted file mode 100644
index 8ec51280c819..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.cpp
+++ /dev/null
@@ -1,25 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/logintask.cpp 2009/01/06 17:13:38 906699
-+++ ../kopete/protocols/yahoo/libkyahoo/logintask.cpp 2009/02/09 14:00:12 923817
-@@ -66,6 +66,12 @@
-
- YMSGTransfer *t = static_cast<YMSGTransfer *>(transfer);
-
-+
-+ if ( t->service() == Yahoo::ServicePing) {
-+ emit buddyListReady();
-+ return true;
-+ }
-+
- switch (mState)
- {
- case (InitialState):
-@@ -99,6 +105,9 @@
- if (!t)
- return false;
-
-+ if ( t->service() == Yahoo::ServicePing)
-+ return true;
-+
- switch (mState)
- {
- case (InitialState):
diff --git a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.h b/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.h
deleted file mode 100644
index 6683119db832..000000000000
--- a/net/kdenetwork4/files/patch-svn923812-kopete_protocols_yahoo_logintask.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kopete/protocols/yahoo/libkyahoo/logintask.h 2009/01/06 17:13:38 906699
-+++ ../kopete/protocols/yahoo/libkyahoo/logintask.h 2009/02/09 14:00:12 923817
-@@ -62,6 +62,7 @@
- void haveSessionID( uint );
- void haveCookies();
- void loginResponse( int, const QString& );
-+ void buddyListReady();
- private:
- State mState;
- Yahoo::Status m_stateOnConnect;
diff --git a/polish/kde4-l10n/distinfo b/polish/kde4-l10n/distinfo
index 0dda415d1852..d7ca6b35ce5b 100644
--- a/polish/kde4-l10n/distinfo
+++ b/polish/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-pl-4.2.0.tar.bz2) = b04d741a53b0e1ba58d315cf118985e4
-SHA256 (KDE/kde-l10n/kde-l10n-pl-4.2.0.tar.bz2) = 2b6a91600ead9ec9a6defc30770fa49c9f1faf330a5afbcb717e0db03de44561
-SIZE (KDE/kde-l10n/kde-l10n-pl-4.2.0.tar.bz2) = 2663037
+MD5 (KDE/kde-l10n/kde-l10n-pl-4.2.1.tar.bz2) = 6cc2883667a293f7db927fd076623f93
+SHA256 (KDE/kde-l10n/kde-l10n-pl-4.2.1.tar.bz2) = cd78ee7d321573a5b93ab1a71eba2c8653a9f99e840a30130c9293ff6bb61481
+SIZE (KDE/kde-l10n/kde-l10n-pl-4.2.1.tar.bz2) = 2747131
diff --git a/polish/kde4-l10n/pkg-plist b/polish/kde4-l10n/pkg-plist
index 08b229d5a879..ea33a69bb1ec 100644
--- a/polish/kde4-l10n/pkg-plist
+++ b/polish/kde4-l10n/pkg-plist
@@ -6,6 +6,13 @@ share/apps/kvtml/pl/medium.kvtml
share/doc/HTML/pl/ark/common
share/doc/HTML/pl/ark/index.cache.bz2
share/doc/HTML/pl/ark/index.docbook
+share/doc/HTML/pl/gwenview/common
+share/doc/HTML/pl/gwenview/index.cache.bz2
+share/doc/HTML/pl/gwenview/index.docbook
+share/doc/HTML/pl/gwenview/interface.docbook
+share/doc/HTML/pl/gwenview/introduction.docbook
+share/doc/HTML/pl/gwenview/keybindings.docbook
+share/doc/HTML/pl/gwenview/mouse.docbook
share/doc/HTML/pl/kbruch/checked.png
share/doc/HTML/pl/kbruch/common
share/doc/HTML/pl/kbruch/compare.png
@@ -19,6 +26,9 @@ share/doc/HTML/pl/kbruch/settings.png
share/doc/HTML/pl/kcontrol/kcontrol/common
share/doc/HTML/pl/kcontrol/kcontrol/index.cache.bz2
share/doc/HTML/pl/kcontrol/kcontrol/index.docbook
+share/doc/HTML/pl/killbots/common
+share/doc/HTML/pl/killbots/index.cache.bz2
+share/doc/HTML/pl/killbots/index.docbook
share/doc/HTML/pl/klettres/common
share/doc/HTML/pl/klettres/index.cache.bz2
share/doc/HTML/pl/klettres/index.docbook
@@ -30,6 +40,12 @@ share/doc/HTML/pl/klettres/klettres5.png
share/doc/HTML/pl/kollision/common
share/doc/HTML/pl/kollision/index.cache.bz2
share/doc/HTML/pl/kollision/index.docbook
+share/doc/HTML/pl/kscd/common
+share/doc/HTML/pl/kscd/index.cache.bz2
+share/doc/HTML/pl/kscd/index.docbook
+share/doc/HTML/pl/ksnapshot/common
+share/doc/HTML/pl/ksnapshot/index.cache.bz2
+share/doc/HTML/pl/ksnapshot/index.docbook
share/doc/HTML/pl/ktouch/common
share/doc/HTML/pl/ktouch/index.cache.bz2
share/doc/HTML/pl/ktouch/index.docbook
@@ -202,6 +218,7 @@ share/locale/pl/LC_MESSAGES/kdessh.mo
share/locale/pl/LC_MESSAGES/kdesu.mo
share/locale/pl/LC_MESSAGES/kdesud.mo
share/locale/pl/LC_MESSAGES/kdf.mo
+share/locale/pl/LC_MESSAGES/kdgantt.mo
share/locale/pl/LC_MESSAGES/kdgantt1.mo
share/locale/pl/LC_MESSAGES/kdialog.mo
share/locale/pl/LC_MESSAGES/kdiamond.mo
@@ -251,6 +268,7 @@ share/locale/pl/LC_MESSAGES/khotnewstuff.mo
share/locale/pl/LC_MESSAGES/khtmlkttsd.mo
share/locale/pl/LC_MESSAGES/kiconfinder.mo
share/locale/pl/LC_MESSAGES/kig.mo
+share/locale/pl/LC_MESSAGES/killbots.mo
share/locale/pl/LC_MESSAGES/kimagemapeditor.mo
share/locale/pl/LC_MESSAGES/kinetd.mo
share/locale/pl/LC_MESSAGES/kinfocenter.mo
@@ -364,6 +382,7 @@ share/locale/pl/LC_MESSAGES/ksaneplugin.mo
share/locale/pl/LC_MESSAGES/ksayit.mo
share/locale/pl/LC_MESSAGES/kscd.mo
share/locale/pl/LC_MESSAGES/kscreensaver.mo
+share/locale/pl/LC_MESSAGES/ksendemail.mo
share/locale/pl/LC_MESSAGES/kshisen.mo
share/locale/pl/LC_MESSAGES/kshorturifilter.mo
share/locale/pl/LC_MESSAGES/ksirk.mo
@@ -483,6 +502,7 @@ share/locale/pl/LC_MESSAGES/plasma.mo
share/locale/pl/LC_MESSAGES/plasma_applet_battery.mo
share/locale/pl/LC_MESSAGES/plasma_applet_bball.mo
share/locale/pl/LC_MESSAGES/plasma_applet_binaryclock.mo
+share/locale/pl/LC_MESSAGES/plasma_applet_bluemarble.mo
share/locale/pl/LC_MESSAGES/plasma_applet_calculator.mo
share/locale/pl/LC_MESSAGES/plasma_applet_charselect.mo
share/locale/pl/LC_MESSAGES/plasma_applet_clock.mo
@@ -503,6 +523,8 @@ share/locale/pl/LC_MESSAGES/plasma_applet_katesession.mo
share/locale/pl/LC_MESSAGES/plasma_applet_kget.mo
share/locale/pl/LC_MESSAGES/plasma_applet_kolourpicker.mo
share/locale/pl/LC_MESSAGES/plasma_applet_launcher.mo
+share/locale/pl/LC_MESSAGES/plasma_applet_leavenote.mo
+share/locale/pl/LC_MESSAGES/plasma_applet_life.mo
share/locale/pl/LC_MESSAGES/plasma_applet_luna.mo
share/locale/pl/LC_MESSAGES/plasma_applet_news.mo
share/locale/pl/LC_MESSAGES/plasma_applet_notes.mo
@@ -514,6 +536,7 @@ share/locale/pl/LC_MESSAGES/plasma_applet_pastebin.mo
share/locale/pl/LC_MESSAGES/plasma_applet_previewer.mo
share/locale/pl/LC_MESSAGES/plasma_applet_quicklaunch.mo
share/locale/pl/LC_MESSAGES/plasma_applet_rssnow.mo
+share/locale/pl/LC_MESSAGES/plasma_applet_showdashboard.mo
share/locale/pl/LC_MESSAGES/plasma_applet_showdesktop.mo
share/locale/pl/LC_MESSAGES/plasma_applet_skapplet.mo
share/locale/pl/LC_MESSAGES/plasma_applet_system-monitor.mo
@@ -532,12 +555,14 @@ share/locale/pl/LC_MESSAGES/plasma_engine_kalzium.mo
share/locale/pl/LC_MESSAGES/plasma_engine_rss.mo
share/locale/pl/LC_MESSAGES/plasma_runner_contacts.mo
share/locale/pl/LC_MESSAGES/plasma_runner_converterrunner.mo
+share/locale/pl/LC_MESSAGES/plasma_runner_katesessions.mo
share/locale/pl/LC_MESSAGES/plasma_runner_locations.mo
share/locale/pl/LC_MESSAGES/plasma_runner_nepomuksearchrunner.mo
share/locale/pl/LC_MESSAGES/plasma_runner_powerdevil.mo
share/locale/pl/LC_MESSAGES/plasma_runner_recentdocuments.mo
share/locale/pl/LC_MESSAGES/plasma_runner_sessions.mo
share/locale/pl/LC_MESSAGES/plasma_runner_shell.mo
+share/locale/pl/LC_MESSAGES/plasma_runner_spellcheckrunner.mo
share/locale/pl/LC_MESSAGES/plasma_runner_webshortcuts.mo
share/locale/pl/LC_MESSAGES/plasma_scriptengine_qscript.mo
share/locale/pl/LC_MESSAGES/plasma_wallpaper_color.mo
@@ -576,11 +601,15 @@ share/locale/pl/entry.desktop
@dirrm share/doc/HTML/pl/kwallet
@dirrm share/doc/HTML/pl/ktuberling
@dirrm share/doc/HTML/pl/ktouch
+@dirrm share/doc/HTML/pl/ksnapshot
+@dirrm share/doc/HTML/pl/kscd
@dirrm share/doc/HTML/pl/kollision
@dirrm share/doc/HTML/pl/klettres
+@dirrm share/doc/HTML/pl/killbots
@dirrm share/doc/HTML/pl/kcontrol/kcontrol
@dirrm share/doc/HTML/pl/kcontrol
@dirrm share/doc/HTML/pl/kbruch
+@dirrm share/doc/HTML/pl/gwenview
@dirrm share/doc/HTML/pl/ark
@dirrm share/apps/kvtml/pl
@dirrm share/apps/kvtml
diff --git a/portuguese/kde4-l10n-pt_BR/Makefile.man b/portuguese/kde4-l10n-pt_BR/Makefile.man
index b25a00811ab3..bb1a7d7b11bc 100644
--- a/portuguese/kde4-l10n-pt_BR/Makefile.man
+++ b/portuguese/kde4-l10n-pt_BR/Makefile.man
@@ -1,4 +1,6 @@
-MAN1= cheatmake.1 \
+MAN1= adddebug.1 \
+ cheatmake.1 \
+ checkXML.1 \
create_cvsignore.1 \
create_makefile.1 \
create_makefiles.1 \
@@ -12,8 +14,21 @@ MAN1= cheatmake.1 \
extractrc.1 \
fixincludes.1 \
kalzium.1 \
+ kate.1 \
kappfinder.1 \
+ kconfig_compiler.1 \
kbookmarkmerger.1 \
+ kde4-config.1 \
+ kdesu.1 \
+ kfind.1 \
+ kjs.1 \
+ kjscmd.1 \
+ kmag.1 \
+ kmousetool.1 \
+ kmouth.1 \
+ kross.1 \
+ makekdewidgets.1 \
+ preparetips.1 \
kworldclock.1 \
po2xml.1 \
pruneemptydirs.1 \
@@ -26,3 +41,10 @@ MAN1= cheatmake.1 \
zonetab2pot.py.1
MAN6= amor.6 \
kpat.6
+MAN7= kdeoptions.7 \
+ qtoptions.7
+MAN8= kbuildsycoca4.8 \
+ kcookiejar4.8 \
+ kded4.8 \
+ kdeinit4.8 \
+ meinproc4.8
diff --git a/portuguese/kde4-l10n-pt_BR/distinfo b/portuguese/kde4-l10n-pt_BR/distinfo
index 84bbad80ba75..f1ce31756081 100644
--- a/portuguese/kde4-l10n-pt_BR/distinfo
+++ b/portuguese/kde4-l10n-pt_BR/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-pt_BR-4.2.0.tar.bz2) = d932254d7168016819aacc45a759592e
-SHA256 (KDE/kde-l10n/kde-l10n-pt_BR-4.2.0.tar.bz2) = c0527db7e7946b345ebec507126a05b0040e310c0a990dc032c0833ac77bd0b5
-SIZE (KDE/kde-l10n/kde-l10n-pt_BR-4.2.0.tar.bz2) = 11006251
+MD5 (KDE/kde-l10n/kde-l10n-pt_BR-4.2.1.tar.bz2) = a77c500292a1615f77a519d84d6f5a7c
+SHA256 (KDE/kde-l10n/kde-l10n-pt_BR-4.2.1.tar.bz2) = e910d6eac7b83683173e4f951e2ca56a9322f4830f77b8326db0103784af504c
+SIZE (KDE/kde-l10n/kde-l10n-pt_BR-4.2.1.tar.bz2) = 11556179
diff --git a/portuguese/kde4-l10n-pt_BR/pkg-plist b/portuguese/kde4-l10n-pt_BR/pkg-plist
index 892d0e3d4e96..4b84de146c5a 100644
--- a/portuguese/kde4-l10n-pt_BR/pkg-plist
+++ b/portuguese/kde4-l10n-pt_BR/pkg-plist
@@ -151,6 +151,16 @@ share/doc/HTML/pt_BR/kalzium/man-kalzium.1.docbook
share/doc/HTML/pt_BR/karm/common
share/doc/HTML/pt_BR/karm/index.cache.bz2
share/doc/HTML/pt_BR/karm/index.docbook
+share/doc/HTML/pt_BR/kate-plugins/common
+share/doc/HTML/pt_BR/kate-plugins/filetemplates.docbook
+share/doc/HTML/pt_BR/kate-plugins/htmltools.docbook
+share/doc/HTML/pt_BR/kate-plugins/index.cache.bz2
+share/doc/HTML/pt_BR/kate-plugins/index.docbook
+share/doc/HTML/pt_BR/kate-plugins/insertcommand.docbook
+share/doc/HTML/pt_BR/kate-plugins/openheader.docbook
+share/doc/HTML/pt_BR/kate-plugins/textfilter.docbook
+share/doc/HTML/pt_BR/kate-plugins/xmlcheck.docbook
+share/doc/HTML/pt_BR/kate-plugins/xmltools.docbook
share/doc/HTML/pt_BR/katomic/common
share/doc/HTML/pt_BR/katomic/index.cache.bz2
share/doc/HTML/pt_BR/katomic/index.docbook
@@ -181,24 +191,179 @@ share/doc/HTML/pt_BR/kcharselect/index.docbook
share/doc/HTML/pt_BR/kcmlirc/common
share/doc/HTML/pt_BR/kcmlirc/index.cache.bz2
share/doc/HTML/pt_BR/kcmlirc/index.docbook
+share/doc/HTML/pt_BR/kcontrol/background/common
+share/doc/HTML/pt_BR/kcontrol/background/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/background/index.docbook
+share/doc/HTML/pt_BR/kcontrol/bell/common
+share/doc/HTML/pt_BR/kcontrol/bell/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/bell/index.docbook
+share/doc/HTML/pt_BR/kcontrol/bookmarks/common
+share/doc/HTML/pt_BR/kcontrol/bookmarks/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/bookmarks/index.docbook
+share/doc/HTML/pt_BR/kcontrol/cache/common
+share/doc/HTML/pt_BR/kcontrol/cache/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/cache/index.docbook
+share/doc/HTML/pt_BR/kcontrol/clock/common
+share/doc/HTML/pt_BR/kcontrol/clock/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/clock/index.docbook
+share/doc/HTML/pt_BR/kcontrol/colors/common
+share/doc/HTML/pt_BR/kcontrol/colors/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/colors/index.docbook
+share/doc/HTML/pt_BR/kcontrol/cookies/common
+share/doc/HTML/pt_BR/kcontrol/cookies/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/cookies/index.docbook
+share/doc/HTML/pt_BR/kcontrol/crypto/common
+share/doc/HTML/pt_BR/kcontrol/crypto/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/crypto/index.docbook
+share/doc/HTML/pt_BR/kcontrol/desktop/common
+share/doc/HTML/pt_BR/kcontrol/desktop/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/desktop/index.docbook
+share/doc/HTML/pt_BR/kcontrol/desktopbehavior/common
+share/doc/HTML/pt_BR/kcontrol/desktopbehavior/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/desktopbehavior/index.docbook
+share/doc/HTML/pt_BR/kcontrol/ebrowsing/common
+share/doc/HTML/pt_BR/kcontrol/ebrowsing/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/ebrowsing/index.docbook
+share/doc/HTML/pt_BR/kcontrol/email/common
+share/doc/HTML/pt_BR/kcontrol/email/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/email/index.docbook
+share/doc/HTML/pt_BR/kcontrol/emoticons/common
+share/doc/HTML/pt_BR/kcontrol/emoticons/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/emoticons/index.docbook
+share/doc/HTML/pt_BR/kcontrol/energy/common
+share/doc/HTML/pt_BR/kcontrol/energy/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/energy/index.docbook
+share/doc/HTML/pt_BR/kcontrol/filemanager/common
+share/doc/HTML/pt_BR/kcontrol/filemanager/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/filemanager/index.docbook
+share/doc/HTML/pt_BR/kcontrol/filetypes/common
+share/doc/HTML/pt_BR/kcontrol/filetypes/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/filetypes/index.docbook
+share/doc/HTML/pt_BR/kcontrol/fontinst/common
+share/doc/HTML/pt_BR/kcontrol/fontinst/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/fontinst/index.docbook
+share/doc/HTML/pt_BR/kcontrol/fonts/common
+share/doc/HTML/pt_BR/kcontrol/fonts/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/fonts/index.docbook
+share/doc/HTML/pt_BR/kcontrol/helpindex/common
+share/doc/HTML/pt_BR/kcontrol/helpindex/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/helpindex/index.docbook
+share/doc/HTML/pt_BR/kcontrol/icons/common
+share/doc/HTML/pt_BR/kcontrol/icons/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/icons/index.docbook
+share/doc/HTML/pt_BR/kcontrol/joystick/common
+share/doc/HTML/pt_BR/kcontrol/joystick/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/joystick/index.docbook
share/doc/HTML/pt_BR/kcontrol/kamera/common
share/doc/HTML/pt_BR/kcontrol/kamera/index.cache.bz2
share/doc/HTML/pt_BR/kcontrol/kamera/index.docbook
-share/doc/HTML/pt_BR/kcontrol/kcmktalkd/common
-share/doc/HTML/pt_BR/kcontrol/kcmktalkd/index.cache.bz2
-share/doc/HTML/pt_BR/kcontrol/kcmktalkd/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmaccess/common
+share/doc/HTML/pt_BR/kcontrol/kcmaccess/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmaccess/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmcss/common
+share/doc/HTML/pt_BR/kcontrol/kcmcss/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmcss/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmdisplay/common
+share/doc/HTML/pt_BR/kcontrol/kcmdisplay/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmdisplay/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmkonsole/common
+share/doc/HTML/pt_BR/kcontrol/kcmkonsole/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmkonsole/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmlaunch/common
+share/doc/HTML/pt_BR/kcontrol/kcmlaunch/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmlaunch/index.docbook
share/doc/HTML/pt_BR/kcontrol/kcmlowbatcrit/common
share/doc/HTML/pt_BR/kcontrol/kcmlowbatcrit/index.cache.bz2
share/doc/HTML/pt_BR/kcontrol/kcmlowbatcrit/index.docbook
share/doc/HTML/pt_BR/kcontrol/kcmlowbatwarn/common
share/doc/HTML/pt_BR/kcontrol/kcmlowbatwarn/index.cache.bz2
share/doc/HTML/pt_BR/kcontrol/kcmlowbatwarn/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmnotify/common
+share/doc/HTML/pt_BR/kcontrol/kcmnotify/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmnotify/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmsmserver/common
+share/doc/HTML/pt_BR/kcontrol/kcmsmserver/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmsmserver/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmstyle/common
+share/doc/HTML/pt_BR/kcontrol/kcmstyle/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmstyle/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kcmtaskbar/common
+share/doc/HTML/pt_BR/kcontrol/kcmtaskbar/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kcmtaskbar/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kdm/common
+share/doc/HTML/pt_BR/kcontrol/kdm/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kdm/index.docbook
+share/doc/HTML/pt_BR/kcontrol/keyboard/common
+share/doc/HTML/pt_BR/kcontrol/keyboard/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/keyboard/index.docbook
+share/doc/HTML/pt_BR/kcontrol/keys/common
+share/doc/HTML/pt_BR/kcontrol/keys/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/keys/index.docbook
+share/doc/HTML/pt_BR/kcontrol/khtml/common
+share/doc/HTML/pt_BR/kcontrol/khtml/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/khtml/index.docbook
+share/doc/HTML/pt_BR/kcontrol/khtml/nsplugin.docbook
+share/doc/HTML/pt_BR/kcontrol/kwincompositing/common
+share/doc/HTML/pt_BR/kcontrol/kwincompositing/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kwincompositing/index.docbook
+share/doc/HTML/pt_BR/kcontrol/kwindecoration/common
+share/doc/HTML/pt_BR/kcontrol/kwindecoration/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/kwindecoration/index.docbook
+share/doc/HTML/pt_BR/kcontrol/language/common
+share/doc/HTML/pt_BR/kcontrol/language/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/language/index.docbook
share/doc/HTML/pt_BR/kcontrol/laptop/common
share/doc/HTML/pt_BR/kcontrol/laptop/index.cache.bz2
share/doc/HTML/pt_BR/kcontrol/laptop/index.docbook
+share/doc/HTML/pt_BR/kcontrol/mouse/common
+share/doc/HTML/pt_BR/kcontrol/mouse/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/mouse/index.docbook
+share/doc/HTML/pt_BR/kcontrol/netpref/common
+share/doc/HTML/pt_BR/kcontrol/netpref/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/netpref/index.docbook
+share/doc/HTML/pt_BR/kcontrol/panel/common
+share/doc/HTML/pt_BR/kcontrol/panel/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/panel/index.docbook
+share/doc/HTML/pt_BR/kcontrol/panelappearance/common
+share/doc/HTML/pt_BR/kcontrol/panelappearance/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/panelappearance/index.docbook
+share/doc/HTML/pt_BR/kcontrol/passwords/common
+share/doc/HTML/pt_BR/kcontrol/passwords/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/passwords/index.docbook
+share/doc/HTML/pt_BR/kcontrol/paths/common
+share/doc/HTML/pt_BR/kcontrol/paths/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/paths/index.docbook
+share/doc/HTML/pt_BR/kcontrol/performance/common
+share/doc/HTML/pt_BR/kcontrol/performance/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/performance/index.docbook
share/doc/HTML/pt_BR/kcontrol/powerctrl/common
share/doc/HTML/pt_BR/kcontrol/powerctrl/index.cache.bz2
share/doc/HTML/pt_BR/kcontrol/powerctrl/index.docbook
+share/doc/HTML/pt_BR/kcontrol/powerdevil/common
+share/doc/HTML/pt_BR/kcontrol/powerdevil/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/powerdevil/index.docbook
+share/doc/HTML/pt_BR/kcontrol/proxy/common
+share/doc/HTML/pt_BR/kcontrol/proxy/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/proxy/index.docbook
+share/doc/HTML/pt_BR/kcontrol/proxy/socks.docbook
+share/doc/HTML/pt_BR/kcontrol/screensaver/common
+share/doc/HTML/pt_BR/kcontrol/screensaver/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/screensaver/index.docbook
+share/doc/HTML/pt_BR/kcontrol/smb/common
+share/doc/HTML/pt_BR/kcontrol/smb/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/smb/index.docbook
+share/doc/HTML/pt_BR/kcontrol/spellchecking/common
+share/doc/HTML/pt_BR/kcontrol/spellchecking/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/spellchecking/index.docbook
+share/doc/HTML/pt_BR/kcontrol/splashscreen/common
+share/doc/HTML/pt_BR/kcontrol/splashscreen/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/splashscreen/index.docbook
+share/doc/HTML/pt_BR/kcontrol/useragent/common
+share/doc/HTML/pt_BR/kcontrol/useragent/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/useragent/index.docbook
+share/doc/HTML/pt_BR/kcontrol/windowbehaviour/common
+share/doc/HTML/pt_BR/kcontrol/windowbehaviour/index.cache.bz2
+share/doc/HTML/pt_BR/kcontrol/windowbehaviour/index.docbook
share/doc/HTML/pt_BR/kcron/common
share/doc/HTML/pt_BR/kcron/index.cache.bz2
share/doc/HTML/pt_BR/kcron/index.docbook
@@ -208,9 +373,13 @@ share/doc/HTML/pt_BR/kdat/index.docbook
share/doc/HTML/pt_BR/kdebugdialog/common
share/doc/HTML/pt_BR/kdebugdialog/index.cache.bz2
share/doc/HTML/pt_BR/kdebugdialog/index.docbook
+share/doc/HTML/pt_BR/kdepasswd/common
+share/doc/HTML/pt_BR/kdepasswd/index.cache.bz2
+share/doc/HTML/pt_BR/kdepasswd/index.docbook
share/doc/HTML/pt_BR/kdesu/common
share/doc/HTML/pt_BR/kdesu/index.cache.bz2
share/doc/HTML/pt_BR/kdesu/index.docbook
+share/doc/HTML/pt_BR/kdesu/man-kdesu.1.docbook
share/doc/HTML/pt_BR/kdf/common
share/doc/HTML/pt_BR/kdf/index.cache.bz2
share/doc/HTML/pt_BR/kdf/index.docbook
@@ -220,6 +389,7 @@ share/doc/HTML/pt_BR/kdm/common
share/doc/HTML/pt_BR/kdm/index.cache.bz2
share/doc/HTML/pt_BR/kdm/index.docbook
share/doc/HTML/pt_BR/kdm/kdmrc-ref.docbook
+share/doc/HTML/pt_BR/kdm/theme-ref.docbook
share/doc/HTML/pt_BR/kedit/common
share/doc/HTML/pt_BR/kedit/index.cache.bz2
share/doc/HTML/pt_BR/kedit/index.docbook
@@ -229,6 +399,7 @@ share/doc/HTML/pt_BR/kfilereplace/index.docbook
share/doc/HTML/pt_BR/kfind/common
share/doc/HTML/pt_BR/kfind/index.cache.bz2
share/doc/HTML/pt_BR/kfind/index.docbook
+share/doc/HTML/pt_BR/kfind/man-kfind.1.docbook
share/doc/HTML/pt_BR/kfloppy/common
share/doc/HTML/pt_BR/kfloppy/index.cache.bz2
share/doc/HTML/pt_BR/kfloppy/index.docbook
@@ -236,22 +407,6 @@ share/doc/HTML/pt_BR/kgamma/common
share/doc/HTML/pt_BR/kgamma/index.cache.bz2
share/doc/HTML/pt_BR/kgamma/index.docbook
share/doc/HTML/pt_BR/kget/common
-share/doc/HTML/pt_BR/kget/cr22-action-tool_delay.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_delete.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_disconnect.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_drop_target.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_expert.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_logwindow.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_offline_mode_off.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_offline_mode_on.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_paste.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_pause.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_queue.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_restart.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_resume.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_shutdown.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_timer.png
-share/doc/HTML/pt_BR/kget/cr22-action-tool_uselastdir.png
share/doc/HTML/pt_BR/kget/index.cache.bz2
share/doc/HTML/pt_BR/kget/index.docbook
share/doc/HTML/pt_BR/kgoldrunner/common
@@ -282,15 +437,12 @@ share/doc/HTML/pt_BR/khelpcenter/faq/moreinfo.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/nonkdeapps.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/notrelated.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/panel.docbook
+share/doc/HTML/pt_BR/khelpcenter/faq/qt.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/questions.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/sound.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/tips.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/webbrowse.docbook
share/doc/HTML/pt_BR/khelpcenter/faq/winmng.docbook
-share/doc/HTML/pt_BR/khelpcenter/glossary/common
-share/doc/HTML/pt_BR/khelpcenter/glossary/index.cache.bz2
-share/doc/HTML/pt_BR/khelpcenter/glossary/index.docbook
-share/doc/HTML/pt_BR/khelpcenter/glossary/kdeprintingglossary.docbook
share/doc/HTML/pt_BR/khelpcenter/help.docbook
share/doc/HTML/pt_BR/khelpcenter/index.cache.bz2
share/doc/HTML/pt_BR/khelpcenter/index.docbook
@@ -306,7 +458,9 @@ share/doc/HTML/pt_BR/khelpcenter/userguide/common
share/doc/HTML/pt_BR/khelpcenter/userguide/control-center.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/creating-graphics.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/credits-and-license.docbook
+share/doc/HTML/pt_BR/khelpcenter/userguide/customizing-desktop.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/email.docbook
+share/doc/HTML/pt_BR/khelpcenter/userguide/extragear-applications.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/file-sharing.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/font-installation.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/getting-help.docbook
@@ -321,6 +475,7 @@ share/doc/HTML/pt_BR/khelpcenter/userguide/kde-for-admins.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/kde-office.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/konsole-intro.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/messaging-intro.docbook
+share/doc/HTML/pt_BR/khelpcenter/userguide/migrator-applications.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/migrator-dictionary.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/net-connection-setup.docbook
share/doc/HTML/pt_BR/khelpcenter/userguide/networking-with-windows.docbook
@@ -419,48 +574,75 @@ share/doc/HTML/pt_BR/kinfocenter/usb/index.docbook
share/doc/HTML/pt_BR/kinfocenter/xserver/common
share/doc/HTML/pt_BR/kinfocenter/xserver/index.cache.bz2
share/doc/HTML/pt_BR/kinfocenter/xserver/index.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/bzip.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/bzip2.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/cgi.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/common
-share/doc/HTML/pt_BR/kioslave/kioslave/data.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/file.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/finger.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/fish.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/floppy.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/ftp.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/gopher.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/gzip.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/help.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/http.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/https.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/imap.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/imaps.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/index.cache.bz2
-share/doc/HTML/pt_BR/kioslave/kioslave/index.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/info.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/lan.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/ldap.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/mac.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/mailto.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/man.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/mrml.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/news.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/nfs.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/nntp.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/pop3.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/pop3s.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/print.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/rlan.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/rlogin.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/sftp.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/smb.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/smtp.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/tar.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/telnet.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/thumbnail.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/webdav.docbook
-share/doc/HTML/pt_BR/kioslave/kioslave/webdavs.docbook
+share/doc/HTML/pt_BR/kioslave/bookmarks/common
+share/doc/HTML/pt_BR/kioslave/bookmarks/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/bookmarks/index.docbook
+share/doc/HTML/pt_BR/kioslave/bzip2/common
+share/doc/HTML/pt_BR/kioslave/bzip2/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/bzip2/index.docbook
+share/doc/HTML/pt_BR/kioslave/cgi/common
+share/doc/HTML/pt_BR/kioslave/cgi/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/cgi/index.docbook
+share/doc/HTML/pt_BR/kioslave/data/common
+share/doc/HTML/pt_BR/kioslave/data/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/data/index.docbook
+share/doc/HTML/pt_BR/kioslave/file/common
+share/doc/HTML/pt_BR/kioslave/file/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/file/index.docbook
+share/doc/HTML/pt_BR/kioslave/finger/common
+share/doc/HTML/pt_BR/kioslave/finger/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/finger/index.docbook
+share/doc/HTML/pt_BR/kioslave/fish/common
+share/doc/HTML/pt_BR/kioslave/fish/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/fish/index.docbook
+share/doc/HTML/pt_BR/kioslave/floppy/common
+share/doc/HTML/pt_BR/kioslave/floppy/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/floppy/index.docbook
+share/doc/HTML/pt_BR/kioslave/ftp/common
+share/doc/HTML/pt_BR/kioslave/ftp/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/ftp/index.docbook
+share/doc/HTML/pt_BR/kioslave/gzip/common
+share/doc/HTML/pt_BR/kioslave/gzip/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/gzip/index.docbook
+share/doc/HTML/pt_BR/kioslave/help/common
+share/doc/HTML/pt_BR/kioslave/help/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/help/index.docbook
+share/doc/HTML/pt_BR/kioslave/http/common
+share/doc/HTML/pt_BR/kioslave/http/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/http/index.docbook
+share/doc/HTML/pt_BR/kioslave/info/common
+share/doc/HTML/pt_BR/kioslave/info/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/info/index.docbook
+share/doc/HTML/pt_BR/kioslave/mailto/common
+share/doc/HTML/pt_BR/kioslave/mailto/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/mailto/index.docbook
+share/doc/HTML/pt_BR/kioslave/man/common
+share/doc/HTML/pt_BR/kioslave/man/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/man/index.docbook
+share/doc/HTML/pt_BR/kioslave/nfs/common
+share/doc/HTML/pt_BR/kioslave/nfs/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/nfs/index.docbook
+share/doc/HTML/pt_BR/kioslave/rlogin/common
+share/doc/HTML/pt_BR/kioslave/rlogin/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/rlogin/index.docbook
+share/doc/HTML/pt_BR/kioslave/sftp/common
+share/doc/HTML/pt_BR/kioslave/sftp/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/sftp/index.docbook
+share/doc/HTML/pt_BR/kioslave/smb/common
+share/doc/HTML/pt_BR/kioslave/smb/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/smb/index.docbook
+share/doc/HTML/pt_BR/kioslave/tar/common
+share/doc/HTML/pt_BR/kioslave/tar/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/tar/index.docbook
+share/doc/HTML/pt_BR/kioslave/telnet/common
+share/doc/HTML/pt_BR/kioslave/telnet/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/telnet/index.docbook
+share/doc/HTML/pt_BR/kioslave/thumbnail/common
+share/doc/HTML/pt_BR/kioslave/thumbnail/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/thumbnail/index.docbook
+share/doc/HTML/pt_BR/kioslave/webdav/common
+share/doc/HTML/pt_BR/kioslave/webdav/index.cache.bz2
+share/doc/HTML/pt_BR/kioslave/webdav/index.docbook
share/doc/HTML/pt_BR/kiten/common
share/doc/HTML/pt_BR/kiten/index.cache.bz2
share/doc/HTML/pt_BR/kiten/index.docbook
@@ -493,6 +675,7 @@ share/doc/HTML/pt_BR/klipper/index.docbook
share/doc/HTML/pt_BR/kmag/common
share/doc/HTML/pt_BR/kmag/index.cache.bz2
share/doc/HTML/pt_BR/kmag/index.docbook
+share/doc/HTML/pt_BR/kmag/man-kmag.1.docbook
share/doc/HTML/pt_BR/kmahjongg/common
share/doc/HTML/pt_BR/kmahjongg/index.cache.bz2
share/doc/HTML/pt_BR/kmahjongg/index.docbook
@@ -500,14 +683,6 @@ share/doc/HTML/pt_BR/kmathtool/common
share/doc/HTML/pt_BR/kmathtool/index.cache.bz2
share/doc/HTML/pt_BR/kmathtool/index.docbook
share/doc/HTML/pt_BR/kmenuedit/common
-share/doc/HTML/pt_BR/kmenuedit/i_copy.png
-share/doc/HTML/pt_BR/kmenuedit/i_cut.png
-share/doc/HTML/pt_BR/kmenuedit/i_delete.png
-share/doc/HTML/pt_BR/kmenuedit/i_k_button.png
-share/doc/HTML/pt_BR/kmenuedit/i_new_item.png
-share/doc/HTML/pt_BR/kmenuedit/i_new_submenu.png
-share/doc/HTML/pt_BR/kmenuedit/i_paste.png
-share/doc/HTML/pt_BR/kmenuedit/icon_sets.png
share/doc/HTML/pt_BR/kmenuedit/index.cache.bz2
share/doc/HTML/pt_BR/kmenuedit/index.docbook
share/doc/HTML/pt_BR/kmines/common
@@ -522,9 +697,11 @@ share/doc/HTML/pt_BR/kmoon/index.docbook
share/doc/HTML/pt_BR/kmousetool/common
share/doc/HTML/pt_BR/kmousetool/index.cache.bz2
share/doc/HTML/pt_BR/kmousetool/index.docbook
+share/doc/HTML/pt_BR/kmousetool/man-kmousetool.1.docbook
share/doc/HTML/pt_BR/kmouth/common
share/doc/HTML/pt_BR/kmouth/index.cache.bz2
share/doc/HTML/pt_BR/kmouth/index.docbook
+share/doc/HTML/pt_BR/kmouth/man-kmouth.1.docbook
share/doc/HTML/pt_BR/kmplot/commands.docbook
share/doc/HTML/pt_BR/kmplot/common
share/doc/HTML/pt_BR/kmplot/configuration.docbook
@@ -539,9 +716,9 @@ share/doc/HTML/pt_BR/kmplot/introduction.docbook
share/doc/HTML/pt_BR/kmplot/menu.docbook
share/doc/HTML/pt_BR/kmplot/reference.docbook
share/doc/HTML/pt_BR/kmplot/using.docbook
-share/doc/HTML/pt_BR/knewsticker/common
-share/doc/HTML/pt_BR/knewsticker/index.cache.bz2
-share/doc/HTML/pt_BR/knewsticker/index.docbook
+share/doc/HTML/pt_BR/knetattach/common
+share/doc/HTML/pt_BR/knetattach/index.cache.bz2
+share/doc/HTML/pt_BR/knetattach/index.docbook
share/doc/HTML/pt_BR/knode/commands.docbook
share/doc/HTML/pt_BR/knode/common
share/doc/HTML/pt_BR/knode/credits.docbook
@@ -600,8 +777,6 @@ share/doc/HTML/pt_BR/konquest/index.docbook
share/doc/HTML/pt_BR/konsole/common
share/doc/HTML/pt_BR/konsole/index.cache.bz2
share/doc/HTML/pt_BR/konsole/index.docbook
-share/doc/HTML/pt_BR/konsole/konsole.png
-share/doc/HTML/pt_BR/konsole/tabbar.png
share/doc/HTML/pt_BR/konsolekalendar/common
share/doc/HTML/pt_BR/konsolekalendar/index.cache.bz2
share/doc/HTML/pt_BR/konsolekalendar/index.docbook
@@ -614,10 +789,12 @@ share/doc/HTML/pt_BR/kontact/main-view.png
share/doc/HTML/pt_BR/kontact/new-menu.png
share/doc/HTML/pt_BR/kontact/side-pane.png
share/doc/HTML/pt_BR/kontact/summary-view.png
+share/doc/HTML/pt_BR/kopete/chatstyle.docbook
share/doc/HTML/pt_BR/kopete/common
share/doc/HTML/pt_BR/kopete/index.cache.bz2
share/doc/HTML/pt_BR/kopete/index.docbook
share/doc/HTML/pt_BR/kopete/menus.docbook
+share/doc/HTML/pt_BR/kopete/pipes.docbook
share/doc/HTML/pt_BR/korganizer/common
share/doc/HTML/pt_BR/korganizer/exchange-plugin.docbook
share/doc/HTML/pt_BR/korganizer/group-scheduling.docbook
@@ -693,9 +870,6 @@ share/doc/HTML/pt_BR/kshisen/index.docbook
share/doc/HTML/pt_BR/ksim/common
share/doc/HTML/pt_BR/ksim/index.cache.bz2
share/doc/HTML/pt_BR/ksim/index.docbook
-share/doc/HTML/pt_BR/ksirc/common
-share/doc/HTML/pt_BR/ksirc/index.cache.bz2
-share/doc/HTML/pt_BR/ksirc/index.docbook
share/doc/HTML/pt_BR/ksirtet/common
share/doc/HTML/pt_BR/ksirtet/index.cache.bz2
share/doc/HTML/pt_BR/ksirtet/index.docbook
@@ -708,9 +882,6 @@ share/doc/HTML/pt_BR/kspaceduel/common
share/doc/HTML/pt_BR/kspaceduel/index.cache.bz2
share/doc/HTML/pt_BR/kspaceduel/index.docbook
share/doc/HTML/pt_BR/kspaceduel/kspaceduel3.png
-share/doc/HTML/pt_BR/ksplashml/common
-share/doc/HTML/pt_BR/ksplashml/index.cache.bz2
-share/doc/HTML/pt_BR/ksplashml/index.docbook
share/doc/HTML/pt_BR/kstars/aavso.png
share/doc/HTML/pt_BR/kstars/ai-contents.docbook
share/doc/HTML/pt_BR/kstars/altvstime.docbook
@@ -871,9 +1042,6 @@ share/doc/HTML/pt_BR/kworldclock/man-kworldclock.1.docbook
share/doc/HTML/pt_BR/kwrite/common
share/doc/HTML/pt_BR/kwrite/index.cache.bz2
share/doc/HTML/pt_BR/kwrite/index.docbook
-share/doc/HTML/pt_BR/kxkb/common
-share/doc/HTML/pt_BR/kxkb/index.cache.bz2
-share/doc/HTML/pt_BR/kxkb/index.docbook
share/doc/HTML/pt_BR/kxsldbg/callstack.docbook
share/doc/HTML/pt_BR/kxsldbg/common
share/doc/HTML/pt_BR/kxsldbg/credits.docbook
@@ -898,6 +1066,9 @@ share/doc/HTML/pt_BR/multisynk/common
share/doc/HTML/pt_BR/multisynk/index.cache.bz2
share/doc/HTML/pt_BR/multisynk/index.docbook
share/doc/HTML/pt_BR/multisynk/konnectors-chapter.docbook
+share/doc/HTML/pt_BR/sonnet/common
+share/doc/HTML/pt_BR/sonnet/index.cache.bz2
+share/doc/HTML/pt_BR/sonnet/index.docbook
share/doc/HTML/pt_BR/umbrello/activity-diagram.png
share/doc/HTML/pt_BR/umbrello/add-remove-languages.png
share/doc/HTML/pt_BR/umbrello/aggregation.png
@@ -1394,6 +1565,7 @@ share/locale/pt_BR/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/pt_BR/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/pt_BR/LC_MESSAGES/plasma_applet_frame.mo
share/locale/pt_BR/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/pt_BR/LC_MESSAGES/plasma_applet_icon.mo
share/locale/pt_BR/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/pt_BR/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/pt_BR/LC_MESSAGES/plasma_applet_kalzium.mo
@@ -1473,11 +1645,11 @@ share/locale/pt_BR/LC_MESSAGES/useraccount.mo
share/locale/pt_BR/entry.desktop
@dirrm share/doc/HTML/pt_BR/xsldbg
@dirrm share/doc/HTML/pt_BR/umbrello
+@dirrm share/doc/HTML/pt_BR/sonnet
@dirrm share/doc/HTML/pt_BR/multisynk
@dirrm share/doc/HTML/pt_BR/lskat
@dirrm share/doc/HTML/pt_BR/lokalize
@dirrm share/doc/HTML/pt_BR/kxsldbg
-@dirrm share/doc/HTML/pt_BR/kxkb
@dirrm share/doc/HTML/pt_BR/kwrite
@dirrm share/doc/HTML/pt_BR/kworldclock
@dirrm share/doc/HTML/pt_BR/kwordquiz
@@ -1495,11 +1667,9 @@ share/locale/pt_BR/entry.desktop
@dirrm share/doc/HTML/pt_BR/ksysv
@dirrm share/doc/HTML/pt_BR/ksysguard
@dirrm share/doc/HTML/pt_BR/kstars
-@dirrm share/doc/HTML/pt_BR/ksplashml
@dirrm share/doc/HTML/pt_BR/kspaceduel
@dirrm share/doc/HTML/pt_BR/ksnapshot
@dirrm share/doc/HTML/pt_BR/ksirtet
-@dirrm share/doc/HTML/pt_BR/ksirc
@dirrm share/doc/HTML/pt_BR/ksim
@dirrm share/doc/HTML/pt_BR/kshisen
@dirrm share/doc/HTML/pt_BR/kscd
@@ -1527,7 +1697,7 @@ share/locale/pt_BR/entry.desktop
@dirrm share/doc/HTML/pt_BR/kolf
@dirrm share/doc/HTML/pt_BR/knotes
@dirrm share/doc/HTML/pt_BR/knode
-@dirrm share/doc/HTML/pt_BR/knewsticker
+@dirrm share/doc/HTML/pt_BR/knetattach
@dirrm share/doc/HTML/pt_BR/kmplot
@dirrm share/doc/HTML/pt_BR/kmouth
@dirrm share/doc/HTML/pt_BR/kmousetool
@@ -1546,7 +1716,29 @@ share/locale/pt_BR/entry.desktop
@dirrm share/doc/HTML/pt_BR/kjumpingcube
@dirrm share/doc/HTML/pt_BR/kjots
@dirrm share/doc/HTML/pt_BR/kiten
-@dirrm share/doc/HTML/pt_BR/kioslave/kioslave
+@dirrm share/doc/HTML/pt_BR/kioslave/webdav
+@dirrm share/doc/HTML/pt_BR/kioslave/thumbnail
+@dirrm share/doc/HTML/pt_BR/kioslave/telnet
+@dirrm share/doc/HTML/pt_BR/kioslave/tar
+@dirrm share/doc/HTML/pt_BR/kioslave/smb
+@dirrm share/doc/HTML/pt_BR/kioslave/sftp
+@dirrm share/doc/HTML/pt_BR/kioslave/rlogin
+@dirrm share/doc/HTML/pt_BR/kioslave/nfs
+@dirrm share/doc/HTML/pt_BR/kioslave/man
+@dirrm share/doc/HTML/pt_BR/kioslave/mailto
+@dirrm share/doc/HTML/pt_BR/kioslave/info
+@dirrm share/doc/HTML/pt_BR/kioslave/http
+@dirrm share/doc/HTML/pt_BR/kioslave/help
+@dirrm share/doc/HTML/pt_BR/kioslave/gzip
+@dirrm share/doc/HTML/pt_BR/kioslave/ftp
+@dirrm share/doc/HTML/pt_BR/kioslave/floppy
+@dirrm share/doc/HTML/pt_BR/kioslave/fish
+@dirrm share/doc/HTML/pt_BR/kioslave/finger
+@dirrm share/doc/HTML/pt_BR/kioslave/file
+@dirrm share/doc/HTML/pt_BR/kioslave/data
+@dirrm share/doc/HTML/pt_BR/kioslave/cgi
+@dirrm share/doc/HTML/pt_BR/kioslave/bzip2
+@dirrm share/doc/HTML/pt_BR/kioslave/bookmarks
@dirrm share/doc/HTML/pt_BR/kioslave
@dirrm share/doc/HTML/pt_BR/kinfocenter/xserver
@dirrm share/doc/HTML/pt_BR/kinfocenter/usb
@@ -1570,7 +1762,6 @@ share/locale/pt_BR/entry.desktop
@dirrm share/doc/HTML/pt_BR/khelpcenter/visualdict
@dirrm share/doc/HTML/pt_BR/khelpcenter/userguide
@dirrm share/doc/HTML/pt_BR/khelpcenter/quickstart
-@dirrm share/doc/HTML/pt_BR/khelpcenter/glossary
@dirrm share/doc/HTML/pt_BR/khelpcenter/faq
@dirrm share/doc/HTML/pt_BR/khelpcenter
@dirrm share/doc/HTML/pt_BR/khangman
@@ -1585,15 +1776,67 @@ share/locale/pt_BR/entry.desktop
@dirrm share/doc/HTML/pt_BR/kdm
@dirrm share/doc/HTML/pt_BR/kdf
@dirrm share/doc/HTML/pt_BR/kdesu
+@dirrm share/doc/HTML/pt_BR/kdepasswd
@dirrm share/doc/HTML/pt_BR/kdebugdialog
@dirrm share/doc/HTML/pt_BR/kdat
@dirrm share/doc/HTML/pt_BR/kcron
+@dirrm share/doc/HTML/pt_BR/kcontrol/windowbehaviour
+@dirrm share/doc/HTML/pt_BR/kcontrol/useragent
+@dirrm share/doc/HTML/pt_BR/kcontrol/splashscreen
+@dirrm share/doc/HTML/pt_BR/kcontrol/spellchecking
+@dirrm share/doc/HTML/pt_BR/kcontrol/smb
+@dirrm share/doc/HTML/pt_BR/kcontrol/screensaver
+@dirrm share/doc/HTML/pt_BR/kcontrol/proxy
+@dirrm share/doc/HTML/pt_BR/kcontrol/powerdevil
@dirrm share/doc/HTML/pt_BR/kcontrol/powerctrl
+@dirrm share/doc/HTML/pt_BR/kcontrol/performance
+@dirrm share/doc/HTML/pt_BR/kcontrol/paths
+@dirrm share/doc/HTML/pt_BR/kcontrol/passwords
+@dirrm share/doc/HTML/pt_BR/kcontrol/panelappearance
+@dirrm share/doc/HTML/pt_BR/kcontrol/panel
+@dirrm share/doc/HTML/pt_BR/kcontrol/netpref
+@dirrm share/doc/HTML/pt_BR/kcontrol/mouse
@dirrm share/doc/HTML/pt_BR/kcontrol/laptop
+@dirrm share/doc/HTML/pt_BR/kcontrol/language
+@dirrm share/doc/HTML/pt_BR/kcontrol/kwindecoration
+@dirrm share/doc/HTML/pt_BR/kcontrol/kwincompositing
+@dirrm share/doc/HTML/pt_BR/kcontrol/khtml
+@dirrm share/doc/HTML/pt_BR/kcontrol/keys
+@dirrm share/doc/HTML/pt_BR/kcontrol/keyboard
+@dirrm share/doc/HTML/pt_BR/kcontrol/kdm
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmtaskbar
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmstyle
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmsmserver
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmnotify
@dirrm share/doc/HTML/pt_BR/kcontrol/kcmlowbatwarn
@dirrm share/doc/HTML/pt_BR/kcontrol/kcmlowbatcrit
-@dirrm share/doc/HTML/pt_BR/kcontrol/kcmktalkd
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmlaunch
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmkonsole
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmdisplay
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmcss
+@dirrm share/doc/HTML/pt_BR/kcontrol/kcmaccess
@dirrm share/doc/HTML/pt_BR/kcontrol/kamera
+@dirrm share/doc/HTML/pt_BR/kcontrol/joystick
+@dirrm share/doc/HTML/pt_BR/kcontrol/icons
+@dirrm share/doc/HTML/pt_BR/kcontrol/helpindex
+@dirrm share/doc/HTML/pt_BR/kcontrol/fonts
+@dirrm share/doc/HTML/pt_BR/kcontrol/fontinst
+@dirrm share/doc/HTML/pt_BR/kcontrol/filetypes
+@dirrm share/doc/HTML/pt_BR/kcontrol/filemanager
+@dirrm share/doc/HTML/pt_BR/kcontrol/energy
+@dirrm share/doc/HTML/pt_BR/kcontrol/emoticons
+@dirrm share/doc/HTML/pt_BR/kcontrol/email
+@dirrm share/doc/HTML/pt_BR/kcontrol/ebrowsing
+@dirrm share/doc/HTML/pt_BR/kcontrol/desktopbehavior
+@dirrm share/doc/HTML/pt_BR/kcontrol/desktop
+@dirrm share/doc/HTML/pt_BR/kcontrol/crypto
+@dirrm share/doc/HTML/pt_BR/kcontrol/cookies
+@dirrm share/doc/HTML/pt_BR/kcontrol/colors
+@dirrm share/doc/HTML/pt_BR/kcontrol/clock
+@dirrm share/doc/HTML/pt_BR/kcontrol/cache
+@dirrm share/doc/HTML/pt_BR/kcontrol/bookmarks
+@dirrm share/doc/HTML/pt_BR/kcontrol/bell
+@dirrm share/doc/HTML/pt_BR/kcontrol/background
@dirrm share/doc/HTML/pt_BR/kcontrol
@dirrm share/doc/HTML/pt_BR/kcmlirc
@dirrm share/doc/HTML/pt_BR/kcharselect
@@ -1605,6 +1848,7 @@ share/locale/pt_BR/entry.desktop
@dirrm share/doc/HTML/pt_BR/kblackbox
@dirrm share/doc/HTML/pt_BR/kbattleship
@dirrm share/doc/HTML/pt_BR/katomic
+@dirrm share/doc/HTML/pt_BR/kate-plugins
@dirrm share/doc/HTML/pt_BR/karm
@dirrm share/doc/HTML/pt_BR/kalzium
@dirrm share/doc/HTML/pt_BR/kalarm
@@ -1623,6 +1867,8 @@ share/locale/pt_BR/entry.desktop
@dirrm share/apps/klettres/pt_BR
@dirrm share/apps/klettres
@dirrm share/apps/khangman
+@dirrmtry man/pt_BR/man8
+@dirrmtry man/pt_BR/man7
@dirrmtry man/pt_BR/man6
@dirrmtry man/pt_BR/man1
@dirrmtry man/pt_BR
diff --git a/portuguese/kde4-l10n/Makefile.man b/portuguese/kde4-l10n/Makefile.man
index d06fae1effcd..f54b5b33692d 100644
--- a/portuguese/kde4-l10n/Makefile.man
+++ b/portuguese/kde4-l10n/Makefile.man
@@ -1,8 +1,10 @@
MAN1= ark.1 \
+ adddebug.1 \
cheatmake.1 \
create_cvsignore.1 \
create_makefile.1 \
create_makefiles.1 \
+ checkXML.1 \
cvscheck.1 \
cvslastchange.1 \
cvslastlog.1 \
@@ -12,6 +14,7 @@ MAN1= ark.1 \
extend_dmalloc.1 \
extractrc.1 \
fixincludes.1 \
+ kabcclient.1 \
kalzium.1 \
kappfinder.1 \
kapptemplate.1 \
@@ -19,16 +22,23 @@ MAN1= ark.1 \
kate.1 \
kbookmarkmerger.1 \
kbruch.1 \
+ kconfig_compiler.1 \
+ kde4-config.1 \
kdesu.1 \
kfind.1 \
kig.1 \
+ kjs.1 \
+ kjscmd.1 \
kmag.1 \
kmousetool.1 \
kmouth.1 \
kmplot.1 \
+ kross.1 \
ktouch.1 \
kworldclock.1 \
+ makekdewidgets.1 \
po2xml.1 \
+ preparetips.1 \
pruneemptydirs.1 \
qtdoc.1 \
reportview.1 \
@@ -36,7 +46,15 @@ MAN1= ark.1 \
swappo.1 \
transxx.1 \
xml2pot.1 \
+ xsldbg.1 \
zonetab2pot.py.1
MAN6= amor.6 \
khangman.6 \
kpat.6
+MAN7= kdeoptions.7 \
+ qtoptions.7
+MAN8= kbuildsycoca4.8 \
+ kcookiejar4.8 \
+ kded4.8 \
+ kdeinit4.8 \
+ meinproc4.8
diff --git a/portuguese/kde4-l10n/distinfo b/portuguese/kde4-l10n/distinfo
index b672fcd383ea..636bdcd8f89f 100644
--- a/portuguese/kde4-l10n/distinfo
+++ b/portuguese/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-pt-4.2.0.tar.bz2) = eabe2a528d1e9d5c10ecae15dea68d26
-SHA256 (KDE/kde-l10n/kde-l10n-pt-4.2.0.tar.bz2) = a1b33ca92f08b43b6be205b3b5a378144a2435394f07f6b211f89176dd1533c5
-SIZE (KDE/kde-l10n/kde-l10n-pt-4.2.0.tar.bz2) = 5754333
+MD5 (KDE/kde-l10n/kde-l10n-pt-4.2.1.tar.bz2) = 55e15795d4901701b7deab813857ec06
+SHA256 (KDE/kde-l10n/kde-l10n-pt-4.2.1.tar.bz2) = bd4b42e2a2a14d406eaac638b3d4b7382221145ddfcd47af0cb28c7d88a4f9b6
+SIZE (KDE/kde-l10n/kde-l10n-pt-4.2.1.tar.bz2) = 6319462
diff --git a/portuguese/kde4-l10n/pkg-plist b/portuguese/kde4-l10n/pkg-plist
index 034a889f7eeb..adfd12150773 100644
--- a/portuguese/kde4-l10n/pkg-plist
+++ b/portuguese/kde4-l10n/pkg-plist
@@ -39,6 +39,9 @@ share/doc/HTML/pt/ark/man-ark.1.docbook
share/doc/HTML/pt/blinken/common
share/doc/HTML/pt/blinken/index.cache.bz2
share/doc/HTML/pt/blinken/index.docbook
+share/doc/HTML/pt/bomber/common
+share/doc/HTML/pt/bomber/index.cache.bz2
+share/doc/HTML/pt/bomber/index.docbook
share/doc/HTML/pt/cervisia/common
share/doc/HTML/pt/cervisia/index.cache.bz2
share/doc/HTML/pt/cervisia/index.docbook
@@ -66,6 +69,9 @@ share/doc/HTML/pt/kaddressbook/index.docbook
share/doc/HTML/pt/kalarm/common
share/doc/HTML/pt/kalarm/index.cache.bz2
share/doc/HTML/pt/kalarm/index.docbook
+share/doc/HTML/pt/kalgebra/common
+share/doc/HTML/pt/kalgebra/index.cache.bz2
+share/doc/HTML/pt/kalgebra/index.docbook
share/doc/HTML/pt/kalzium/common
share/doc/HTML/pt/kalzium/index.cache.bz2
share/doc/HTML/pt/kalzium/index.docbook
@@ -76,23 +82,24 @@ share/doc/HTML/pt/kamera/index.docbook
share/doc/HTML/pt/kanagram/common
share/doc/HTML/pt/kanagram/index.cache.bz2
share/doc/HTML/pt/kanagram/index.docbook
+share/doc/HTML/pt/kapptemplate/common
+share/doc/HTML/pt/kapptemplate/index.cache.bz2
+share/doc/HTML/pt/kapptemplate/index.docbook
+share/doc/HTML/pt/kapptemplate/man-kapptemplate.1.docbook
share/doc/HTML/pt/karm/common
share/doc/HTML/pt/karm/index.cache.bz2
share/doc/HTML/pt/karm/index.docbook
share/doc/HTML/pt/karm/man-karm.1.docbook
-share/doc/HTML/pt/kate/advanced.docbook
-share/doc/HTML/pt/kate/common
-share/doc/HTML/pt/kate/configuring.docbook
-share/doc/HTML/pt/kate/fundamentals.docbook
-share/doc/HTML/pt/kate/highlighting.docbook
-share/doc/HTML/pt/kate/index.cache.bz2
-share/doc/HTML/pt/kate/index.docbook
-share/doc/HTML/pt/kate/man-kate.1.docbook
-share/doc/HTML/pt/kate/mdi.docbook
-share/doc/HTML/pt/kate/menus.docbook
-share/doc/HTML/pt/kate/part.docbook
-share/doc/HTML/pt/kate/plugins.docbook
-share/doc/HTML/pt/kate/regular-expressions.docbook
+share/doc/HTML/pt/kate-plugins/common
+share/doc/HTML/pt/kate-plugins/filetemplates.docbook
+share/doc/HTML/pt/kate-plugins/htmltools.docbook
+share/doc/HTML/pt/kate-plugins/index.cache.bz2
+share/doc/HTML/pt/kate-plugins/index.docbook
+share/doc/HTML/pt/kate-plugins/insertcommand.docbook
+share/doc/HTML/pt/kate-plugins/openheader.docbook
+share/doc/HTML/pt/kate-plugins/textfilter.docbook
+share/doc/HTML/pt/kate-plugins/xmlcheck.docbook
+share/doc/HTML/pt/kate-plugins/xmltools.docbook
share/doc/HTML/pt/katomic/common
share/doc/HTML/pt/katomic/index.cache.bz2
share/doc/HTML/pt/katomic/index.docbook
@@ -102,9 +109,15 @@ share/doc/HTML/pt/kbattleship/index.docbook
share/doc/HTML/pt/kblackbox/common
share/doc/HTML/pt/kblackbox/index.cache.bz2
share/doc/HTML/pt/kblackbox/index.docbook
+share/doc/HTML/pt/kblocks/common
+share/doc/HTML/pt/kblocks/index.cache.bz2
+share/doc/HTML/pt/kblocks/index.docbook
share/doc/HTML/pt/kbounce/common
share/doc/HTML/pt/kbounce/index.cache.bz2
share/doc/HTML/pt/kbounce/index.docbook
+share/doc/HTML/pt/kbreakout/common
+share/doc/HTML/pt/kbreakout/index.cache.bz2
+share/doc/HTML/pt/kbreakout/index.docbook
share/doc/HTML/pt/kbruch/common
share/doc/HTML/pt/kbruch/index.cache.bz2
share/doc/HTML/pt/kbruch/index.docbook
@@ -134,6 +147,12 @@ share/doc/HTML/pt/kcontrol/background/index.docbook
share/doc/HTML/pt/kcontrol/bell/common
share/doc/HTML/pt/kcontrol/bell/index.cache.bz2
share/doc/HTML/pt/kcontrol/bell/index.docbook
+share/doc/HTML/pt/kcontrol/blockdevices/common
+share/doc/HTML/pt/kcontrol/blockdevices/index.cache.bz2
+share/doc/HTML/pt/kcontrol/blockdevices/index.docbook
+share/doc/HTML/pt/kcontrol/bookmarks/common
+share/doc/HTML/pt/kcontrol/bookmarks/index.cache.bz2
+share/doc/HTML/pt/kcontrol/bookmarks/index.docbook
share/doc/HTML/pt/kcontrol/cache/common
share/doc/HTML/pt/kcontrol/cache/index.cache.bz2
share/doc/HTML/pt/kcontrol/cache/index.docbook
@@ -191,12 +210,18 @@ share/doc/HTML/pt/kcontrol/joystick/index.docbook
share/doc/HTML/pt/kcontrol/kalarmd/common
share/doc/HTML/pt/kcontrol/kalarmd/index.cache.bz2
share/doc/HTML/pt/kcontrol/kalarmd/index.docbook
+share/doc/HTML/pt/kcontrol/kamera/common
+share/doc/HTML/pt/kcontrol/kamera/index.cache.bz2
+share/doc/HTML/pt/kcontrol/kamera/index.docbook
share/doc/HTML/pt/kcontrol/kcmaccess/common
share/doc/HTML/pt/kcontrol/kcmaccess/index.cache.bz2
share/doc/HTML/pt/kcontrol/kcmaccess/index.docbook
share/doc/HTML/pt/kcontrol/kcmcss/common
share/doc/HTML/pt/kcontrol/kcmcss/index.cache.bz2
share/doc/HTML/pt/kcontrol/kcmcss/index.docbook
+share/doc/HTML/pt/kcontrol/kcmdisplay/common
+share/doc/HTML/pt/kcontrol/kcmdisplay/index.cache.bz2
+share/doc/HTML/pt/kcontrol/kcmdisplay/index.docbook
share/doc/HTML/pt/kcontrol/kcmfontinst/common
share/doc/HTML/pt/kcontrol/kcmfontinst/index.cache.bz2
share/doc/HTML/pt/kcontrol/kcmfontinst/index.docbook
@@ -243,9 +268,15 @@ share/doc/HTML/pt/kcontrol/khtml/nsplugin.docbook
share/doc/HTML/pt/kcontrol/knetworkconf/common
share/doc/HTML/pt/kcontrol/knetworkconf/index.cache.bz2
share/doc/HTML/pt/kcontrol/knetworkconf/index.docbook
+share/doc/HTML/pt/kcontrol/kresources/common
+share/doc/HTML/pt/kcontrol/kresources/index.cache.bz2
+share/doc/HTML/pt/kcontrol/kresources/index.docbook
share/doc/HTML/pt/kcontrol/kthememgr/common
share/doc/HTML/pt/kcontrol/kthememgr/index.cache.bz2
share/doc/HTML/pt/kcontrol/kthememgr/index.docbook
+share/doc/HTML/pt/kcontrol/kwincompositing/common
+share/doc/HTML/pt/kcontrol/kwincompositing/index.cache.bz2
+share/doc/HTML/pt/kcontrol/kwincompositing/index.docbook
share/doc/HTML/pt/kcontrol/kwindecoration/common
share/doc/HTML/pt/kcontrol/kwindecoration/index.cache.bz2
share/doc/HTML/pt/kcontrol/kwindecoration/index.docbook
@@ -304,9 +335,15 @@ share/doc/HTML/pt/kcontrol/splashscreen/index.docbook
share/doc/HTML/pt/kcontrol/useragent/common
share/doc/HTML/pt/kcontrol/useragent/index.cache.bz2
share/doc/HTML/pt/kcontrol/useragent/index.docbook
+share/doc/HTML/pt/kcontrol/windowbehaviour/common
+share/doc/HTML/pt/kcontrol/windowbehaviour/index.cache.bz2
+share/doc/HTML/pt/kcontrol/windowbehaviour/index.docbook
share/doc/HTML/pt/kcontrol/windowmanagement/common
share/doc/HTML/pt/kcontrol/windowmanagement/index.cache.bz2
share/doc/HTML/pt/kcontrol/windowmanagement/index.docbook
+share/doc/HTML/pt/kcontrol/windowspecific/common
+share/doc/HTML/pt/kcontrol/windowspecific/index.cache.bz2
+share/doc/HTML/pt/kcontrol/windowspecific/index.docbook
share/doc/HTML/pt/kcron/common
share/doc/HTML/pt/kcron/index.cache.bz2
share/doc/HTML/pt/kcron/index.docbook
@@ -331,6 +368,9 @@ share/doc/HTML/pt/kdesu/man-kdesu.1.docbook
share/doc/HTML/pt/kdf/common
share/doc/HTML/pt/kdf/index.cache.bz2
share/doc/HTML/pt/kdf/index.docbook
+share/doc/HTML/pt/kdiamond/common
+share/doc/HTML/pt/kdiamond/index.cache.bz2
+share/doc/HTML/pt/kdiamond/index.docbook
share/doc/HTML/pt/kdm/common
share/doc/HTML/pt/kdm/index.cache.bz2
share/doc/HTML/pt/kdm/index.docbook
@@ -352,6 +392,9 @@ share/doc/HTML/pt/kfind/man-kfind.1.docbook
share/doc/HTML/pt/kfloppy/common
share/doc/HTML/pt/kfloppy/index.cache.bz2
share/doc/HTML/pt/kfloppy/index.docbook
+share/doc/HTML/pt/kfourinline/common
+share/doc/HTML/pt/kfourinline/index.cache.bz2
+share/doc/HTML/pt/kfourinline/index.docbook
share/doc/HTML/pt/kgamma/common
share/doc/HTML/pt/kgamma/index.cache.bz2
share/doc/HTML/pt/kgamma/index.docbook
@@ -459,6 +502,12 @@ share/doc/HTML/pt/kig/common
share/doc/HTML/pt/kig/index.cache.bz2
share/doc/HTML/pt/kig/index.docbook
share/doc/HTML/pt/kig/man-kig.1.docbook
+share/doc/HTML/pt/killbots/common
+share/doc/HTML/pt/killbots/index.cache.bz2
+share/doc/HTML/pt/killbots/index.docbook
+share/doc/HTML/pt/kimagemapeditor/common
+share/doc/HTML/pt/kimagemapeditor/index.cache.bz2
+share/doc/HTML/pt/kimagemapeditor/index.docbook
share/doc/HTML/pt/kinfocenter/blockdevices/common
share/doc/HTML/pt/kinfocenter/blockdevices/index.cache.bz2
share/doc/HTML/pt/kinfocenter/blockdevices/index.docbook
@@ -513,48 +562,99 @@ share/doc/HTML/pt/kinfocenter/usb/index.docbook
share/doc/HTML/pt/kinfocenter/xserver/common
share/doc/HTML/pt/kinfocenter/xserver/index.cache.bz2
share/doc/HTML/pt/kinfocenter/xserver/index.docbook
-share/doc/HTML/pt/kioslave/kioslave/bzip.docbook
-share/doc/HTML/pt/kioslave/kioslave/bzip2.docbook
-share/doc/HTML/pt/kioslave/kioslave/cgi.docbook
-share/doc/HTML/pt/kioslave/kioslave/common
-share/doc/HTML/pt/kioslave/kioslave/data.docbook
-share/doc/HTML/pt/kioslave/kioslave/file.docbook
-share/doc/HTML/pt/kioslave/kioslave/finger.docbook
-share/doc/HTML/pt/kioslave/kioslave/fish.docbook
-share/doc/HTML/pt/kioslave/kioslave/floppy.docbook
-share/doc/HTML/pt/kioslave/kioslave/ftp.docbook
-share/doc/HTML/pt/kioslave/kioslave/gopher.docbook
-share/doc/HTML/pt/kioslave/kioslave/gzip.docbook
-share/doc/HTML/pt/kioslave/kioslave/help.docbook
-share/doc/HTML/pt/kioslave/kioslave/http.docbook
-share/doc/HTML/pt/kioslave/kioslave/https.docbook
-share/doc/HTML/pt/kioslave/kioslave/imap.docbook
-share/doc/HTML/pt/kioslave/kioslave/imaps.docbook
-share/doc/HTML/pt/kioslave/kioslave/index.cache.bz2
-share/doc/HTML/pt/kioslave/kioslave/index.docbook
-share/doc/HTML/pt/kioslave/kioslave/info.docbook
-share/doc/HTML/pt/kioslave/kioslave/lan.docbook
-share/doc/HTML/pt/kioslave/kioslave/ldap.docbook
-share/doc/HTML/pt/kioslave/kioslave/mac.docbook
-share/doc/HTML/pt/kioslave/kioslave/mailto.docbook
-share/doc/HTML/pt/kioslave/kioslave/man.docbook
-share/doc/HTML/pt/kioslave/kioslave/mrml.docbook
-share/doc/HTML/pt/kioslave/kioslave/news.docbook
-share/doc/HTML/pt/kioslave/kioslave/nfs.docbook
-share/doc/HTML/pt/kioslave/kioslave/nntp.docbook
-share/doc/HTML/pt/kioslave/kioslave/pop3.docbook
-share/doc/HTML/pt/kioslave/kioslave/pop3s.docbook
-share/doc/HTML/pt/kioslave/kioslave/print.docbook
-share/doc/HTML/pt/kioslave/kioslave/rlan.docbook
-share/doc/HTML/pt/kioslave/kioslave/rlogin.docbook
-share/doc/HTML/pt/kioslave/kioslave/sftp.docbook
-share/doc/HTML/pt/kioslave/kioslave/smb.docbook
-share/doc/HTML/pt/kioslave/kioslave/smtp.docbook
-share/doc/HTML/pt/kioslave/kioslave/tar.docbook
-share/doc/HTML/pt/kioslave/kioslave/telnet.docbook
-share/doc/HTML/pt/kioslave/kioslave/thumbnail.docbook
-share/doc/HTML/pt/kioslave/kioslave/webdav.docbook
-share/doc/HTML/pt/kioslave/kioslave/webdavs.docbook
+share/doc/HTML/pt/kioslave/audiocd/common
+share/doc/HTML/pt/kioslave/audiocd/index.cache.bz2
+share/doc/HTML/pt/kioslave/audiocd/index.docbook
+share/doc/HTML/pt/kioslave/bookmarks/common
+share/doc/HTML/pt/kioslave/bookmarks/index.cache.bz2
+share/doc/HTML/pt/kioslave/bookmarks/index.docbook
+share/doc/HTML/pt/kioslave/bzip2/common
+share/doc/HTML/pt/kioslave/bzip2/index.cache.bz2
+share/doc/HTML/pt/kioslave/bzip2/index.docbook
+share/doc/HTML/pt/kioslave/cgi/common
+share/doc/HTML/pt/kioslave/cgi/index.cache.bz2
+share/doc/HTML/pt/kioslave/cgi/index.docbook
+share/doc/HTML/pt/kioslave/data/common
+share/doc/HTML/pt/kioslave/data/index.cache.bz2
+share/doc/HTML/pt/kioslave/data/index.docbook
+share/doc/HTML/pt/kioslave/file/common
+share/doc/HTML/pt/kioslave/file/index.cache.bz2
+share/doc/HTML/pt/kioslave/file/index.docbook
+share/doc/HTML/pt/kioslave/finger/common
+share/doc/HTML/pt/kioslave/finger/index.cache.bz2
+share/doc/HTML/pt/kioslave/finger/index.docbook
+share/doc/HTML/pt/kioslave/fish/common
+share/doc/HTML/pt/kioslave/fish/index.cache.bz2
+share/doc/HTML/pt/kioslave/fish/index.docbook
+share/doc/HTML/pt/kioslave/floppy/common
+share/doc/HTML/pt/kioslave/floppy/index.cache.bz2
+share/doc/HTML/pt/kioslave/floppy/index.docbook
+share/doc/HTML/pt/kioslave/ftp/common
+share/doc/HTML/pt/kioslave/ftp/index.cache.bz2
+share/doc/HTML/pt/kioslave/ftp/index.docbook
+share/doc/HTML/pt/kioslave/gzip/common
+share/doc/HTML/pt/kioslave/gzip/index.cache.bz2
+share/doc/HTML/pt/kioslave/gzip/index.docbook
+share/doc/HTML/pt/kioslave/help/common
+share/doc/HTML/pt/kioslave/help/index.cache.bz2
+share/doc/HTML/pt/kioslave/help/index.docbook
+share/doc/HTML/pt/kioslave/http/common
+share/doc/HTML/pt/kioslave/http/index.cache.bz2
+share/doc/HTML/pt/kioslave/http/index.docbook
+share/doc/HTML/pt/kioslave/imap/common
+share/doc/HTML/pt/kioslave/imap/index.cache.bz2
+share/doc/HTML/pt/kioslave/imap/index.docbook
+share/doc/HTML/pt/kioslave/info/common
+share/doc/HTML/pt/kioslave/info/index.cache.bz2
+share/doc/HTML/pt/kioslave/info/index.docbook
+share/doc/HTML/pt/kioslave/ldap/common
+share/doc/HTML/pt/kioslave/ldap/index.cache.bz2
+share/doc/HTML/pt/kioslave/ldap/index.docbook
+share/doc/HTML/pt/kioslave/mailto/common
+share/doc/HTML/pt/kioslave/mailto/index.cache.bz2
+share/doc/HTML/pt/kioslave/mailto/index.docbook
+share/doc/HTML/pt/kioslave/man/common
+share/doc/HTML/pt/kioslave/man/index.cache.bz2
+share/doc/HTML/pt/kioslave/man/index.docbook
+share/doc/HTML/pt/kioslave/news/common
+share/doc/HTML/pt/kioslave/news/index.cache.bz2
+share/doc/HTML/pt/kioslave/news/index.docbook
+share/doc/HTML/pt/kioslave/nfs/common
+share/doc/HTML/pt/kioslave/nfs/index.cache.bz2
+share/doc/HTML/pt/kioslave/nfs/index.docbook
+share/doc/HTML/pt/kioslave/nntp/common
+share/doc/HTML/pt/kioslave/nntp/index.cache.bz2
+share/doc/HTML/pt/kioslave/nntp/index.docbook
+share/doc/HTML/pt/kioslave/pop3/common
+share/doc/HTML/pt/kioslave/pop3/index.cache.bz2
+share/doc/HTML/pt/kioslave/pop3/index.docbook
+share/doc/HTML/pt/kioslave/rlogin/common
+share/doc/HTML/pt/kioslave/rlogin/index.cache.bz2
+share/doc/HTML/pt/kioslave/rlogin/index.docbook
+share/doc/HTML/pt/kioslave/sftp/common
+share/doc/HTML/pt/kioslave/sftp/index.cache.bz2
+share/doc/HTML/pt/kioslave/sftp/index.docbook
+share/doc/HTML/pt/kioslave/smb/common
+share/doc/HTML/pt/kioslave/smb/index.cache.bz2
+share/doc/HTML/pt/kioslave/smb/index.docbook
+share/doc/HTML/pt/kioslave/smtp/common
+share/doc/HTML/pt/kioslave/smtp/index.cache.bz2
+share/doc/HTML/pt/kioslave/smtp/index.docbook
+share/doc/HTML/pt/kioslave/tar/common
+share/doc/HTML/pt/kioslave/tar/index.cache.bz2
+share/doc/HTML/pt/kioslave/tar/index.docbook
+share/doc/HTML/pt/kioslave/telnet/common
+share/doc/HTML/pt/kioslave/telnet/index.cache.bz2
+share/doc/HTML/pt/kioslave/telnet/index.docbook
+share/doc/HTML/pt/kioslave/thumbnail/common
+share/doc/HTML/pt/kioslave/thumbnail/index.cache.bz2
+share/doc/HTML/pt/kioslave/thumbnail/index.docbook
+share/doc/HTML/pt/kioslave/webdav/common
+share/doc/HTML/pt/kioslave/webdav/index.cache.bz2
+share/doc/HTML/pt/kioslave/webdav/index.docbook
+share/doc/HTML/pt/kiriki/common
+share/doc/HTML/pt/kiriki/index.cache.bz2
+share/doc/HTML/pt/kiriki/index.docbook
share/doc/HTML/pt/kiten/common
share/doc/HTML/pt/kiten/index.cache.bz2
share/doc/HTML/pt/kiten/index.docbook
@@ -586,6 +686,17 @@ share/doc/HTML/pt/kmag/man-kmag.1.docbook
share/doc/HTML/pt/kmahjongg/common
share/doc/HTML/pt/kmahjongg/index.cache.bz2
share/doc/HTML/pt/kmahjongg/index.docbook
+share/doc/HTML/pt/kmail/common
+share/doc/HTML/pt/kmail/configure.docbook
+share/doc/HTML/pt/kmail/credits-and-licenses.docbook
+share/doc/HTML/pt/kmail/faq.docbook
+share/doc/HTML/pt/kmail/getting-started.docbook
+share/doc/HTML/pt/kmail/importing.docbook
+share/doc/HTML/pt/kmail/index.cache.bz2
+share/doc/HTML/pt/kmail/index.docbook
+share/doc/HTML/pt/kmail/intro.docbook
+share/doc/HTML/pt/kmail/menus.docbook
+share/doc/HTML/pt/kmail/using-kmail.docbook
share/doc/HTML/pt/kmathtool/common
share/doc/HTML/pt/kmathtool/index.cache.bz2
share/doc/HTML/pt/kmathtool/index.docbook
@@ -598,6 +709,9 @@ share/doc/HTML/pt/kmines/index.docbook
share/doc/HTML/pt/kmix/common
share/doc/HTML/pt/kmix/index.cache.bz2
share/doc/HTML/pt/kmix/index.docbook
+share/doc/HTML/pt/kmobiletools/common
+share/doc/HTML/pt/kmobiletools/index.cache.bz2
+share/doc/HTML/pt/kmobiletools/index.docbook
share/doc/HTML/pt/kmoon/common
share/doc/HTML/pt/kmoon/index.cache.bz2
share/doc/HTML/pt/kmoon/index.docbook
@@ -626,6 +740,9 @@ share/doc/HTML/pt/kmplot/using.docbook
share/doc/HTML/pt/knetattach/common
share/doc/HTML/pt/knetattach/index.cache.bz2
share/doc/HTML/pt/knetattach/index.docbook
+share/doc/HTML/pt/knetwalk/common
+share/doc/HTML/pt/knetwalk/index.cache.bz2
+share/doc/HTML/pt/knetwalk/index.docbook
share/doc/HTML/pt/knetworkconf/common
share/doc/HTML/pt/knetworkconf/index.cache.bz2
share/doc/HTML/pt/knetworkconf/index.docbook
@@ -652,6 +769,9 @@ share/doc/HTML/pt/knotes/index.docbook
share/doc/HTML/pt/kolf/common
share/doc/HTML/pt/kolf/index.cache.bz2
share/doc/HTML/pt/kolf/index.docbook
+share/doc/HTML/pt/kollision/common
+share/doc/HTML/pt/kollision/index.cache.bz2
+share/doc/HTML/pt/kollision/index.docbook
share/doc/HTML/pt/kolourpaint/common
share/doc/HTML/pt/kolourpaint/index.cache.bz2
share/doc/HTML/pt/kolourpaint/index.docbook
@@ -703,10 +823,12 @@ share/doc/HTML/pt/konsolekalendar/index.docbook
share/doc/HTML/pt/kontact/common
share/doc/HTML/pt/kontact/index.cache.bz2
share/doc/HTML/pt/kontact/index.docbook
+share/doc/HTML/pt/kopete/chatstyle.docbook
share/doc/HTML/pt/kopete/common
share/doc/HTML/pt/kopete/index.cache.bz2
share/doc/HTML/pt/kopete/index.docbook
share/doc/HTML/pt/kopete/menus.docbook
+share/doc/HTML/pt/kopete/pipes.docbook
share/doc/HTML/pt/korganizer/common
share/doc/HTML/pt/korganizer/exchange-plugin.docbook
share/doc/HTML/pt/korganizer/group-scheduling.docbook
@@ -786,6 +908,9 @@ share/doc/HTML/pt/ksim/index.docbook
share/doc/HTML/pt/ksirc/common
share/doc/HTML/pt/ksirc/index.cache.bz2
share/doc/HTML/pt/ksirc/index.docbook
+share/doc/HTML/pt/ksirk/common
+share/doc/HTML/pt/ksirk/index.cache.bz2
+share/doc/HTML/pt/ksirk/index.docbook
share/doc/HTML/pt/ksirtet/common
share/doc/HTML/pt/ksirtet/index.cache.bz2
share/doc/HTML/pt/ksirtet/index.docbook
@@ -867,6 +992,9 @@ share/doc/HTML/pt/kstars/tools.docbook
share/doc/HTML/pt/kstars/utime.docbook
share/doc/HTML/pt/kstars/wut.docbook
share/doc/HTML/pt/kstars/zenith.docbook
+share/doc/HTML/pt/ksudoku/common
+share/doc/HTML/pt/ksudoku/index.cache.bz2
+share/doc/HTML/pt/ksudoku/index.docbook
share/doc/HTML/pt/ksysguard/common
share/doc/HTML/pt/ksysguard/index.cache.bz2
share/doc/HTML/pt/ksysguard/index.docbook
@@ -882,6 +1010,9 @@ share/doc/HTML/pt/kteatime/index.docbook
share/doc/HTML/pt/ktimer/common
share/doc/HTML/pt/ktimer/index.cache.bz2
share/doc/HTML/pt/ktimer/index.docbook
+share/doc/HTML/pt/ktimetracker/common
+share/doc/HTML/pt/ktimetracker/index.cache.bz2
+share/doc/HTML/pt/ktimetracker/index.docbook
share/doc/HTML/pt/ktnef/common
share/doc/HTML/pt/ktnef/index.cache.bz2
share/doc/HTML/pt/ktnef/index.docbook
@@ -904,6 +1035,9 @@ share/doc/HTML/pt/kturtle/index.docbook
share/doc/HTML/pt/kturtle/programming-reference.docbook
share/doc/HTML/pt/kturtle/translator-guide.docbook
share/doc/HTML/pt/kturtle/using-kturtle.docbook
+share/doc/HTML/pt/kubrick/common
+share/doc/HTML/pt/kubrick/index.cache.bz2
+share/doc/HTML/pt/kubrick/index.docbook
share/doc/HTML/pt/kuser/common
share/doc/HTML/pt/kuser/index.cache.bz2
share/doc/HTML/pt/kuser/index.docbook
@@ -946,6 +1080,9 @@ share/doc/HTML/pt/kxsldbg/variables.docbook
share/doc/HTML/pt/lilo-config/common
share/doc/HTML/pt/lilo-config/index.cache.bz2
share/doc/HTML/pt/lilo-config/index.docbook
+share/doc/HTML/pt/lokalize/common
+share/doc/HTML/pt/lokalize/index.cache.bz2
+share/doc/HTML/pt/lokalize/index.docbook
share/doc/HTML/pt/lskat/common
share/doc/HTML/pt/lskat/index.cache.bz2
share/doc/HTML/pt/lskat/index.docbook
@@ -953,9 +1090,37 @@ share/doc/HTML/pt/multisynk/common
share/doc/HTML/pt/multisynk/index.cache.bz2
share/doc/HTML/pt/multisynk/index.docbook
share/doc/HTML/pt/multisynk/konnectors-chapter.docbook
+share/doc/HTML/pt/okteta/basics.docbook
+share/doc/HTML/pt/okteta/common
+share/doc/HTML/pt/okteta/credits.docbook
+share/doc/HTML/pt/okteta/index.cache.bz2
+share/doc/HTML/pt/okteta/index.docbook
+share/doc/HTML/pt/okteta/introduction.docbook
+share/doc/HTML/pt/okteta/menu.docbook
+share/doc/HTML/pt/okteta/tools.docbook
+share/doc/HTML/pt/okular/common
+share/doc/HTML/pt/okular/index.cache.bz2
+share/doc/HTML/pt/okular/index.docbook
+share/doc/HTML/pt/parley/common
+share/doc/HTML/pt/parley/index.cache.bz2
+share/doc/HTML/pt/parley/index.docbook
+share/doc/HTML/pt/plasma/common
+share/doc/HTML/pt/plasma/index.cache.bz2
+share/doc/HTML/pt/plasma/index.docbook
+share/doc/HTML/pt/sonnet/common
+share/doc/HTML/pt/sonnet/index.cache.bz2
+share/doc/HTML/pt/sonnet/index.docbook
+share/doc/HTML/pt/step/common
+share/doc/HTML/pt/step/examples.docbook
+share/doc/HTML/pt/step/index.cache.bz2
+share/doc/HTML/pt/step/index.docbook
+share/doc/HTML/pt/step/tutorials.docbook
share/doc/HTML/pt/superkaramba/common
share/doc/HTML/pt/superkaramba/index.cache.bz2
share/doc/HTML/pt/superkaramba/index.docbook
+share/doc/HTML/pt/systemsettings/common
+share/doc/HTML/pt/systemsettings/index.cache.bz2
+share/doc/HTML/pt/systemsettings/index.docbook
share/doc/HTML/pt/umbrello/authors.docbook
share/doc/HTML/pt/umbrello/code_import_and_generation.docbook
share/doc/HTML/pt/umbrello/common
@@ -972,6 +1137,7 @@ share/doc/HTML/pt/xsldbg/credits.docbook
share/doc/HTML/pt/xsldbg/index.cache.bz2
share/doc/HTML/pt/xsldbg/index.docbook
share/doc/HTML/pt/xsldbg/introduction.docbook
+share/doc/HTML/pt/xsldbg/man-xsldbg.1.docbook
share/doc/HTML/pt/xsldbg/usage.docbook
share/locale/pt/LC_MESSAGES/akonaditray.mo
share/locale/pt/LC_MESSAGES/akregator.mo
@@ -1434,6 +1600,7 @@ share/locale/pt/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/pt/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/pt/LC_MESSAGES/plasma_applet_frame.mo
share/locale/pt/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/pt/LC_MESSAGES/plasma_applet_icon.mo
share/locale/pt/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/pt/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/pt/LC_MESSAGES/plasma_applet_kalzium.mo
@@ -1513,9 +1680,17 @@ share/locale/pt/LC_MESSAGES/useraccount.mo
share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/xsldbg
@dirrm share/doc/HTML/pt/umbrello
+@dirrm share/doc/HTML/pt/systemsettings
@dirrm share/doc/HTML/pt/superkaramba
+@dirrm share/doc/HTML/pt/step
+@dirrm share/doc/HTML/pt/sonnet
+@dirrm share/doc/HTML/pt/plasma
+@dirrm share/doc/HTML/pt/parley
+@dirrm share/doc/HTML/pt/okular
+@dirrm share/doc/HTML/pt/okteta
@dirrm share/doc/HTML/pt/multisynk
@dirrm share/doc/HTML/pt/lskat
+@dirrm share/doc/HTML/pt/lokalize
@dirrm share/doc/HTML/pt/lilo-config
@dirrm share/doc/HTML/pt/kxsldbg
@dirrm share/doc/HTML/pt/kxkb
@@ -1526,22 +1701,26 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kwatchgnupg
@dirrm share/doc/HTML/pt/kwallet
@dirrm share/doc/HTML/pt/kuser
+@dirrm share/doc/HTML/pt/kubrick
@dirrm share/doc/HTML/pt/kturtle
@dirrm share/doc/HTML/pt/ktuberling
@dirrm share/doc/HTML/pt/kttsd
@dirrm share/doc/HTML/pt/ktouch
@dirrm share/doc/HTML/pt/ktnef
+@dirrm share/doc/HTML/pt/ktimetracker
@dirrm share/doc/HTML/pt/ktimer
@dirrm share/doc/HTML/pt/kteatime
@dirrm share/doc/HTML/pt/ksysv
@dirrm share/doc/HTML/pt/ksystemlog
@dirrm share/doc/HTML/pt/ksysguard
+@dirrm share/doc/HTML/pt/ksudoku
@dirrm share/doc/HTML/pt/kstars
@dirrm share/doc/HTML/pt/ksplashml
@dirrm share/doc/HTML/pt/kspaceduel
@dirrm share/doc/HTML/pt/ksnapshot
@dirrm share/doc/HTML/pt/ksmiletris
@dirrm share/doc/HTML/pt/ksirtet
+@dirrm share/doc/HTML/pt/ksirk
@dirrm share/doc/HTML/pt/ksirc
@dirrm share/doc/HTML/pt/ksim
@dirrm share/doc/HTML/pt/kshisen
@@ -1568,20 +1747,24 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kompare
@dirrm share/doc/HTML/pt/kommander
@dirrm share/doc/HTML/pt/kolourpaint
+@dirrm share/doc/HTML/pt/kollision
@dirrm share/doc/HTML/pt/kolf
@dirrm share/doc/HTML/pt/knotes
@dirrm share/doc/HTML/pt/knode
@dirrm share/doc/HTML/pt/knewsticker
@dirrm share/doc/HTML/pt/knetworkconf
+@dirrm share/doc/HTML/pt/knetwalk
@dirrm share/doc/HTML/pt/knetattach
@dirrm share/doc/HTML/pt/kmplot
@dirrm share/doc/HTML/pt/kmouth
@dirrm share/doc/HTML/pt/kmousetool
@dirrm share/doc/HTML/pt/kmoon
+@dirrm share/doc/HTML/pt/kmobiletools
@dirrm share/doc/HTML/pt/kmix
@dirrm share/doc/HTML/pt/kmines
@dirrm share/doc/HTML/pt/kmenuedit
@dirrm share/doc/HTML/pt/kmathtool
+@dirrm share/doc/HTML/pt/kmail
@dirrm share/doc/HTML/pt/kmahjongg
@dirrm share/doc/HTML/pt/kmag
@dirrm share/doc/HTML/pt/klipper
@@ -1592,7 +1775,37 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kjumpingcube
@dirrm share/doc/HTML/pt/kjots
@dirrm share/doc/HTML/pt/kiten
-@dirrm share/doc/HTML/pt/kioslave/kioslave
+@dirrm share/doc/HTML/pt/kiriki
+@dirrm share/doc/HTML/pt/kioslave/webdav
+@dirrm share/doc/HTML/pt/kioslave/thumbnail
+@dirrm share/doc/HTML/pt/kioslave/telnet
+@dirrm share/doc/HTML/pt/kioslave/tar
+@dirrm share/doc/HTML/pt/kioslave/smtp
+@dirrm share/doc/HTML/pt/kioslave/smb
+@dirrm share/doc/HTML/pt/kioslave/sftp
+@dirrm share/doc/HTML/pt/kioslave/rlogin
+@dirrm share/doc/HTML/pt/kioslave/pop3
+@dirrm share/doc/HTML/pt/kioslave/nntp
+@dirrm share/doc/HTML/pt/kioslave/nfs
+@dirrm share/doc/HTML/pt/kioslave/news
+@dirrm share/doc/HTML/pt/kioslave/man
+@dirrm share/doc/HTML/pt/kioslave/mailto
+@dirrm share/doc/HTML/pt/kioslave/ldap
+@dirrm share/doc/HTML/pt/kioslave/info
+@dirrm share/doc/HTML/pt/kioslave/imap
+@dirrm share/doc/HTML/pt/kioslave/http
+@dirrm share/doc/HTML/pt/kioslave/help
+@dirrm share/doc/HTML/pt/kioslave/gzip
+@dirrm share/doc/HTML/pt/kioslave/ftp
+@dirrm share/doc/HTML/pt/kioslave/floppy
+@dirrm share/doc/HTML/pt/kioslave/fish
+@dirrm share/doc/HTML/pt/kioslave/finger
+@dirrm share/doc/HTML/pt/kioslave/file
+@dirrm share/doc/HTML/pt/kioslave/data
+@dirrm share/doc/HTML/pt/kioslave/cgi
+@dirrm share/doc/HTML/pt/kioslave/bzip2
+@dirrm share/doc/HTML/pt/kioslave/bookmarks
+@dirrm share/doc/HTML/pt/kioslave/audiocd
@dirrm share/doc/HTML/pt/kioslave
@dirrm share/doc/HTML/pt/kinfocenter/xserver
@dirrm share/doc/HTML/pt/kinfocenter/usb
@@ -1613,6 +1826,8 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kinfocenter/devices
@dirrm share/doc/HTML/pt/kinfocenter/blockdevices
@dirrm share/doc/HTML/pt/kinfocenter
+@dirrm share/doc/HTML/pt/kimagemapeditor
+@dirrm share/doc/HTML/pt/killbots
@dirrm share/doc/HTML/pt/kig
@dirrm share/doc/HTML/pt/khelpcenter/visualdict
@dirrm share/doc/HTML/pt/khelpcenter/userguide
@@ -1626,19 +1841,23 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kget
@dirrm share/doc/HTML/pt/kgeography
@dirrm share/doc/HTML/pt/kgamma
+@dirrm share/doc/HTML/pt/kfourinline
@dirrm share/doc/HTML/pt/kfloppy
@dirrm share/doc/HTML/pt/kfind
@dirrm share/doc/HTML/pt/kfilereplace
@dirrm share/doc/HTML/pt/kedit
@dirrm share/doc/HTML/pt/kdvi
@dirrm share/doc/HTML/pt/kdm
+@dirrm share/doc/HTML/pt/kdiamond
@dirrm share/doc/HTML/pt/kdf
@dirrm share/doc/HTML/pt/kdesu
@dirrm share/doc/HTML/pt/kdepasswd
@dirrm share/doc/HTML/pt/kdebugdialog
@dirrm share/doc/HTML/pt/kdat
@dirrm share/doc/HTML/pt/kcron
+@dirrm share/doc/HTML/pt/kcontrol/windowspecific
@dirrm share/doc/HTML/pt/kcontrol/windowmanagement
+@dirrm share/doc/HTML/pt/kcontrol/windowbehaviour
@dirrm share/doc/HTML/pt/kcontrol/useragent
@dirrm share/doc/HTML/pt/kcontrol/splashscreen
@dirrm share/doc/HTML/pt/kcontrol/spellchecking
@@ -1658,7 +1877,9 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kcontrol/kxmlrpcd
@dirrm share/doc/HTML/pt/kcontrol/kxkb
@dirrm share/doc/HTML/pt/kcontrol/kwindecoration
+@dirrm share/doc/HTML/pt/kcontrol/kwincompositing
@dirrm share/doc/HTML/pt/kcontrol/kthememgr
+@dirrm share/doc/HTML/pt/kcontrol/kresources
@dirrm share/doc/HTML/pt/kcontrol/knetworkconf
@dirrm share/doc/HTML/pt/kcontrol/khtml
@dirrm share/doc/HTML/pt/kcontrol/keys
@@ -1674,8 +1895,10 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kcontrol/kcmktalkd
@dirrm share/doc/HTML/pt/kcontrol/kcmkonsole
@dirrm share/doc/HTML/pt/kcontrol/kcmfontinst
+@dirrm share/doc/HTML/pt/kcontrol/kcmdisplay
@dirrm share/doc/HTML/pt/kcontrol/kcmcss
@dirrm share/doc/HTML/pt/kcontrol/kcmaccess
+@dirrm share/doc/HTML/pt/kcontrol/kamera
@dirrm share/doc/HTML/pt/kcontrol/kalarmd
@dirrm share/doc/HTML/pt/kcontrol/joystick
@dirrm share/doc/HTML/pt/kcontrol/icons
@@ -1695,6 +1918,8 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kcontrol/colors
@dirrm share/doc/HTML/pt/kcontrol/clock
@dirrm share/doc/HTML/pt/kcontrol/cache
+@dirrm share/doc/HTML/pt/kcontrol/bookmarks
+@dirrm share/doc/HTML/pt/kcontrol/blockdevices
@dirrm share/doc/HTML/pt/kcontrol/bell
@dirrm share/doc/HTML/pt/kcontrol/background
@dirrm share/doc/HTML/pt/kcontrol/autostart
@@ -1705,15 +1930,19 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/kcachegrind
@dirrm share/doc/HTML/pt/kbugbuster
@dirrm share/doc/HTML/pt/kbruch
+@dirrm share/doc/HTML/pt/kbreakout
@dirrm share/doc/HTML/pt/kbounce
+@dirrm share/doc/HTML/pt/kblocks
@dirrm share/doc/HTML/pt/kblackbox
@dirrm share/doc/HTML/pt/kbattleship
@dirrm share/doc/HTML/pt/katomic
-@dirrm share/doc/HTML/pt/kate
+@dirrm share/doc/HTML/pt/kate-plugins
@dirrm share/doc/HTML/pt/karm
+@dirrm share/doc/HTML/pt/kapptemplate
@dirrm share/doc/HTML/pt/kanagram
@dirrm share/doc/HTML/pt/kamera
@dirrm share/doc/HTML/pt/kalzium
+@dirrm share/doc/HTML/pt/kalgebra
@dirrm share/doc/HTML/pt/kalarm
@dirrm share/doc/HTML/pt/kaddressbook
@dirrm share/doc/HTML/pt/juk
@@ -1721,6 +1950,7 @@ share/locale/pt/entry.desktop
@dirrm share/doc/HTML/pt/gwenview
@dirrm share/doc/HTML/pt/dolphin
@dirrm share/doc/HTML/pt/cervisia
+@dirrm share/doc/HTML/pt/bomber
@dirrm share/doc/HTML/pt/blinken
@dirrm share/doc/HTML/pt/ark
@dirrm share/doc/HTML/pt/amor
@@ -1731,6 +1961,8 @@ share/locale/pt/entry.desktop
@dirrm share/apps/ktuberling/sounds
@dirrm share/apps/ktuberling
@dirrm share/apps/khangman
+@dirrmtry man/pt/man8
+@dirrmtry man/pt/man7
@dirrmtry man/pt/man6
@dirrmtry man/pt/man1
@dirrmtry man/pt
diff --git a/russian/kde4-l10n/distinfo b/russian/kde4-l10n/distinfo
index 1052652836f1..b1b35587778a 100644
--- a/russian/kde4-l10n/distinfo
+++ b/russian/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-ru-4.2.0.tar.bz2) = 9038ce82cdddf3fcf028aff50a55932a
-SHA256 (KDE/kde-l10n/kde-l10n-ru-4.2.0.tar.bz2) = 934a430028ddda882599612dad343877b3ac398dc2dcbff87f5941447853595b
-SIZE (KDE/kde-l10n/kde-l10n-ru-4.2.0.tar.bz2) = 5225900
+MD5 (KDE/kde-l10n/kde-l10n-ru-4.2.1.tar.bz2) = 770d39e08471b0fe91762dbee93d6d00
+SHA256 (KDE/kde-l10n/kde-l10n-ru-4.2.1.tar.bz2) = 9be752727d06cda384f61b20652e51499712ef014b511fb31319d0e8853fe177
+SIZE (KDE/kde-l10n/kde-l10n-ru-4.2.1.tar.bz2) = 5258117
diff --git a/russian/kde4-l10n/pkg-plist b/russian/kde4-l10n/pkg-plist
index 8c688918b519..165d8f41626e 100644
--- a/russian/kde4-l10n/pkg-plist
+++ b/russian/kde4-l10n/pkg-plist
@@ -1188,6 +1188,7 @@ share/locale/ru/LC_MESSAGES/liboktetacore.mo
share/locale/ru/LC_MESSAGES/libphonon.mo
share/locale/ru/LC_MESSAGES/libplasma.mo
share/locale/ru/LC_MESSAGES/libplasmaclock.mo
+share/locale/ru/LC_MESSAGES/libksane.mo
share/locale/ru/LC_MESSAGES/libtaskmanager.mo
share/locale/ru/LC_MESSAGES/lokalize.mo
share/locale/ru/LC_MESSAGES/lskat.mo
@@ -1219,7 +1220,9 @@ share/locale/ru/LC_MESSAGES/phonon_kde.mo
share/locale/ru/LC_MESSAGES/plasma.mo
share/locale/ru/LC_MESSAGES/plasma_applet_battery.mo
share/locale/ru/LC_MESSAGES/plasma_applet_binaryclock.mo
+share/locale/ru/LC_MESSAGES/plasma_applet_bluemarble.mo
share/locale/ru/LC_MESSAGES/plasma_applet_calculator.mo
+share/locale/ru/LC_MESSAGES/plasma_applet_charselect.mo
share/locale/ru/LC_MESSAGES/plasma_applet_clock.mo
share/locale/ru/LC_MESSAGES/plasma_applet_comic.mo
share/locale/ru/LC_MESSAGES/plasma_applet_desktop.mo
@@ -1231,6 +1234,7 @@ share/locale/ru/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/ru/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/ru/LC_MESSAGES/plasma_applet_frame.mo
share/locale/ru/LC_MESSAGES/plasma_applet_incomingmsg.mo
+share/locale/ru/LC_MESSAGES/plasma_runner_katesessions.mo
share/locale/ru/LC_MESSAGES/plasma_applet_kget.mo
share/locale/ru/LC_MESSAGES/plasma_applet_kolourpicker.mo
share/locale/ru/LC_MESSAGES/plasma_applet_launcher.mo
diff --git a/security/kgpg-kde4/distinfo b/security/kgpg-kde4/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/security/kgpg-kde4/distinfo
+++ b/security/kgpg-kde4/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/security/kgpg-kde4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/security/kgpg-kde4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/security/kgpg-kde4/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/security/kwallet/distinfo b/security/kwallet/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/security/kwallet/distinfo
+++ b/security/kwallet/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/security/kwallet/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/security/kwallet/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/security/kwallet/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/sysutils/kdeadmin4/distinfo b/sysutils/kdeadmin4/distinfo
index 5c44dda1e7bd..7ac3743f0d62 100644
--- a/sysutils/kdeadmin4/distinfo
+++ b/sysutils/kdeadmin4/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeadmin-4.2.1.tar.bz2) = 11dde15ee5150357801c245d1290f38d
+SHA256 (KDE/kdeadmin-4.2.1.tar.bz2) = 48c063373211befe47d103f0ecf43f6e23a0b41a5a52d880b3c6374c1c13b498
+SIZE (KDE/kdeadmin-4.2.1.tar.bz2) = 1923382
diff --git a/sysutils/kdf/distinfo b/sysutils/kdf/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/sysutils/kdf/distinfo
+++ b/sysutils/kdf/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/sysutils/kdf/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/sysutils/kdf/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/sysutils/kdf/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/sysutils/kfloppy/distinfo b/sysutils/kfloppy/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/sysutils/kfloppy/distinfo
+++ b/sysutils/kfloppy/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/sysutils/kfloppy/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/sysutils/kfloppy/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/sysutils/kfloppy/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/sysutils/sweeper/distinfo b/sysutils/sweeper/distinfo
index 5bf5f73fd46e..cd8792021961 100644
--- a/sysutils/sweeper/distinfo
+++ b/sysutils/sweeper/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (KDE/kdeutils-4.2.1.tar.bz2) = ed3397244a64530c108e76d6767c07d0
+SHA256 (KDE/kdeutils-4.2.1.tar.bz2) = a8225e4a430bade4106c2bcd5c1b6f5f2cd3c6e68c2a89bfc90aabc277271d77
+SIZE (KDE/kdeutils-4.2.1.tar.bz2) = 2239659
diff --git a/sysutils/sweeper/files/patch-ark_plugins_libarchive-libarchivehandler.cpp b/sysutils/sweeper/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
new file mode 100644
index 000000000000..6f6752537061
--- /dev/null
+++ b/sysutils/sweeper/files/patch-ark_plugins_libarchive-libarchivehandler.cpp
@@ -0,0 +1,20 @@
+--- ../ark/plugins/libarchive/libarchivehandler.cpp.orig 2009-02-01 00:16:54.000000000 +0100
++++ ../ark/plugins/libarchive/libarchivehandler.cpp 2009-02-01 00:19:50.000000000 +0100
+@@ -567,7 +567,7 @@
+ }
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ if (!creatingNewFile) {
+ archive_read_finish( arch_reader );
+@@ -700,7 +700,7 @@
+ archive_entry_clear( entry );
+ }
+
+- ret = archive_write_finish(arch_writer);
++ archive_write_finish(arch_writer);
+
+ archive_read_finish( arch_reader );
+
diff --git a/textproc/ebook-tools/Makefile b/textproc/ebook-tools/Makefile
index d2fa64b90d03..4f70669c5fc4 100644
--- a/textproc/ebook-tools/Makefile
+++ b/textproc/ebook-tools/Makefile
@@ -7,6 +7,7 @@
PORTNAME= ebook-tools
PORTVERSION= 0.1.1
+PORTREVISION= 1
CATEGORIES= textproc kde
MASTER_SITES= SF
@@ -15,13 +16,8 @@ COMMENT= Accessing and converting various ebook file formats
LIB_DEPENDS= zip.1:${PORTSDIR}/archivers/libzip
-USE_KDE4= kdehier kdeprefix
USE_CMAKE= yes
-CMAKE_VERBOSE= yes
USE_LDCONFIG= yes
USE_GNOME= libxml2 pkgconfig
-post-extract:
- ${MKDIR} ${WRKSRC}/build
-
.include <bsd.port.mk>
diff --git a/textproc/soprano/Makefile b/textproc/soprano/Makefile
index 632e715bb915..b3a7b5404ca3 100644
--- a/textproc/soprano/Makefile
+++ b/textproc/soprano/Makefile
@@ -5,7 +5,7 @@
# $FreeBSD$
PORTNAME= soprano
-PORTVERSION= 2.1.67
+PORTVERSION= 2.2.3
CATEGORIES= textproc
MASTER_SITES= SF
@@ -13,7 +13,10 @@ MAINTAINER= kde@FreeBSD.org
COMMENT= QT4 RDF framework
LIB_DEPENDS= clucene.0:${PORTSDIR}/textproc/clucene \
- rdf.0:${PORTSDIR}/textproc/redland
+ raptor.2:${PORTSDIR}/textproc/raptor
+
+OPTIONS= REDLAND "Use Redland as storage backend" on \
+ SESAME2 "Use Sesame2 as storage backend (requires Java)" off
USE_BZIP2= yes
USE_QT_VER= 4
@@ -23,9 +26,30 @@ USE_GNOME= pkgconfig
USE_LDCONFIG= yes
USE_CMAKE= yes
+.include <bsd.port.pre.mk>
+
+.if defined(WITH_REDLAND)
+LIB_DEPENDS+= rdf.0:${PORTSDIR}/textproc/redland
+PLIST_SUB+= REDLAND=""
+.else
+CMAKE_ARGS+= -DSOPRANO_DISABLE_REDLAND_BACKEND=yes
+PLIST_SUB+= REDLAND="@comment "
+.endif
+
+.if defined(WITH_SESAME2)
+CATEGORIES+= java
+CMAKE_ENV+= JAVA_HOME=${JAVA_HOME}
+USE_JAVA= yes
+JAVA_VERSION= 1.4+
+JAVA_OS= native
+PLIST_SUB+= SESAME2=""
+.else
+CMAKE_ARGS+= -DSOPRANO_DISABLE_SESAME2_BACKEND=yes
+PLIST_SUB+= SESAME2="@comment "
+.endif
+
post-patch:
- ${MKDIR} ${WRKSRC}
${REINPLACE_CMD} -e "s,$${LIB_SUFFIX}/pkgconfig,data/pkgconfig," \
${WRKSRC}/CMakeLists.txt
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>
diff --git a/textproc/soprano/distinfo b/textproc/soprano/distinfo
index 28c90a118012..b67f39ae6de5 100644
--- a/textproc/soprano/distinfo
+++ b/textproc/soprano/distinfo
@@ -1,3 +1,3 @@
-MD5 (soprano-2.1.67.tar.bz2) = 9639e400ba4beb08af35e5128439cc77
-SHA256 (soprano-2.1.67.tar.bz2) = 1fe7feb83891e5761646e731fbdb8a44c84600392a72316c7eada304e8e29026
-SIZE (soprano-2.1.67.tar.bz2) = 1847445
+MD5 (soprano-2.2.3.tar.bz2) = 22c992a252144ae0a3a964ba2f6f1933
+SHA256 (soprano-2.2.3.tar.bz2) = 49df0b7ee51c1dc1722b167726c95b18bb1eb8cb7178e5afd28c639efed7a6d2
+SIZE (soprano-2.2.3.tar.bz2) = 1849174
diff --git a/textproc/soprano/pkg-plist b/textproc/soprano/pkg-plist
index 9e951c5e1979..976e4f46f0d7 100644
--- a/textproc/soprano/pkg-plist
+++ b/textproc/soprano/pkg-plist
@@ -150,7 +150,8 @@ lib/soprano/libsoprano_nquadparser.so
lib/soprano/libsoprano_nquadserializer.so
lib/soprano/libsoprano_raptorparser.so
lib/soprano/libsoprano_raptorserializer.so
-lib/soprano/libsoprano_redlandbackend.so
+%%REDLAND%%lib/soprano/libsoprano_redlandbackend.so
+%%SESAME2%%lib/soprano/libsoprano_sesame2backend.so
libdata/pkgconfig/soprano.pc
share/dbus-1/interfaces/org.soprano.Model.xml
share/dbus-1/interfaces/org.soprano.NodeIterator.xml
@@ -161,9 +162,15 @@ share/dbus-1/interfaces/org.soprano.StatementIterator.xml
%%DATADIR%%/plugins/nquadserializer.desktop
%%DATADIR%%/plugins/raptorparser.desktop
%%DATADIR%%/plugins/raptorserializer.desktop
-%%DATADIR%%/plugins/redlandbackend.desktop
+%%REDLAND%%%%DATADIR%%/plugins/redlandbackend.desktop
+%%SESAME2%%%%DATADIR%%/plugins/sesame2backend.desktop
%%DATADIR%%/rules/nrl.rules
%%DATADIR%%/rules/rdfs.rules
+%%SESAME2%%%%DATADIR%%/sesame2/openrdf-sesame-2.1.4-onejar.jar
+%%SESAME2%%%%DATADIR%%/sesame2/slf4j-api-1.5.5.jar
+%%SESAME2%%%%DATADIR%%/sesame2/slf4j-simple-1.5.5.jar
+%%SESAME2%%%%DATADIR%%/sesame2/SopranoSesame2Wrapper.class
+%%SESAME2%%@dirrm %%DATADIR%%/sesame2
@dirrm %%DATADIR%%/rules
@dirrm %%DATADIR%%/plugins
@dirrm %%DATADIR%%
diff --git a/ukrainian/kde4-l10n/distinfo b/ukrainian/kde4-l10n/distinfo
index d886e1073a6d..fddafdbf7553 100644
--- a/ukrainian/kde4-l10n/distinfo
+++ b/ukrainian/kde4-l10n/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kde-l10n/kde-l10n-uk-4.2.0.tar.bz2) = 7dba32b49fe5d263103a617a49a1849e
-SHA256 (KDE/kde-l10n/kde-l10n-uk-4.2.0.tar.bz2) = 63ca2f86f436d5e1bf5f510afecced7e99acf75adc7469d2904fe4ff6e6b573a
-SIZE (KDE/kde-l10n/kde-l10n-uk-4.2.0.tar.bz2) = 7165708
+MD5 (KDE/kde-l10n/kde-l10n-uk-4.2.1.tar.bz2) = 40f6a3fd553144ccd8a576fed272fb6d
+SHA256 (KDE/kde-l10n/kde-l10n-uk-4.2.1.tar.bz2) = edef9a2991ae6254f881fd0b4430a8e772893ca0e0a940ae316ab53eb7cc4724
+SIZE (KDE/kde-l10n/kde-l10n-uk-4.2.1.tar.bz2) = 7438732
diff --git a/ukrainian/kde4-l10n/pkg-plist b/ukrainian/kde4-l10n/pkg-plist
index 26ffe68dd929..2f4d11494b71 100644
--- a/ukrainian/kde4-l10n/pkg-plist
+++ b/ukrainian/kde4-l10n/pkg-plist
@@ -145,6 +145,9 @@ share/doc/HTML/uk/kabcclient/man-kabcclient.1.docbook
share/doc/HTML/uk/kaddressbook/common
share/doc/HTML/uk/kaddressbook/index.cache.bz2
share/doc/HTML/uk/kaddressbook/index.docbook
+share/doc/HTML/uk/kalarm/common
+share/doc/HTML/uk/kalarm/index.cache.bz2
+share/doc/HTML/uk/kalarm/index.docbook
share/doc/HTML/uk/kalgebra/common
share/doc/HTML/uk/kalgebra/index.cache.bz2
share/doc/HTML/uk/kalgebra/index.docbook
@@ -211,6 +214,9 @@ share/doc/HTML/uk/kbruch/man-kbruch.1.docbook
share/doc/HTML/uk/kbugbuster/common
share/doc/HTML/uk/kbugbuster/index.cache.bz2
share/doc/HTML/uk/kbugbuster/index.docbook
+share/doc/HTML/uk/kcachegrind/common
+share/doc/HTML/uk/kcachegrind/index.cache.bz2
+share/doc/HTML/uk/kcachegrind/index.docbook
share/doc/HTML/uk/kcalc/commands.docbook
share/doc/HTML/uk/kcalc/common
share/doc/HTML/uk/kcalc/index.cache.bz2
@@ -784,6 +790,20 @@ share/doc/HTML/uk/knetattach/index.docbook
share/doc/HTML/uk/knetwalk/common
share/doc/HTML/uk/knetwalk/index.cache.bz2
share/doc/HTML/uk/knetwalk/index.docbook
+share/doc/HTML/uk/knode/commands.docbook
+share/doc/HTML/uk/knode/common
+share/doc/HTML/uk/knode/credits.docbook
+share/doc/HTML/uk/knode/faq.docbook
+share/doc/HTML/uk/knode/gloss.docbook
+share/doc/HTML/uk/knode/index.cache.bz2
+share/doc/HTML/uk/knode/index.docbook
+share/doc/HTML/uk/knode/install.docbook
+share/doc/HTML/uk/knode/introduction.docbook
+share/doc/HTML/uk/knode/journey.docbook
+share/doc/HTML/uk/knode/more.docbook
+share/doc/HTML/uk/knode/using-firststart.docbook
+share/doc/HTML/uk/knode/using-morefeatures.docbook
+share/doc/HTML/uk/knode/using-subscribing.docbook
share/doc/HTML/uk/knotes/common
share/doc/HTML/uk/knotes/index.cache.bz2
share/doc/HTML/uk/knotes/index.docbook
@@ -812,6 +832,9 @@ share/doc/HTML/uk/kommander/q-and-a.docbook
share/doc/HTML/uk/kommander/specials.docbook
share/doc/HTML/uk/kommander/tutorials.docbook
share/doc/HTML/uk/kommander/widgets.docbook
+share/doc/HTML/uk/kompare/common
+share/doc/HTML/uk/kompare/index.cache.bz2
+share/doc/HTML/uk/kompare/index.docbook
share/doc/HTML/uk/konqueror/basics.docbook
share/doc/HTML/uk/konqueror/bookmarks.docbook
share/doc/HTML/uk/konqueror/browser.docbook
@@ -1567,6 +1590,7 @@ share/locale/uk/LC_MESSAGES/plasma_applet_fileWatcher.mo
share/locale/uk/LC_MESSAGES/plasma_applet_folderview.mo
share/locale/uk/LC_MESSAGES/plasma_applet_frame.mo
share/locale/uk/LC_MESSAGES/plasma_applet_fuzzy_clock.mo
+share/locale/uk/LC_MESSAGES/plasma_applet_icon.mo
share/locale/uk/LC_MESSAGES/plasma_applet_incomingmsg.mo
share/locale/uk/LC_MESSAGES/plasma_applet_kalgebra.mo
share/locale/uk/LC_MESSAGES/plasma_applet_kalzium.mo
@@ -1703,11 +1727,13 @@ share/locale/uk/entry.desktop
@dirrm share/doc/HTML/uk/konsole
@dirrm share/doc/HTML/uk/konquest
@dirrm share/doc/HTML/uk/konqueror
+@dirrm share/doc/HTML/uk/kompare
@dirrm share/doc/HTML/uk/kommander
@dirrm share/doc/HTML/uk/kolourpaint
@dirrm share/doc/HTML/uk/kollision
@dirrm share/doc/HTML/uk/kolf
@dirrm share/doc/HTML/uk/knotes
+@dirrm share/doc/HTML/uk/knode
@dirrm share/doc/HTML/uk/knetwalk
@dirrm share/doc/HTML/uk/knetattach
@dirrm share/doc/HTML/uk/kmplot
@@ -1867,6 +1893,7 @@ share/locale/uk/entry.desktop
@dirrm share/doc/HTML/uk/kcontrol
@dirrm share/doc/HTML/uk/kcharselect
@dirrm share/doc/HTML/uk/kcalc
+@dirrm share/doc/HTML/uk/kcachegrind
@dirrm share/doc/HTML/uk/kbugbuster
@dirrm share/doc/HTML/uk/kbruch
@dirrm share/doc/HTML/uk/kbreakout
@@ -1882,6 +1909,7 @@ share/locale/uk/entry.desktop
@dirrm share/doc/HTML/uk/kanagram
@dirrm share/doc/HTML/uk/kalzium
@dirrm share/doc/HTML/uk/kalgebra
+@dirrm share/doc/HTML/uk/kalarm
@dirrm share/doc/HTML/uk/kaddressbook
@dirrm share/doc/HTML/uk/kabcclient
@dirrm share/doc/HTML/uk/juk
diff --git a/www/kdewebdev4/Makefile b/www/kdewebdev4/Makefile
index 19648207798a..518bcbbed558 100644
--- a/www/kdewebdev4/Makefile
+++ b/www/kdewebdev4/Makefile
@@ -6,7 +6,6 @@
PORTNAME= kdewebdev
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= www kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/www/kdewebdev4/distinfo b/www/kdewebdev4/distinfo
index d8dbad3c3092..1992413d3ee9 100644
--- a/www/kdewebdev4/distinfo
+++ b/www/kdewebdev4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdewebdev-4.2.0.tar.bz2) = 8b60c68f6cbbe9c5bb48caa576853f9e
-SHA256 (KDE/kdewebdev-4.2.0.tar.bz2) = a7fee58405e290157b0613abf6c890d53701570b50850a88fa45e98ba9d1110d
-SIZE (KDE/kdewebdev-4.2.0.tar.bz2) = 3400470
+MD5 (KDE/kdewebdev-4.2.1.tar.bz2) = 38e6f1343cf1024e52059146609a6a85
+SHA256 (KDE/kdewebdev-4.2.1.tar.bz2) = 5176fe4cea74f34581b223851014ed2737ae4eecc1e1d548a687e95edaad2424
+SIZE (KDE/kdewebdev-4.2.1.tar.bz2) = 2525699
diff --git a/x11-clocks/kdetoys4/distinfo b/x11-clocks/kdetoys4/distinfo
index 41f9f899fba6..ea091e06939b 100644
--- a/x11-clocks/kdetoys4/distinfo
+++ b/x11-clocks/kdetoys4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdetoys-4.2.0.tar.bz2) = 3adf538297e5dca51f15186b4acd02ce
-SHA256 (KDE/kdetoys-4.2.0.tar.bz2) = c68b54f82d5c9fe25e575df8a3d8caaf60c822aab59d289e595674d3fbfbfcbe
-SIZE (KDE/kdetoys-4.2.0.tar.bz2) = 1306756
+MD5 (KDE/kdetoys-4.2.1.tar.bz2) = 78cd751eb92ec2f068c8dc39794175e6
+SHA256 (KDE/kdetoys-4.2.1.tar.bz2) = 46a01ed207a66ec4150b8d6b825e902569397450d7fb1c8099a1d51dcca7c31f
+SIZE (KDE/kdetoys-4.2.1.tar.bz2) = 1307563
diff --git a/x11-themes/kdeartwork4/distinfo b/x11-themes/kdeartwork4/distinfo
index defb2189bfa9..52d14a49fdda 100644
--- a/x11-themes/kdeartwork4/distinfo
+++ b/x11-themes/kdeartwork4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeartwork-4.2.0.tar.bz2) = d81623b60c7deb314bc2e28a52254ac2
-SHA256 (KDE/kdeartwork-4.2.0.tar.bz2) = ec8dbbcbaabc95b10a9d7a9756d99b5a6d4bb0c77ac4cbd14ad06a943bf00d4c
-SIZE (KDE/kdeartwork-4.2.0.tar.bz2) = 22594956
+MD5 (KDE/kdeartwork-4.2.1.tar.bz2) = 2712142e1cd452f6ada441a310a971d6
+SHA256 (KDE/kdeartwork-4.2.1.tar.bz2) = c7ef5207796cf01d1437d5cdf959108a5ebb909bc9462edd9f73ef56437663af
+SIZE (KDE/kdeartwork-4.2.1.tar.bz2) = 22645936
diff --git a/x11-themes/kdeartwork4/pkg-plist b/x11-themes/kdeartwork4/pkg-plist
index 95924a5fb550..b187114c3435 100644
--- a/x11-themes/kdeartwork4/pkg-plist
+++ b/x11-themes/kdeartwork4/pkg-plist
@@ -3112,6 +3112,33 @@ share/icons/kdeclassic/8x8/emblems/emblem-symbolic-link.png
share/icons/kdeclassic/8x8/emblems/emblem-unreadable.png
share/icons/kdeclassic/8x8/emblems/emblem-zipped.png
share/icons/kdeclassic/index.theme
+share/kde4/services/ScreenSavers/abstractile.desktop
+share/kde4/services/ScreenSavers/antmaze.desktop
+share/kde4/services/ScreenSavers/boing.desktop
+share/kde4/services/ScreenSavers/boxfit.desktop
+share/kde4/services/ScreenSavers/carousel.desktop
+share/kde4/services/ScreenSavers/celtic.desktop
+share/kde4/services/ScreenSavers/crackberg.desktop
+share/kde4/services/ScreenSavers/cube21.desktop
+share/kde4/services/ScreenSavers/cubicgrid.desktop
+share/kde4/services/ScreenSavers/cwaves.desktop
+share/kde4/services/ScreenSavers/fiberlamp.desktop
+share/kde4/services/ScreenSavers/fliptext.desktop
+share/kde4/services/ScreenSavers/glcells.desktop
+share/kde4/services/ScreenSavers/glhanoi.desktop
+share/kde4/services/ScreenSavers/glschool.desktop
+share/kde4/services/ScreenSavers/hypnowheel.desktop
+share/kde4/services/ScreenSavers/interaggregate.desktop
+share/kde4/services/ScreenSavers/juggler3d.desktop
+share/kde4/services/ScreenSavers/lcdscrub.desktop
+share/kde4/services/ScreenSavers/lockward.desktop
+share/kde4/services/ScreenSavers/m6502.desktop
+share/kde4/services/ScreenSavers/moebiusgears.desktop
+share/kde4/services/ScreenSavers/skytentacles.desktop
+share/kde4/services/ScreenSavers/tangram.desktop
+share/kde4/services/ScreenSavers/timetunnel.desktop
+share/kde4/services/ScreenSavers/topblock.desktop
+share/kde4/services/ScreenSavers/voronoi.desktop
share/kde4/services/ScreenSavers/KBanner.desktop
share/kde4/services/ScreenSavers/KBlob.desktop
share/kde4/services/ScreenSavers/KClock.desktop
diff --git a/x11/kde4-baseapps/distinfo b/x11/kde4-baseapps/distinfo
index 8da5f818e6ed..ce2af62525a6 100644
--- a/x11/kde4-baseapps/distinfo
+++ b/x11/kde4-baseapps/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.2.0.tar.bz2) = da86a8ad624e86eda3a7509f39272060
-SHA256 (KDE/kdebase-4.2.0.tar.bz2) = 51694794fd90883f45456c8bf694feb9c0eafef1b267377c586c417913b0dd88
-SIZE (KDE/kdebase-4.2.0.tar.bz2) = 4249816
+MD5 (KDE/kdebase-4.2.1.tar.bz2) = a8f391db7b98feaa6ae81b8f1e99ed5a
+SHA256 (KDE/kdebase-4.2.1.tar.bz2) = 05c2111bcd0b5809f212c7f8f0e8b401bd68b4e684843c9dcd3658ba294482c1
+SIZE (KDE/kdebase-4.2.1.tar.bz2) = 4255541
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index d6a2f78a3236..b37826a60f10 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kde4-runtime/distinfo b/x11/kde4-runtime/distinfo
index 94fa7bb63013..93e4d6a3947a 100644
--- a/x11/kde4-runtime/distinfo
+++ b/x11/kde4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 8ef48aae16a6dddb3055d81d7e5c375f
-SHA256 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 5bb18a691915f42dc2a836422ce913405b5c51463caa236f2474293feead51d8
-SIZE (KDE/kdebase-runtime-4.2.0.tar.bz2) = 69901790
+MD5 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 93ef480ed5376ce02324d1b85b8bae0f
+SHA256 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 0eba1fd2f9b453b4e60033ff4f969218ed3c42c71a37277ac88c4f3e6f7edd14
+SIZE (KDE/kdebase-runtime-4.2.1.tar.bz2) = 70247291
diff --git a/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake b/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake
deleted file mode 100644
index a71e40083978..000000000000
--- a/x11/kde4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../cmake/modules/FindPulseAudio.cmake.orig 2008-09-03 11:24:24.000000000 +0000
-+++ ../cmake/modules/FindPulseAudio.cmake 2008-12-27 14:20:09.000000000 +0000
-@@ -16,16 +16,16 @@
- set(PULSEAUDIO_FIND_QUIETLY TRUE)
- endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
-
--if (NOT WIN32)
-- include(FindPkgConfig)
-- pkg_check_modules(PULSEAUDIO libpulse)
-- if(PULSEAUDIO_FOUND)
-- set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
-- set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
-- # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
-- # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
-- endif(PULSEAUDIO_FOUND)
--endif (NOT WIN32)
-+# if (NOT WIN32)
-+# include(FindPkgConfig)
-+# pkg_check_modules(PULSEAUDIO libpulse)
-+# if(PULSEAUDIO_FOUND)
-+# set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
-+# set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
-+# # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
-+# # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
-+# endif(PULSEAUDIO_FOUND)
-+# endif (NOT WIN32)
-
- if (NOT PULSEAUDIO_INCLUDE_DIR)
- FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h)
diff --git a/x11/kde4-runtime/pkg-plist b/x11/kde4-runtime/pkg-plist
index 0083d1aa44fa..50e29ca19d03 100644
--- a/x11/kde4-runtime/pkg-plist
+++ b/x11/kde4-runtime/pkg-plist
@@ -44,7 +44,6 @@ lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
-lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
lib/kde4/kded_desktopnotifier.so
@@ -839,6 +838,7 @@ share/icons/oxygen/128x128/apps/preferences-system-windows.png
share/icons/oxygen/128x128/apps/preferences-web-browser-identification.png
share/icons/oxygen/128x128/apps/scribus.png
share/icons/oxygen/128x128/apps/semn.png
+share/icons/oxygen/128x128/apps/showfoto.png
share/icons/oxygen/128x128/apps/strigi.png
share/icons/oxygen/128x128/apps/system-diagnosis.png
share/icons/oxygen/128x128/apps/system-file-manager.png
@@ -1678,6 +1678,7 @@ share/icons/oxygen/16x16/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/16x16/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/16x16/apps/scribus.png
share/icons/oxygen/16x16/apps/semn.png
+share/icons/oxygen/16x16/apps/showfoto.png
share/icons/oxygen/16x16/apps/strigi.png
share/icons/oxygen/16x16/apps/system-file-manager.png
share/icons/oxygen/16x16/apps/system-software-update.png
@@ -2553,6 +2554,7 @@ share/icons/oxygen/22x22/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/22x22/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/22x22/apps/scribus.png
share/icons/oxygen/22x22/apps/semn.png
+share/icons/oxygen/22x22/apps/showfoto.png
share/icons/oxygen/22x22/apps/strigi.png
share/icons/oxygen/22x22/apps/system-file-manager.png
share/icons/oxygen/22x22/apps/system-software-update.png
@@ -3440,6 +3442,7 @@ share/icons/oxygen/32x32/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/32x32/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/32x32/apps/scribus.png
share/icons/oxygen/32x32/apps/semn.png
+share/icons/oxygen/32x32/apps/showfoto.png
share/icons/oxygen/32x32/apps/strigi.png
share/icons/oxygen/32x32/apps/system-file-manager.png
share/icons/oxygen/32x32/apps/system-software-update.png
@@ -4315,6 +4318,7 @@ share/icons/oxygen/48x48/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/48x48/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/48x48/apps/scribus.png
share/icons/oxygen/48x48/apps/semn.png
+share/icons/oxygen/48x48/apps/showfoto.png
share/icons/oxygen/48x48/apps/strigi.png
share/icons/oxygen/48x48/apps/system-file-manager.png
share/icons/oxygen/48x48/apps/system-software-update.png
@@ -4942,6 +4946,7 @@ share/icons/oxygen/64x64/apps/preferences-system-windows-move.png
share/icons/oxygen/64x64/apps/preferences-system-windows.png
share/icons/oxygen/64x64/apps/scribus.png
share/icons/oxygen/64x64/apps/semn.png
+share/icons/oxygen/64x64/apps/showfoto.png
share/icons/oxygen/64x64/apps/strigi.png
share/icons/oxygen/64x64/apps/system-file-manager.png
share/icons/oxygen/64x64/apps/system-software-update.png
@@ -6220,6 +6225,7 @@ share/icons/oxygen/scalable/apps/preferences-web-browser-shortcuts.svgz
share/icons/oxygen/scalable/apps/preferences-web-browser-stylesheets.svgz
share/icons/oxygen/scalable/apps/scribus.svgz
share/icons/oxygen/scalable/apps/semn.svg
+share/icons/oxygen/scalable/apps/showfoto.svgz
share/icons/oxygen/scalable/apps/small/16x16/accessories-calculator.svgz
share/icons/oxygen/scalable/apps/small/16x16/accessories-character-map.svgz
share/icons/oxygen/scalable/apps/small/16x16/accessories-dictionary.svgz
@@ -7442,7 +7448,6 @@ share/kde4/services/jpegthumbnail.desktop
share/kde4/services/kcm_kdnssd.desktop
share/kde4/services/kcm_nepomuk.desktop
share/kde4/services/kcm_phonon.desktop
-share/kde4/services/kcm_phononxine.desktop
share/kde4/services/kcmcgi.desktop
share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index cd7b63248e9f..9380d226f5fb 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -58,9 +58,6 @@ post-extract:
pre-configure:
${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\
${WRKSRC}/../kwin/effects/thumbnailaside.h
- ${REINPLACE_CMD} -e 's|<qdir.h>|<QDir>|'\
- -e 's|<qfile.h>|<QFile>|'\
- ${WRKSRC}/../kwin/effects/videorecord.cpp
.for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp\
laptop/laptopclient.cpp modernsystem/modernsys.cpp\
redmond/redmond.cpp
diff --git a/x11/kde4-workspace/distinfo b/x11/kde4-workspace/distinfo
index 89497e8c976b..845540ffcd1f 100644
--- a/x11/kde4-workspace/distinfo
+++ b/x11/kde4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.2.0.tar.bz2) = 193e30b9ed0b55b0196289d9df43a904
-SHA256 (KDE/kdebase-workspace-4.2.0.tar.bz2) = e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
-SIZE (KDE/kdebase-workspace-4.2.0.tar.bz2) = 50724381
+MD5 (KDE/kdebase-workspace-4.2.1.tar.bz2) = 5659e3c7c992fab38223b0a467377495
+SHA256 (KDE/kdebase-workspace-4.2.1.tar.bz2) = fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
+SIZE (KDE/kdebase-workspace-4.2.1.tar.bz2) = 50777207
diff --git a/x11/kde4-workspace/files/patch-CMakeLists.txt b/x11/kde4-workspace/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..25851f037692
--- /dev/null
+++ b/x11/kde4-workspace/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ../CMakeLists.txt.orig 2009-01-01 19:26:09.000000000 +0300
++++ ../CMakeLists.txt 2009-03-07 10:02:36.000000000 +0300
+@@ -220,7 +220,7 @@
+ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake
+ ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
+
+-set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
++set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake)
+ # places where find_package() looks for FooConfig.cmake files:
+ # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
+ # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
diff --git a/x11/kde4-workspace/files/patch-kdm_config.def b/x11/kde4-workspace/files/patch-kdm_config.def
deleted file mode 100644
index d099b948a4ff..000000000000
--- a/x11/kde4-workspace/files/patch-kdm_config.def
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../kdm/config.def.orig 2008-08-02 16:58:49.000000000 +0200
-+++ ../kdm/config.def 2008-08-02 16:59:49.000000000 +0200
-@@ -35,8 +35,8 @@
- #ifdef _AIX
- # define HALT_CMD "/usr/sbin/shutdown -h now"
- # define REBOOT_CMD "/usr/sbin/shutdown -r now"
--#elif defined(BSD)
--# define HALT_CMD "/sbin/shutdown -h now"
-+#elif defined(__FreeBSD__)
-+# define HALT_CMD "/sbin/shutdown -p now"
- # define REBOOT_CMD "/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kde4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc b/x11/kde4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc
deleted file mode 100644
index 835260b86eff..000000000000
--- a/x11/kde4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../krunner/lock/lockprocess.cc (revision 916963)
-+++ ../krunner/lock/lockprocess.cc (revision 916964)
-@@ -1104,7 +1104,6 @@
- return; // no resuming with dialog visible or when not visible
- if( mSuspended && mHackProc.state() == QProcess::Running )
- {
-- XForceScreenSaver(QX11Info::display(), ScreenSaverReset );
- QPainter p( this );
- p.drawPixmap( 0, 0, mSavedScreen );
- p.end();
diff --git a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp b/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp
deleted file mode 100644
index 4f49a3d0463b..000000000000
--- a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- ../krunner/screensaver/saverengine.cpp (revision 916963)
-+++ ../krunner/screensaver/saverengine.cpp (revision 916964)
-@@ -46,7 +46,11 @@
- // Save X screensaver parameters
- XGetScreenSaver(QX11Info::display(), &mXTimeout, &mXInterval,
- &mXBlanking, &mXExposures);
-- // ... and disable it
-+ // And disable it. The internal X screensaver is not used at all, but we use its
-+ // internal idle timer (and it is also used by DPMS support in X). This timer must not
-+ // be altered by this code, since e.g. resetting the counter after activating our
-+ // screensaver would prevent DPMS from activating. We use the timer merely to detect
-+ // user activity.
- XSetScreenSaver(QX11Info::display(), 0, mXInterval, mXBlanking, mXExposures);
-
- mState = Waiting;
-@@ -87,7 +91,6 @@
-
- void SaverEngine::Lock()
- {
-- bool ok = true;
- if (mState == Waiting)
- {
- startLockProcess( ForceLock );
-@@ -125,6 +128,7 @@
-
- void SaverEngine::SimulateUserActivity()
- {
-+ XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
- if ( mXAutoLock && mState == Waiting )
- {
- mXAutoLock->resetTrigger();
-@@ -323,6 +327,8 @@
- //
- void SaverEngine::idleTimeout()
- {
-+ if( mState != Waiting )
-+ return; // already saving
- startLockProcess( DefaultLock );
- }
-
diff --git a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp b/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp
deleted file mode 100644
index fac3a214f2d1..000000000000
--- a/x11/kde4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
---- ../krunner/screensaver/xautolock.cpp (revision 916963)
-+++ ../krunner/screensaver/xautolock.cpp (revision 916964)
-@@ -83,8 +83,10 @@
- mActive = false;
-
- mTimerId = startTimer( CHECK_INTERVAL );
-+ // This is an internal clock timer (in seconds), used instead of querying system time.
-+ // It is incremented manually, preventing from problems with clock jumps.
-+ // In other words, this is the 'now' time and the reference point for other times here.
- mElapsed = 0;
--
- }
-
- //---------------------------------------------------------------------------
-@@ -126,8 +128,6 @@
- {
- mActive = true;
- resetTrigger();
-- XSetScreenSaver(QX11Info::display(), mTimeout + 10, 100, PreferBlanking, DontAllowExposures); // We'll handle blanking
-- kDebug() << "XSetScreenSaver" << mTimeout + 10;
- }
-
- //---------------------------------------------------------------------------
-@@ -138,8 +138,6 @@
- {
- mActive = false;
- resetTrigger();
-- XSetScreenSaver(QX11Info::display(), 0, 100, PreferBlanking, DontAllowExposures); // No blanking at all
-- kDebug() << "XSetScreenSaver 0";
- }
-
- //---------------------------------------------------------------------------
-@@ -148,12 +146,15 @@
- //
- void XAutoLock::resetTrigger()
- {
-+ // Time of the last user activity (used only when the internal XScreensaver
-+ // idle counter is not available).
- mLastReset = mElapsed;
-+ // Time when screensaver should be activated.
- mTrigger = mElapsed + mTimeout;
- #ifdef HAVE_XSCREENSAVER
- mLastIdle = 0;
- #endif
-- XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
-+ // Do not reset the internal X screensaver here (no XForceScreenSaver())
- }
-
- //---------------------------------------------------------------------------
-@@ -205,6 +206,9 @@
- if (mMitInfo)
- {
- Display *d = QX11Info::display();
-+ // Check user idle time. If it is smaller than before, it is either
-+ // clock jump or user activity, so reset the trigger time. Checking whether
-+ // there is user inactivity timeout is done below using mTrigger and mElapsed.
- XScreenSaverQueryInfo(d, DefaultRootWindow(d), mMitInfo);
- if (mLastIdle < mMitInfo->idle)
- mLastIdle = mMitInfo->idle;
-@@ -218,12 +222,11 @@
-
- bool activate = false;
-
-- // kDebug() << now << mTrigger;
-+ // This is the test whether to activate screensaver. If we have reached the time
-+ // and for the whole timeout period there was no activity (which would change mTrigger
-+ // again), activate.
- if (mElapsed >= mTrigger)
-- {
-- resetTrigger();
- activate = true;
-- }
-
- #ifdef HAVE_DPMS
- BOOL on;
-@@ -237,6 +240,8 @@
- // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
- // saving is active, simply always activate our saving too, otherwise
- // this could prevent locking from working.
-+ // X.Org 7.4: With this version activating DPMS resets the screensaver idle timer,
-+ // so keep this. It probably makes sense to always do this anyway.
- if(state == DPMSModeStandby || state == DPMSModeSuspend || state == DPMSModeOff)
- activate = true;
- // If we are DPMS-dependent and either DPMS is turned off completely or all
diff --git a/x11/kde4-workspace/pkg-plist b/x11/kde4-workspace/pkg-plist
index 0f53efd5db76..3cc33f7bb322 100644
--- a/x11/kde4-workspace/pkg-plist
+++ b/x11/kde4-workspace/pkg-plist
@@ -137,10 +137,10 @@ include/taskmanager/taskgroup.h
include/taskmanager/taskitem.h
include/taskmanager/taskmanager.h
include/taskmanager/taskmanager_export.h
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceConfig.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceConfigVersion.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceLibraryTargets-%%KDE4_BUILD_TYPE%%.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceLibraryTargets.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceConfig.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceConfigVersion.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets-release.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets.cmake
lib/kconf_update_bin/khotkeys_update
lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
@@ -761,9 +761,9 @@ share/doc/HTML/en/kcontrol/kwindecoration/main.png
share/doc/HTML/en/kcontrol/mouse/common
share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
share/doc/HTML/en/kcontrol/mouse/index.docbook
-share/doc/HTML/en/kcontrol/powerdevilconfig/common
-share/doc/HTML/en/kcontrol/powerdevilconfig/index.cache.bz2
-share/doc/HTML/en/kcontrol/powerdevilconfig/index.docbook
+share/doc/HTML/en/kcontrol/powerdevil/common
+share/doc/HTML/en/kcontrol/powerdevil/index.cache.bz2
+share/doc/HTML/en/kcontrol/powerdevil/index.docbook
share/doc/HTML/en/kcontrol/screensaver/common
share/doc/HTML/en/kcontrol/screensaver/index.cache.bz2
share/doc/HTML/en/kcontrol/screensaver/index.docbook
@@ -2001,7 +2001,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/windowbehaviour
@dirrm share/doc/HTML/en/kcontrol/splashscreen
@dirrm share/doc/HTML/en/kcontrol/screensaver
-@dirrm share/doc/HTML/en/kcontrol/powerdevilconfig
+@dirrm share/doc/HTML/en/kcontrol/powerdevil
@dirrm share/doc/HTML/en/kcontrol/mouse
@dirrm share/doc/HTML/en/kcontrol/kwindecoration
@dirrm share/doc/HTML/en/kcontrol/kwincompositing
@@ -2089,8 +2089,8 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/doc
@dirrm share/apps/desktoptheme/default/system-monitor
@dirrm share/apps/desktoptheme/default/calendar
-@dirrm lib/KDE4Workspace-%%KDE4_VERSION%%/cmake
-@dirrm lib/KDE4Workspace-%%KDE4_VERSION%%
+@dirrm lib/KDE4Workspace/cmake
+@dirrm lib/KDE4Workspace
@dirrm include/taskmanager
@dirrm include/solid/control/ifaces
@dirrm include/solid/control
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index d6a2f78a3236..b37826a60f10 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -8,7 +8,6 @@
PORTNAME= kdebase-runtime
PORTVERSION= ${KDE4_VERSION}
-PORTREVISION= 1
CATEGORIES= x11 kde
MASTER_SITES= ${MASTER_SITE_KDE}
MASTER_SITE_SUBDIR= ${KDE4_BRANCH}/${PORTVERSION}/src
diff --git a/x11/kdebase4-runtime/distinfo b/x11/kdebase4-runtime/distinfo
index 94fa7bb63013..93e4d6a3947a 100644
--- a/x11/kdebase4-runtime/distinfo
+++ b/x11/kdebase4-runtime/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 8ef48aae16a6dddb3055d81d7e5c375f
-SHA256 (KDE/kdebase-runtime-4.2.0.tar.bz2) = 5bb18a691915f42dc2a836422ce913405b5c51463caa236f2474293feead51d8
-SIZE (KDE/kdebase-runtime-4.2.0.tar.bz2) = 69901790
+MD5 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 93ef480ed5376ce02324d1b85b8bae0f
+SHA256 (KDE/kdebase-runtime-4.2.1.tar.bz2) = 0eba1fd2f9b453b4e60033ff4f969218ed3c42c71a37277ac88c4f3e6f7edd14
+SIZE (KDE/kdebase-runtime-4.2.1.tar.bz2) = 70247291
diff --git a/x11/kdebase4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake b/x11/kdebase4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake
deleted file mode 100644
index a71e40083978..000000000000
--- a/x11/kdebase4-runtime/files/patch-cmake_modules_FindPulseAudio.cmake
+++ /dev/null
@@ -1,29 +0,0 @@
---- ../cmake/modules/FindPulseAudio.cmake.orig 2008-09-03 11:24:24.000000000 +0000
-+++ ../cmake/modules/FindPulseAudio.cmake 2008-12-27 14:20:09.000000000 +0000
-@@ -16,16 +16,16 @@
- set(PULSEAUDIO_FIND_QUIETLY TRUE)
- endif (PULSEAUDIO_INCLUDE_DIR AND PULSEAUDIO_LIBRARY)
-
--if (NOT WIN32)
-- include(FindPkgConfig)
-- pkg_check_modules(PULSEAUDIO libpulse)
-- if(PULSEAUDIO_FOUND)
-- set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
-- set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
-- # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
-- # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
-- endif(PULSEAUDIO_FOUND)
--endif (NOT WIN32)
-+# if (NOT WIN32)
-+# include(FindPkgConfig)
-+# pkg_check_modules(PULSEAUDIO libpulse)
-+# if(PULSEAUDIO_FOUND)
-+# set(PULSEAUDIO_LIBRARY ${PULSEAUDIO_LIBRARIES} CACHE FILEPATH "Path to the PulseAudio library")
-+# set(PULSEAUDIO_INCLUDE_DIR ${PULSEAUDIO_INCLUDEDIR} CACHE PATH "Path to the PulseAudio includes")
-+# # PULSEAUDIO_DEFINITIONS - Compiler switches required for using PulseAudio
-+# # set(PULSEAUDIO_DEFINITIONS ${PULSEAUDIO_CFLAGS})
-+# endif(PULSEAUDIO_FOUND)
-+# endif (NOT WIN32)
-
- if (NOT PULSEAUDIO_INCLUDE_DIR)
- FIND_PATH(PULSEAUDIO_INCLUDE_DIR pulse/pulseaudio.h)
diff --git a/x11/kdebase4-runtime/pkg-plist b/x11/kdebase4-runtime/pkg-plist
index 0083d1aa44fa..50e29ca19d03 100644
--- a/x11/kdebase4-runtime/pkg-plist
+++ b/x11/kdebase4-runtime/pkg-plist
@@ -44,7 +44,6 @@ lib/kde4/kcm_knotify.so
lib/kde4/kcm_locale.so
lib/kde4/kcm_nepomuk.so
lib/kde4/kcm_phonon.so
-lib/kde4/kcm_phononxine.so
lib/kde4/kcm_trash.so
lib/kde4/kcmspellchecking.so
lib/kde4/kded_desktopnotifier.so
@@ -839,6 +838,7 @@ share/icons/oxygen/128x128/apps/preferences-system-windows.png
share/icons/oxygen/128x128/apps/preferences-web-browser-identification.png
share/icons/oxygen/128x128/apps/scribus.png
share/icons/oxygen/128x128/apps/semn.png
+share/icons/oxygen/128x128/apps/showfoto.png
share/icons/oxygen/128x128/apps/strigi.png
share/icons/oxygen/128x128/apps/system-diagnosis.png
share/icons/oxygen/128x128/apps/system-file-manager.png
@@ -1678,6 +1678,7 @@ share/icons/oxygen/16x16/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/16x16/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/16x16/apps/scribus.png
share/icons/oxygen/16x16/apps/semn.png
+share/icons/oxygen/16x16/apps/showfoto.png
share/icons/oxygen/16x16/apps/strigi.png
share/icons/oxygen/16x16/apps/system-file-manager.png
share/icons/oxygen/16x16/apps/system-software-update.png
@@ -2553,6 +2554,7 @@ share/icons/oxygen/22x22/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/22x22/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/22x22/apps/scribus.png
share/icons/oxygen/22x22/apps/semn.png
+share/icons/oxygen/22x22/apps/showfoto.png
share/icons/oxygen/22x22/apps/strigi.png
share/icons/oxygen/22x22/apps/system-file-manager.png
share/icons/oxygen/22x22/apps/system-software-update.png
@@ -3440,6 +3442,7 @@ share/icons/oxygen/32x32/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/32x32/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/32x32/apps/scribus.png
share/icons/oxygen/32x32/apps/semn.png
+share/icons/oxygen/32x32/apps/showfoto.png
share/icons/oxygen/32x32/apps/strigi.png
share/icons/oxygen/32x32/apps/system-file-manager.png
share/icons/oxygen/32x32/apps/system-software-update.png
@@ -4315,6 +4318,7 @@ share/icons/oxygen/48x48/apps/preferences-web-browser-shortcuts.png
share/icons/oxygen/48x48/apps/preferences-web-browser-stylesheets.png
share/icons/oxygen/48x48/apps/scribus.png
share/icons/oxygen/48x48/apps/semn.png
+share/icons/oxygen/48x48/apps/showfoto.png
share/icons/oxygen/48x48/apps/strigi.png
share/icons/oxygen/48x48/apps/system-file-manager.png
share/icons/oxygen/48x48/apps/system-software-update.png
@@ -4942,6 +4946,7 @@ share/icons/oxygen/64x64/apps/preferences-system-windows-move.png
share/icons/oxygen/64x64/apps/preferences-system-windows.png
share/icons/oxygen/64x64/apps/scribus.png
share/icons/oxygen/64x64/apps/semn.png
+share/icons/oxygen/64x64/apps/showfoto.png
share/icons/oxygen/64x64/apps/strigi.png
share/icons/oxygen/64x64/apps/system-file-manager.png
share/icons/oxygen/64x64/apps/system-software-update.png
@@ -6220,6 +6225,7 @@ share/icons/oxygen/scalable/apps/preferences-web-browser-shortcuts.svgz
share/icons/oxygen/scalable/apps/preferences-web-browser-stylesheets.svgz
share/icons/oxygen/scalable/apps/scribus.svgz
share/icons/oxygen/scalable/apps/semn.svg
+share/icons/oxygen/scalable/apps/showfoto.svgz
share/icons/oxygen/scalable/apps/small/16x16/accessories-calculator.svgz
share/icons/oxygen/scalable/apps/small/16x16/accessories-character-map.svgz
share/icons/oxygen/scalable/apps/small/16x16/accessories-dictionary.svgz
@@ -7442,7 +7448,6 @@ share/kde4/services/jpegthumbnail.desktop
share/kde4/services/kcm_kdnssd.desktop
share/kde4/services/kcm_nepomuk.desktop
share/kde4/services/kcm_phonon.desktop
-share/kde4/services/kcm_phononxine.desktop
share/kde4/services/kcmcgi.desktop
share/kde4/services/kcmkded.desktop
share/kde4/services/kcmnotify.desktop
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index cd7b63248e9f..9380d226f5fb 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -58,9 +58,6 @@ post-extract:
pre-configure:
${REINPLACE_CMD} -e 's|<qhash.h>|<QHash>|'\
${WRKSRC}/../kwin/effects/thumbnailaside.h
- ${REINPLACE_CMD} -e 's|<qdir.h>|<QDir>|'\
- -e 's|<qfile.h>|<QFile>|'\
- ${WRKSRC}/../kwin/effects/videorecord.cpp
.for item in b2/b2client.cpp kwmtheme/kwmthemeclient.cpp\
laptop/laptopclient.cpp modernsystem/modernsys.cpp\
redmond/redmond.cpp
diff --git a/x11/kdebase4-workspace/distinfo b/x11/kdebase4-workspace/distinfo
index 89497e8c976b..845540ffcd1f 100644
--- a/x11/kdebase4-workspace/distinfo
+++ b/x11/kdebase4-workspace/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-workspace-4.2.0.tar.bz2) = 193e30b9ed0b55b0196289d9df43a904
-SHA256 (KDE/kdebase-workspace-4.2.0.tar.bz2) = e5c550af7d655d62e37c51667f264b53eb9785166f3567960d91acd37b6f902b
-SIZE (KDE/kdebase-workspace-4.2.0.tar.bz2) = 50724381
+MD5 (KDE/kdebase-workspace-4.2.1.tar.bz2) = 5659e3c7c992fab38223b0a467377495
+SHA256 (KDE/kdebase-workspace-4.2.1.tar.bz2) = fa8165cb1c64046c4a659cd69962cda79093453f72bf4fb6df869a34dfb87f98
+SIZE (KDE/kdebase-workspace-4.2.1.tar.bz2) = 50777207
diff --git a/x11/kdebase4-workspace/files/patch-CMakeLists.txt b/x11/kdebase4-workspace/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..25851f037692
--- /dev/null
+++ b/x11/kdebase4-workspace/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- ../CMakeLists.txt.orig 2009-01-01 19:26:09.000000000 +0300
++++ ../CMakeLists.txt 2009-03-07 10:02:36.000000000 +0300
+@@ -220,7 +220,7 @@
+ macro_write_basic_cmake_version_file(${CMAKE_CURRENT_BINARY_DIR}/KDE4WorkspaceConfigVersion.cmake
+ ${KDE4WORKSPACE_VERSION_MAJOR} ${KDE4WORKSPACE_VERSION_MINOR} ${KDE4WORKSPACE_VERSION_PATCH})
+
+-set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace-${KDE4WORKSPACE_VERSION}/cmake)
++set(_KDE4WorkspaceConfig_INSTALL_DIR ${LIB_INSTALL_DIR}/KDE4Workspace/cmake)
+ # places where find_package() looks for FooConfig.cmake files:
+ # CMake >= 2.6.0 looks in lib/Foo*/cmake/, CMake >= 2.6.3 also looks in
+ # lib/cmake/Foo*/, which packagers prefer. So they can set the KDE4_USE_COMMON_CMAKE_PACKAGE_CONFIG_DIR
diff --git a/x11/kdebase4-workspace/files/patch-kdm_config.def b/x11/kdebase4-workspace/files/patch-kdm_config.def
deleted file mode 100644
index d099b948a4ff..000000000000
--- a/x11/kdebase4-workspace/files/patch-kdm_config.def
+++ /dev/null
@@ -1,13 +0,0 @@
---- ../kdm/config.def.orig 2008-08-02 16:58:49.000000000 +0200
-+++ ../kdm/config.def 2008-08-02 16:59:49.000000000 +0200
-@@ -35,8 +35,8 @@
- #ifdef _AIX
- # define HALT_CMD "/usr/sbin/shutdown -h now"
- # define REBOOT_CMD "/usr/sbin/shutdown -r now"
--#elif defined(BSD)
--# define HALT_CMD "/sbin/shutdown -h now"
-+#elif defined(__FreeBSD__)
-+# define HALT_CMD "/sbin/shutdown -p now"
- # define REBOOT_CMD "/sbin/shutdown -r now"
- #elif defined(__SVR4)
- # define HALT_CMD "/usr/sbin/halt"
diff --git a/x11/kdebase4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc b/x11/kdebase4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc
deleted file mode 100644
index 835260b86eff..000000000000
--- a/x11/kdebase4-workspace/files/patch-svn916964_krunner_lock_lockprocess.cc
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../krunner/lock/lockprocess.cc (revision 916963)
-+++ ../krunner/lock/lockprocess.cc (revision 916964)
-@@ -1104,7 +1104,6 @@
- return; // no resuming with dialog visible or when not visible
- if( mSuspended && mHackProc.state() == QProcess::Running )
- {
-- XForceScreenSaver(QX11Info::display(), ScreenSaverReset );
- QPainter p( this );
- p.drawPixmap( 0, 0, mSavedScreen );
- p.end();
diff --git a/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp b/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp
deleted file mode 100644
index 4f49a3d0463b..000000000000
--- a/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_saverengine.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
---- ../krunner/screensaver/saverengine.cpp (revision 916963)
-+++ ../krunner/screensaver/saverengine.cpp (revision 916964)
-@@ -46,7 +46,11 @@
- // Save X screensaver parameters
- XGetScreenSaver(QX11Info::display(), &mXTimeout, &mXInterval,
- &mXBlanking, &mXExposures);
-- // ... and disable it
-+ // And disable it. The internal X screensaver is not used at all, but we use its
-+ // internal idle timer (and it is also used by DPMS support in X). This timer must not
-+ // be altered by this code, since e.g. resetting the counter after activating our
-+ // screensaver would prevent DPMS from activating. We use the timer merely to detect
-+ // user activity.
- XSetScreenSaver(QX11Info::display(), 0, mXInterval, mXBlanking, mXExposures);
-
- mState = Waiting;
-@@ -87,7 +91,6 @@
-
- void SaverEngine::Lock()
- {
-- bool ok = true;
- if (mState == Waiting)
- {
- startLockProcess( ForceLock );
-@@ -125,6 +128,7 @@
-
- void SaverEngine::SimulateUserActivity()
- {
-+ XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
- if ( mXAutoLock && mState == Waiting )
- {
- mXAutoLock->resetTrigger();
-@@ -323,6 +327,8 @@
- //
- void SaverEngine::idleTimeout()
- {
-+ if( mState != Waiting )
-+ return; // already saving
- startLockProcess( DefaultLock );
- }
-
diff --git a/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp b/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp
deleted file mode 100644
index fac3a214f2d1..000000000000
--- a/x11/kdebase4-workspace/files/patch-svn916964_krunner_screensaver_xautolock.cpp
+++ /dev/null
@@ -1,84 +0,0 @@
---- ../krunner/screensaver/xautolock.cpp (revision 916963)
-+++ ../krunner/screensaver/xautolock.cpp (revision 916964)
-@@ -83,8 +83,10 @@
- mActive = false;
-
- mTimerId = startTimer( CHECK_INTERVAL );
-+ // This is an internal clock timer (in seconds), used instead of querying system time.
-+ // It is incremented manually, preventing from problems with clock jumps.
-+ // In other words, this is the 'now' time and the reference point for other times here.
- mElapsed = 0;
--
- }
-
- //---------------------------------------------------------------------------
-@@ -126,8 +128,6 @@
- {
- mActive = true;
- resetTrigger();
-- XSetScreenSaver(QX11Info::display(), mTimeout + 10, 100, PreferBlanking, DontAllowExposures); // We'll handle blanking
-- kDebug() << "XSetScreenSaver" << mTimeout + 10;
- }
-
- //---------------------------------------------------------------------------
-@@ -138,8 +138,6 @@
- {
- mActive = false;
- resetTrigger();
-- XSetScreenSaver(QX11Info::display(), 0, 100, PreferBlanking, DontAllowExposures); // No blanking at all
-- kDebug() << "XSetScreenSaver 0";
- }
-
- //---------------------------------------------------------------------------
-@@ -148,12 +146,15 @@
- //
- void XAutoLock::resetTrigger()
- {
-+ // Time of the last user activity (used only when the internal XScreensaver
-+ // idle counter is not available).
- mLastReset = mElapsed;
-+ // Time when screensaver should be activated.
- mTrigger = mElapsed + mTimeout;
- #ifdef HAVE_XSCREENSAVER
- mLastIdle = 0;
- #endif
-- XForceScreenSaver( QX11Info::display(), ScreenSaverReset );
-+ // Do not reset the internal X screensaver here (no XForceScreenSaver())
- }
-
- //---------------------------------------------------------------------------
-@@ -205,6 +206,9 @@
- if (mMitInfo)
- {
- Display *d = QX11Info::display();
-+ // Check user idle time. If it is smaller than before, it is either
-+ // clock jump or user activity, so reset the trigger time. Checking whether
-+ // there is user inactivity timeout is done below using mTrigger and mElapsed.
- XScreenSaverQueryInfo(d, DefaultRootWindow(d), mMitInfo);
- if (mLastIdle < mMitInfo->idle)
- mLastIdle = mMitInfo->idle;
-@@ -218,12 +222,11 @@
-
- bool activate = false;
-
-- // kDebug() << now << mTrigger;
-+ // This is the test whether to activate screensaver. If we have reached the time
-+ // and for the whole timeout period there was no activity (which would change mTrigger
-+ // again), activate.
- if (mElapsed >= mTrigger)
-- {
-- resetTrigger();
- activate = true;
-- }
-
- #ifdef HAVE_DPMS
- BOOL on;
-@@ -237,6 +240,8 @@
- // that is always smaller than DPMS timeout (X bug I guess). So if DPMS
- // saving is active, simply always activate our saving too, otherwise
- // this could prevent locking from working.
-+ // X.Org 7.4: With this version activating DPMS resets the screensaver idle timer,
-+ // so keep this. It probably makes sense to always do this anyway.
- if(state == DPMSModeStandby || state == DPMSModeSuspend || state == DPMSModeOff)
- activate = true;
- // If we are DPMS-dependent and either DPMS is turned off completely or all
diff --git a/x11/kdebase4-workspace/pkg-plist b/x11/kdebase4-workspace/pkg-plist
index 0f53efd5db76..3cc33f7bb322 100644
--- a/x11/kdebase4-workspace/pkg-plist
+++ b/x11/kdebase4-workspace/pkg-plist
@@ -137,10 +137,10 @@ include/taskmanager/taskgroup.h
include/taskmanager/taskitem.h
include/taskmanager/taskmanager.h
include/taskmanager/taskmanager_export.h
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceConfig.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceConfigVersion.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceLibraryTargets-%%KDE4_BUILD_TYPE%%.cmake
-lib/KDE4Workspace-%%KDE4_VERSION%%/cmake/KDE4WorkspaceLibraryTargets.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceConfig.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceConfigVersion.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets-release.cmake
+lib/KDE4Workspace/cmake/KDE4WorkspaceLibraryTargets.cmake
lib/kconf_update_bin/khotkeys_update
lib/kconf_update_bin/krdb_clearlibrarypath
lib/kconf_update_bin/kwin_update_default_rules
@@ -761,9 +761,9 @@ share/doc/HTML/en/kcontrol/kwindecoration/main.png
share/doc/HTML/en/kcontrol/mouse/common
share/doc/HTML/en/kcontrol/mouse/index.cache.bz2
share/doc/HTML/en/kcontrol/mouse/index.docbook
-share/doc/HTML/en/kcontrol/powerdevilconfig/common
-share/doc/HTML/en/kcontrol/powerdevilconfig/index.cache.bz2
-share/doc/HTML/en/kcontrol/powerdevilconfig/index.docbook
+share/doc/HTML/en/kcontrol/powerdevil/common
+share/doc/HTML/en/kcontrol/powerdevil/index.cache.bz2
+share/doc/HTML/en/kcontrol/powerdevil/index.docbook
share/doc/HTML/en/kcontrol/screensaver/common
share/doc/HTML/en/kcontrol/screensaver/index.cache.bz2
share/doc/HTML/en/kcontrol/screensaver/index.docbook
@@ -2001,7 +2001,7 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/doc/HTML/en/kcontrol/windowbehaviour
@dirrm share/doc/HTML/en/kcontrol/splashscreen
@dirrm share/doc/HTML/en/kcontrol/screensaver
-@dirrm share/doc/HTML/en/kcontrol/powerdevilconfig
+@dirrm share/doc/HTML/en/kcontrol/powerdevil
@dirrm share/doc/HTML/en/kcontrol/mouse
@dirrm share/doc/HTML/en/kcontrol/kwindecoration
@dirrm share/doc/HTML/en/kcontrol/kwincompositing
@@ -2089,8 +2089,8 @@ share/wallpapers/default_blue.jpg.desktop
@dirrm share/apps/doc
@dirrm share/apps/desktoptheme/default/system-monitor
@dirrm share/apps/desktoptheme/default/calendar
-@dirrm lib/KDE4Workspace-%%KDE4_VERSION%%/cmake
-@dirrm lib/KDE4Workspace-%%KDE4_VERSION%%
+@dirrm lib/KDE4Workspace/cmake
+@dirrm lib/KDE4Workspace
@dirrm include/taskmanager
@dirrm include/solid/control/ifaces
@dirrm include/solid/control
diff --git a/x11/kdebase4/distinfo b/x11/kdebase4/distinfo
index 8da5f818e6ed..ce2af62525a6 100644
--- a/x11/kdebase4/distinfo
+++ b/x11/kdebase4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdebase-4.2.0.tar.bz2) = da86a8ad624e86eda3a7509f39272060
-SHA256 (KDE/kdebase-4.2.0.tar.bz2) = 51694794fd90883f45456c8bf694feb9c0eafef1b267377c586c417913b0dd88
-SIZE (KDE/kdebase-4.2.0.tar.bz2) = 4249816
+MD5 (KDE/kdebase-4.2.1.tar.bz2) = a8f391db7b98feaa6ae81b8f1e99ed5a
+SHA256 (KDE/kdebase-4.2.1.tar.bz2) = 05c2111bcd0b5809f212c7f8f0e8b401bd68b4e684843c9dcd3658ba294482c1
+SIZE (KDE/kdebase-4.2.1.tar.bz2) = 4255541
diff --git a/x11/kdelibs4/distinfo b/x11/kdelibs4/distinfo
index 612408102bb4..4473e34eb737 100644
--- a/x11/kdelibs4/distinfo
+++ b/x11/kdelibs4/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdelibs-4.2.0.tar.bz2) = 2d830a922195fefe6e073111850247ac
-SHA256 (KDE/kdelibs-4.2.0.tar.bz2) = d66da8881f4d347a2140ce19e87dacf48809c02823f87cece680148f2b2ed665
-SIZE (KDE/kdelibs-4.2.0.tar.bz2) = 10033136
+MD5 (KDE/kdelibs-4.2.1.tar.bz2) = fa4206dd747890c4e4283c8adb831e6c
+SHA256 (KDE/kdelibs-4.2.1.tar.bz2) = 25ee5be213c4f1ccaf6f19a1a2375c3b23f6e2b4602a45542758e58782a0864d
+SIZE (KDE/kdelibs-4.2.1.tar.bz2) = 10049614
diff --git a/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake
new file mode 100644
index 000000000000..1562c5409d20
--- /dev/null
+++ b/x11/kdelibs4/files/patch-cmake_modules_FindLibKonq.cmake
@@ -0,0 +1,11 @@
+--- ../cmake/modules/FindLibKonq.cmake.orig 2009-01-07 03:13:55.000000000 +0300
++++ ../cmake/modules/FindLibKonq.cmake 2009-03-06 22:06:02.000000000 +0300
+@@ -19,7 +19,7 @@
+ else(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY)
+ find_path(LIBKONQ_INCLUDE_DIR konq_popupmenuplugin.h )
+
+- find_library(LIBKONQ_LIBRARY konq)
++ find_library(LIBKONQ_LIBRARY NAMES konq PATHS ${KDE4_LIB_INSTALL_DIR} NO_DEFAULT_PATH)
+
+ if(LIBKONQ_INCLUDE_DIR AND LIBKONQ_LIBRARY)
+ set(LIBKONQ_FOUND TRUE)
diff --git a/x11/kdelibs4/files/patch-kded-kded.cpp b/x11/kdelibs4/files/patch-kded-kded.cpp
deleted file mode 100644
index af0ff725708f..000000000000
--- a/x11/kdelibs4/files/patch-kded-kded.cpp
+++ /dev/null
@@ -1,68 +0,0 @@
---- ../kded/kded.cpp (revision 918837)
-+++ ../kded/kded.cpp (revision 918838)
-@@ -115,9 +115,8 @@
- KToolInvocation::kdeinitExecWait( "kdontchangethehostname", args );
- }
-
--Kded::Kded(bool checkUpdates)
-- : b_checkUpdates(checkUpdates),
-- m_needDelayedCheck(false)
-+Kded::Kded()
-+ : m_needDelayedCheck(false)
- {
- _self = this;
-
-@@ -280,7 +279,7 @@
- KSharedConfig::Ptr config = KGlobal::config();
- // Ensure the service exists.
- KService::Ptr service = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-- if (!service)
-+ if (!service)
- return;
- KConfigGroup cg(config, QString("Module-%1").arg(service->desktopEntryName()));
- cg.writeEntry("autoload", autoload);
-@@ -290,7 +289,7 @@
- bool Kded::isModuleAutoloaded(const QString &obj) const
- {
- KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-- if (!s)
-+ if (!s)
- return false;
- return isModuleAutoloaded(s);
- }
-@@ -307,7 +306,7 @@
- bool Kded::isModuleLoadedOnDemand(const QString &obj) const
- {
- KService::Ptr s = KService::serviceByDesktopPath("kded/"+obj+".desktop");
-- if (!s)
-+ if (!s)
- return false;
- return isModuleLoadedOnDemand(s);
- }
-@@ -446,7 +445,7 @@
-
- void Kded::updateDirWatch()
- {
-- if (!b_checkUpdates) return;
-+ if (!bCheckUpdates) return;
-
- delete m_pDirWatch;
- m_pDirWatch = new KDirWatch;
-@@ -471,7 +470,7 @@
- {
- delete KSycoca::self();
-
-- if (!b_checkUpdates) return;
-+ if (!bCheckUpdates) return;
-
- if (delayedCheck) return;
-
-@@ -921,7 +920,7 @@
- checkStamps = cg.readEntry("CheckFileStamps", true);
- delayedCheck = cg.readEntry("DelayedCheck", false);
-
-- Kded *kded = new Kded(false); // Build data base
-+ Kded *kded = new Kded(); // Build data base
-
- KDE_signal(SIGTERM, sighandler);
- KDE_signal(SIGHUP, sighandler);
diff --git a/x11/kdelibs4/files/patch-kded-kded.h b/x11/kdelibs4/files/patch-kded-kded.h
deleted file mode 100644
index b5459c80193e..000000000000
--- a/x11/kdelibs4/files/patch-kded-kded.h
+++ /dev/null
@@ -1,20 +0,0 @@
---- ../kded/kded.h (revision 918837)
-+++ ../kded/kded.h (revision 918838)
-@@ -41,7 +41,7 @@
- {
- Q_OBJECT
- public:
-- Kded(bool checkUpdates);
-+ Kded();
- virtual ~Kded();
-
- static Kded *self() { return _self;}
-@@ -186,8 +186,6 @@
- */
- KDirWatch* m_pDirWatch;
-
-- bool b_checkUpdates;
--
- /**
- * When a desktop file is updated, a timer is started (5 sec)
- * before rebuilding the binary - so that multiple updates result
diff --git a/x11/kdelibs4/files/patch-kinit-klauncher.cpp b/x11/kdelibs4/files/patch-kinit-klauncher.cpp
deleted file mode 100644
index bd4e42526602..000000000000
--- a/x11/kdelibs4/files/patch-kinit-klauncher.cpp
+++ /dev/null
@@ -1,199 +0,0 @@
-diff -u ../kinit/klauncher.cpp ../kinit/klauncher.cpp
---- ../kinit/klauncher.cpp (revision 918403)
-+++ ../kinit/klauncher.cpp (revision 918654)
-@@ -58,6 +58,9 @@
-
- // #define KLAUNCHER_VERBOSE_OUTPUT
-
-+static const char* const s_DBusStartupTypeToString[] =
-+ { "DBusNone", "DBusUnique", "DBusMulti", "DBusWait", "ERROR" };
-+
- using namespace KIO;
-
- IdleSlave::IdleSlave(QObject *parent)
-@@ -167,7 +170,7 @@
-
- KLauncher::KLauncher(int _kdeinitSocket)
- : QObject(0),
-- kdeinitSocket(_kdeinitSocket), dontBlockReading(false)
-+ kdeinitSocket(_kdeinitSocket)
- {
- #ifdef Q_WS_X11
- mCached_dpy = NULL;
-@@ -276,8 +279,24 @@
- {
- ssize_t result;
- int bytes_left = len;
-- while ( bytes_left > 0)
-- {
-+ while (bytes_left > 0) {
-+ // in case we get a request to start an application and data arrive
-+ // to kdeinitSocket at the same time, requestStart() will already
-+ // call slotKDEInitData(), so we must check there's still something
-+ // to read, otherwise this would block
-+
-+ // Same thing if kdeinit dies without warning.
-+
-+ fd_set in;
-+ timeval tm = { 30, 0 }; // 30 seconds timeout, so we're not stuck in case kdeinit dies on us
-+ FD_ZERO ( &in );
-+ FD_SET( sock, &in );
-+ select( sock + 1, &in, 0, 0, &tm );
-+ if( !FD_ISSET( sock, &in )) {
-+ kDebug(7016) << "read_socket" << sock << "nothing to read, kdeinit4 must be dead";
-+ return -1;
-+ }
-+
- result = read(sock, buffer, bytes_left);
- if (result > 0)
- {
-@@ -298,21 +317,7 @@
- {
- klauncher_header request_header;
- QByteArray requestData;
-- if( dontBlockReading )
-- {
-- // in case we get a request to start an application and data arrive
-- // to kdeinitSocket at the same time, requestStart() will already
-- // call slotKDEInitData(), so we must check there's still something
-- // to read, otherwise this would block
-- fd_set in;
-- timeval tm = { 0, 0 };
-- FD_ZERO ( &in );
-- FD_SET( kdeinitSocket, &in );
-- select( kdeinitSocket + 1, &in, 0, 0, &tm );
-- if( !FD_ISSET( kdeinitSocket, &in ))
-- return;
-- }
-- dontBlockReading = false;
-+
- int result = read_socket(kdeinitSocket, (char *) &request_header,
- sizeof( request_header));
- if (result == -1)
-@@ -391,15 +396,19 @@
- if (request->pid == pid)
- {
- if (request->dbus_startup_type == KService::DBusWait)
-- request->status = KLaunchRequest::Done;
-+ request->status = KLaunchRequest::Done;
- else if ((request->dbus_startup_type == KService::DBusUnique)
-- && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name))
-- request->status = KLaunchRequest::Running;
-- else
-- request->status = KLaunchRequest::Error;
-+ && QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) {
-+ request->status = KLaunchRequest::Running;
- #ifdef KLAUNCHER_VERBOSE_OUTPUT
-- kDebug(7016) << pid << "died, requestDone. status=" << request->status;
-+ kDebug(7016) << pid << "running as a unique app";
- #endif
-+ } else {
-+ request->status = KLaunchRequest::Error;
-+#ifdef KLAUNCHER_VERBOSE_OUTPUT
-+ kDebug(7016) << pid << "died, requestDone. status=" << request->status;
-+#endif
-+ }
- requestDone(request);
- return;
- }
-@@ -444,19 +453,29 @@
- if (request->status != KLaunchRequest::Launching)
- continue;
-
-+#ifdef KLAUNCHER_VERBOSE_OUTPUT
-+ kDebug(7016) << "had pending request" << request->name << s_DBusStartupTypeToString[request->dbus_startup_type] << "dbus_name" << request->dbus_name << request->tolerant_dbus_name;
-+#endif
- // For unique services check the requested service name first
-- if ((request->dbus_startup_type == KService::DBusUnique) &&
-- ((appId == request->dbus_name) ||
-- QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)))
-- {
-- request->status = KLaunchRequest::Running;
-- requestDone(request);
-- continue;
-+ if (request->dbus_startup_type == KService::DBusUnique) {
-+ if ((appId == request->dbus_name) || // just started
-+ QDBusConnection::sessionBus().interface()->isServiceRegistered(request->dbus_name)) { // was already running
-+ request->status = KLaunchRequest::Running;
-+#ifdef KLAUNCHER_VERBOSE_OUTPUT
-+ kDebug(7016) << "OK, unique app" << request->dbus_name << "is running";
-+#endif
-+ requestDone(request);
-+ continue;
-+ } else {
-+#ifdef KLAUNCHER_VERBOSE_OUTPUT
-+ kDebug(7016) << "unique app" << request->dbus_name << "not running yet";
-+#endif
-+ }
- }
-
-- const QString rAppId = request->dbus_name;
-+ const QString rAppId = !request->tolerant_dbus_name.isEmpty() ? request->tolerant_dbus_name : request->dbus_name;
- #ifdef KLAUNCHER_VERBOSE_OUTPUT
-- kDebug(7016) << "had pending request" << rAppId;
-+ //kDebug(7016) << "using" << rAppId << "for matching";
- #endif
- if (rAppId.isEmpty())
- continue;
-@@ -647,17 +666,21 @@
- request_header.cmd = LAUNCHER_EXEC_NEW;
- #endif
- request_header.arg_length = requestData.length();
-+
-+#ifdef KLAUNCHER_VERBOSE_OUTPUT
-+ kDebug(7016) << "Asking kdeinit to start" << request->name << request->arg_list
-+ << "cmd=" << commandToString(request_header.cmd);
-+#endif
-+
- write(kdeinitSocket, &request_header, sizeof(request_header));
- write(kdeinitSocket, requestData.data(), requestData.length());
-
- // Wait for pid to return.
- lastRequest = request;
-- dontBlockReading = false;
- do {
- slotKDEInitData( kdeinitSocket );
- }
- while (lastRequest != 0);
-- dontBlockReading = true;
- #endif
- }
-
-@@ -812,11 +835,18 @@
- request->dbus_name = v.toString().toUtf8();
- }
- if (request->dbus_name.isEmpty()) {
-- request->dbus_name = "*." + QFile::encodeName(KRun::binaryName(service->exec(), true));
-+ const QString binName = KRun::binaryName(service->exec(), true);
-+ request->dbus_name = "org.kde." + binName;
-+ request->tolerant_dbus_name = "*." + binName;
- }
- }
- }
-
-+#ifdef KLAUNCHER_VERBOSE_OUTPUT
-+ kDebug(7016) << "name=" << request->name << "dbus_name=" << request->dbus_name
-+ << "startup type=" << s_DBusStartupTypeToString[request->dbus_startup_type];
-+#endif
-+
- request->pid = 0;
- request->envs = envs;
- send_service_startup_info( request, service, startup_id, envs );
-@@ -932,7 +962,7 @@
- request->arg_list.append(arg.toLocal8Bit());
- }
-
-- request->name = app.toLocal8Bit();
-+ request->name = app;
-
- if (wait)
- request->dbus_startup_type = KService::DBusWait;
-@@ -1107,7 +1137,7 @@
- }
- if (mSlaveValgrind == arg1)
- {
-- arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name.toLocal8Bit())));
-+ arg_list.prepend(QFile::encodeName(KLibLoader::findLibrary(name)));
- arg_list.prepend(QFile::encodeName(KStandardDirs::locate("exe", "kioslave")));
- name = "valgrind";
- if (!mSlaveValgrindSkin.isEmpty()) {
diff --git a/x11/kdelibs4/files/patch-kinit-klauncher.h b/x11/kdelibs4/files/patch-kinit-klauncher.h
deleted file mode 100644
index bc0b14f52f45..000000000000
--- a/x11/kdelibs4/files/patch-kinit-klauncher.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kinit/klauncher.h (revision 918653)
-+++ ../kinit/klauncher.h (revision 918654)
-@@ -87,6 +87,7 @@
- QString name;
- QStringList arg_list;
- QString dbus_name;
-+ QString tolerant_dbus_name;
- enum status_t { Init = 0, Launching, Running, Error, Done };
- pid_t pid;
- status_t status;
diff --git a/x11/kdelibs4/files/patch-kio-kio-copyjob.cpp b/x11/kdelibs4/files/patch-kio-kio-copyjob.cpp
deleted file mode 100644
index 9ab742f74206..000000000000
--- a/x11/kdelibs4/files/patch-kio-kio-copyjob.cpp
+++ /dev/null
@@ -1,116 +0,0 @@
---- ../kio/kio/copyjob.cpp (revision 917169)
-+++ ../kio/kio/copyjob.cpp (revision 917170)
-@@ -153,7 +153,7 @@
- QList<CopyInfo> dirs;
- KUrl::List dirsToRemove;
- KUrl::List m_srcList;
-- KUrl::List m_skippedSourceUrls;
-+ KUrl::List m_successSrcList;
- KUrl::List::const_iterator m_currentStatSrc;
- bool m_bCurrentSrcIsDir;
- bool m_bCurrentOperationIsLink;
-@@ -770,10 +770,6 @@
-
- void CopyJobPrivate::skip( const KUrl & sourceUrl )
- {
-- // If this is one if toplevel sources,
-- // remove it from d->m_srcList, for a correct FilesRemoved() signal
-- // But don't do it right away, we have iterators into that list (#157601)
-- m_skippedSourceUrls.append( sourceUrl );
- dirsToRemove.removeAll( sourceUrl );
- }
-
-@@ -857,6 +853,7 @@
- {
- //this is required for the undo feature
- emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, true, false );
-+ m_successSrcList.append((*it).uSource);
- m_directoriesCopied.append( *it );
- dirs.erase( it );
- }
-@@ -1118,6 +1115,7 @@
- emit q->copyingDone( q, (*it).uSource, (*it).uDest, (*it).mtime, false, false );
- if (m_mode == CopyJob::Move)
- org::kde::KDirNotify::emitFileMoved( (*it).uSource.url(), (*it).uDest.url() );
-+ m_successSrcList.append((*it).uSource);
- }
- // remove from list, to move on to next file
- files.erase( it );
-@@ -1372,7 +1370,7 @@
- KIO::Job * newjob = 0;
- if ( m_mode == CopyJob::Link ) {
- // User requested that a symlink be made
-- JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
-+ const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
- newjob = linkNextFile(uSource, uDest, flags);
- if (!newjob)
- return;
-@@ -1384,7 +1382,7 @@
- (uSource.pass() == uDest.pass()))
- // Copying a symlink - only on the same protocol/host/etc. (#5601, downloading an FTP file through its link),
- {
-- JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
-+ const JobFlags flags = bOverwrite ? Overwrite : DefaultFlags;
- KIO::SimpleJob *newJob = KIO::symlink( (*it).linkDest, uDest, flags | HideProgressInfo /*no GUI*/ );
- Scheduler::scheduleJob(newJob);
- newjob = newJob;
-@@ -1509,23 +1507,6 @@
- // but then we need to jump to the else part below. Maybe with a recursive call?
- #endif
- } else {
-- // Finished - tell the world
-- if ( !m_bOnlyRenames )
-- {
-- KUrl url( m_globalDest );
-- if ( m_globalDestinationState != DEST_IS_DIR || m_asMethod )
-- url.setPath( url.directory() );
-- //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
-- org::kde::KDirNotify::emitFilesAdded( url.url() );
--
-- Q_FOREACH(const KUrl& url, m_skippedSourceUrls)
-- m_srcList.removeAll(url);
--
-- if ( m_mode == CopyJob::Move && !m_srcList.isEmpty() ) {
-- //kDebug(7007) << "KDirNotify'ing FilesRemoved " << m_srcList.toStringList();
-- org::kde::KDirNotify::emitFilesRemoved( m_srcList.toStringList() );
-- }
-- }
- if (m_reportTimer)
- m_reportTimer->stop();
- --m_processedFiles; // undo the "start at 1" hack
-@@ -1535,6 +1516,27 @@
- }
- }
-
-+void CopyJob::emitResult()
-+{
-+ Q_D(CopyJob);
-+ // Before we go, tell the world about the changes that were made.
-+ // Even if some error made us abort midway, we might still have done
-+ // part of the job so we better update the views! (#118583)
-+ if (!d->m_bOnlyRenames) {
-+ KUrl url(d->m_globalDest);
-+ if (d->m_globalDestinationState != DEST_IS_DIR || d->m_asMethod)
-+ url.setPath(url.directory());
-+ //kDebug(7007) << "KDirNotify'ing FilesAdded " << url;
-+ org::kde::KDirNotify::emitFilesAdded( url.url() );
-+
-+ if (d->m_mode == CopyJob::Move && !d->m_successSrcList.isEmpty()) {
-+ kDebug(7007) << "KDirNotify'ing FilesRemoved" << d->m_successSrcList.toStringList();
-+ org::kde::KDirNotify::emitFilesRemoved(d->m_successSrcList.toStringList());
-+ }
-+ }
-+ Job::emitResult();
-+}
-+
- void CopyJobPrivate::slotProcessedSize( KJob*, qulonglong data_size )
- {
- Q_Q(CopyJob);
-@@ -1801,6 +1803,7 @@
- kDebug(7007) << "Renaming succeeded, move on";
- ++m_processedFiles;
- emit q->copyingDone( q, *m_currentStatSrc, dest, -1 /*mtime unknown, and not needed*/, true, true );
-+ m_successSrcList.append(*m_currentStatSrc);
- statNextSrc();
- }
- }
diff --git a/x11/kdelibs4/files/patch-kio-kio-copyjob.h b/x11/kdelibs4/files/patch-kio-kio-copyjob.h
deleted file mode 100644
index e42e30810389..000000000000
--- a/x11/kdelibs4/files/patch-kio-kio-copyjob.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- ../kio/kio/copyjob.h (revision 917169)
-+++ ../kio/kio/copyjob.h (revision 917170)
-@@ -245,6 +245,7 @@
-
- protected:
- CopyJob(CopyJobPrivate &dd);
-+ void emitResult();
-
- private:
- Q_PRIVATE_SLOT(d_func(), void slotStart())
diff --git a/x11/kdelibs4/pkg-plist b/x11/kdelibs4/pkg-plist
index c84d936d548d..375c7fae40aa 100644
--- a/x11/kdelibs4/pkg-plist
+++ b/x11/kdelibs4/pkg-plist
@@ -29,6 +29,7 @@ include/KDE/DNSSD/RemoteService
include/KDE/DNSSD/ServiceBase
include/KDE/DNSSD/ServiceBrowser
include/KDE/DNSSD/ServiceModel
+include/KDE/DNSSD/ServiceTypeBrowser
include/KDE/DOM/AbstractView
include/KDE/DOM/Attr
include/KDE/DOM/CDATASection
@@ -1886,6 +1887,7 @@ share/apps/katepart/katepartui.rc
share/apps/katepart/script/cstyle.js
share/apps/katepart/script/jstest.js
share/apps/katepart/script/lisp.js
+share/apps/katepart/script/lilypond.js
share/apps/katepart/script/python.js
share/apps/katepart/script/ruby.js
share/apps/katepart/script/sort.js
@@ -2054,6 +2056,8 @@ share/apps/kcharselect/kcharselect-data
share/apps/kcm_componentchooser/kcm_instantmessenger.desktop
share/apps/kcm_componentchooser/kcm_ktexteditor.desktop
share/apps/kconf_update/kcookiescfg.upd
+share/apps/kconf_update/ksslcertificatemanager.upd
+share/apps/kconf_update/ksslcertificatemanager.upd.sh
share/apps/kconf_update/kded.upd
share/apps/kconf_update/kio_help.upd
share/apps/kconf_update/kioslave.upd